Merge pull request #23 from hellojavaer/1.0.x

1.0.x

Author: hellojavaer

ddal-ddr/src/main/java/org/hellojavaer/ddal/ddr/expression/range/Token.java

@@ -52,7 +52,7 @@ public String getData() {
     public String toString() {
         StringBuilder s = new StringBuilder();
         s.append("[").append(this.kind.toString());
-        if (this.kind.hasPayload()) {
+        if (this.data != null) {
             s.append(":").append(this.data);
         }
         s.append("]");

ddal-ddr/src/main/java/org/hellojavaer/ddal/ddr/expression/range/TokenKind.java

@@ -39,13 +39,10 @@ enum TokenKind {
 
     TO("..");
 
-    final char[]          tokenChars;
-
-    final private boolean hasPayload; // is there more to this token than simply the kind
+    private final String tokenString;
 
     private TokenKind(String tokenString) {
-        this.tokenChars = tokenString.toCharArray();
-        this.hasPayload = (this.tokenChars.length == 0);
+        this.tokenString = tokenString;
     }
 
     private TokenKind() {
@@ -54,15 +51,6 @@ private TokenKind() {
 
     @Override
     public String toString() {
-        return (name() + (this.tokenChars.length != 0 ? "(" + new String(this.tokenChars) + ")" : ""));
-    }
-
-    public boolean hasPayload() {
-        return this.hasPayload;
+        return (name() + (this.tokenString.length() != 0 ? "(" + this.tokenString + ")" : ""));
     }
-
-    public int getLength() {
-        return this.tokenChars.length;
-    }
-
 }