minor refactoring

Author: raydac

jbbp-plugins/jbbp-gradle/build.gradle

@@ -57,7 +57,7 @@ pluginBundle {
     plugins {
         JBBPPlugin {
             id = 'com.igormaznitsa.gradle.jbbp'
-            displayName = 'Translator of JBBP scripts into executable sources'
+            displayName = 'JBBP Sources Generator plugin'
         }
     }
 }

jbbp-plugins/jbbp-maven/jbbp-maven-plugin/pom.xml

@@ -13,7 +13,7 @@
     <packaging>maven-plugin</packaging>
 
     <name>JBBP Maven plugin</name>
-    <description>Tool to generate static Java classes (1.6+) from JBBP scripts</description>
+    <description>Generator of sources from JBBP scripts</description>
 
     <profiles>
         <profile>

jbbp/src/main/java/com/igormaznitsa/jbbp/compiler/conversion/ExpressionEvaluatorVisitor.java

@@ -91,37 +91,14 @@ enum Operator {
         UNARY_PLUS("+", 1, 500),
         UNARY_MINUS("-", 1, 500);
 
-        private final int priority;
-        private final int args;
-        private final String text;
+        public final int priority;
+        public final int argsNumber;
+        public final String text;
 
-        Operator(final String text, final int args, final int priority) {
-            this.args = args;
+        Operator(final String text, final int argsNumber, final int priority) {
+            this.argsNumber = argsNumber;
             this.priority = priority;
             this.text = text;
         }
-
-        public static Operator findForText(final String text) {
-            Operator result = null;
-            for (final Operator p : values()) {
-                if (p.getText().equals(text)) {
-                    result = p;
-                    break;
-                }
-            }
-            return result;
-        }
-
-        public int getArgsNumber() {
-            return this.args;
-        }
-
-        public String getText() {
-            return this.text;
-        }
-
-        public int getPriority() {
-            return this.priority;
-        }
     }
 }

jbbp/src/main/java/com/igormaznitsa/jbbp/compiler/conversion/JBBPToJava6Converter.java

@@ -649,7 +649,7 @@ public ExpressionEvaluatorVisitor visitEnd() {
                         final Operator op = (Operator) this.stack.remove(i);
                         i--;
                         ExprTreeItem newItem = new ExprTreeItem(op);
-                        for (int j = 0; j < op.getArgsNumber(); j++) {
+                        for (int j = 0; j < op.argsNumber; j++) {
                             final Object val = this.stack.remove(i);
                             i--;
                             if (newItem.right == null) {
@@ -693,7 +693,7 @@ boolean doesNeedBrackets(Object obj) {
                     }
                     final ExprTreeItem that = (ExprTreeItem) obj;
 
-                    return that.op.getPriority() <= this.op.getPriority() || ((that.op == Operator.LSHIFT || that.op == Operator.RSHIFT || that.op == Operator.URSHIFT) && (this.op == Operator.LSHIFT || this.op == Operator.RSHIFT || this.op == Operator.URSHIFT));
+                    return that.op.priority <= this.op.priority || ((that.op == Operator.LSHIFT || that.op == Operator.RSHIFT || that.op == Operator.URSHIFT) && (this.op == Operator.LSHIFT || this.op == Operator.RSHIFT || this.op == Operator.URSHIFT));
                 }
 
                 @Override
@@ -706,7 +706,7 @@ public String toString() {
                     if (doesNeedBrackets(this.right)) {
                         rightStr = '(' + rightStr + ')';
                     }
-                    return (leftStr == null ? "" : leftStr) + this.op.getText() + (rightStr == null ? "" : rightStr);
+                    return (leftStr == null ? "" : leftStr) + this.op.text + (rightStr == null ? "" : rightStr);
                 }
             }
         };