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 526ff4b..9eba696 100644 --- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/builder/IdentifierIndexManager.java +++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/builder/IdentifierIndexManager.java @@ -24,14 +24,14 @@ 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; import org.eclipse.core.runtime.IStatus; /** - * Manages the identifer index information for a specific project + * Manages the identifier index information for a specific project * */ public class IdentifierIndexManager { @@ -380,12 +380,13 @@ public class IdentifierIndexManager { ident = fScanner.getCurrentIdentifierSource(); addIdentifierInformation('v', ident, buf, phpdocOffset, phpdocLength); - } - skipComments(); - if (fToken == TokenNameCOMMA) { skipComments(); - } - } while (fToken != TokenNameRPAREN ); + if (fToken == TokenNameCOMMA) { + skipComments(); + } + } + getNextToken (); + } while ((fToken != TokenNameRPAREN) && (fToken != 0)); } parseDeclarations(null, buf, true); } @@ -468,7 +469,7 @@ public class IdentifierIndexManager { } public boolean equals(Object o) { - String s = (String) o; + //String s = (String) o; return compare(this, o) == 0; } } @@ -576,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; @@ -588,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;