minor edits

groovy · Feb 22, 2022 · 1a92069 · 1a92069
1 parent ea0398f
commit 1a92069
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 7 deletions.
diff --git a/base/org.codehaus.groovy25/src/org/codehaus/groovy/control/ErrorCollector.java b/base/org.codehaus.groovy25/src/org/codehaus/groovy/control/ErrorCollector.java
@@ -40,6 +40,11 @@
 public class ErrorCollector implements Serializable {
 
     private static final long serialVersionUID = 2844774170905056755L;
+
+    // GRECLIPSE add
+    public transient boolean transformActive;
+    // GRECLIPSE end
+
     /**
      * WarningMessages collected during processing
      */
@@ -53,10 +58,6 @@ public class ErrorCollector implements Serializable {
      */
     protected CompilerConfiguration configuration;
 
-    // GRECLIPSE add
-    public boolean transformActive;
-    // GRECLIPSE end
-
     /**
      * Initialize the ErrorReporter.
      */

diff --git a/base/org.codehaus.groovy30/src/org/codehaus/groovy/control/ErrorCollector.java b/base/org.codehaus.groovy30/src/org/codehaus/groovy/control/ErrorCollector.java
@@ -42,7 +42,7 @@ public class ErrorCollector implements Serializable {
     private static final long serialVersionUID = 2844774170905056755L;
 
     // GRECLIPSE add
-    public boolean transformActive;
+    public transient boolean transformActive;
     // GRECLIPSE end
 
     /**

diff --git a/base/org.codehaus.groovy40/src/org/codehaus/groovy/control/ErrorCollector.java b/base/org.codehaus.groovy40/src/org/codehaus/groovy/control/ErrorCollector.java
@@ -42,7 +42,7 @@ public class ErrorCollector implements Serializable {
     private static final long serialVersionUID = 2844774170905056755L;
 
     // GRECLIPSE add
-    public boolean transformActive;
+    public transient boolean transformActive;
     // GRECLIPSE end
 
     /**

diff --git a/...dt.groovy.core/src/org/eclipse/jdt/groovy/search/TypeInferencingVisitorWithRequestor.java b/...dt.groovy.core/src/org/eclipse/jdt/groovy/search/TypeInferencingVisitorWithRequestor.java
@@ -681,7 +681,7 @@ private void visitMethodInternal(final MethodNode node) {
     //
 
     @Override
-    public void visitAnnotation(final AnnotationNode node) {
+    protected void visitAnnotation(final AnnotationNode node) {
         ClassNode type = node.getClassNode();
         VariableScope scope = scopes.getLast();
         TypeLookupResult noLookup = new TypeLookupResult(type, type, node, TypeConfidence.EXACT, scope);