fixed api

speedment · Jan 21, 2015 · 7c490da · 7c490da
1 parent b64b6b3
commit 7c490da
Show file tree

Hide file tree

Showing 10 changed files with 59 additions and 52 deletions.
diff --git a/src/main/java/com/speedment/codegen/Test.java b/src/main/java/com/speedment/codegen/Test.java
@@ -17,18 +17,21 @@ public class Test {
      * @param args the command line arguments
      */
     public static void main(String[] args) {
-        
+
         Package_ package_ = new Package_();
-        
+
         final Field_ field = new Field_(STRING, "foo").private_();
-        
+
         final Class_ class_ = new Class_();
         class_.add(field);
         class_.add(new Field_(STRING, "bar"));
         class_.add(ClassModifier_.PUBLIC).add(ClassModifier_.STATIC);
-        
+
         new AccessorImplementer(class_).apply();
-
+
+        final Class_ c2 = new Class_();
+        c2.set(ClassModifier_.of("private static final"));
+
     }
-    
+
 }
diff --git a/src/main/java/com/speedment/codegen/model/Class_.java b/src/main/java/com/speedment/codegen/model/Class_.java
@@ -51,6 +51,10 @@ public Class_ set(Set<ClassModifier_> newSet) {
         return this;
     }
 
+    public boolean is(ClassModifier_ modifier) {
+        return classModifiers.contains(modifier);
+    }
+
     public List<Field_> getFields() {
         return fields;
     }

diff --git a/src/main/java/com/speedment/codegen/model/modifier/AccessModifier_.java b/src/main/java/com/speedment/codegen/model/modifier/AccessModifier_.java
@@ -26,16 +26,16 @@ public int getValue() {
         return value;
     }
 
