This is an automated email from the ASF dual-hosted git repository. sunlan pushed a commit to branch GROOVY_3_0_X in repository https://gitbox.apache.org/repos/asf/groovy.git
commit 9c6e8be7301ff435f8c4c53c0dbca0129d62cb91 Author: Daniel Sun <[email protected]> AuthorDate: Sat Apr 11 20:35:24 2020 +0800 Trivial refactoring: Replaced with Java-Style code (cherry picked from commit f389be25b554d2f372a60c0712e9a923d8629401) --- src/main/java/groovy/io/PlatformLineWriter.java | 2 +- src/main/java/groovy/lang/ExpandoMetaClass.java | 4 ++-- src/main/java/groovy/lang/MetaClassImpl.java | 10 ++++----- .../groovy/ast/MixinASTTransformation.java | 2 +- .../codehaus/groovy/reflection/ParameterTypes.java | 4 ++-- .../reflection/stdclasses/CachedClosureClass.java | 2 +- .../codehaus/groovy/runtime/MethodRankHelper.java | 4 ++-- .../groovy/runtime/StringBufferWriter.java | 2 +- .../groovy/runtime/callsite/ConstructorSite.java | 6 +++--- .../runtime/callsite/StaticMetaMethodSite.java | 6 +++--- .../runtime/metaclass/ConcurrentReaderHashMap.java | 4 ++-- .../groovy/runtime/metaclass/MetaMethodIndex.java | 14 ++++++------- .../org/codehaus/groovy/tools/GroovyStarter.java | 4 ++-- .../groovy/transform/ASTTransformation.java | 2 +- .../groovy/util/AbstractConcurrentMap.java | 12 +++++------ .../groovy/util/AbstractConcurrentMapBase.java | 24 +++++++++++----------- .../codehaus/groovy/util/ComplexKeyHashMap.java | 2 +- .../java/org/codehaus/groovy/util/FastArray.java | 2 +- 18 files changed, 53 insertions(+), 53 deletions(-) diff --git a/src/main/java/groovy/io/PlatformLineWriter.java b/src/main/java/groovy/io/PlatformLineWriter.java index 7fb5289..f4e5cfe 100644 --- a/src/main/java/groovy/io/PlatformLineWriter.java +++ b/src/main/java/groovy/io/PlatformLineWriter.java @@ -41,7 +41,7 @@ public class PlatformLineWriter extends Writer { writer = new BufferedWriter(out, sz); } - public void write(char cbuf[], int off, int len) throws IOException { + public void write(char[] cbuf, int off, int len) throws IOException { for (; len > 0; len--) { char c = cbuf[off++]; if (c == '\n') { diff --git a/src/main/java/groovy/lang/ExpandoMetaClass.java b/src/main/java/groovy/lang/ExpandoMetaClass.java index 73a2ad4..558531e 100644 --- a/src/main/java/groovy/lang/ExpandoMetaClass.java +++ b/src/main/java/groovy/lang/ExpandoMetaClass.java @@ -1348,7 +1348,7 @@ public class ExpandoMetaClass extends MetaClassImpl implements GroovyObject { public Object invokeMethod(String name, Object obj) { if (obj instanceof Object[]) { - Object args[] = (Object[]) obj; + Object[] args = (Object[]) obj; if (args.length == 1 && args[0] instanceof Closure) { registerSubclassInstanceMethod(name, klazz, (Closure) args[0]); return null; @@ -1395,7 +1395,7 @@ public class ExpandoMetaClass extends MetaClassImpl implements GroovyObject { c.call((Object)null); return null; } - Object args[] = (Object[]) obj; + Object[] args = (Object[]) obj; if (args.length == 1 && args[0] instanceof Closure) { registerInstanceMethod(name, (Closure) args[0]); } else if (args.length == 2 && args[0] instanceof Class && args[1] instanceof Closure) diff --git a/src/main/java/groovy/lang/MetaClassImpl.java b/src/main/java/groovy/lang/MetaClassImpl.java index 27b19bf..9e8ab86 100644 --- a/src/main/java/groovy/lang/MetaClassImpl.java +++ b/src/main/java/groovy/lang/MetaClassImpl.java @@ -212,7 +212,7 @@ public class MetaClassImpl implements MetaClass, MutableMetaClass { * @param theClass The class * @param add The methods */ - public MetaClassImpl(MetaClassRegistry registry, final Class theClass, MetaMethod add[]) { + public MetaClassImpl(MetaClassRegistry registry, final Class theClass, MetaMethod[] add) { this(theClass, add); this.registry = registry; this.constructors = new FastArray(theCachedClass.getConstructors()); @@ -620,7 +620,7 @@ public class MetaClassImpl implements MetaClass, MutableMetaClass { private void inheritInterfaceNewMetaMethods(Set<CachedClass> interfaces) { // add methods declared by DGM for interfaces for (CachedClass cls : interfaces) { - MetaMethod methods[] = getNewMetaMethods(cls); + MetaMethod[] methods = getNewMetaMethods(cls); for (MetaMethod method : methods) { boolean skip = false; // skip DGM methods on an interface if the class already has the method @@ -3169,7 +3169,7 @@ public class MetaClassImpl implements MetaClass, MutableMetaClass { return; } - Object data[] = list.getArray(); + Object[] data = list.getArray(); for (int j = 0; j != len; ++j) { MetaMethod aMethod = (MetaMethod) data[j]; Boolean match = getMatchKindForCategory(aMethod, method); @@ -3217,7 +3217,7 @@ public class MetaClassImpl implements MetaClass, MutableMetaClass { if (methods instanceof FastArray) { FastArray m = (FastArray) methods; final int len = m.size; - final Object data[] = m.getArray(); + final Object[] data = m.getArray(); for (int i = 0; i != len; ++i) { MetaMethod method = (MetaMethod) data[i]; if (method.isMethod(aMethod)) { @@ -3278,7 +3278,7 @@ public class MetaClassImpl implements MetaClass, MutableMetaClass { Object matchingMethods = null; final int len = methods.size; - Object data[] = methods.getArray(); + Object[] data = methods.getArray(); for (int i = 0; i != len; ++i) { Object method = data[i]; diff --git a/src/main/java/org/codehaus/groovy/ast/MixinASTTransformation.java b/src/main/java/org/codehaus/groovy/ast/MixinASTTransformation.java index 21bccce..5bbe7b0 100644 --- a/src/main/java/org/codehaus/groovy/ast/MixinASTTransformation.java +++ b/src/main/java/org/codehaus/groovy/ast/MixinASTTransformation.java @@ -42,7 +42,7 @@ import static org.codehaus.groovy.ast.tools.GeneralUtils.stmt; public class MixinASTTransformation extends AbstractASTTransformation { private static final ClassNode MY_TYPE = make(Mixin.class); - public void visit(ASTNode nodes[], SourceUnit source) { + public void visit(ASTNode[] nodes, SourceUnit source) { init(nodes, source); AnnotationNode node = (AnnotationNode) nodes[0]; AnnotatedNode parent = (AnnotatedNode) nodes[1]; diff --git a/src/main/java/org/codehaus/groovy/reflection/ParameterTypes.java b/src/main/java/org/codehaus/groovy/reflection/ParameterTypes.java index 6069036..4b7cc45 100644 --- a/src/main/java/org/codehaus/groovy/reflection/ParameterTypes.java +++ b/src/main/java/org/codehaus/groovy/reflection/ParameterTypes.java @@ -36,11 +36,11 @@ public class ParameterTypes { public ParameterTypes() { } - public ParameterTypes(Class pt[]) { + public ParameterTypes(Class[] pt) { nativeParamTypes = pt; } - public ParameterTypes(String pt[]) { + public ParameterTypes(String[] pt) { nativeParamTypes = new Class[pt.length]; for (int i = 0; i != pt.length; ++i) { try { diff --git a/src/main/java/org/codehaus/groovy/reflection/stdclasses/CachedClosureClass.java b/src/main/java/org/codehaus/groovy/reflection/stdclasses/CachedClosureClass.java index 7dcaed0..5ade872 100644 --- a/src/main/java/org/codehaus/groovy/reflection/stdclasses/CachedClosureClass.java +++ b/src/main/java/org/codehaus/groovy/reflection/stdclasses/CachedClosureClass.java @@ -29,7 +29,7 @@ public class CachedClosureClass extends CachedClass { public CachedClosureClass(Class klazz, ClassInfo classInfo) { super(klazz, classInfo); - CachedMethod methods [] = getMethods(); + CachedMethod[] methods = getMethods(); // set it to -1 for starters so parameterTypes will always get a type int maximumNumberOfParameters = -1; diff --git a/src/main/java/org/codehaus/groovy/runtime/MethodRankHelper.java b/src/main/java/org/codehaus/groovy/runtime/MethodRankHelper.java index 83723df..74a4a5a 100644 --- a/src/main/java/org/codehaus/groovy/runtime/MethodRankHelper.java +++ b/src/main/java/org/codehaus/groovy/runtime/MethodRankHelper.java @@ -428,7 +428,7 @@ public class MethodRankHelper{ int[][] vals = new int[3][n + 1]; - int _d[]; //placeholder to assist in rotating vals + int[] _d; //placeholder to assist in rotating vals // indexes into strings s and t int i; // iterates through s @@ -519,7 +519,7 @@ public class MethodRankHelper{ int[][] vals = new int[3][n + 1]; - int _d[]; //placeholder to assist in rotating vals + int[] _d; //placeholder to assist in rotating vals // indexes into arrays s and t int i; // iterates through s diff --git a/src/main/java/org/codehaus/groovy/runtime/StringBufferWriter.java b/src/main/java/org/codehaus/groovy/runtime/StringBufferWriter.java index d25398e..09ce506 100644 --- a/src/main/java/org/codehaus/groovy/runtime/StringBufferWriter.java +++ b/src/main/java/org/codehaus/groovy/runtime/StringBufferWriter.java @@ -51,7 +51,7 @@ public class StringBufferWriter extends Writer { * @param offset Offset from which to start writing characters * @param length Number of characters to write */ - public void write(char text[], int offset, int length) { + public void write(char[] text, int offset, int length) { if ((offset < 0) || (offset > text.length) || (length < 0) || ((offset + length) > text.length) || ((offset + length) < 0)) { throw new IndexOutOfBoundsException(); } diff --git a/src/main/java/org/codehaus/groovy/runtime/callsite/ConstructorSite.java b/src/main/java/org/codehaus/groovy/runtime/callsite/ConstructorSite.java index 1724ac0..9f50abe 100644 --- a/src/main/java/org/codehaus/groovy/runtime/callsite/ConstructorSite.java +++ b/src/main/java/org/codehaus/groovy/runtime/callsite/ConstructorSite.java @@ -31,7 +31,7 @@ public class ConstructorSite extends MetaClassSite { final Class[] params; private final int version; - public ConstructorSite(CallSite site, MetaClassImpl metaClass, CachedConstructor constructor, Class params[]) { + public ConstructorSite(CallSite site, MetaClassImpl metaClass, CachedConstructor constructor, Class[] params) { super(site, metaClass); this.constructor = constructor; this.params = params; @@ -74,7 +74,7 @@ public class ConstructorSite extends MetaClassSite { */ public static class ConstructorSiteNoUnwrap extends ConstructorSite { - public ConstructorSiteNoUnwrap(CallSite site, MetaClassImpl metaClass, CachedConstructor constructor, Class params[]) { + public ConstructorSiteNoUnwrap(CallSite site, MetaClassImpl metaClass, CachedConstructor constructor, Class[] params) { super(site, metaClass, constructor, params); } @@ -95,7 +95,7 @@ public class ConstructorSite extends MetaClassSite { */ public static class ConstructorSiteNoUnwrapNoCoerce extends ConstructorSite { - public ConstructorSiteNoUnwrapNoCoerce(CallSite site, MetaClassImpl metaClass, CachedConstructor constructor, Class params[]) { + public ConstructorSiteNoUnwrapNoCoerce(CallSite site, MetaClassImpl metaClass, CachedConstructor constructor, Class[] params) { super(site, metaClass, constructor, params); } diff --git a/src/main/java/org/codehaus/groovy/runtime/callsite/StaticMetaMethodSite.java b/src/main/java/org/codehaus/groovy/runtime/callsite/StaticMetaMethodSite.java index 2758478..399594f 100644 --- a/src/main/java/org/codehaus/groovy/runtime/callsite/StaticMetaMethodSite.java +++ b/src/main/java/org/codehaus/groovy/runtime/callsite/StaticMetaMethodSite.java @@ -33,7 +33,7 @@ import org.codehaus.groovy.runtime.ScriptBytecodeAdapter; public class StaticMetaMethodSite extends MetaMethodSite { private final int version; - public StaticMetaMethodSite(CallSite site, MetaClassImpl metaClass, MetaMethod metaMethod, Class params[]) { + public StaticMetaMethodSite(CallSite site, MetaClassImpl metaClass, MetaMethod metaMethod, Class[] params) { super(site, metaClass, metaMethod, params); version = metaClass.getVersion (); } @@ -122,7 +122,7 @@ public class StaticMetaMethodSite extends MetaMethodSite { */ public static class StaticMetaMethodSiteNoUnwrap extends StaticMetaMethodSite { - public StaticMetaMethodSiteNoUnwrap(CallSite site, MetaClassImpl metaClass, MetaMethod metaMethod, Class params[]) { + public StaticMetaMethodSiteNoUnwrap(CallSite site, MetaClassImpl metaClass, MetaMethod metaMethod, Class[] params) { super(site, metaClass, metaMethod, params); } @@ -140,7 +140,7 @@ public class StaticMetaMethodSite extends MetaMethodSite { */ public static class StaticMetaMethodSiteNoUnwrapNoCoerce extends StaticMetaMethodSite { - public StaticMetaMethodSiteNoUnwrapNoCoerce(CallSite site, MetaClassImpl metaClass, MetaMethod metaMethod, Class params[]) { + public StaticMetaMethodSiteNoUnwrapNoCoerce(CallSite site, MetaClassImpl metaClass, MetaMethod metaMethod, Class[] params) { super(site, metaClass, metaMethod, params); } diff --git a/src/main/java/org/codehaus/groovy/runtime/metaclass/ConcurrentReaderHashMap.java b/src/main/java/org/codehaus/groovy/runtime/metaclass/ConcurrentReaderHashMap.java index a99f714..71d29af 100644 --- a/src/main/java/org/codehaus/groovy/runtime/metaclass/ConcurrentReaderHashMap.java +++ b/src/main/java/org/codehaus/groovy/runtime/metaclass/ConcurrentReaderHashMap.java @@ -713,7 +713,7 @@ public class ConcurrentReaderHashMap public boolean containsValue(Object value) { if (value == null) throw new NullPointerException(); - Entry tab[] = getTableForReading(); + Entry[] tab = getTableForReading(); for (Entry entry : tab) { for (Entry e = entry; e != null; e = e.next) @@ -780,7 +780,7 @@ public class ConcurrentReaderHashMap * Removes all mappings from this map. */ public synchronized void clear() { - Entry tab[] = table; + Entry[] tab = table; for (int i = 0; i < tab.length ; ++i) { // must invalidate all to force concurrent get's to wait and then retry diff --git a/src/main/java/org/codehaus/groovy/runtime/metaclass/MetaMethodIndex.java b/src/main/java/org/codehaus/groovy/runtime/metaclass/MetaMethodIndex.java index e1ca0f8..fbdaadc 100644 --- a/src/main/java/org/codehaus/groovy/runtime/metaclass/MetaMethodIndex.java +++ b/src/main/java/org/codehaus/groovy/runtime/metaclass/MetaMethodIndex.java @@ -92,7 +92,7 @@ public class MetaMethodIndex { } } - protected Entry table[]; + protected Entry[] table; protected static final int DEFAULT_CAPACITY = 32; protected static final int MINIMUM_CAPACITY = 4; @@ -275,7 +275,7 @@ public class MetaMethodIndex { FastArray oldList = (FastArray) oldListOrMethod; Entry e = null; int len1 = oldList.size(); - Object list[] = oldList.getArray(); + Object[] list = oldList.getArray(); for (int j = 0; j != len1; ++j) { MetaMethod method = (MetaMethod) list[j]; if (method.isPrivate()) continue; @@ -298,7 +298,7 @@ public class MetaMethodIndex { FastArray oldList = (FastArray) oldListOrMethod; Entry e = null; int len1 = oldList.size(); - Object list[] = oldList.getArray(); + Object[] list = oldList.getArray(); for (int j = 0; j != len1; ++j) { MetaMethod method = (MetaMethod) list[j]; if (e == null) @@ -320,7 +320,7 @@ public class MetaMethodIndex { if (oldListOrMethod instanceof FastArray) { FastArray oldList = (FastArray) oldListOrMethod; int len1 = oldList.size(); - Object list[] = oldList.getArray(); + Object[] list = oldList.getArray(); for (int j = 0; j != len1; ++j) { MetaMethod method = (MetaMethod) list[j]; if (method.isPrivate()) continue; @@ -352,7 +352,7 @@ public class MetaMethodIndex { FastArray oldList = (FastArray) oldListOrMethod; Entry e = null; int len1 = oldList.size(); - Object list[] = oldList.getArray(); + Object[] list = oldList.getArray(); for (int j = 0; j != len1; ++j) { MetaMethod method = (MetaMethod) list[j]; if (method instanceof NewMetaMethod || method.isPrivate()) continue; @@ -474,7 +474,7 @@ public class MetaMethodIndex { private static int findMatchingMethod(FastArray list, MetaMethod method) { int len = list.size(); - Object data[] = list.getArray(); + Object[] data = list.getArray(); for (int j = 0; j != len; ++j) { MetaMethod aMethod = (MetaMethod) data[j]; if (isMatchingMethod(aMethod, method)) @@ -513,7 +513,7 @@ public class MetaMethodIndex { FastArray oldList = (FastArray) oldListOrMethod; Entry e = null; int len1 = oldList.size(); - Object list[] = oldList.getArray(); + Object[] list = oldList.getArray(); for (int j = 0; j != len1; ++j) { MetaMethod method = (MetaMethod) list[j]; if (e == null) diff --git a/src/main/java/org/codehaus/groovy/tools/GroovyStarter.java b/src/main/java/org/codehaus/groovy/tools/GroovyStarter.java index 2f3a78d..5ad37bf 100644 --- a/src/main/java/org/codehaus/groovy/tools/GroovyStarter.java +++ b/src/main/java/org/codehaus/groovy/tools/GroovyStarter.java @@ -35,7 +35,7 @@ public class GroovyStarter { } - public static void rootLoader(String args[]) { + public static void rootLoader(String[] args) { String conf = System.getProperty("groovy.starter.conf",null); final LoaderConfiguration lc = new LoaderConfiguration(); @@ -124,7 +124,7 @@ public class GroovyStarter { System.exit(1); } - public static void main(String args[]) { + public static void main(String[] args) { try { rootLoader(args); } catch (Throwable t) { diff --git a/src/main/java/org/codehaus/groovy/transform/ASTTransformation.java b/src/main/java/org/codehaus/groovy/transform/ASTTransformation.java index 47354c1..ba59ce7 100644 --- a/src/main/java/org/codehaus/groovy/transform/ASTTransformation.java +++ b/src/main/java/org/codehaus/groovy/transform/ASTTransformation.java @@ -45,5 +45,5 @@ public interface ASTTransformation { * @param source The source unit being compiled. The source unit may contain several classes. For global transformations, * information about the AST can be retrieved from this object. */ - void visit(ASTNode nodes[], SourceUnit source); + void visit(ASTNode[] nodes, SourceUnit source); } diff --git a/src/main/java/org/codehaus/groovy/util/AbstractConcurrentMap.java b/src/main/java/org/codehaus/groovy/util/AbstractConcurrentMap.java index 3fbf8e0..6168877 100644 --- a/src/main/java/org/codehaus/groovy/util/AbstractConcurrentMap.java +++ b/src/main/java/org/codehaus/groovy/util/AbstractConcurrentMap.java @@ -67,7 +67,7 @@ public abstract class AbstractConcurrentMap<K, V> extends AbstractConcurrentMapB } } else { - Object arr [] = (Object[]) o; + Object[] arr = (Object[]) o; for (Object value : arr) { Entry<K, V> e = (Entry<K, V>) value; if (e != null && e.isEqual(key, hash)) { @@ -90,7 +90,7 @@ public abstract class AbstractConcurrentMap<K, V> extends AbstractConcurrentMapB } } else { - Object arr [] = (Object[]) o; + Object[] arr = (Object[]) o; for (Object item : arr) { Entry<K, V> e = (Entry<K, V>) item; if (e != null && e.isEqual(key, hash)) { @@ -118,7 +118,7 @@ public abstract class AbstractConcurrentMap<K, V> extends AbstractConcurrentMapB return e; } else { - Object arr [] = new Object [2]; + Object[] arr = new Object [2]; final Entry ee = createEntry(key, hash, value); arr [0] = ee; arr [1] = e; @@ -128,7 +128,7 @@ public abstract class AbstractConcurrentMap<K, V> extends AbstractConcurrentMapB } } else { - Object arr [] = (Object[]) o; + Object[] arr = (Object[]) o; for (Object item : arr) { Entry e = (Entry) item; if (e != null && e.isEqual(key, hash)) { @@ -147,7 +147,7 @@ public abstract class AbstractConcurrentMap<K, V> extends AbstractConcurrentMapB } } - Object newArr [] = new Object[arr.length+1]; + Object[] newArr = new Object[arr.length+1]; newArr [0] = ee; System.arraycopy(arr, 0, newArr, 1, arr.length); tab [index] = newArr; @@ -181,7 +181,7 @@ public abstract class AbstractConcurrentMap<K, V> extends AbstractConcurrentMapB } } else { - Object arr [] = (Object[]) o; + Object[] arr = (Object[]) o; for (int i = 0; i < arr.length; i++) { Entry<K,V> e = (Entry<K,V>) arr[i]; if (e != null && e.isEqual(key, hash)) { diff --git a/src/main/java/org/codehaus/groovy/util/AbstractConcurrentMapBase.java b/src/main/java/org/codehaus/groovy/util/AbstractConcurrentMapBase.java index d592b9b..01f84af 100644 --- a/src/main/java/org/codehaus/groovy/util/AbstractConcurrentMapBase.java +++ b/src/main/java/org/codehaus/groovy/util/AbstractConcurrentMapBase.java @@ -77,7 +77,7 @@ public abstract class AbstractConcurrentMapBase { if (o instanceof Entry) { count++; } else { - Object arr[] = (Object[]) o; + Object[] arr = (Object[]) o; count += arr.length; } } @@ -102,7 +102,7 @@ public abstract class AbstractConcurrentMapBase { if (e.isValid()) count++; } else { - Object arr[] = (Object[]) o; + Object[] arr = (Object[]) o; for (Object value : arr) { Entry info = (Entry) value; if (info != null && info.isValid()) @@ -131,7 +131,7 @@ public abstract class AbstractConcurrentMapBase { if (e.isValid()) result.add(e); } else { - Object arr[] = (Object[]) o; + Object[] arr = (Object[]) o; for (Object value : arr) { Entry info = (Entry) value; if (info != null && info.isValid()) @@ -179,7 +179,7 @@ public abstract class AbstractConcurrentMapBase { } } else { - Object arr [] = (Object[]) o; + Object[] arr = (Object[]) o; Object res = null; for (Object value : arr) { Entry info = (Entry) value; @@ -231,7 +231,7 @@ public abstract class AbstractConcurrentMapBase { } } else { - Object arr [] = (Object[]) o; + Object[] arr = (Object[]) o; int localCount = 0; for (int index = 0; index < arr.length; index++) { Entry e = (Entry) arr[index]; @@ -263,7 +263,7 @@ public abstract class AbstractConcurrentMapBase { newCount++; } } else { - Object arr[] = (Object[]) o; + Object[] arr = (Object[]) o; for (Object value : arr) { Entry e = (Entry) value; if (e != null && e.isValid()) { @@ -286,15 +286,15 @@ public abstract class AbstractConcurrentMapBase { Object o = tab[index]; if (o != null) { if (o instanceof Entry) { - Object arr [] = new Object [2]; + Object[] arr = new Object [2]; arr [0] = ee; arr [1] = o; tab[index] = arr; return; } else { - Object arr [] = (Object[]) o; - Object newArr [] = new Object[arr.length+1]; + Object[] arr = (Object[]) o; + Object[] newArr = new Object[arr.length+1]; newArr [0] = ee; System.arraycopy(arr, 0, newArr, 1, arr.length); tab [index] = newArr; @@ -307,14 +307,14 @@ public abstract class AbstractConcurrentMapBase { private static Object put(Entry ee, Object o) { if (o != null) { if (o instanceof Entry) { - Object arr [] = new Object [2]; + Object[] arr = new Object [2]; arr [0] = ee; arr [1] = o; return arr; } else { - Object arr [] = (Object[]) o; - Object newArr [] = new Object[arr.length+1]; + Object[] arr = (Object[]) o; + Object[] newArr = new Object[arr.length+1]; newArr [0] = ee; System.arraycopy(arr, 0, newArr, 1, arr.length); return newArr; diff --git a/src/main/java/org/codehaus/groovy/util/ComplexKeyHashMap.java b/src/main/java/org/codehaus/groovy/util/ComplexKeyHashMap.java index 91fc7f9..c74f0bb 100644 --- a/src/main/java/org/codehaus/groovy/util/ComplexKeyHashMap.java +++ b/src/main/java/org/codehaus/groovy/util/ComplexKeyHashMap.java @@ -37,7 +37,7 @@ public class ComplexKeyHashMap } } - protected Entry table []; + protected Entry[] table; protected static final int DEFAULT_CAPACITY = 32; protected static final int MINIMUM_CAPACITY = 4; diff --git a/src/main/java/org/codehaus/groovy/util/FastArray.java b/src/main/java/org/codehaus/groovy/util/FastArray.java index 17e6f6d..183878b 100644 --- a/src/main/java/org/codehaus/groovy/util/FastArray.java +++ b/src/main/java/org/codehaus/groovy/util/FastArray.java @@ -82,7 +82,7 @@ public class FastArray implements Cloneable, Serializable { return; final int newSize = this.size + size; if (newSize > data.length) { - Object nd [] = new Object [newSize]; + Object[] nd = new Object [newSize]; System.arraycopy(data, 0, nd, 0, this.size); data = nd; }
