Cleanup unused field + dead/commented code

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@1073477 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/src/java/org/apache/fop/fo/expr/PropertyTokenizer.java b/src/java/org/apache/fop/fo/expr/PropertyTokenizer.java
index 89a3877535c981c3377df1b6063a7575ff53602d..e07f3c433a6dbc76a38bdb5c17033e3cd0ed5767 100644 (file)
--- a/src/java/org/apache/fop/fo/expr/PropertyTokenizer.java
+++ b/src/java/org/apache/fop/fo/expr/PropertyTokenizer.java
@@ -29,7 +29,7 @@ package org.apache.fop.fo.expr;
 class PropertyTokenizer {
 
     static final int TOK_EOF = 0;
-    static final int TOK_NCNAME = TOK_EOF + 1;
+    static final int TOK_NCNAME = 1;
     static final int TOK_MULTIPLY = TOK_NCNAME + 1;
     static final int TOK_LPAR = TOK_MULTIPLY + 1;
     static final int TOK_RPAR = TOK_LPAR + 1;
@@ -55,8 +55,6 @@ class PropertyTokenizer {
     private /* final */ String expr;
     private int exprIndex = 0;
     private int exprLength;
-    private boolean recognizeOperator = false;
-
 
     /**
      * Construct a new PropertyTokenizer object to tokenize the passed
@@ -81,7 +79,6 @@ class PropertyTokenizer {
         currentTokenValue = null;
         currentTokenStartIndex = exprIndex;
         boolean bSawDecimal;
-        recognizeOperator = true;
         while ( true ) {
             if (exprIndex >= exprLength) {
                 currentToken = TOK_EOF;
@@ -96,20 +93,16 @@ class PropertyTokenizer {
                 currentTokenStartIndex = exprIndex;
                 break;
             case ',':
-                recognizeOperator = false;
                 currentToken = TOK_COMMA;
                 return;
             case '+':
-                recognizeOperator = false;
                 currentToken = TOK_PLUS;
                 return;
             case '-':
-                recognizeOperator = false;
                 currentToken = TOK_MINUS;
                 return;
             case '(':
                 currentToken = TOK_LPAR;
-                recognizeOperator = false;
                 return;
             case ')':
                 currentToken = TOK_RPAR;
@@ -188,9 +181,7 @@ class PropertyTokenizer {
                 if (exprIndex == currentTokenStartIndex) {
                     throw new PropertyException("illegal character");
                 }
-                currentTokenValue = expr.substring(currentTokenStartIndex,
-        exprIndex);
-                // if (currentMaybeOperator) {
+                currentTokenValue = expr.substring(currentTokenStartIndex, exprIndex);
                 if (currentTokenValue.equals("mod")) {
                     currentToken = TOK_MOD;
                     return;
@@ -198,19 +189,10 @@ class PropertyTokenizer {
                     currentToken = TOK_DIV;
                     return;
                 }
-                /*
-                 * else
-                 * throw new PropertyException("unrecognized operator name");
-                 * recognizeOperator = false;
-                 * return;
-                 * }
-                 */
                 if (followingParen()) {
                     currentToken = TOK_FUNCTION_LPAR;
-                    recognizeOperator = false;
                 } else {
                     currentToken = TOK_NCNAME;
-                    recognizeOperator = false;
                 }
                 return;
             }