Removed ModifierSet class

javaparser · Jul 18, 2016 · 9e677ac · 9e677ac
1 parent c242e8d
commit 9e677ac
Show file tree

Hide file tree

Showing 8 changed files with 52 additions and 182 deletions.
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/NodeWithModifiers.java b/javaparser-core/src/main/java/com/github/javaparser/ast/NodeWithModifiers.java
@@ -3,7 +3,6 @@
 import java.util.EnumSet;
 
 import com.github.javaparser.ast.body.Modifier;
-import com.github.javaparser.ast.body.ModifierSet;
 
 /**
  * A Node with Modifiers.

diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/body/ConstructorDeclaration.java b/javaparser-core/src/main/java/com/github/javaparser/ast/body/ConstructorDeclaration.java
@@ -195,7 +195,7 @@ public String getDeclarationAsString(boolean includingModifiers, boolean includi
                                          boolean includingParameterName) {
         StringBuilder sb = new StringBuilder();
         if (includingModifiers) {
-            AccessSpecifier accessSpecifier = ModifierSet.getAccessSpecifier(getModifiers());
+            AccessSpecifier accessSpecifier = Modifier.getAccessSpecifier(getModifiers());
             sb.append(accessSpecifier.getCodeRepresenation());
             sb.append(accessSpecifier == AccessSpecifier.DEFAULT ? "" : " ");
         }

diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/body/MethodDeclaration.java b/javaparser-core/src/main/java/com/github/javaparser/ast/body/MethodDeclaration.java
@@ -254,22 +254,22 @@ public String getDeclarationAsString(boolean includingModifiers, boolean includi
     public String getDeclarationAsString(boolean includingModifiers, boolean includingThrows, boolean includingParameterName) {
         StringBuilder sb = new StringBuilder();
         if (includingModifiers) {
-            AccessSpecifier accessSpecifier = ModifierSet.getAccessSpecifier(getModifiers());
+            AccessSpecifier accessSpecifier = Modifier.getAccessSpecifier(getModifiers());
             sb.append(accessSpecifier.getCodeRepresenation());
             sb.append(accessSpecifier == AccessSpecifier.DEFAULT ? "" : " ");
-            if (ModifierSet.isStatic(getModifiers())){
+            if (getModifiers().contains(Modifier.STATIC)) {
                 sb.append("static ");
             }
-            if (ModifierSet.isAbstract(getModifiers())){
+            if (getModifiers().contains(Modifier.ABSTRACT)) {
                 sb.append("abstract ");
             }
-            if (ModifierSet.isFinal(getModifiers())){
+            if (getModifiers().contains(Modifier.FINAL)) {
                 sb.append("final ");
             }
-            if (ModifierSet.isNative(getModifiers())){
+            if (getModifiers().contains(Modifier.NATIVE)) {
                 sb.append("native ");
             }
-            if (ModifierSet.isSynchronized(getModifiers())){
+            if (getModifiers().contains(Modifier.SYNCHRONIZED)) {
                 sb.append("synchronized ");
             }
         }

diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/body/Modifier.java b/javaparser-core/src/main/java/com/github/javaparser/ast/body/Modifier.java
@@ -1,15 +1,44 @@
 package com.github.javaparser.ast.body;
 
+import java.util.EnumSet;
+
+import com.github.javaparser.ast.AccessSpecifier;
+
 public enum Modifier {
-	PUBLIC,
-	PRIVATE,
-	PROTECTED,
-	STATIC,
-	FINAL,
-	SYNCHRONIZED,
-	VOLATILE,
-	TRANSIENT,
-	NATIVE,
-	ABSTRACT,
-	STRICTFP;
+	PUBLIC("public"),
+	PRIVATE("private"),
+	PROTECTED("protected"),
+	STATIC("static"),
+	FINAL("final"),
+	SYNCHRONIZED("synchronized"),
+	VOLATILE("volatile"),
+	TRANSIENT("transient"),
+	NATIVE("native"),
+	ABSTRACT("abstract"),
+	STRICTFP("strictfp");
+
+    String lib;
+
+    private Modifier(String lib) {
+        this.lib = lib;
+    }
+
+    /**
+     * @return the lib
+     */
+    public String getLib() {
+        return lib;
+    }
+
+    public static AccessSpecifier getAccessSpecifier(EnumSet<Modifier> modifiers) {
+        if (modifiers.contains(Modifier.PUBLIC)) {
+            return AccessSpecifier.PUBLIC;
+        } else if (modifiers.contains(Modifier.PROTECTED)) {
+            return AccessSpecifier.PROTECTED;
+        } else if (modifiers.contains(Modifier.PRIVATE)) {
+            return AccessSpecifier.PRIVATE;
+        } else {
+            return AccessSpecifier.DEFAULT;
+        }
+    }
 }
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/body/ModifierSet.java b/javaparser-core/src/main/java/com/github/javaparser/ast/body/ModifierSet.java
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/VariableDeclarationExpr.java b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/VariableDeclarationExpr.java
@@ -31,7 +31,6 @@
 import com.github.javaparser.ast.NodeWithModifiers;
 import com.github.javaparser.ast.TypedNode;
 import com.github.javaparser.ast.body.Modifier;
