Repository: groovy Updated Branches: refs/heads/master 068be4456 -> f38e2751d
Trivial refactoring: simplify collection initialization Project: http://git-wip-us.apache.org/repos/asf/groovy/repo Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/f38e2751 Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/f38e2751 Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/f38e2751 Branch: refs/heads/master Commit: f38e2751daefa1b7a97f435bd87741ff49796f6f Parents: 068be44 Author: sunlan <[email protected]> Authored: Mon Apr 2 12:41:13 2018 +0800 Committer: sunlan <[email protected]> Committed: Mon Apr 2 12:41:13 2018 +0800 ---------------------------------------------------------------------- src/main/groovy/groovy/lang/ExpandoMetaClass.java | 3 +-- src/main/groovy/groovy/util/ObservableList.java | 3 +-- src/main/groovy/groovy/util/ObservableSet.java | 3 +-- .../java/org/codehaus/groovy/classgen/ExtendedVerifier.java | 3 +-- src/main/java/org/codehaus/groovy/reflection/CachedClass.java | 5 ++--- .../codehaus/groovy/transform/CategoryASTTransformation.java | 3 +-- 6 files changed, 7 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/groovy/blob/f38e2751/src/main/groovy/groovy/lang/ExpandoMetaClass.java ---------------------------------------------------------------------- diff --git a/src/main/groovy/groovy/lang/ExpandoMetaClass.java b/src/main/groovy/groovy/lang/ExpandoMetaClass.java index d56f738..8183e08 100644 --- a/src/main/groovy/groovy/lang/ExpandoMetaClass.java +++ b/src/main/groovy/groovy/lang/ExpandoMetaClass.java @@ -926,8 +926,7 @@ public class ExpandoMetaClass extends MetaClassImpl implements GroovyObject { } public List<MetaProperty> getProperties() { - List<MetaProperty> propertyList = new ArrayList<MetaProperty>(); - propertyList.addAll(super.getProperties()); + List<MetaProperty> propertyList = new ArrayList<MetaProperty>(super.getProperties()); return propertyList; } http://git-wip-us.apache.org/repos/asf/groovy/blob/f38e2751/src/main/groovy/groovy/util/ObservableList.java ---------------------------------------------------------------------- diff --git a/src/main/groovy/groovy/util/ObservableList.java b/src/main/groovy/groovy/util/ObservableList.java index 01c2e2f..c860fea 100644 --- a/src/main/groovy/groovy/util/ObservableList.java +++ b/src/main/groovy/groovy/util/ObservableList.java @@ -193,8 +193,7 @@ public class ObservableList implements List { public void clear() { int oldSize = size(); - List values = new ArrayList(); - values.addAll(delegate); + List values = new ArrayList(delegate); delegate.clear(); if (!values.isEmpty()) { fireElementClearedEvent(values); http://git-wip-us.apache.org/repos/asf/groovy/blob/f38e2751/src/main/groovy/groovy/util/ObservableSet.java ---------------------------------------------------------------------- diff --git a/src/main/groovy/groovy/util/ObservableSet.java b/src/main/groovy/groovy/util/ObservableSet.java index 2a50d2d..851c651 100644 --- a/src/main/groovy/groovy/util/ObservableSet.java +++ b/src/main/groovy/groovy/util/ObservableSet.java @@ -300,8 +300,7 @@ public class ObservableSet<E> implements Set<E> { public void clear() { int oldSize = size(); - List<E> values = new ArrayList<E>(); - values.addAll(delegate); + List<E> values = new ArrayList<E>(delegate); delegate.clear(); if (!values.isEmpty()) { fireElementClearedEvent(values); http://git-wip-us.apache.org/repos/asf/groovy/blob/f38e2751/src/main/java/org/codehaus/groovy/classgen/ExtendedVerifier.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/codehaus/groovy/classgen/ExtendedVerifier.java b/src/main/java/org/codehaus/groovy/classgen/ExtendedVerifier.java index 5e13cd7..8b7ed89 100644 --- a/src/main/java/org/codehaus/groovy/classgen/ExtendedVerifier.java +++ b/src/main/java/org/codehaus/groovy/classgen/ExtendedVerifier.java @@ -267,8 +267,7 @@ public class ExtendedVerifier extends ClassCodeVisitorSupport { MethodNode found = getDeclaredMethodCorrected(genericsSpec, mn, correctedNext); if (found != null) break; } - List<ClassNode> ifaces = new ArrayList<ClassNode>(); - ifaces.addAll(Arrays.asList(next.getInterfaces())); + List<ClassNode> ifaces = new ArrayList<ClassNode>(Arrays.asList(next.getInterfaces())); Map updatedGenericsSpec = new HashMap(genericsSpec); while (!ifaces.isEmpty()) { ClassNode origInterface = ifaces.remove(0); http://git-wip-us.apache.org/repos/asf/groovy/blob/f38e2751/src/main/java/org/codehaus/groovy/reflection/CachedClass.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/codehaus/groovy/reflection/CachedClass.java b/src/main/java/org/codehaus/groovy/reflection/CachedClass.java index 55d2a43..1c285c9 100644 --- a/src/main/java/org/codehaus/groovy/reflection/CachedClass.java +++ b/src/main/java/org/codehaus/groovy/reflection/CachedClass.java @@ -362,11 +362,10 @@ public class CachedClass { } public MetaMethod[] getNewMetaMethods() { - List<MetaMethod> arr = new ArrayList<MetaMethod>(); - arr.addAll(Arrays.asList(classInfo.newMetaMethods)); + List<MetaMethod> arr = new ArrayList<MetaMethod>(Arrays.asList(classInfo.newMetaMethods)); final MetaClass metaClass = classInfo.getStrongMetaClass(); - if (metaClass != null && metaClass instanceof ExpandoMetaClass) { + if (metaClass instanceof ExpandoMetaClass) { arr.addAll(((ExpandoMetaClass)metaClass).getExpandoMethods()); } http://git-wip-us.apache.org/repos/asf/groovy/blob/f38e2751/src/main/java/org/codehaus/groovy/transform/CategoryASTTransformation.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/codehaus/groovy/transform/CategoryASTTransformation.java b/src/main/java/org/codehaus/groovy/transform/CategoryASTTransformation.java index d992cce..1affbf0 100644 --- a/src/main/java/org/codehaus/groovy/transform/CategoryASTTransformation.java +++ b/src/main/java/org/codehaus/groovy/transform/CategoryASTTransformation.java @@ -111,8 +111,7 @@ public class CategoryASTTransformation implements ASTTransformation, Opcodes { } private void addVariablesToStack(Parameter[] params) { - Set<String> names = new HashSet<String>(); - names.addAll(varStack.getLast()); + Set<String> names = new HashSet<String>(varStack.getLast()); for (Parameter param : params) { names.add(param.getName()); }
