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

diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/obfuscator/ObfuscatorPass2Exporter.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/obfuscator/ObfuscatorPass2Exporter.java
index 47923a6..b143f41 100644
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/obfuscator/ObfuscatorPass2Exporter.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/obfuscator/ObfuscatorPass2Exporter.java
@@ -34,7 +34,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;
 
 /**
  * Helper class for exporting resources to the file system.
@@ -42,7 +42,7 @@ import org.eclipse.jface.preference.IPreferenceStore;
 public class ObfuscatorPass2Exporter implements ITerminalSymbols {
 	private Scanner fScanner;
 
-	private int fToken;
+	private TokenName fToken;
 
 	private int fCounter;
 
@@ -74,22 +74,22 @@ public class ObfuscatorPass2Exporter implements ITerminalSymbols {
 		} catch (InvalidInputException e) {
 
 		}
-		fToken = TokenNameERROR;
+		fToken = TokenName.ERROR;
 	}
 
 	private boolean obfuscate(StringBuffer buf) {
-		char[] ident;
+		//char[] ident;
 		String identifier;
 		PHPIdentifier value;
 
 		int startPosition = 0;
 		int lastPosition = 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());
 					lastPosition = fScanner.startPosition;
@@ -111,7 +111,7 @@ public class ObfuscatorPass2Exporter implements ITerminalSymbols {
 					}
 					startPosition = fScanner.currentPosition;
 					getNextToken();
-				} else if (fToken == TokenNameIdentifier) {
+				} else if (fToken == TokenName.IDENTIFIER) {
 					identifier = new String(fScanner
 							.getCurrentIdentifierSource());
 					lastPosition = fScanner.startPosition;
@@ -134,15 +134,15 @@ public class ObfuscatorPass2Exporter implements ITerminalSymbols {
 					startPosition = fScanner.currentPosition;
 					getNextToken();
 
-				} else if (fToken == TokenNameCOMMENT_LINE
-						|| fToken == TokenNameCOMMENT_BLOCK
-						|| fToken == TokenNameCOMMENT_PHPDOC) {
+				} else if (fToken == TokenName.COMMENT_LINE
+						|| fToken == TokenName.COMMENT_BLOCK
+						|| fToken == TokenName.COMMENT_PHPDOC) {
 					lastPosition = fScanner.startPosition;
 					buf.append(fScanner.source, startPosition, lastPosition
 							- startPosition);
 					startPosition = fScanner.currentPosition;
 					getNextToken();
-				} else if (fToken == TokenNameStringDoubleQuote) {
+				} else if (fToken == TokenName.STRINGDOUBLEQUOTE) {
 					char currentCharacter;
 					int i = fScanner.startPosition;
 					ArrayList varList = new ArrayList();
@@ -209,9 +209,9 @@ public class ObfuscatorPass2Exporter implements ITerminalSymbols {
 					startPosition = fScanner.currentPosition;
 					getNextToken();
 				}
-				if (fToken == TokenNameMINUS_GREATER) { // i.e. $this->var_name
+				if (fToken == TokenName.MINUS_GREATER) { // i.e. $this->var_name
 					getNextToken();
-					if (fToken == TokenNameIdentifier) {
+					if (fToken == TokenName.IDENTIFIER) {
 						// assuming this is a dereferenced variable
 						identifier = new String(fScanner
 								.getCurrentIdentifierSource());
@@ -322,7 +322,7 @@ public class ObfuscatorPass2Exporter implements ITerminalSymbols {
 
 			fScanner.setSource(charArray);
 			fScanner.setPHPMode(false);
-			fToken = TokenNameEOF;
+			fToken = TokenName.EOF;
 			getNextToken();
 
 			StringBuffer buf = new StringBuffer();