merge master
authorMaxim Medvedev <maxim.medvedev@jetbrains.com>
Fri, 21 May 2010 13:39:25 +0000 (17:39 +0400)
committerMaxim Medvedev <maxim.medvedev@jetbrains.com>
Fri, 21 May 2010 13:39:25 +0000 (17:39 +0400)
1  2 
java/java-impl/src/com/intellij/psi/impl/source/codeStyle/JavaCodeStyleManagerImpl.java
java/java-tests/testSrc/com/intellij/refactoring/ChangeSignatureTest.java
platform/lvcs-impl/testSrc/com/intellij/historyIntegrTests/FileListeningTest.java
plugins/groovy/src/META-INF/plugin.xml
plugins/groovy/src/org/jetbrains/plugins/groovy/GroovyBundle.properties
plugins/groovy/src/org/jetbrains/plugins/groovy/annotator/GroovyAnnotator.java
plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/GroovyPsiElementFactoryImpl.java
plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/typedef/members/GrMethodBaseImpl.java
plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/util/PsiUtil.java
plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenArtifact.java
resources/src/META-INF/IdeaPlugin.xml

index c49ff116a74495aa79826920ac0d3b3da33800c4,895c16050a7599832e9d2f0f0a18e7cb61d26362..24d4611d518f371b20ac3753cd4215804f96a250
@@@ -72,10 -76,16 +76,16 @@@ public class FileListeningTest extends 
  
      List<Change> changes = getVcs().getChangeListInTests().getChangesInTests().get(0).getChanges();
      assertEquals(4, changes.size());
-     assertEquals(dir1, ((StructuralChange)changes.get(0)).getPath());
-     assertEquals(dir2, ((StructuralChange)changes.get(1)).getPath());
-     assertEquals(f2, ((StructuralChange)changes.get(2)).getPath());
-     assertEquals(f1, ((StructuralChange)changes.get(3)).getPath());
+     List<String> actual = new SmartList<String>();
+     for (Change each : changes) {
+       actual.add(((StructuralChange)each).getPath());
+     }
 -    
++
+     List<String> expected = new ArrayList<String>(Arrays.asList(dir1, dir2, f1, f2));
+     Collections.sort(actual);
+     Collections.sort(expected);
+     assertOrderedEquals(actual, expected);
    }
  
    public void testChangingFileContent() throws Exception {
      ReadOnlyAttributeUtil.setReadOnlyAttribute(f, false);
      assertEquals(3, getRevisionsFor(f).size());
    }
--  
++
    public void testIgnoringROStstusChangeForUnversionedFiles() throws Exception {
      int before = getRevisionsFor(myRoot).size();
  
  
      assertEquals(before, getRevisionsFor(myRoot).size());
    }
--  
++
    public void testDeletion() throws Exception {
      VirtualFile f = createDirectory("f.txt");
  
  
    public void testCreationAndDeletionOfUnversionedFile() throws IOException {
      addExcludedDir(myRoot.getPath() + "/dir");
--    
++
      Module m = createModule("foo");
      addContentRoot(m, myRoot.getPath() + "/dir/subDir");
  
index 4f2e1a91b8810b2830997742ac352cdd131bc752,b134838b6f2df0c3fe5f7e58144b8f37314e5c31..dbeb0b6daf07546d700a709a28a2e4b285516674
@@@ -335,4 -335,5 +335,6 @@@ property.name.expected=Property name ex
  add.method.body=Add method body
  wildcards.are.not.allowed.in.extends.list=A super type may not specify a wildcard type
  method.doesnot.override.super=Method does not override method from its superclass
 +method.duplicate=Method with signature {0} is already defined in the class ''{1}''
+ method.duplicate={0} is already defined
+ ambiguous.code.block=Ambiguous code block
Simple merge