-import com.github.javaparser.ast.body.ModifierSet;
 import com.github.javaparser.ast.body.VariableDeclarator;
 import com.github.javaparser.ast.type.Type;
 import com.github.javaparser.ast.visitor.GenericVisitor;

diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/visitor/DumpVisitor.java b/javaparser-core/src/main/java/com/github/javaparser/ast/visitor/DumpVisitor.java
@@ -28,6 +28,7 @@
 import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
+import java.util.stream.Collectors;
 
 import com.github.javaparser.ast.CompilationUnit;
 import com.github.javaparser.ast.ImportDeclaration;
@@ -47,7 +48,6 @@
 import com.github.javaparser.ast.body.InitializerDeclaration;
 import com.github.javaparser.ast.body.MethodDeclaration;
 import com.github.javaparser.ast.body.Modifier;
-import com.github.javaparser.ast.body.ModifierSet;
 import com.github.javaparser.ast.body.MultiTypeParameter;
 import com.github.javaparser.ast.body.Parameter;
 import com.github.javaparser.ast.body.TypeDeclaration;
@@ -209,39 +209,8 @@ public String getSource() {
 	}
 
     private void printModifiers(final EnumSet<Modifier> modifiers) {
-		if (ModifierSet.isPrivate(modifiers)) {
-			printer.print("private ");
-		}
-		if (ModifierSet.isProtected(modifiers)) {
-			printer.print("protected ");
-		}
-		if (ModifierSet.isPublic(modifiers)) {
-			printer.print("public ");
-		}
-		if (ModifierSet.isAbstract(modifiers)) {
-			printer.print("abstract ");
-		}
-		if (ModifierSet.isStatic(modifiers)) {
-			printer.print("static ");
-		}
-		if (ModifierSet.isFinal(modifiers)) {
-			printer.print("final ");
-		}
-		if (ModifierSet.isNative(modifiers)) {
-			printer.print("native ");
-		}
-		if (ModifierSet.isStrictfp(modifiers)) {
-			printer.print("strictfp ");
-		}
-		if (ModifierSet.isSynchronized(modifiers)) {
-			printer.print("synchronized ");
-		}
-		if (ModifierSet.isTransient(modifiers)) {
-			printer.print("transient ");
-		}
-		if (ModifierSet.isVolatile(modifiers)) {
-			printer.print("volatile ");
-		}
+        if (modifiers.size() > 0)
+            printer.print(modifiers.stream().map(m -> m.getLib()).collect(Collectors.joining(" ")) + " ");
 	}
 
 	private void printMembers(final List<BodyDeclaration> members, final Object arg) {

diff --git a/javaparser-core/src/main/javacc/java_1_8.jj b/javaparser-core/src/main/javacc/java_1_8.jj
@@ -95,7 +95,7 @@ final class ASTParser {
 	}
 
     public void addModifier(EnumSet<Modifier> modifiers, Modifier mod, Token token) throws ParseException {
-        if ((ModifierSet.hasModifier(modifiers, mod))) {
+        if (modifiers.contains(mod)) {
             throwParseException(token, "Duplicated modifier");
         }
         modifiers.add(mod);
@@ -105,7 +105,7 @@ final class ASTParser {
         if(mods == null)
             return;
         for(Modifier m : mods)
-            if ((ModifierSet.hasModifier(modifiers, m))) 
+            if (modifiers.contains(m)) 
                 throwParseException(token, "Duplicated modifier");
         for(Modifier m : mods)
             modifiers.add(m);