Fix groovy#188: Rename chars() to toArray() to fix collision with Java 8

felixdo · Jul 24, 2016 · 6a918d8 · 6a918d8
1 parent 31fe9f3
commit 6a918d8
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/...t.completion/src/org/codehaus/groovy/eclipse/codeassist/processors/CharArraySequence.java b/...t.completion/src/org/codehaus/groovy/eclipse/codeassist/processors/CharArraySequence.java
@@ -32,7 +32,7 @@ public CharArraySequence(String contents) {
         this.chars = contents.toCharArray();
     }
 
-    public char[] chars() {
+    public char[] toArray() {
         return chars;
     }
 
@@ -60,4 +60,4 @@ public String toString() {
         }
         return sb.toString();
     }
-}
+}
diff --git a/...ion/src/org/codehaus/groovy/eclipse/codeassist/processors/GroovyImportRewriteFactory.java b/...ion/src/org/codehaus/groovy/eclipse/codeassist/processors/GroovyImportRewriteFactory.java
@@ -130,7 +130,7 @@ public ImportRewrite getImportRewrite(IProgressMonitor monitor) {
 
             ASTParser parser = ASTParser.newParser(getAstLevel());
 			parser.setSource(unit.cloneCachingContents(CharOperation.concat(
-					imports.chars(), "\nclass X { }".toCharArray())));
+					imports.toArray(), "\nclass X { }".toCharArray())));
 			parser.setKind(ASTParser.K_COMPILATION_UNIT);
 			ASTNode result = null;
 			try {