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

diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/obfuscator/ObfuscatorPass1Exporter.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/obfuscator/ObfuscatorPass1Exporter.java
index a275475..604132f 100644
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/obfuscator/ObfuscatorPass1Exporter.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/obfuscator/ObfuscatorPass1Exporter.java
@@ -29,7 +29,7 @@ import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IResource;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IPath;
-import org.eclipse.jface.preference.IPreferenceStore;
+//import org.eclipse.jface.preference.IPreferenceStore;
 
 /**
  * Analyzing php files in a first pass over all resources !
@@ -38,7 +38,7 @@ public class ObfuscatorPass1Exporter implements ITerminalSymbols {
 
 	protected Scanner fScanner;
 
-	protected int fToken;
+	protected TokenName fToken;
 
 	protected HashMap fIdentifierMap;
 
@@ -67,20 +67,20 @@ public class ObfuscatorPass1Exporter implements ITerminalSymbols {
 		} catch (InvalidInputException e) {
 
 		}
-		fToken = TokenNameERROR;
+		fToken = TokenName.ERROR;
 	}
 
 	private void parseIdentifiers(boolean goBack) {
-		char[] ident;
+		//char[] ident;
 		String identifier;
 		PHPIdentifier value;
 		int counter = 0;
 
-		IPreferenceStore store = PHPeclipsePlugin.getDefault()
-				.getPreferenceStore();
+//		IPreferenceStore store = PHPeclipsePlugin.getDefault()
+//				.getPreferenceStore();
 		try {
-			while (fToken != TokenNameEOF && fToken != TokenNameERROR) {
-				if (fToken == TokenNameVariable) {
+			while (fToken != TokenName.EOF && fToken != TokenName.ERROR) {
+				if (fToken == TokenName.VARIABLE) {
 					identifier = new String(fScanner
 							.getCurrentIdentifierSource());
 					value = (PHPIdentifier) fIdentifierMap.get(identifier);
@@ -122,7 +122,7 @@ public class ObfuscatorPass1Exporter implements ITerminalSymbols {
 					// parseDeclarations(outlineInfo, temp, true);
 					// // stack.pop();
 					// }
-				} else if (fToken == TokenNameStringDoubleQuote) {
+				} else if (fToken == TokenName.STRINGDOUBLEQUOTE) {
 					char currentCharacter;
 					int i = fScanner.startPosition;
 					ArrayList varList = new ArrayList();
@@ -155,10 +155,10 @@ public class ObfuscatorPass1Exporter implements ITerminalSymbols {
 					}
 
 					getNextToken();
-				} else if (fToken == TokenNameLBRACE) {
+				} else if (fToken == TokenName.LBRACE) {
 					getNextToken();
 					counter++;
-				} else if (fToken == TokenNameRBRACE) {
+				} else if (fToken == TokenName.RBRACE) {
 					getNextToken();
 					--counter;
 					if (counter == 0 && goBack) {
@@ -237,7 +237,7 @@ public class ObfuscatorPass1Exporter implements ITerminalSymbols {
 		/* fScanner initialization */
 		fScanner.setSource(charArray);
 		fScanner.setPHPMode(false);
-		fToken = TokenNameEOF;
+		fToken = TokenName.EOF;
 		getNextToken();
 		parseIdentifiers(false);
 	}