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

diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/ltk/core/RenameLocalVariableDelegate.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/ltk/core/RenameLocalVariableDelegate.java
index 3f2571f..e9cde45 100644
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/ltk/core/RenameLocalVariableDelegate.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/ltk/core/RenameLocalVariableDelegate.java
@@ -9,6 +9,7 @@ import java.util.ArrayList;
 
 import net.sourceforge.phpdt.core.ISourceRange;
 import net.sourceforge.phpdt.core.compiler.ITerminalSymbols;
+import net.sourceforge.phpdt.core.compiler.ITerminalSymbols.TokenName;
 import net.sourceforge.phpdt.core.compiler.InvalidInputException;
 import net.sourceforge.phpdt.internal.compiler.parser.Scanner;
 import net.sourceforge.phpdt.internal.compiler.parser.SyntaxError;
@@ -116,14 +117,14 @@ public class RenameLocalVariableDelegate extends RenameIdentifierDelegate {
 			//
 			Scanner firstScanner = new Scanner(true, false);
 			firstScanner.setSource(content.toCharArray());
-			int fToken = ITerminalSymbols.TokenNameEOF;
+			TokenName fToken = ITerminalSymbols.TokenName.EOF;
 			int start = 0;
 			int phpdocStart = -1;
 			try {
 				fToken = firstScanner.getNextToken();
-				while (fToken != ITerminalSymbols.TokenNameEOF
+				while (fToken != ITerminalSymbols.TokenName.EOF
 						&& start < offset) {
-					if (fToken == ITerminalSymbols.TokenNameCOMMENT_PHPDOC) {
+					if (fToken == ITerminalSymbols.TokenName.COMMENT_PHPDOC) {
 						phpdocStart = firstScanner
 								.getCurrentTokenStartPosition();
 					} else {
@@ -160,7 +161,7 @@ public class RenameLocalVariableDelegate extends RenameIdentifierDelegate {
 			boolean renameOtherComments = info.isRenameOtherComments();
 			char[] word = wordStr.toCharArray();
 
-			fToken = ITerminalSymbols.TokenNameEOF;
+			fToken = ITerminalSymbols.TokenName.EOF;
 			// double quoted string
 			String tokenString;
 			// double quoted string offset
@@ -168,8 +169,8 @@ public class RenameLocalVariableDelegate extends RenameIdentifierDelegate {
 			int index;
 			try {
 				fToken = secondScanner.getNextToken();
-				while (fToken != ITerminalSymbols.TokenNameEOF) {
-					if (fToken == ITerminalSymbols.TokenNameVariable) {
+				while (fToken != ITerminalSymbols.TokenName.EOF) {
+					if (fToken == ITerminalSymbols.TokenName.VARIABLE) {
 						if (secondScanner.equalsCurrentTokenSource(word)) {
 							// the current variable token is equal to the given
 							// word
@@ -177,7 +178,7 @@ public class RenameLocalVariableDelegate extends RenameIdentifierDelegate {
 									.getCurrentTokenStartPosition()
 									+ offset));
 						}
-					} else if (fToken == ITerminalSymbols.TokenNameStringDoubleQuote
+					} else if (fToken == ITerminalSymbols.TokenName.STRINGDOUBLEQUOTE
 							&& renameDQString) {
 						// determine the word in double quoted strings:
 						tokenString = new String(secondScanner
@@ -189,7 +190,7 @@ public class RenameLocalVariableDelegate extends RenameIdentifierDelegate {
 							matches.add(new Integer(offset + tokenOffset
 									+ index));
 						}
-					} else if (fToken == ITerminalSymbols.TokenNameCOMMENT_PHPDOC
+					} else if (fToken == ITerminalSymbols.TokenName.COMMENT_PHPDOC
 							&& renamePHPdoc) {
 						tokenString = new String(secondScanner
 								.getCurrentTokenSource());
@@ -200,7 +201,7 @@ public class RenameLocalVariableDelegate extends RenameIdentifierDelegate {
 							matches.add(new Integer(offset + tokenOffset
 									+ index));
 						}
-					} else if ((fToken == ITerminalSymbols.TokenNameCOMMENT_BLOCK || fToken == ITerminalSymbols.TokenNameCOMMENT_LINE)
+					} else if ((fToken == ITerminalSymbols.TokenName.COMMENT_BLOCK || fToken == ITerminalSymbols.TokenName.COMMENT_LINE)
 							&& renameOtherComments) {
 						tokenString = new String(secondScanner
 								.getCurrentTokenSource());