X-Git-Url: http://git.phpeclipse.com

diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/formatter/impl/SplitLine.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/formatter/impl/SplitLine.java
index 90297d7..5a8abc3 100644
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/formatter/impl/SplitLine.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/formatter/impl/SplitLine.java
@@ -16,7 +16,7 @@ import net.sourceforge.phpdt.core.compiler.ITerminalSymbols;
  * Represents a split line: contains an operator and all substrings
  */
 public class SplitLine implements ITerminalSymbols {
-	public int[] operators; // the operator on which the string was split.
+	public TokenName[] operators; // the operator on which the string was split.
 
 	public String[] substrings;
 
@@ -25,19 +25,19 @@ public class SplitLine implements ITerminalSymbols {
 	/**
 	 * SplitLine constructor comment.
 	 */
-	public SplitLine(int[] operators, String[] substrings) {
-		this(operators, substrings, null);
-	}
+//	public SplitLine(int[] operators, String[] substrings) {
+//		this(operators, substrings, null);
+//	}
 
 	/**
 	 * SplitLine constructor comment.
 	 */
-	public SplitLine(int[] operators, String[] substrings, int[] startIndexes) {
-		super();
-		this.operators = operators;
-		this.substrings = substrings;
-		this.startSubstringsIndexes = startIndexes;
-	}
+//	public SplitLine(int[] operators, String[] substrings, int[] startIndexes) {
+//		super();
+//		this.operators = operators;
+//		this.substrings = substrings;
+//		this.startSubstringsIndexes = startIndexes;
+//	}
 
 	/**
 	 * Prints a nice representation of the receiver
@@ -49,158 +49,158 @@ public class SplitLine implements ITerminalSymbols {
 		String operatorString = new String();
 
 		for (int i = 0, max = substrings.length; i < max; i++) {
-			int currentOperator = operators[i];
+			TokenName currentOperator = operators[i];
 			String currentString = substrings[i];
-			boolean placeOperatorAhead = currentOperator != TokenNameCOMMA
-					&& currentOperator != TokenNameSEMICOLON;
-			boolean placeOperatorBehind = currentOperator == TokenNameCOMMA
-					|| currentOperator == TokenNameSEMICOLON;
+			boolean placeOperatorAhead = currentOperator != TokenName.COMMA
+					&& currentOperator != TokenName.SEMICOLON;
+			boolean placeOperatorBehind = currentOperator == TokenName.COMMA
+					|| currentOperator == TokenName.SEMICOLON;
 
 			switch (currentOperator) {
-			case TokenNameextends:
+			case EXTENDS:
 				operatorString = "extends"; //$NON-NLS-1$
 				break;
-			// case TokenNameimplements:
+			// case implements:
 			// operatorString="implements"; //$NON-NLS-1$
 			// break;
-			// case TokenNamethrows:
+			// case throws:
 			// operatorString="throws"; //$NON-NLS-1$
 			// break;
-			case TokenNameSEMICOLON: // ;
+			case SEMICOLON: // ;
 				operatorString = ";"; //$NON-NLS-1$
 				break;
-			case TokenNameCOMMA: // ,
+			case COMMA: // ,
 				operatorString = ","; //$NON-NLS-1$
 				break;
-			case TokenNameEQUAL: // =
+			case EQUAL: // =
 				operatorString = "="; //$NON-NLS-1$
 				break;
-			case TokenNameAND_AND: // && (15.22)
+			case AND_AND: // && (15.22)
 				operatorString = "&&"; //$NON-NLS-1$
 				break;
-			case TokenNameOR_OR: // || (15.23)
+			case OR_OR: // || (15.23)
 				operatorString = "||"; //$NON-NLS-1$
 				break;
-			case TokenNameQUESTION: // ? (15.24)
+			case QUESTION: // ? (15.24)
 				operatorString = "?"; //$NON-NLS-1$
 				break;
 
-			case TokenNameCOLON: // : (15.24)
+			case COLON: // : (15.24)
 				operatorString = ":"; //$NON-NLS-1$
 				break;
-			case TokenNameEQUAL_EQUAL: // == (15.20, 15.20.1, 15.20.2, 15.20.3)
+			case EQUAL_EQUAL: // == (15.20, 15.20.1, 15.20.2, 15.20.3)
 				operatorString = "=="; //$NON-NLS-1$
 				break;
 
-			case TokenNameNOT_EQUAL: // != (15.20, 15.20.1, 15.20.2, 15.20.3)
+			case NOT_EQUAL: // != (15.20, 15.20.1, 15.20.2, 15.20.3)
 				operatorString = "!="; //$NON-NLS-1$
 				break;
 
-			case TokenNameLESS: // < (15.19.1)
+			case LESS: // < (15.19.1)
 				operatorString = "<"; //$NON-NLS-1$
 				break;
 
-			case TokenNameLESS_EQUAL: // <= (15.19.1)
+			case LESS_EQUAL: // <= (15.19.1)
 				operatorString = "<="; //$NON-NLS-1$
 				break;
 
-			case TokenNameGREATER: // > (15.19.1)
+			case GREATER: // > (15.19.1)
 				operatorString = ">"; //$NON-NLS-1$
 				break;
 
-			case TokenNameGREATER_EQUAL: // >= (15.19.1)
+			case GREATER_EQUAL: // >= (15.19.1)
 				operatorString = ">="; //$NON-NLS-1$
 				break;
 
-			// case TokenNameinstanceof : // instanceof
+			// case instanceof : // instanceof
 			// operatorString="instanceof"; //$NON-NLS-1$
 			// break;
-			case TokenNamePLUS: // + (15.17, 15.17.2)
+			case PLUS: // + (15.17, 15.17.2)
 				operatorString = "+"; //$NON-NLS-1$
 				break;
 
-			case TokenNameMINUS: // - (15.17.2)
+			case MINUS: // - (15.17.2)
 				operatorString = "-"; //$NON-NLS-1$
 				break;
-			case TokenNameMULTIPLY: // * (15.16.1)
+			case MULTIPLY: // * (15.16.1)
 				operatorString = "*"; //$NON-NLS-1$
 				break;
 
-			case TokenNameDIVIDE: // / (15.16.2)
+			case DIVIDE: // / (15.16.2)
 				operatorString = "/"; //$NON-NLS-1$
 				break;
 
-			case TokenNameREMAINDER: // % (15.16.3)
+			case REMAINDER: // % (15.16.3)
 				operatorString = "%"; //$NON-NLS-1$
 				break;
-			case TokenNameLEFT_SHIFT: // << (15.18)
+			case LEFT_SHIFT: // << (15.18)
 				operatorString = "<<"; //$NON-NLS-1$
 				break;
 
-			case TokenNameRIGHT_SHIFT: // >> (15.18)
+			case RIGHT_SHIFT: // >> (15.18)
 				operatorString = ">>"; //$NON-NLS-1$
 				break;
 
-			// case TokenNameUNSIGNED_RIGHT_SHIFT : // >>> (15.18)
+			// case UNSIGNED_RIGHT_SHIFT : // >>> (15.18)
 			// operatorString=">>>"; //$NON-NLS-1$
 			// break;
-			case TokenNameAND: // & (15.21, 15.21.1, 15.21.2)
+			case OP_AND: // & (15.21, 15.21.1, 15.21.2)
 				operatorString = "&"; //$NON-NLS-1$
 				break;
 
-			case TokenNameOR: // | (15.21, 15.21.1, 15.21.2)
+			case OP_OR: // | (15.21, 15.21.1, 15.21.2)
 				operatorString = "|"; //$NON-NLS-1$
 				break;
 
-			case TokenNameXOR: // ^ (15.21, 15.21.1, 15.21.2)
+			case OP_XOR: // ^ (15.21, 15.21.1, 15.21.2)
 				operatorString = "^"; //$NON-NLS-1$
 				break;
-			case TokenNameMULTIPLY_EQUAL: // *= (15.25.2)
+			case MULTIPLY_EQUAL: // *= (15.25.2)
 				operatorString = "*="; //$NON-NLS-1$
 				break;
 
-			case TokenNameDIVIDE_EQUAL: // /= (15.25.2)
+			case DIVIDE_EQUAL: // /= (15.25.2)
 				operatorString = "/="; //$NON-NLS-1$
 				break;
-			case TokenNameREMAINDER_EQUAL: // %= (15.25.2)
+			case REMAINDER_EQUAL: // %= (15.25.2)
 				operatorString = "%="; //$NON-NLS-1$
 				break;
 
-			case TokenNamePLUS_EQUAL: // += (15.25.2)
+			case PLUS_EQUAL: // += (15.25.2)
 				operatorString = "+="; //$NON-NLS-1$
 				break;
 
-			case TokenNameMINUS_EQUAL: // -= (15.25.2)
+			case MINUS_EQUAL: // -= (15.25.2)
 				operatorString = "-="; //$NON-NLS-1$
 				break;
 
-			case TokenNameLEFT_SHIFT_EQUAL: // <<= (15.25.2)
+			case LEFT_SHIFT_EQUAL: // <<= (15.25.2)
 				operatorString = "<<="; //$NON-NLS-1$
 				break;
 
-			case TokenNameRIGHT_SHIFT_EQUAL: // >>= (15.25.2)
+			case RIGHT_SHIFT_EQUAL: // >>= (15.25.2)
 				operatorString = ">>="; //$NON-NLS-1$
 				break;
 
-			// case TokenNameUNSIGNED_RIGHT_SHIFT_EQUAL : // >>>= (15.25.2)
+			// case UNSIGNED_RIGHT_SHIFT_EQUAL : // >>>= (15.25.2)
 			// operatorString=">>>="; //$NON-NLS-1$
 			// break;
 
-			case TokenNameAND_EQUAL: // &= (15.25.2)
+			case AND_EQUAL: // &= (15.25.2)
 				operatorString = "&="; //$NON-NLS-1$
 				break;
 
-			case TokenNameXOR_EQUAL: // ^= (15.25.2)
+			case XOR_EQUAL: // ^= (15.25.2)
 				operatorString = "^="; //$NON-NLS-1$
 				break;
 
-			case TokenNameOR_EQUAL: // |= (15.25.2)
+			case OR_EQUAL: // |= (15.25.2)
 				operatorString = "|="; //$NON-NLS-1$
 				break;
-			case TokenNameDOT_EQUAL: // .=
+			case DOT_EQUAL: // .=
 				operatorString = ".="; //$NON-NLS-1$
 				break;
-			case TokenNameDOT: // .
+			case DOT: // .
 				operatorString = "."; //$NON-NLS-1$
 				break;