X-Git-Url: http://git.phpeclipse.com diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/builder/IdentifierIndexManager.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/builder/IdentifierIndexManager.java index 86de9b5..639f165 100644 --- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/builder/IdentifierIndexManager.java +++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/builder/IdentifierIndexManager.java @@ -24,7 +24,7 @@ import net.sourceforge.phpdt.internal.compiler.parser.Scanner; import net.sourceforge.phpdt.internal.compiler.parser.SyntaxError; import net.sourceforge.phpdt.internal.compiler.util.Util; import net.sourceforge.phpeclipse.PHPeclipsePlugin; -import net.sourceforge.phpeclipse.obfuscator.PHPIdentifier; +//import net.sourceforge.phpeclipse.obfuscator.PHPIdentifier; import org.eclipse.core.resources.IFile; import org.eclipse.core.runtime.CoreException; @@ -149,7 +149,6 @@ public class IdentifierIndexManager { boolean hasModifiers = false; int phpdocOffset = -1; int phpdocLength = -1; - try { while (fToken != TokenNameEOF && fToken != TokenNameERROR) { phpdocOffset = -1; @@ -326,7 +325,6 @@ public class IdentifierIndexManager { // TODO Auto-generated catch block e.printStackTrace(); } - } synchronized public void parseIdentifiers(char[] charArray, @@ -339,7 +337,6 @@ public class IdentifierIndexManager { fScanner.setSource(charArray); fScanner.setPHPMode(false); fToken = TokenNameEOF; - try { getNextToken(); while (fToken != TokenNameEOF) { // && fToken != @@ -388,11 +385,8 @@ public class IdentifierIndexManager { skipComments(); } } -/* skipComments(); - if (fToken == TokenNameCOMMA) { - skipComments(); - }*/ - } while (fToken != TokenNameRPAREN ); + getNextToken (); + } while ((fToken != TokenNameRPAREN) && (fToken != 0)); } parseDeclarations(null, buf, true); } @@ -475,7 +469,7 @@ public class IdentifierIndexManager { } public boolean equals(Object o) { - String s = (String) o; + //String s = (String) o; return compare(this, o) == 0; } } @@ -583,7 +577,7 @@ public class IdentifierIndexManager { String line = (String) fFileMap.get(file.getProjectRelativePath() .toString()); if (line != null) { - PHPIdentifierLocation ident; + //PHPIdentifierLocation ident; ArrayList allClassNames = new ArrayList(); addLine(treeMap, null, line, allClassNames); int i = 0; @@ -595,7 +589,7 @@ public class IdentifierIndexManager { } public void addIdentifiers(TreeMap treeMap, String startClazz) { - PHPIdentifierLocation ident; + //PHPIdentifierLocation ident; ArrayList allClassNames = new ArrayList(); addClassName(treeMap, startClazz, allClassNames); int i = 0;