-    public static AccessModifier_ byName(final String text) {
+    public static AccessModifier_ by(final String text) {
-        return staticSupport.byName(text);
+        return staticSupport.by(text);
     }
 
-    public static Set<AccessModifier_> byText(final String text) {
+    public static Set<AccessModifier_> of(final String text) {
-        return staticSupport.byText(text);
+        return staticSupport.of(text);
     }
 
-    public static Set<AccessModifier_> byCode(final int code) {
+    public static Set<AccessModifier_> of(final int code) {
-        return staticSupport.byCode(code);
+        return staticSupport.of(code);
     }
 
     public static Set<AccessModifier_> of(final AccessModifier_... classModifiers) {

diff --git a/src/main/java/com/speedment/codegen/model/modifier/ClassModifier_.java b/src/main/java/com/speedment/codegen/model/modifier/ClassModifier_.java
@@ -30,16 +30,16 @@ public int getValue() {
         return value;
     }
 
-    public static ClassModifier_ byName(final String text) {
+    public static ClassModifier_ by(final String text) {
-        return staticSupport.byName(text);
+        return staticSupport.by(text);
     }
 
-    public static Set<ClassModifier_> byText(final String text) {
+    public static Set<ClassModifier_> of(final String text) {
-        return staticSupport.byText(text);
+        return staticSupport.of(text);
     }
 
-    public static Set<ClassModifier_> byCode(final int code) {
+    public static Set<ClassModifier_> of(final int code) {
-        return staticSupport.byCode(code);
+        return staticSupport.of(code);
     }
 
     public static Set<ClassModifier_> of(final ClassModifier_... classModifiers) {

diff --git a/src/main/java/com/speedment/codegen/model/modifier/ConstructorModifier_.java b/src/main/java/com/speedment/codegen/model/modifier/ConstructorModifier_.java
@@ -26,16 +26,16 @@ public int getValue() {
         return value;
     }
 
-    public static ConstructorModifier_ byName(final String text) {
+    public static ConstructorModifier_ by(final String text) {
-        return staticSupport.byName(text);
+        return staticSupport.by(text);
     }
 
-    public static Set<ConstructorModifier_> byText(final String text) {
+    public static Set<ConstructorModifier_> of(final String text) {
-        return staticSupport.byText(text);
+        return staticSupport.of(text);
     }
 
-    public static Set<ConstructorModifier_> byCode(final int code) {
+    public static Set<ConstructorModifier_> of(final int code) {
-        return staticSupport.byCode(code);
+        return staticSupport.of(code);
     }
 
     public static Set<ConstructorModifier_> of(final ConstructorModifier_... classModifiers) {

diff --git a/src/main/java/com/speedment/codegen/model/modifier/FieldModifier_.java b/src/main/java/com/speedment/codegen/model/modifier/FieldModifier_.java
@@ -30,16 +30,16 @@ public int getValue() {
         return value;
     }
 
-    public static FieldModifier_ byName(final String text) {
+    public static FieldModifier_ by(final String text) {
-        return staticSupport.byName(text);
+        return staticSupport.by(text);
     }
 
-    public static Set<FieldModifier_> byText(final String text) {
+    public static Set<FieldModifier_> of(final String text) {
-        return staticSupport.byText(text);
+        return staticSupport.of(text);
     }
 
-    public static Set<FieldModifier_> byCode(final int code) {
+    public static Set<FieldModifier_> of(final int code) {
-        return staticSupport.byCode(code);
+        return staticSupport.of(code);
     }
 
     public static Set<FieldModifier_> of(final FieldModifier_... classModifiers) {

diff --git a/src/main/java/com/speedment/codegen/model/modifier/InterfaceModifier_.java b/src/main/java/com/speedment/codegen/model/modifier/InterfaceModifier_.java
@@ -29,16 +29,16 @@ public int getValue() {
         return value;
     }
 
-    public static InterfaceModifier_ byName(final String text) {
+    public static InterfaceModifier_ by(final String text) {
-        return support.byName(text);
+        return support.by(text);
     }
 
-    public static Set<InterfaceModifier_> byText(final String text) {
+    public static Set<InterfaceModifier_> of(final String text) {
-        return support.byText(text);
+        return support.of(text);
     }
 
-    public static Set<InterfaceModifier_> byCode(final int code) {
+    public static Set<InterfaceModifier_> of(final int code) {
-        return support.byCode(code);
+        return support.of(code);
     }
 
     public static Set<InterfaceModifier_> of(final InterfaceModifier_... classModifiers) {

diff --git a/src/main/java/com/speedment/codegen/model/modifier/MethodModifier_.java b/src/main/java/com/speedment/codegen/model/modifier/MethodModifier_.java
@@ -32,16 +32,16 @@ public int getValue() {
         return value;
     }
 
-    public static MethodModifier_ byName(final String text) {
+    public static MethodModifier_ by(final String text) {
-        return staticSupport.byName(text);
+        return staticSupport.by(text);
     }
 
-    public static Set<MethodModifier_> byText(final String text) {
+    public static Set<MethodModifier_> of(final String text) {
-        return staticSupport.byText(text);
+        return staticSupport.of(text);
     }
 
-    public static Set<MethodModifier_> byCode(final int code) {
+    public static Set<MethodModifier_> of(final int code) {
-        return staticSupport.byCode(code);
+        return staticSupport.of(code);
     }
 
     public static Set<MethodModifier_> of(final MethodModifier_... classModifiers) {

diff --git a/src/main/java/com/speedment/codegen/model/modifier/ParameterModifier_.java b/src/main/java/com/speedment/codegen/model/modifier/ParameterModifier_.java
@@ -24,16 +24,16 @@ public int getValue() {
         return value;
     }
 
-    public static ParameterModifier_ byName(final String text) {
+    public static ParameterModifier_ by(final String text) {
-        return staticSupport.byName(text);
+        return staticSupport.by(text);
     }
 
-    public static Set<ParameterModifier_> byText(final String text) {
+    public static Set<ParameterModifier_> of(final String text) {
-        return staticSupport.byText(text);
+        return staticSupport.of(text);
     }
 
-    public static Set<ParameterModifier_> byCode(final int code) {
+    public static Set<ParameterModifier_> of(final int code) {
-        return staticSupport.byCode(code);
+        return staticSupport.of(code);
     }
 
     public static Set<ParameterModifier_> of(final ParameterModifier_... classModifiers) {

diff --git a/src/main/java/com/speedment/codegen/model/modifier/StaticSupport.java b/src/main/java/com/speedment/codegen/model/modifier/StaticSupport.java
@@ -20,16 +20,16 @@ public StaticSupport(T[] values) {
         this.nameMap = Stream.of(values).collect(Collectors.toMap((m) -> m.name().toLowerCase(), (m) -> m));
     }
 
-    public T byName(final String name) {
+    public T by(final String name) {
         return nameMap.get(name.toLowerCase());
     }
 
-    public Set<T> byText(final String text) {
+    public Set<T> of(final String text) {
         final String[] tokens = text.split("\\s+");
-        return Stream.of(tokens).filter((token) -> byName(token) != null).map((token) -> byName(token)).collect(Collectors.toSet());
+        return Stream.of(tokens).filter((token) -> by(token) != null).map((token) -> by(token)).collect(Collectors.toSet());
     }
 
-    public Set<T> byCode(final int code) {
+    public Set<T> of(final int code) {
         return Stream.of(values).filter((cm) -> Modifier_.valuesContains(code, cm.getValue())).collect(Collectors.toSet());
     }