[groovy] branch master updated: Minor refactoring: move `ModifierNode` to `org.codehaus.groovy.ast` (#1064)

[su...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

sunlan pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/groovy.git


The following commit(s) were added to refs/heads/master by this push:
     new 21ddeab  Minor refactoring: move `ModifierNode` to `org.codehaus.groovy.ast` (#1064)
21ddeab is described below

commit 21ddeabdae79ebf9dd632af0a8e6d4be08d45b75
Author: Daniel.Sun <su...@apache.org>
AuthorDate: Mon Nov 4 13:37:46 2019 +0800

    Minor refactoring: move `ModifierNode` to `org.codehaus.groovy.ast` (#1064)
---
 .../src/main/java/org/apache/groovy/parser/antlr4/AstBuilder.java   | 1 +
 .../main/java/org/apache/groovy/parser/antlr4/ModifierManager.java  | 1 +
 .../java/org/apache/groovy/parser/antlr4/SemanticPredicates.java    | 1 +
 .../groovy/parser/antlr4 => codehaus/groovy/ast}/ModifierNode.java  | 6 ++----
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/subprojects/parser-antlr4/src/main/java/org/apache/groovy/parser/antlr4/AstBuilder.java b/subprojects/parser-antlr4/src/main/java/org/apache/groovy/parser/antlr4/AstBuilder.java
index c1eb396..84c9824 100644
--- a/subprojects/parser-antlr4/src/main/java/org/apache/groovy/parser/antlr4/AstBuilder.java
+++ b/subprojects/parser-antlr4/src/main/java/org/apache/groovy/parser/antlr4/AstBuilder.java
@@ -49,6 +49,7 @@ import org.codehaus.groovy.ast.GenericsType;
 import org.codehaus.groovy.ast.ImportNode;
 import org.codehaus.groovy.ast.InnerClassNode;
 import org.codehaus.groovy.ast.MethodNode;
+import org.codehaus.groovy.ast.ModifierNode;
 import org.codehaus.groovy.ast.ModuleNode;
 import org.codehaus.groovy.ast.NodeMetaDataHandler;
 import org.codehaus.groovy.ast.PackageNode;
diff --git a/subprojects/parser-antlr4/src/main/java/org/apache/groovy/parser/antlr4/ModifierManager.java b/subprojects/parser-antlr4/src/main/java/org/apache/groovy/parser/antlr4/ModifierManager.java
index 286adfe..0c232cf 100644
--- a/subprojects/parser-antlr4/src/main/java/org/apache/groovy/parser/antlr4/ModifierManager.java
+++ b/subprojects/parser-antlr4/src/main/java/org/apache/groovy/parser/antlr4/ModifierManager.java
@@ -23,6 +23,7 @@ import org.codehaus.groovy.ast.AnnotatedNode;
 import org.codehaus.groovy.ast.AnnotationNode;
 import org.codehaus.groovy.ast.ConstructorNode;
 import org.codehaus.groovy.ast.MethodNode;
+import org.codehaus.groovy.ast.ModifierNode;
 import org.codehaus.groovy.ast.Parameter;
 import org.codehaus.groovy.ast.expr.VariableExpression;
 import org.objectweb.asm.Opcodes;
diff --git a/subprojects/parser-antlr4/src/main/java/org/apache/groovy/parser/antlr4/SemanticPredicates.java b/subprojects/parser-antlr4/src/main/java/org/apache/groovy/parser/antlr4/SemanticPredicates.java
index 8381ac1..48a04c3 100644
--- a/subprojects/parser-antlr4/src/main/java/org/apache/groovy/parser/antlr4/SemanticPredicates.java
+++ b/subprojects/parser-antlr4/src/main/java/org/apache/groovy/parser/antlr4/SemanticPredicates.java
@@ -22,6 +22,7 @@ import org.antlr.v4.runtime.CharStream;
 import org.antlr.v4.runtime.Token;
 import org.antlr.v4.runtime.TokenStream;
 import org.antlr.v4.runtime.tree.ParseTree;
+import org.codehaus.groovy.ast.ModifierNode;
 
 import java.util.Collections;
 import java.util.List;
diff --git a/subprojects/parser-antlr4/src/main/java/org/apache/groovy/parser/antlr4/ModifierNode.java b/subprojects/parser-antlr4/src/main/java/org/codehaus/groovy/ast/ModifierNode.java
similarity index 96%
rename from subprojects/parser-antlr4/src/main/java/org/apache/groovy/parser/antlr4/ModifierNode.java
rename to subprojects/parser-antlr4/src/main/java/org/codehaus/groovy/ast/ModifierNode.java
index 1164254..2111f24 100644
--- a/subprojects/parser-antlr4/src/main/java/org/apache/groovy/parser/antlr4/ModifierNode.java
+++ b/subprojects/parser-antlr4/src/main/java/org/codehaus/groovy/ast/ModifierNode.java
@@ -16,11 +16,9 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.groovy.parser.antlr4;
+package org.codehaus.groovy.ast;
 
 import org.apache.groovy.util.Maps;
-import org.codehaus.groovy.ast.ASTNode;
-import org.codehaus.groovy.ast.AnnotationNode;
 import org.objectweb.asm.Opcodes;
 
 import java.util.Map;
@@ -43,7 +41,7 @@ import static org.apache.groovy.parser.antlr4.GroovyParser.VOLATILE;
 import static org.codehaus.groovy.runtime.DefaultGroovyMethods.asBoolean;
 
 /**
- * Represents a modifier, which is better to place in the package org.codehaus.groovy.ast
+ * Represents a modifier
  * <p>
  * Created by Daniel.Sun on 2016/08/23.
  */