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

diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/jdom/DOMType.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/jdom/DOMType.java
index d0c21dc..c9617e0 100644
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/jdom/DOMType.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/jdom/DOMType.java
@@ -16,6 +16,7 @@ import net.sourceforge.phpdt.core.ICompilationUnit;
 import net.sourceforge.phpdt.core.IJavaElement;
 import net.sourceforge.phpdt.core.IType;
 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.core.jdom.IDOMMethod;
 import net.sourceforge.phpdt.core.jdom.IDOMNode;
@@ -547,12 +548,12 @@ import net.sourceforge.phpdt.internal.core.util.CharArrayOps;
 		scanner.resetTo(fNameRange[1] + 1, fDocument.length);
 
 		try {
-			int currentToken = scanner.getNextToken();
-			while (currentToken != ITerminalSymbols.TokenNameLBRACE
-					&& currentToken != ITerminalSymbols.TokenNameEOF) {
+			TokenName currentToken = scanner.getNextToken();
+			while (currentToken != ITerminalSymbols.TokenName.LBRACE
+					&& currentToken != ITerminalSymbols.TokenName.EOF) {
 				currentToken = scanner.getNextToken();
 			}
-			if (currentToken == ITerminalSymbols.TokenNameLBRACE) {
+			if (currentToken == ITerminalSymbols.TokenName.LBRACE) {
 				openBodyEnd = scanner.currentPosition - 1;
 				openBodyStart = scanner.startPosition;
 			} else {
@@ -581,12 +582,12 @@ import net.sourceforge.phpdt.internal.core.util.CharArrayOps;
 			scanner.setSource(fDocument);
 			scanner.resetTo(lastNode.getEndPosition() + 1, fDocument.length);
 			try {
-				int currentToken = scanner.getNextToken();
-				while (currentToken != ITerminalSymbols.TokenNameRBRACE
-						&& currentToken != ITerminalSymbols.TokenNameEOF) {
+				TokenName currentToken = scanner.getNextToken();
+				while (currentToken != ITerminalSymbols.TokenName.RBRACE
+						&& currentToken != ITerminalSymbols.TokenName.EOF) {
 					currentToken = scanner.getNextToken();
 				}
-				if (currentToken == ITerminalSymbols.TokenNameRBRACE) {
+				if (currentToken == ITerminalSymbols.TokenName.RBRACE) {
 					closeBodyStart = scanner.startPosition;
 					closeBodyEnd = scanner.currentPosition - 1;
 				} else {
@@ -600,12 +601,12 @@ import net.sourceforge.phpdt.internal.core.util.CharArrayOps;
 		} else {
 			scanner.resetTo(openBodyEnd, fDocument.length);
 			try {
-				int currentToken = scanner.getNextToken();
-				while (currentToken != ITerminalSymbols.TokenNameRBRACE
-						&& currentToken != ITerminalSymbols.TokenNameEOF) {
+				TokenName currentToken = scanner.getNextToken();
+				while (currentToken != ITerminalSymbols.TokenName.RBRACE
+						&& currentToken != ITerminalSymbols.TokenName.EOF) {
 					currentToken = scanner.getNextToken();
 				}
-				if (currentToken == ITerminalSymbols.TokenNameRBRACE) {
+				if (currentToken == ITerminalSymbols.TokenName.RBRACE) {
 					closeBodyStart = scanner.startPosition;
 					closeBodyEnd = scanner.currentPosition - 1;
 				} else {