groovy 1.8 doesn't like overloads with different visibility

diff --git a/jps/src/org/jetbrains/jps/ProjectBuilder.groovy b/jps/src/org/jetbrains/jps/ProjectBuilder.groovy
index 22b5ead3770d712b751d3aa18606de4062bfc32b..68fa8e955186ab5f85edcac891b524887998f9d8 100644 (file)
--- a/jps/src/org/jetbrains/jps/ProjectBuilder.groovy
+++ b/jps/src/org/jetbrains/jps/ProjectBuilder.groovy
@@ -179,7 +179,7 @@ class ProjectBuilder {
   private def clearChunks(Collection<Module> modules) {
     getChunks(true).getChunkList().each {
       if (!modules.intersect(it.modules).isEmpty()) {
-        clearChunk(it)
+        clearChunk(it, null, null)
       }
     }
   }
@@ -224,7 +224,7 @@ class ProjectBuilder {
   private def buildChunks(Collection<Module> modules, boolean tests) {
     getChunks(tests).getChunkList().each {
       if (!modules.intersect(it.modules).isEmpty()) {
-        buildChunk(it, tests)
+        buildChunk(it, tests, null, null, null)
       }
     }
   }
@@ -291,13 +291,7 @@ class ProjectBuilder {
     }
   }
 
-  private def clearChunk(ModuleChunk c) {
-    clearChunk(c, null, null)
-  }
 
-  private def buildChunk(ModuleChunk chunk, boolean tests) {
-    buildChunk(chunk, tests, null, null, null)
-  }
 
   def buildChunk(ModuleChunk chunk, boolean tests, Collection<String> files, Backend callback, ProjectWrapper pw) {
     Set<ModuleChunk> compiledSet = tests ? compiledTestChunks : compiledChunks

diff --git a/jps/testSrc/org/jetbrains/jps/util/FileUtil.groovy b/jps/testSrc/org/jetbrains/jps/util/FileUtil.groovy
index 9af86d7a25c11ad27e587d42d2567d28b72f4cdb..f1b669718e2cdd759ea3c228c61bf892bdf08cca 100644 (file)
--- a/jps/testSrc/org/jetbrains/jps/util/FileUtil.groovy
+++ b/jps/testSrc/org/jetbrains/jps/util/FileUtil.groovy
@@ -73,7 +73,7 @@ class FileUtil {
     if (name.endsWith(".jar") || name.endsWith(".war") || name.endsWith(".zip")) {
       def dir1 = ZipUtil.extractToTempDir(file1)
       def dir2 = ZipUtil.extractToTempDir(file2)
-      processed = compareDirectories(dir1, dir2, relativePath)
+      processed = _compareDirectories(dir1, dir2, relativePath)
       delete(dir1)
       delete(dir2)
     }
@@ -98,11 +98,11 @@ class FileUtil {
       return
     }
     System.out.println("Comparing ${dir1.absolutePath}(#1) and ${dir2.absolutePath}(#2)...");
-    def files = compareDirectories(dir1, dir2, "")
+    def files = _compareDirectories(dir1, dir2, "")
     System.out.println("$files files processed.");
   }
 
-  private static int compareDirectories(File dir1, File dir2, String relativePath) {
+  private static int _compareDirectories(File dir1, File dir2, String relativePath) {
     def processed = 0
     Set<String> dir2Files = dir2.listFiles()*.name as Set
 
@@ -118,7 +118,7 @@ class FileUtil {
           processed += compareFiles(child1, child2, relativePath + "/" + child1.name)
         }
         else if (child1.isDirectory() && child2.isDirectory()) {
-          processed += compareDirectories(child1, child2, relativePath + "/" + child1.name)
+          processed += _compareDirectories(child1, child2, relativePath + "/" + child1.name)
         }
         else {
           System.out.println("type mismatch for $relativePath: #1 is ${child1.isDirectory() ? "dir" : "file"}, #2 is ${child2.isDirectory() ? "dir" : "file"}");

diff --git a/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/formatter/EnterActionTest.groovy b/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/formatter/EnterActionTest.groovy
index 2660e3cbd0085dead7a205ae2c99945fd20f3057..1de81cbf2f4543a560453e6aa3657c9e4f3d9c92 100644 (file)
--- a/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/formatter/EnterActionTest.groovy
+++ b/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/formatter/EnterActionTest.groovy
@@ -32,7 +32,7 @@ public class EnterActionTest extends GroovyFormatterTestCase {
   }
 
 
-  private void doTest() throws Throwable {
+  void doTest() throws Throwable {
     final List<String> data = TestUtils.readInput(getTestDataPath() + getTestName(true) + ".test");
     myFixture.configureByText(GroovyFileType.GROOVY_FILE_TYPE, data.get(0));
     doEnter();