1) Moved net.sourceforge.phpeclipse.ui\src\net\sourceforge\phpdt back to net.sourcefo...

[phpeclipse.git] / net.sourceforge.phpeclipse / src / net / sourceforge / phpdt / core / JavaConventions.java

diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/core/JavaConventions.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/core/JavaConventions.java
index 45b0f41..e7ec0d5 100644 (file)
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/core/JavaConventions.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/core/JavaConventions.java
@@ -14,6 +14,7 @@ package net.sourceforge.phpdt.core;
 
 //import net.sourceforge.phpdt.core.compiler.CharOperation;
 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.core.ClasspathEntry;
@@ -94,16 +95,16 @@ public final class JavaConventions {
                }
                try {
                        SCANNER.setSource(id.toCharArray());
-                       int token = SCANNER.getNextToken();
+                       TokenName token = SCANNER.getNextToken();
                        char[] currentIdentifier;
                        try {
                                currentIdentifier = SCANNER.getCurrentIdentifierSource();
                        } catch (ArrayIndexOutOfBoundsException e) {
                                return null;
                        }
-                       int nextToken = SCANNER.getNextToken();
-                       if (token == ITerminalSymbols.TokenNameIdentifier
-                                       && nextToken == ITerminalSymbols.TokenNameEOF
+                       TokenName nextToken = SCANNER.getNextToken();
+                       if (token == ITerminalSymbols.TokenName.IDENTIFIER
+                                       && nextToken == ITerminalSymbols.TokenName.EOF
                                        && SCANNER.startPosition == SCANNER.source.length) { // to
                                                                                                                                                        // handle
                                                                                                                                                        // case