Repository: incubator-groovy Updated Branches: refs/heads/master 569d68a9b -> 458524c42
remove some checkstyle warnings plus dummy closing message (closes #9) Project: http://git-wip-us.apache.org/repos/asf/incubator-groovy/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-groovy/commit/458524c4 Tree: http://git-wip-us.apache.org/repos/asf/incubator-groovy/tree/458524c4 Diff: http://git-wip-us.apache.org/repos/asf/incubator-groovy/diff/458524c4 Branch: refs/heads/master Commit: 458524c42d699e105da491feafd404f1a5bfd820 Parents: 569d68a Author: Paul King <pa...@asert.com.au> Authored: Sat May 23 11:37:07 2015 +1000 Committer: Paul King <pa...@asert.com.au> Committed: Sat May 23 11:37:07 2015 +1000 ---------------------------------------------------------------------- .../codehaus/groovy/transform/AbstractASTTransformation.java | 4 ++-- .../groovy/transform/AnnotationCollectorTransform.java | 8 ++++---- .../groovy/transform/AutoCloneASTTransformation.java | 6 +++--- .../groovy/transform/ImmutableASTTransformation.java | 8 +++++--- .../org/codehaus/groovy/transform/LogASTTransformation.java | 2 +- .../sc/transformers/MethodCallExpressionTransformer.java | 2 +- 6 files changed, 16 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/458524c4/src/main/org/codehaus/groovy/transform/AbstractASTTransformation.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/transform/AbstractASTTransformation.java b/src/main/org/codehaus/groovy/transform/AbstractASTTransformation.java index c1a97ec..d67b971 100644 --- a/src/main/org/codehaus/groovy/transform/AbstractASTTransformation.java +++ b/src/main/org/codehaus/groovy/transform/AbstractASTTransformation.java @@ -62,8 +62,8 @@ public abstract class AbstractASTTransformation implements Opcodes, ASTTransform * Annotations with {@link org.codehaus.groovy.runtime.GeneratedClosure} members are not supported for now. */ protected List<AnnotationNode> copyAnnotatedNodeAnnotations(final AnnotatedNode annotatedNode, String myTypeName) { - final ArrayList<AnnotationNode> copiedAnnotations = new ArrayList<AnnotationNode>(); - final ArrayList<AnnotationNode> notCopied = new ArrayList<AnnotationNode>(); + final List<AnnotationNode> copiedAnnotations = new ArrayList<AnnotationNode>(); + final List<AnnotationNode> notCopied = new ArrayList<AnnotationNode>(); GeneralUtils.copyAnnotatedNodeAnnotations(annotatedNode, copiedAnnotations, notCopied); for (AnnotationNode annotation : notCopied) { addError(myTypeName + " does not support keeping Closure annotation members.", annotation); http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/458524c4/src/main/org/codehaus/groovy/transform/AnnotationCollectorTransform.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/transform/AnnotationCollectorTransform.java b/src/main/org/codehaus/groovy/transform/AnnotationCollectorTransform.java index c593111..b313835 100644 --- a/src/main/org/codehaus/groovy/transform/AnnotationCollectorTransform.java +++ b/src/main/org/codehaus/groovy/transform/AnnotationCollectorTransform.java @@ -168,7 +168,7 @@ public class AnnotationCollectorTransform { ListExpression memberListExp = (ListExpression) memberValue; List<Expression> memberList = memberListExp.getExpressions(); if (memberList.size()==0) return Collections.EMPTY_LIST; - ArrayList<AnnotationNode> ret = new ArrayList<AnnotationNode>(); + List<AnnotationNode> ret = new ArrayList<AnnotationNode>(); for (Expression e : memberList) { AnnotationNode toAdd = new AnnotationNode(e.getType()); toAdd.setSourcePosition(aliasAnnotationUsage); @@ -199,7 +199,7 @@ public class AnnotationCollectorTransform { List<AnnotationNode> annotations = alias.getAnnotations(); if (annotations.size() < 2) return Collections.EMPTY_LIST; - ArrayList<AnnotationNode> ret = new ArrayList<AnnotationNode>(annotations.size()); + List<AnnotationNode> ret = new ArrayList<AnnotationNode>(annotations.size()); for (AnnotationNode an : annotations) { ClassNode type = an.getClassNode(); if (type.getName().equals(AnnotationCollector.class.getName())) continue; @@ -225,7 +225,7 @@ public class AnnotationCollectorTransform { private static List<AnnotationNode> makeListOfAnnotations(Object[][] data) { if (data.length==0) return Collections.EMPTY_LIST; - ArrayList<AnnotationNode> ret = new ArrayList<AnnotationNode>(data.length); + List<AnnotationNode> ret = new ArrayList<AnnotationNode>(data.length); for (Object[] inner : data) { Class anno = (Class) inner[0]; AnnotationNode toAdd = new AnnotationNode(ClassHelper.make(anno)); @@ -278,7 +278,7 @@ public class AnnotationCollectorTransform { List<AnnotationNode> targetList = getTargetListFromValue(collector, aliasAnnotationUsage, source); int size = targetList.size()+stored.size(); if (size==0) return Collections.EMPTY_LIST; - ArrayList<AnnotationNode> ret = new ArrayList<AnnotationNode>(size); + List<AnnotationNode> ret = new ArrayList<AnnotationNode>(size); ret.addAll(stored); ret.addAll(targetList); http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/458524c4/src/main/org/codehaus/groovy/transform/AutoCloneASTTransformation.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/transform/AutoCloneASTTransformation.java b/src/main/org/codehaus/groovy/transform/AutoCloneASTTransformation.java index ba9d877..49e6535 100644 --- a/src/main/org/codehaus/groovy/transform/AutoCloneASTTransformation.java +++ b/src/main/org/codehaus/groovy/transform/AutoCloneASTTransformation.java @@ -97,12 +97,12 @@ public class AutoCloneASTTransformation extends AbstractASTTransformation { case SERIALIZATION: createCloneSerialization(cNode); break; - case CLONE: - createClone(cNode, list, excludes); - break; case SIMPLE: createSimpleClone(cNode, list, excludes); break; + default: + createClone(cNode, list, excludes); + break; } } } http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/458524c4/src/main/org/codehaus/groovy/transform/ImmutableASTTransformation.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/transform/ImmutableASTTransformation.java b/src/main/org/codehaus/groovy/transform/ImmutableASTTransformation.java index d06e8a5..f74f11c 100644 --- a/src/main/org/codehaus/groovy/transform/ImmutableASTTransformation.java +++ b/src/main/org/codehaus/groovy/transform/ImmutableASTTransformation.java @@ -230,7 +230,7 @@ public class ImmutableASTTransformation extends AbstractASTTransformation { } private List<String> getKnownImmutableClasses(AnnotationNode node) { - final ArrayList<String> immutableClasses = new ArrayList<String>(); + final List<String> immutableClasses = new ArrayList<String>(); final Expression expression = node.getMember(MEMBER_KNOWN_IMMUTABLE_CLASSES); if (expression == null) return immutableClasses; @@ -251,7 +251,7 @@ public class ImmutableASTTransformation extends AbstractASTTransformation { } private List<String> getKnownImmutables(AnnotationNode node) { - final ArrayList<String> immutables = new ArrayList<String>(); + final List<String> immutables = new ArrayList<String>(); final Expression expression = node.getMember(MEMBER_KNOWN_IMMUTABLES); if (expression == null) return immutables; @@ -756,7 +756,9 @@ public class ImmutableASTTransformation extends AbstractASTTransformation { if (inImmutableList(fieldType.getName()) || knownImmutableClasses.contains(fieldType)) { return field; } - } catch (NoSuchFieldException ignore) { } + } catch (NoSuchFieldException ignore) { + // ignore + } } final String typeName = field.getClass().getName(); throw new RuntimeException(createErrorMessage(clazz.getName(), fieldName, typeName, "constructing")); http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/458524c4/src/main/org/codehaus/groovy/transform/LogASTTransformation.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/transform/LogASTTransformation.java b/src/main/org/codehaus/groovy/transform/LogASTTransformation.java index 7acad59..97be657 100644 --- a/src/main/org/codehaus/groovy/transform/LogASTTransformation.java +++ b/src/main/org/codehaus/groovy/transform/LogASTTransformation.java @@ -244,7 +244,7 @@ public class LogASTTransformation extends AbstractASTTransformation implements C Expression wrapLoggingMethodCall(Expression logVariable, String methodName, Expression originalExpression); } - public static abstract class AbstractLoggingStrategy implements LoggingStrategy { + public abstract static class AbstractLoggingStrategy implements LoggingStrategy { protected final GroovyClassLoader loader; protected AbstractLoggingStrategy(final GroovyClassLoader loader) { http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/458524c4/src/main/org/codehaus/groovy/transform/sc/transformers/MethodCallExpressionTransformer.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/transform/sc/transformers/MethodCallExpressionTransformer.java b/src/main/org/codehaus/groovy/transform/sc/transformers/MethodCallExpressionTransformer.java index 35a8e4f..e6cae53 100644 --- a/src/main/org/codehaus/groovy/transform/sc/transformers/MethodCallExpressionTransformer.java +++ b/src/main/org/codehaus/groovy/transform/sc/transformers/MethodCallExpressionTransformer.java @@ -42,7 +42,7 @@ import static org.objectweb.asm.Opcodes.ACC_PUBLIC; import static org.objectweb.asm.Opcodes.ACC_SYNTHETIC; public class MethodCallExpressionTransformer { - private final static ClassNode DGM_CLASSNODE = ClassHelper.make(DefaultGroovyMethods.class); + private static final ClassNode DGM_CLASSNODE = ClassHelper.make(DefaultGroovyMethods.class); private final StaticCompilationTransformer staticCompilationTransformer;
