From 2a02c784024fbe98b07116d3299cc5e166aea6f9 Mon Sep 17 00:00:00 2001 From: incastrix Date: Wed, 7 Oct 2009 15:04:22 +0000 Subject: [PATCH] Refactory: removed unnecessary local variables and imports. --- .../phpdt/debug/core/PHPDebugModel.java | 2 +- .../debug/ui/actions/ToggleBreakpointAdapter.java | 8 ++-- .../properties/PHPBreakpointPropertiesDialog.java | 2 +- .../externaltools/internal/ui/StatusDialog.java | 10 +++--- .../internal/launching/ConsoleLineTracker.java | 4 +- .../phpdt/internal/launching/DebuggerRunner.java | 8 ++-- .../internal/launching/InterpreterRunner.java | 2 +- .../phpdt/internal/launching/PHPSourceLocator.java | 6 ++-- .../phpeclipse/phpunit/PHPUnitView.java | 2 +- .../phpunit/preferences/PHPUnitPreferencePage.java | 10 +++--- .../phpunit/reporthandling/ReportListener.java | 2 +- .../phpeclipse/phpunit/testpool/TestPool.java | 2 +- .../phpeclipse/phpunit/testpool/TestSuite.java | 4 +- .../editor/SmartyEditorActionContributor.java | 16 +++++----- .../template/php/CodeTemplateContextType.java | 2 +- .../internal/corext/template/php/JavaContext.java | 6 ++-- .../ui/preferences/CompilerConfigurationBlock.java | 24 ++++++++-------- .../ui/preferences/JavaEditorPreferencePage.java | 4 +- .../java/hover/AbstractJavaEditorTextHover.java | 10 +++--- .../ui/text/phpdoc/JavaDocAutoIndentStrategy.java | 2 +- .../ui/text/phpdoc/PHPDocCompletionProcessor.java | 4 +- .../ui/viewsupport/JavaElementImageProvider.java | 30 ++++++++++---------- .../phpdt/ui/OverrideIndicatorLabelDecorator.java | 2 +- .../phpdt/ui/actions/GenerateActionGroup.java | 4 +- .../phpdt/ui/wizards/NewContainerWizardPage.java | 4 +- .../phpdt/ui/wizards/NewTypeWizardPage.java | 9 +++-- .../phpeclipse/actions/PHPEclipseShowAction.java | 28 +++++++++--------- .../phpeclipse/builder/IdentifierIndexManager.java | 4 +- .../obfuscator/ObfuscatorPass1Exporter.java | 10 +++--- .../obfuscator/ObfuscatorPass2Exporter.java | 10 +++--- .../export/ObfuscatorExportOperation.java | 12 ++++---- .../phpeclipse/phpeditor/JavaOutlinePage.java | 16 +++++----- .../phpeditor/JavaSelectMarkerRulerAction.java | 8 ++-- .../phpeclipse/phpeditor/PHPEditor.java | 2 +- .../phpeditor/php/HTMLCompletionProcessor.java | 6 ++-- .../src/net/sourceforge/phpeclipse/ui/WebUI.java | 4 +- .../phpeclipse/ui/editor/BrowserUtil.java | 14 ++++---- .../phpeclipse/wizards/html/EditElementWizard.java | 2 +- .../wizards/html/UnknownElementWizardPage.java | 2 +- .../editor/XMLEditorActionContributor.java | 16 +++++----- .../src/net/sourceforge/phpdt/core/JavaCore.java | 2 +- .../formatter/DefaultCodeFormatterConstants.java | 2 +- .../internal/compiler/SourceElementParser.java | 10 +++--- .../internal/compiler/ast/WhileStatement.java | 4 +- .../phpdt/internal/compiler/batch/FileSystem.java | 2 +- .../compiler/lookup/CompilationUnitScope.java | 2 +- .../phpdt/internal/compiler/parser/Parser.java | 4 +- .../compiler/parser/SourceTypeConverter.java | 4 +- .../phpdt/internal/core/ClasspathEntry.java | 14 ++++---- .../phpdt/internal/core/DeltaProcessingState.java | 2 +- .../phpdt/internal/core/JavaModelManager.java | 4 +- .../phpdt/internal/core/JavaProject.java | 8 ++-- .../internal/core/JavaProjectElementInfo.java | 6 ++-- .../phpdt/internal/core/ModelUpdater.java | 4 +- .../phpdt/internal/core/NameLookup.java | 2 +- .../phpdt/internal/core/PackageFragment.java | 4 +- .../phpdt/internal/core/PackageFragmentRoot.java | 6 ++-- .../internal/core/PackageFragmentRootInfo.java | 6 ++-- .../phpdt/internal/core/SetClasspathOperation.java | 2 +- .../internal/core/builder/BatchImageBuilder.java | 6 ++-- .../internal/core/builder/ClasspathDirectory.java | 2 +- .../core/builder/IncrementalImageBuilder.java | 2 +- .../phpdt/internal/core/builder/State.java | 4 +- .../sourceforge/phpdt/internal/core/util/Util.java | 12 ++++---- .../phpdt/internal/corext/util/JavaModelUtil.java | 2 +- .../phpeclipse/builder/IdentifierIndexManager.java | 4 +- 66 files changed, 217 insertions(+), 216 deletions(-) diff --git a/net.sourceforge.phpeclipse.debug.core/src/net/sourceforge/phpdt/debug/core/PHPDebugModel.java b/net.sourceforge.phpeclipse.debug.core/src/net/sourceforge/phpdt/debug/core/PHPDebugModel.java index 94c9556..007cd10 100644 --- a/net.sourceforge.phpeclipse.debug.core/src/net/sourceforge/phpdt/debug/core/PHPDebugModel.java +++ b/net.sourceforge.phpeclipse.debug.core/src/net/sourceforge/phpdt/debug/core/PHPDebugModel.java @@ -128,7 +128,7 @@ public class PHPDebugModel { public static PHPLineBreakpoint lineBreakpointExists(IResource resource, int lineNumber) throws CoreException { String modelId = PHPDebugCorePlugin.PLUGIN_ID; // getPluginIdentifier(); - String markerType = PHPLineBreakpoint.getMarkerType(); + //String markerType = PHPLineBreakpoint.getMarkerType(); IBreakpointManager manager = DebugPlugin.getDefault() .getBreakpointManager(); IBreakpoint[] breakpoints = manager.getBreakpoints(modelId); diff --git a/net.sourceforge.phpeclipse.debug.ui/src/net/sourceforge/phpdt/internal/debug/ui/actions/ToggleBreakpointAdapter.java b/net.sourceforge.phpeclipse.debug.ui/src/net/sourceforge/phpdt/internal/debug/ui/actions/ToggleBreakpointAdapter.java index 6c88414..26ea209 100644 --- a/net.sourceforge.phpeclipse.debug.ui/src/net/sourceforge/phpdt/internal/debug/ui/actions/ToggleBreakpointAdapter.java +++ b/net.sourceforge.phpeclipse.debug.ui/src/net/sourceforge/phpdt/internal/debug/ui/actions/ToggleBreakpointAdapter.java @@ -30,7 +30,7 @@ import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.core.runtime.CoreException; import org.eclipse.debug.core.DebugPlugin; import org.eclipse.debug.ui.actions.IToggleBreakpointsTarget; -import org.eclipse.jface.text.IDocument; +//import org.eclipse.jface.text.IDocument; import org.eclipse.jface.text.ITextSelection; import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.IStructuredSelection; @@ -39,7 +39,7 @@ import org.eclipse.ui.IEditorPart; import org.eclipse.ui.IFileEditorInput; import org.eclipse.ui.IWorkbenchPart; import org.eclipse.ui.texteditor.IEditorStatusLine; -import org.eclipse.ui.texteditor.ITextEditor; +//import org.eclipse.ui.texteditor.ITextEditor; /** * Toggles a line breakpoint in a Java editor. @@ -100,8 +100,8 @@ public class ToggleBreakpointAdapter implements IToggleBreakpointsTarget { ITextSelection textSelection = (ITextSelection) selection; // IType type = getType(textSelection); IEditorInput editorInput = editorPart.getEditorInput(); - IDocument document = ((ITextEditor) editorPart) - .getDocumentProvider().getDocument(editorInput); +// IDocument document = ((ITextEditor) editorPart) +// .getDocumentProvider().getDocument(editorInput); int lineNumber = textSelection.getStartLine() + 1; int offset = textSelection.getOffset(); try { diff --git a/net.sourceforge.phpeclipse.debug.ui/src/net/sourceforge/phpdt/internal/debug/ui/properties/PHPBreakpointPropertiesDialog.java b/net.sourceforge.phpeclipse.debug.ui/src/net/sourceforge/phpdt/internal/debug/ui/properties/PHPBreakpointPropertiesDialog.java index 3774832..88b3605 100644 --- a/net.sourceforge.phpeclipse.debug.ui/src/net/sourceforge/phpdt/internal/debug/ui/properties/PHPBreakpointPropertiesDialog.java +++ b/net.sourceforge.phpeclipse.debug.ui/src/net/sourceforge/phpdt/internal/debug/ui/properties/PHPBreakpointPropertiesDialog.java @@ -46,7 +46,7 @@ public class PHPBreakpointPropertiesDialog extends StatusDialog { IDocument document; Control control; Label label; - Spinner spinner; + //Spinner spinner; String condition = ""; boolean enabled = false; int hitCount = 0; diff --git a/net.sourceforge.phpeclipse.externaltools/src/net/sourceforge/phpdt/externaltools/internal/ui/StatusDialog.java b/net.sourceforge.phpeclipse.externaltools/src/net/sourceforge/phpdt/externaltools/internal/ui/StatusDialog.java index b809c79..a0eddd2 100644 --- a/net.sourceforge.phpeclipse.externaltools/src/net/sourceforge/phpdt/externaltools/internal/ui/StatusDialog.java +++ b/net.sourceforge.phpeclipse.externaltools/src/net/sourceforge/phpdt/externaltools/internal/ui/StatusDialog.java @@ -37,14 +37,14 @@ public abstract class StatusDialog extends Dialog { private Image fImage; - private boolean fStatusLineAboveButtons; + //private boolean fStatusLineAboveButtons; /** * Creates an instane of a status dialog. */ public StatusDialog(Shell parent) { super(parent); - fStatusLineAboveButtons = false; + //fStatusLineAboveButtons = false; fLastStatus = new StatusInfo(); } @@ -56,9 +56,9 @@ public abstract class StatusDialog extends Dialog { * if true status line is placed above buttons; if * false to the right */ - public void setStatusLineAboveButtons(boolean aboveButtons) { - fStatusLineAboveButtons = aboveButtons; - } +// public void setStatusLineAboveButtons(boolean aboveButtons) { +// //fStatusLineAboveButtons = aboveButtons; +// } /** * Update the dialog's status line to reflect the given status. It is save diff --git a/net.sourceforge.phpeclipse.launching/src/net/sourceforge/phpdt/internal/launching/ConsoleLineTracker.java b/net.sourceforge.phpeclipse.launching/src/net/sourceforge/phpdt/internal/launching/ConsoleLineTracker.java index 49d1b3c..830e02c 100644 --- a/net.sourceforge.phpeclipse.launching/src/net/sourceforge/phpdt/internal/launching/ConsoleLineTracker.java +++ b/net.sourceforge.phpeclipse.launching/src/net/sourceforge/phpdt/internal/launching/ConsoleLineTracker.java @@ -139,8 +139,8 @@ public class ConsoleLineTracker implements IConsoleLineTracker { } if (lineNumber != -1) { - JavadocConsoleHyperLink link = new JavadocConsoleHyperLink( - path, lineNumber); +// JavadocConsoleHyperLink link = new JavadocConsoleHyperLink( +// path, lineNumber); // TODO XXX Disabled for 3.1 fConsole.addLink(link, // line.getOffset(), index1); diff --git a/net.sourceforge.phpeclipse.launching/src/net/sourceforge/phpdt/internal/launching/DebuggerRunner.java b/net.sourceforge.phpeclipse.launching/src/net/sourceforge/phpdt/internal/launching/DebuggerRunner.java index ab6157c..95938af 100644 --- a/net.sourceforge.phpeclipse.launching/src/net/sourceforge/phpdt/internal/launching/DebuggerRunner.java +++ b/net.sourceforge.phpeclipse.launching/src/net/sourceforge/phpdt/internal/launching/DebuggerRunner.java @@ -26,12 +26,12 @@ public class DebuggerRunner extends InterpreterRunner { public IProcess run(InterpreterRunnerConfiguration configuration, ILaunch launch) { - String[] env; - String name, value; + //String[] env; + //String name, value; PHPDBGProxy newPHPDBGProxy = new PHPDBGProxy(configuration .useRemoteDebugger(), configuration.getRemoteSourcePath(), configuration.usePathTranslation(), configuration.getPathMap()); - int pos; + //int pos; IProcess process = null; PHPDebugTarget debugTarget = new PHPDebugTarget(launch, process); @@ -82,7 +82,7 @@ public class DebuggerRunner extends InterpreterRunner { protected void setEnvironmentVariables( InterpreterRunnerConfiguration configuration, int listenPort) { String DBGSessID; - String env[] = new String[18]; + //String env[] = new String[18]; long id = Math.round(Math.random() * 100000); DBGSessID = "DBGSESSID=" + id + "@clienthost:" + listenPort; diff --git a/net.sourceforge.phpeclipse.launching/src/net/sourceforge/phpdt/internal/launching/InterpreterRunner.java b/net.sourceforge.phpeclipse.launching/src/net/sourceforge/phpdt/internal/launching/InterpreterRunner.java index 8509af3..fe70c29 100644 --- a/net.sourceforge.phpeclipse.launching/src/net/sourceforge/phpdt/internal/launching/InterpreterRunner.java +++ b/net.sourceforge.phpeclipse.launching/src/net/sourceforge/phpdt/internal/launching/InterpreterRunner.java @@ -61,7 +61,7 @@ public class InterpreterRunner { protected String renderCommandLine( InterpreterRunnerConfiguration configuration) { - PHPInterpreter interpreter = configuration.getInterpreter(); + //PHPInterpreter interpreter = configuration.getInterpreter(); StringBuffer buffer = new StringBuffer(); buffer.append(this.getDebugCommandLineArgument()); diff --git a/net.sourceforge.phpeclipse.launching/src/net/sourceforge/phpdt/internal/launching/PHPSourceLocator.java b/net.sourceforge.phpeclipse.launching/src/net/sourceforge/phpdt/internal/launching/PHPSourceLocator.java index d032da5..4c0c61d 100644 --- a/net.sourceforge.phpeclipse.launching/src/net/sourceforge/phpdt/internal/launching/PHPSourceLocator.java +++ b/net.sourceforge.phpeclipse.launching/src/net/sourceforge/phpdt/internal/launching/PHPSourceLocator.java @@ -84,11 +84,11 @@ public class PHPSourceLocator implements IPersistableSourceLocator, ISourcePrese IPath localPath; Iterator iterator; String fileName; - String file; + //String file; String local; fileName = ((PHPStackFrame) stackFrame).getFileName (); // Get the filename as it is submitted by DBG - file = ""; + //file = ""; if (remoteDebug) { // Is it a remote debugging session path = new Path (fileName); // Create a IPath object for the server side filename @@ -96,7 +96,7 @@ public class PHPSourceLocator implements IPersistableSourceLocator, ISourcePrese if (!remoteSourcePath.isEmpty()) { if (remoteSourcePath.isPrefixOf (path)) { // Is the server side filename with the remote source path path = path.removeFirstSegments (remoteSourcePath.matchingFirstSegments (path)); // Remove the remote source path - file = path.toString (); // The filename without the remote source path + //file = path.toString (); // The filename without the remote source path projectPath = (PHPeclipsePlugin.getWorkspace().getRoot().getProject(projectName).getLocation()); // Get the absolute project path return (projectPath.append (path)).toOSString (); // Return the filename as absolute client side path diff --git a/net.sourceforge.phpeclipse.phpunit/src/net/sourceforge/phpeclipse/phpunit/PHPUnitView.java b/net.sourceforge.phpeclipse.phpunit/src/net/sourceforge/phpeclipse/phpunit/PHPUnitView.java index 135cdcd..7a9d128 100644 --- a/net.sourceforge.phpeclipse.phpunit/src/net/sourceforge/phpeclipse/phpunit/PHPUnitView.java +++ b/net.sourceforge.phpeclipse.phpunit/src/net/sourceforge/phpeclipse/phpunit/PHPUnitView.java @@ -372,7 +372,7 @@ public class PHPUnitView extends ViewPart { } else if (command.equals("testStarted")) { String testID = args[0]; - String testCount = args[1]; + //String testCount = args[1]; String testName = args[2]; String parentTestSuiteName = args[3]; diff --git a/net.sourceforge.phpeclipse.phpunit/src/net/sourceforge/phpeclipse/phpunit/preferences/PHPUnitPreferencePage.java b/net.sourceforge.phpeclipse.phpunit/src/net/sourceforge/phpeclipse/phpunit/preferences/PHPUnitPreferencePage.java index ffd19f1..6f6d150 100644 --- a/net.sourceforge.phpeclipse.phpunit/src/net/sourceforge/phpeclipse/phpunit/preferences/PHPUnitPreferencePage.java +++ b/net.sourceforge.phpeclipse.phpunit/src/net/sourceforge/phpeclipse/phpunit/preferences/PHPUnitPreferencePage.java @@ -36,16 +36,16 @@ public class PHPUnitPreferencePage extends FieldEditorPreferencePage implements super(GRID); setPreferenceStore(PHPUnitPlugin.getDefault().getPreferenceStore()); setDescription("Please browse for the folder containing the PHPUnit files (among them: \"phpunit.php\" and \"socketTestResult.php\"). If you don't have it, please download the latest version from http://sourceforge.net/projects/phpunit/ first. "); - initializeDefaults(); + //initializeDefaults(); } /** * Sets the default values of the preferences. */ - private void initializeDefaults() { - IPreferenceStore store = getPreferenceStore(); - - } +// private void initializeDefaults() { +// //IPreferenceStore store = getPreferenceStore(); +// +// } /** * Creates the field editors. Field editors are abstractions of the common diff --git a/net.sourceforge.phpeclipse.phpunit/src/net/sourceforge/phpeclipse/phpunit/reporthandling/ReportListener.java b/net.sourceforge.phpeclipse.phpunit/src/net/sourceforge/phpeclipse/phpunit/reporthandling/ReportListener.java index f0fb4a7..a9aa230 100644 --- a/net.sourceforge.phpeclipse.phpunit/src/net/sourceforge/phpeclipse/phpunit/reporthandling/ReportListener.java +++ b/net.sourceforge.phpeclipse.phpunit/src/net/sourceforge/phpeclipse/phpunit/reporthandling/ReportListener.java @@ -36,7 +36,7 @@ public class ReportListener extends Thread { BufferedReader in = new BufferedReader(reader); String report = null; - int i = 0; + //int i = 0; // keep listening until the while ((report = in.readLine()) != null && (report != "end_all_tests")) { diff --git a/net.sourceforge.phpeclipse.phpunit/src/net/sourceforge/phpeclipse/phpunit/testpool/TestPool.java b/net.sourceforge.phpeclipse.phpunit/src/net/sourceforge/phpeclipse/phpunit/testpool/TestPool.java index ddd0422..eda03a0 100644 --- a/net.sourceforge.phpeclipse.phpunit/src/net/sourceforge/phpeclipse/phpunit/testpool/TestPool.java +++ b/net.sourceforge.phpeclipse.phpunit/src/net/sourceforge/phpeclipse/phpunit/testpool/TestPool.java @@ -95,7 +95,7 @@ public class TestPool { String string = ""; - TestSuite node = root; + //TestSuite node = root; string = root.toString(); diff --git a/net.sourceforge.phpeclipse.phpunit/src/net/sourceforge/phpeclipse/phpunit/testpool/TestSuite.java b/net.sourceforge.phpeclipse.phpunit/src/net/sourceforge/phpeclipse/phpunit/testpool/TestSuite.java index 301b9fd..43b78ef 100644 --- a/net.sourceforge.phpeclipse.phpunit/src/net/sourceforge/phpeclipse/phpunit/testpool/TestSuite.java +++ b/net.sourceforge.phpeclipse.phpunit/src/net/sourceforge/phpeclipse/phpunit/testpool/TestSuite.java @@ -14,7 +14,7 @@ public class TestSuite { private boolean hasFailure; - private boolean isAllPass; + //private boolean isAllPass; private boolean hasError; @@ -48,7 +48,7 @@ public class TestSuite { testSuites = new Vector(); hasError = false; - isAllPass = true; + //isAllPass = true; hasFailure = false; } diff --git a/net.sourceforge.phpeclipse.smarty.ui/src/net/sourceforge/phpdt/smarty/ui/internal/editor/SmartyEditorActionContributor.java b/net.sourceforge.phpeclipse.smarty.ui/src/net/sourceforge/phpdt/smarty/ui/internal/editor/SmartyEditorActionContributor.java index 9dd8c26..c1a722b 100644 --- a/net.sourceforge.phpeclipse.smarty.ui/src/net/sourceforge/phpdt/smarty/ui/internal/editor/SmartyEditorActionContributor.java +++ b/net.sourceforge.phpeclipse.smarty.ui/src/net/sourceforge/phpdt/smarty/ui/internal/editor/SmartyEditorActionContributor.java @@ -12,10 +12,10 @@ package net.sourceforge.phpdt.smarty.ui.internal.editor; import net.sourceforge.phpeclipse.ui.editor.ShowExternalPreviewAction; -import org.eclipse.core.resources.IFile; -import org.eclipse.ui.IEditorInput; +//import org.eclipse.core.resources.IFile; +//import org.eclipse.ui.IEditorInput; import org.eclipse.ui.IEditorPart; -import org.eclipse.ui.IFileEditorInput; +//import org.eclipse.ui.IFileEditorInput; import org.eclipse.ui.texteditor.BasicTextEditorActionContributor; import org.eclipse.ui.texteditor.ITextEditor; @@ -37,12 +37,12 @@ public class SmartyEditorActionContributor extends textEditor = (ITextEditor) part; if (textEditor != null) { - IFile file = null; - IEditorInput editorInput = textEditor.getEditorInput(); + //IFile file = null; + //IEditorInput editorInput = textEditor.getEditorInput(); - if (editorInput instanceof IFileEditorInput) { - file = ((IFileEditorInput) editorInput).getFile(); - } +// if (editorInput instanceof IFileEditorInput) { +// file = ((IFileEditorInput) editorInput).getFile(); +// } ShowExternalPreviewAction fShowExternalPreviewAction = ShowExternalPreviewAction .getInstance(); diff --git a/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpdt/internal/corext/template/php/CodeTemplateContextType.java b/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpdt/internal/corext/template/php/CodeTemplateContextType.java index 94dd363..12d7b28 100644 --- a/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpdt/internal/corext/template/php/CodeTemplateContextType.java +++ b/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpdt/internal/corext/template/php/CodeTemplateContextType.java @@ -429,7 +429,7 @@ public class CodeTemplateContextType extends TemplateContextType { protected void validateVariables(TemplateVariable[] variables) throws TemplateException { ArrayList required = new ArrayList(5); - String contextName = getId(); + //String contextName = getId(); // if (NEWTYPE_CONTEXTTYPE.equals(contextName)) { // required.add(PACKAGE_DECLARATION); // required.add(TYPE_DECLARATION); diff --git a/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpdt/internal/corext/template/php/JavaContext.java b/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpdt/internal/corext/template/php/JavaContext.java index 869b5b8..5c6f25c 100644 --- a/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpdt/internal/corext/template/php/JavaContext.java +++ b/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpdt/internal/corext/template/php/JavaContext.java @@ -26,7 +26,7 @@ import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; //import org.eclipse.jface.dialogs.MessageDialog; -import org.eclipse.jface.preference.IPreferenceStore; +//import org.eclipse.jface.preference.IPreferenceStore; import org.eclipse.jface.text.BadLocationException; import org.eclipse.jface.text.Document; import org.eclipse.jface.text.IDocument; @@ -122,8 +122,8 @@ public class JavaContext extends CompilationUnitContext { if (lineDelimiter == null) lineDelimiter = PLATFORM_LINE_DELIMITER; - IPreferenceStore prefs = WebUI.getDefault() - .getPreferenceStore(); +// IPreferenceStore prefs = WebUI.getDefault() +// .getPreferenceStore(); // axelcl start // boolean useCodeFormatter = // prefs.getBoolean(PreferenceConstants.TEMPLATES_USE_CODEFORMATTER); diff --git a/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpdt/internal/ui/preferences/CompilerConfigurationBlock.java b/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpdt/internal/ui/preferences/CompilerConfigurationBlock.java index 3264406..d7940e6 100644 --- a/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpdt/internal/ui/preferences/CompilerConfigurationBlock.java +++ b/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpdt/internal/ui/preferences/CompilerConfigurationBlock.java @@ -492,18 +492,18 @@ public class CompilerConfigurationBlock extends OptionsConfigurationBlock { } private Composite createAdvancedTabContent(TabFolder folder) { - String[] errorWarningIgnore = new String[] { ERROR, WARNING, IGNORE }; - - String[] errorWarningIgnoreLabels = new String[] { - PreferencesMessages - .getString("CompilerConfigurationBlock.error"), //$NON-NLS-1$ - PreferencesMessages - .getString("CompilerConfigurationBlock.warning"), //$NON-NLS-1$ - PreferencesMessages - .getString("CompilerConfigurationBlock.ignore") //$NON-NLS-1$ - }; - - String[] enabledDisabled = new String[] { ENABLED, DISABLED }; + //String[] errorWarningIgnore = new String[] { ERROR, WARNING, IGNORE }; + +// String[] errorWarningIgnoreLabels = new String[] { +// PreferencesMessages +// .getString("CompilerConfigurationBlock.error"), //$NON-NLS-1$ +// PreferencesMessages +// .getString("CompilerConfigurationBlock.warning"), //$NON-NLS-1$ +// PreferencesMessages +// .getString("CompilerConfigurationBlock.ignore") //$NON-NLS-1$ +// }; + + //String[] enabledDisabled = new String[] { ENABLED, DISABLED }; int nColumns = 3; diff --git a/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpdt/internal/ui/preferences/JavaEditorPreferencePage.java b/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpdt/internal/ui/preferences/JavaEditorPreferencePage.java index d48b77b..d1a88f9 100644 --- a/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpdt/internal/ui/preferences/JavaEditorPreferencePage.java +++ b/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpdt/internal/ui/preferences/JavaEditorPreferencePage.java @@ -1814,8 +1814,8 @@ public class JavaEditorPreferencePage extends PreferencePage implements fBackgroundDefaultRadioButton.setSelection(default_); fBackgroundCustomRadioButton.setSelection(!default_); fBackgroundColorButton.setEnabled(!default_); - boolean closeJavaDocs = fOverlayStore - .getBoolean(PreferenceConstants.EDITOR_CLOSE_JAVADOCS); +// boolean closeJavaDocs = fOverlayStore +// .getBoolean(PreferenceConstants.EDITOR_CLOSE_JAVADOCS); // fAddJavaDocTagsButton.setEnabled(closeJavaDocs); fEscapeStringsButtonDQ.setEnabled(fOverlayStore .getBoolean(PreferenceConstants.EDITOR_WRAP_STRINGS_DQ)); diff --git a/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpdt/internal/ui/text/java/hover/AbstractJavaEditorTextHover.java b/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpdt/internal/ui/text/java/hover/AbstractJavaEditorTextHover.java index 70669e4..de83858 100644 --- a/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpdt/internal/ui/text/java/hover/AbstractJavaEditorTextHover.java +++ b/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpdt/internal/ui/text/java/hover/AbstractJavaEditorTextHover.java @@ -29,12 +29,12 @@ import org.eclipse.jface.text.ITextViewer; import org.eclipse.swt.SWT; import org.eclipse.swt.widgets.Shell; import org.eclipse.ui.IEditorPart; -import org.eclipse.ui.PlatformUI; +//import org.eclipse.ui.PlatformUI; import org.eclipse.ui.commands.ICommand; -import org.eclipse.ui.commands.ICommandManager; +//import org.eclipse.ui.commands.ICommandManager; import org.eclipse.ui.commands.IKeySequenceBinding; import org.eclipse.ui.keys.KeySequence; - +//import org.eclipse.jface.bindings.keys.KeySequence; /** * Abstract class for providing hover information for Java elements. * @@ -47,8 +47,8 @@ public abstract class AbstractJavaEditorTextHover implements private ICommand fCommand; { - ICommandManager commandManager = PlatformUI.getWorkbench() - .getCommandSupport().getCommandManager(); +// ICommandManager commandManager = PlatformUI.getWorkbench() +// .getCommandSupport().getCommandManager(); // fCommand= // commandManager.getCommand(PHPEditorActionDefinitionIds.SHOW_JAVADOC); // if (!fCommand.isDefined()) diff --git a/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpdt/internal/ui/text/phpdoc/JavaDocAutoIndentStrategy.java b/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpdt/internal/ui/text/phpdoc/JavaDocAutoIndentStrategy.java index 1995a11..8f33483 100644 --- a/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpdt/internal/ui/text/phpdoc/JavaDocAutoIndentStrategy.java +++ b/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpdt/internal/ui/text/phpdoc/JavaDocAutoIndentStrategy.java @@ -119,7 +119,7 @@ public class JavaDocAutoIndentStrategy extends String endTag = lineDelimiter + indentation + " */"; //$NON-NLS-1$ d.replace(c.offset, 0, endTag); //$NON-NLS-1$ // evaluate method signature - ICompilationUnit unit = getCompilationUnit(); + //ICompilationUnit unit = getCompilationUnit(); // if // (PHPeclipsePlugin.getDefault().getPreferenceStore().getBoolean(PreferenceConstants.EDITOR_ADD_JAVADOC_TAGS) diff --git a/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpdt/internal/ui/text/phpdoc/PHPDocCompletionProcessor.java b/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpdt/internal/ui/text/phpdoc/PHPDocCompletionProcessor.java index 1cf1c2f..19b5ee5 100644 --- a/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpdt/internal/ui/text/phpdoc/PHPDocCompletionProcessor.java +++ b/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpdt/internal/ui/text/phpdoc/PHPDocCompletionProcessor.java @@ -16,7 +16,7 @@ import net.sourceforge.phpdt.ui.IWorkingCopyManager; import net.sourceforge.phpeclipse.ui.WebUI; //import net.sourceforge.phpeclipse.PHPeclipsePlugin; -import org.eclipse.jface.text.IDocument; +//import org.eclipse.jface.text.IDocument; import org.eclipse.jface.text.ITextViewer; import org.eclipse.jface.text.contentassist.ICompletionProposal; import org.eclipse.jface.text.contentassist.IContentAssistProcessor; @@ -144,7 +144,7 @@ public class PHPDocCompletionProcessor implements IContentAssistProcessor { int documentOffset) { ICompilationUnit unit = fManager.getWorkingCopy(fEditor .getEditorInput()); - IDocument document = viewer.getDocument(); + //IDocument document = viewer.getDocument(); IPHPCompletionProposal[] results = new IPHPCompletionProposal[0]; diff --git a/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpdt/internal/ui/viewsupport/JavaElementImageProvider.java b/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpdt/internal/ui/viewsupport/JavaElementImageProvider.java index 78d9636..865baec 100644 --- a/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpdt/internal/ui/viewsupport/JavaElementImageProvider.java +++ b/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpdt/internal/ui/viewsupport/JavaElementImageProvider.java @@ -16,7 +16,7 @@ import net.sourceforge.phpdt.core.IJavaElement; import net.sourceforge.phpdt.core.IJavaProject; import net.sourceforge.phpdt.core.IMember; import net.sourceforge.phpdt.core.IMethod; -import net.sourceforge.phpdt.core.IPackageFragmentRoot; +//import net.sourceforge.phpdt.core.IPackageFragmentRoot; import net.sourceforge.phpdt.core.IType; import net.sourceforge.phpdt.core.JavaModelException; import net.sourceforge.phpdt.internal.ui.PHPUIMessages; @@ -34,8 +34,8 @@ import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.core.runtime.Assert; import org.eclipse.swt.graphics.Image; import org.eclipse.swt.graphics.Point; -import org.eclipse.ui.ISharedImages; -import org.eclipse.ui.ide.IDE.SharedImages; +//import org.eclipse.ui.ISharedImages; +//import org.eclipse.ui.ide.IDE.SharedImages; import org.eclipse.ui.model.IWorkbenchAdapter; /** @@ -67,17 +67,17 @@ public class JavaElementImageProvider { private static ImageDescriptor DESC_OBJ_PROJECT; - private static ImageDescriptor DESC_OBJ_FOLDER; - { - ISharedImages images = WebUI.getDefault().getWorkbench() - .getSharedImages(); - DESC_OBJ_PROJECT_CLOSED = images - .getImageDescriptor(SharedImages.IMG_OBJ_PROJECT_CLOSED); - DESC_OBJ_PROJECT = images - .getImageDescriptor(SharedImages.IMG_OBJ_PROJECT); - DESC_OBJ_FOLDER = images - .getImageDescriptor(ISharedImages.IMG_OBJ_FOLDER); - } +// private static ImageDescriptor DESC_OBJ_FOLDER; +// { +// ISharedImages images = WebUI.getDefault().getWorkbench() +// .getSharedImages(); +// DESC_OBJ_PROJECT_CLOSED = images +// .getImageDescriptor(SharedImages.IMG_OBJ_PROJECT_CLOSED); +// DESC_OBJ_PROJECT = images +// .getImageDescriptor(SharedImages.IMG_OBJ_PROJECT); +// DESC_OBJ_FOLDER = images +// .getImageDescriptor(ISharedImages.IMG_OBJ_FOLDER); +// } private ImageDescriptorRegistry fRegistry; @@ -233,7 +233,7 @@ public class JavaElementImageProvider { } case IJavaElement.PACKAGE_FRAGMENT_ROOT: { - IPackageFragmentRoot root = (IPackageFragmentRoot) element; + //IPackageFragmentRoot root = (IPackageFragmentRoot) element; // if (root.isArchive()) { // IPath attach= root.getSourceAttachmentPath(); // if (root.isExternal()) { diff --git a/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpdt/ui/OverrideIndicatorLabelDecorator.java b/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpdt/ui/OverrideIndicatorLabelDecorator.java index db7385e..1aed547 100644 --- a/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpdt/ui/OverrideIndicatorLabelDecorator.java +++ b/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpdt/ui/OverrideIndicatorLabelDecorator.java @@ -142,7 +142,7 @@ public class OverrideIndicatorLabelDecorator implements ILabelDecorator, */ protected int getOverrideIndicators(IMethod method) throws JavaModelException { - IType type = method.getDeclaringType(); + //IType type = method.getDeclaringType(); // ITypeHierarchy hierarchy= // SuperTypeHierarchyCache.getTypeHierarchy(type); // if (hierarchy != null) { diff --git a/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpdt/ui/actions/GenerateActionGroup.java b/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpdt/ui/actions/GenerateActionGroup.java index bb14a3c..67aec73 100644 --- a/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpdt/ui/actions/GenerateActionGroup.java +++ b/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpdt/ui/actions/GenerateActionGroup.java @@ -90,8 +90,8 @@ public class GenerateActionGroup extends ActionGroup { fEditor = editor; fGroupName = groupName; - ISelectionProvider provider = fSite.getSelectionProvider(); - ISelection selection = provider.getSelection(); + //ISelectionProvider provider = fSite.getSelectionProvider(); + //ISelection selection = provider.getSelection(); // fAddImport= new AddImportOnSelectionAction(editor); // fAddImport.setActionDefinitionId(IJavaEditorActionDefinitionIds.ADD_IMPORT); diff --git a/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpdt/ui/wizards/NewContainerWizardPage.java b/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpdt/ui/wizards/NewContainerWizardPage.java index b2a5da6..a7857e8 100644 --- a/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpdt/ui/wizards/NewContainerWizardPage.java +++ b/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpdt/ui/wizards/NewContainerWizardPage.java @@ -96,7 +96,7 @@ public abstract class NewContainerWizardPage extends NewElementWizardPage { * root used as the source folder */ protected void initContainerPage(IJavaElement elem) { - IPackageFragmentRoot initRoot = null; + //IPackageFragmentRoot initRoot = null; // if (elem != null) { // initRoot= JavaModelUtil.getPackageFragmentRoot(elem); // if (initRoot == null || initRoot.isArchive()) { @@ -294,7 +294,7 @@ public abstract class NewContainerWizardPage extends NewElementWizardPage { "NewContainerWizardPage.error.ProjectClosed", proj.getFullPath().toString())); //$NON-NLS-1$ return status; } - IJavaProject jproject = JavaCore.create(proj); + //IJavaProject jproject = JavaCore.create(proj); // fCurrRoot= jproject.getPackageFragmentRoot(res); // if (res.exists()) { // try { diff --git a/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpdt/ui/wizards/NewTypeWizardPage.java b/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpdt/ui/wizards/NewTypeWizardPage.java index 9819992..2157335 100644 --- a/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpdt/ui/wizards/NewTypeWizardPage.java +++ b/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpdt/ui/wizards/NewTypeWizardPage.java @@ -55,7 +55,7 @@ import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.core.runtime.SubProgressMonitor; -import org.eclipse.jface.preference.IPreferenceStore; +//import org.eclipse.jface.preference.IPreferenceStore; import org.eclipse.jface.text.BadLocationException; import org.eclipse.jface.text.templates.Template; import org.eclipse.jface.text.templates.TemplateException; @@ -1333,7 +1333,8 @@ public abstract class NewTypeWizardPage extends NewContainerWizardPage { */ protected IStatus modifiersChanged() { StatusInfo status = new StatusInfo(); - int modifiers = getModifiers(); + //int modifiers = getModifiers(); + // if (Flags.isFinal(modifiers) && Flags.isAbstract(modifiers)) { // status.setError(NewWizardMessages.getString("NewTypeWizardPage.error.ModifiersFinalAndAbstract")); // //$NON-NLS-1$ @@ -1485,7 +1486,7 @@ public abstract class NewTypeWizardPage extends NewContainerWizardPage { // ImportsStructure imports; int indent = 0; - IPreferenceStore store = PreferenceConstants.getPreferenceStore(); + //IPreferenceStore store = PreferenceConstants.getPreferenceStore(); // String[] prefOrder = // JavaPreferencesSettings.getImportOrderPreference(store); // int threshold = @@ -1508,7 +1509,7 @@ public abstract class NewTypeWizardPage extends NewContainerWizardPage { // solves 14661 // imports.addImport(pack.getElementName(), getTypeName()); // - String typeContent = constructTypeStub(lineDelimiter);// new + //String typeContent = constructTypeStub(lineDelimiter);// new // ImportsManager(imports), // lineDelimiter); diff --git a/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpeclipse/actions/PHPEclipseShowAction.java b/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpeclipse/actions/PHPEclipseShowAction.java index a0b64f3..f0ea56a 100644 --- a/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpeclipse/actions/PHPEclipseShowAction.java +++ b/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpeclipse/actions/PHPEclipseShowAction.java @@ -13,10 +13,10 @@ import java.net.URL; import java.util.Iterator; //import net.sourceforge.phpeclipse.PHPeclipsePlugin; -import net.sourceforge.phpeclipse.ui.IPreferenceConstants; +//import net.sourceforge.phpeclipse.ui.IPreferenceConstants; import net.sourceforge.phpeclipse.ui.WebUI; import net.sourceforge.phpeclipse.ui.editor.ShowExternalPreviewAction; -import net.sourceforge.phpeclipse.ui.overlaypages.ProjectPrefUtil; +//import net.sourceforge.phpeclipse.ui.overlaypages.ProjectPrefUtil; import net.sourceforge.phpeclipse.webbrowser.IWebBrowser; import net.sourceforge.phpeclipse.webbrowser.internal.BrowserManager; @@ -71,24 +71,24 @@ public class PHPEclipseShowAction implements IObjectActionDelegate { case IResource.FILE: // single file: IFile previewFile = (IFile) resource; - String extension = previewFile.getFileExtension() - .toLowerCase(); - boolean bringToTopPreview = ProjectPrefUtil - .getPreviewBooleanValue( - previewFile, - IPreferenceConstants.PHP_BRING_TO_TOP_PREVIEW_DEFAULT); +// String extension = previewFile.getFileExtension() +// .toLowerCase(); +// boolean bringToTopPreview = ProjectPrefUtil +// .getPreviewBooleanValue( +// previewFile, +// IPreferenceConstants.PHP_BRING_TO_TOP_PREVIEW_DEFAULT); // boolean showHTMLFilesLocal = // ProjectPrefUtil.getPreviewBooleanValue(previewFile, // IPreferenceConstants.PHP_SHOW_HTML_FILES_LOCAL); // boolean showXMLFilesLocal = // ProjectPrefUtil.getPreviewBooleanValue(previewFile, // IPreferenceConstants.PHP_SHOW_XML_FILES_LOCAL); - boolean isHTMLFileName = "html".equals(extension) - || "htm".equals(extension) - || "xhtml".equals(extension); - boolean isXMLFileName = "xml".equals(extension) - || "xsd".equals(extension) - || "dtd".equals(extension); +// boolean isHTMLFileName = "html".equals(extension) +// || "htm".equals(extension) +// || "xhtml".equals(extension); +// boolean isXMLFileName = "xml".equals(extension) +// || "xsd".equals(extension) +// || "dtd".equals(extension); String localhostURL; // if (showHTMLFilesLocal && isHTMLFileName) { diff --git a/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpeclipse/builder/IdentifierIndexManager.java b/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpeclipse/builder/IdentifierIndexManager.java index 18f3458..e87c627 100644 --- a/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpeclipse/builder/IdentifierIndexManager.java +++ b/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpeclipse/builder/IdentifierIndexManager.java @@ -576,7 +576,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 +588,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; diff --git a/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpeclipse/obfuscator/ObfuscatorPass1Exporter.java b/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpeclipse/obfuscator/ObfuscatorPass1Exporter.java index 28d62a9..19597bb 100644 --- a/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpeclipse/obfuscator/ObfuscatorPass1Exporter.java +++ b/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpeclipse/obfuscator/ObfuscatorPass1Exporter.java @@ -23,14 +23,14 @@ import net.sourceforge.phpdt.internal.compiler.parser.SyntaxError; import net.sourceforge.phpdt.internal.compiler.util.Util; import net.sourceforge.phpdt.internal.ui.util.PHPFileUtil; //import net.sourceforge.phpeclipse.PHPeclipsePlugin; -import net.sourceforge.phpeclipse.ui.WebUI; +//import net.sourceforge.phpeclipse.ui.WebUI; import org.eclipse.core.resources.IContainer; 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 ! @@ -72,13 +72,13 @@ public class ObfuscatorPass1Exporter implements ITerminalSymbols { } private void parseIdentifiers(boolean goBack) { - char[] ident; + //char[] ident; String identifier; PHPIdentifier value; int counter = 0; - IPreferenceStore store = WebUI.getDefault() - .getPreferenceStore(); +// IPreferenceStore store = WebUI.getDefault() +// .getPreferenceStore(); try { while (fToken != TokenNameEOF && fToken != TokenNameERROR) { if (fToken == TokenNameVariable) { diff --git a/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpeclipse/obfuscator/ObfuscatorPass2Exporter.java b/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpeclipse/obfuscator/ObfuscatorPass2Exporter.java index dfbbbb4..1339fa3 100644 --- a/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpeclipse/obfuscator/ObfuscatorPass2Exporter.java +++ b/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpeclipse/obfuscator/ObfuscatorPass2Exporter.java @@ -28,14 +28,14 @@ import net.sourceforge.phpdt.internal.compiler.parser.SyntaxError; import net.sourceforge.phpdt.internal.compiler.util.Util; import net.sourceforge.phpdt.internal.ui.util.PHPFileUtil; //import net.sourceforge.phpeclipse.PHPeclipsePlugin; -import net.sourceforge.phpeclipse.ui.WebUI; +//import net.sourceforge.phpeclipse.ui.WebUI; import org.eclipse.core.resources.IContainer; 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. @@ -79,15 +79,15 @@ public class ObfuscatorPass2Exporter implements ITerminalSymbols { } private boolean obfuscate(StringBuffer buf) { - char[] ident; + //char[] ident; String identifier; PHPIdentifier value; int startPosition = 0; int lastPosition = 0; - IPreferenceStore store = WebUI.getDefault() - .getPreferenceStore(); +// IPreferenceStore store = WebUI.getDefault() +// .getPreferenceStore(); try { while (fToken != TokenNameEOF && fToken != TokenNameERROR) { if (fToken == TokenNameVariable) { diff --git a/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpeclipse/obfuscator/export/ObfuscatorExportOperation.java b/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpeclipse/obfuscator/export/ObfuscatorExportOperation.java index f4037cd..fe09c63 100644 --- a/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpeclipse/obfuscator/export/ObfuscatorExportOperation.java +++ b/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpeclipse/obfuscator/export/ObfuscatorExportOperation.java @@ -22,7 +22,7 @@ import net.sourceforge.phpdt.internal.compiler.parser.Scanner; import net.sourceforge.phpeclipse.obfuscator.ObfuscatorIgnores; import net.sourceforge.phpeclipse.obfuscator.ObfuscatorPass1Exporter; import net.sourceforge.phpeclipse.obfuscator.ObfuscatorPass2Exporter; -import net.sourceforge.phpeclipse.ui.WebUI; +//import net.sourceforge.phpeclipse.ui.WebUI; import org.eclipse.core.resources.IContainer; import org.eclipse.core.resources.IFile; @@ -37,7 +37,7 @@ import org.eclipse.core.runtime.Path; import org.eclipse.core.runtime.Status; import org.eclipse.jface.operation.IRunnableWithProgress; import org.eclipse.jface.operation.ModalContext; -import org.eclipse.jface.preference.IPreferenceStore; +//import org.eclipse.jface.preference.IPreferenceStore; import org.eclipse.ui.PlatformUI; import org.eclipse.ui.dialogs.IOverwriteQuery; @@ -310,8 +310,8 @@ class ObfuscatorExportOperation implements IRunnableWithProgress { throws InterruptedException { IPath fullPath = location.append(file.getName()); fMonitor.subTask(file.getFullPath().toString()); - String properPathString = fullPath.toOSString(); - File targetFile = new File(properPathString); + //String properPathString = fullPath.toOSString(); + //File targetFile = new File(properPathString); // if (targetFile.exists()) { // if (!targetFile.canWrite()) { @@ -621,8 +621,8 @@ class ObfuscatorExportOperation implements IRunnableWithProgress { private void createExporters(IResource resource) { IProject project = resource.getProject(); - IPreferenceStore store = WebUI.getDefault() - .getPreferenceStore(); +// IPreferenceStore store = WebUI.getDefault() +// .getPreferenceStore(); ObfuscatorIgnores ignore = new ObfuscatorIgnores(project); fCurrentIdentifierMap = ignore.getIdentifierMap(); fCurrentProjectName = project.getName(); diff --git a/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpeclipse/phpeditor/JavaOutlinePage.java b/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpeclipse/phpeditor/JavaOutlinePage.java index 1edd68b..89e41c1 100644 --- a/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpeclipse/phpeditor/JavaOutlinePage.java +++ b/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpeclipse/phpeditor/JavaOutlinePage.java @@ -83,8 +83,8 @@ import org.eclipse.jface.viewers.Viewer; import org.eclipse.jface.viewers.ViewerFilter; import org.eclipse.swt.SWT; import org.eclipse.swt.custom.BusyIndicator; -import org.eclipse.swt.dnd.DND; -import org.eclipse.swt.dnd.Transfer; +//import org.eclipse.swt.dnd.DND; +//import org.eclipse.swt.dnd.Transfer; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; import org.eclipse.swt.widgets.Display; @@ -111,7 +111,7 @@ import org.eclipse.ui.texteditor.ITextEditorActionDefinitionIds; import org.eclipse.ui.texteditor.IUpdate; import org.eclipse.ui.texteditor.TextEditorAction; import org.eclipse.ui.views.contentoutline.IContentOutlinePage; -import org.eclipse.ui.views.navigator.LocalSelectionTransfer; +//import org.eclipse.ui.views.navigator.LocalSelectionTransfer; /** * The content outline page of the Java editor. The viewer implements a @@ -141,8 +141,8 @@ public class JavaOutlinePage extends Page implements IContentOutlinePage, if (d != null) { d.asyncExec(new Runnable() { public void run() { - ICompilationUnit cu = (ICompilationUnit) fInput; - IJavaElement base = cu; + //ICompilationUnit cu = (ICompilationUnit) fInput; + //IJavaElement base = cu; // if (fTopLevelTypeOnly) { // base= getMainType(cu); // if (base == null) { @@ -1407,9 +1407,9 @@ public class JavaOutlinePage extends Page implements IContentOutlinePage, } private void initDragAndDrop() { - int ops = DND.DROP_COPY | DND.DROP_MOVE | DND.DROP_LINK; - Transfer[] transfers = new Transfer[] { LocalSelectionTransfer - .getInstance() }; +// int ops = DND.DROP_COPY | DND.DROP_MOVE | DND.DROP_LINK; +// Transfer[] transfers = new Transfer[] { LocalSelectionTransfer +// .getInstance() }; // Drop Adapter // TransferDropTargetListener[] dropListeners= new diff --git a/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpeclipse/phpeditor/JavaSelectMarkerRulerAction.java b/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpeclipse/phpeditor/JavaSelectMarkerRulerAction.java index e265b54..2b6e9db 100644 --- a/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpeclipse/phpeditor/JavaSelectMarkerRulerAction.java +++ b/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpeclipse/phpeditor/JavaSelectMarkerRulerAction.java @@ -20,7 +20,7 @@ import net.sourceforge.phpdt.internal.ui.IJavaHelpContextIds; import org.eclipse.core.resources.IFile; import org.eclipse.jface.text.IDocument; -import org.eclipse.jface.text.ITextOperationTarget; +//import org.eclipse.jface.text.ITextOperationTarget; import org.eclipse.jface.text.Position; import org.eclipse.jface.text.source.Annotation; import org.eclipse.jface.text.source.IVerticalRulerInfo; @@ -56,8 +56,8 @@ public class JavaSelectMarkerRulerAction extends SelectMarkerRulerAction { // return; if (fPosition != null) { - ITextOperationTarget operation = (ITextOperationTarget) fTextEditor - .getAdapter(ITextOperationTarget.class); +// ITextOperationTarget operation = (ITextOperationTarget) fTextEditor +// .getAdapter(ITextOperationTarget.class); // final int opCode= PHPUnitEditor.CORRECTIONASSIST_PROPOSALS; // if (operation != null && operation.canDoOperation(opCode)) { // fTextEditor.selectAndReveal(fPosition.getOffset(), @@ -106,7 +106,7 @@ public class JavaSelectMarkerRulerAction extends SelectMarkerRulerAction { if (annotation instanceof IJavaAnnotation) { IJavaAnnotation javaAnnotation = (IJavaAnnotation) annotation; if (!javaAnnotation.isMarkedDeleted()) { - Position position = model.getPosition(annotation); + //Position position = model.getPosition(annotation); // if (includesRulerLine(position, document) && // JavaCorrectionProcessor.hasCorrections(javaAnnotation)) // return position; diff --git a/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpeclipse/phpeditor/PHPEditor.java b/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpeclipse/phpeditor/PHPEditor.java index 14e4ef3..8cc981c 100644 --- a/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpeclipse/phpeditor/PHPEditor.java +++ b/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpeclipse/phpeditor/PHPEditor.java @@ -3592,7 +3592,7 @@ public abstract class PHPEditor extends AbstractDecoratedTextEditor implements protected void createActions() { super.createActions(); - ActionGroup oeg, ovg, jsg, sg; + ActionGroup oeg/*, ovg, jsg, sg*/; fActionGroups = new CompositeActionGroup( new ActionGroup[] { oeg = new OpenEditorActionGroup(this), // sg= new ShowActionGroup(this), diff --git a/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpeclipse/phpeditor/php/HTMLCompletionProcessor.java b/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpeclipse/phpeditor/php/HTMLCompletionProcessor.java index 4cb4844..1d406b0 100644 --- a/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpeclipse/phpeditor/php/HTMLCompletionProcessor.java +++ b/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpeclipse/phpeditor/php/HTMLCompletionProcessor.java @@ -23,7 +23,7 @@ import net.sourceforge.phpdt.ui.IWorkingCopyManager; //import net.sourceforge.phpeclipse.PHPeclipsePlugin; import net.sourceforge.phpeclipse.ui.WebUI; -import org.eclipse.jface.text.IDocument; +//import org.eclipse.jface.text.IDocument; import org.eclipse.jface.text.ITextViewer; import org.eclipse.jface.text.TextPresentation; import org.eclipse.jface.text.contentassist.ICompletionProposal; @@ -159,7 +159,7 @@ public class HTMLCompletionProcessor implements IContentAssistProcessor { private ICompletionProposal[] internalComputeCompletionProposals( ITextViewer viewer, int offset, int contextOffset) { - IDocument document = viewer.getDocument(); + //IDocument document = viewer.getDocument(); ICompilationUnit unit = fManager.getWorkingCopy(fEditor .getEditorInput()); @@ -199,7 +199,7 @@ public class HTMLCompletionProcessor implements IContentAssistProcessor { private int guessContextInformationPosition(ITextViewer viewer, int offset) { int contextPosition = offset; - IDocument document = viewer.getDocument(); + //IDocument document = viewer.getDocument(); return contextPosition; } diff --git a/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpeclipse/ui/WebUI.java b/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpeclipse/ui/WebUI.java index ca6517c..4dbdae9 100644 --- a/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpeclipse/ui/WebUI.java +++ b/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpeclipse/ui/WebUI.java @@ -669,8 +669,8 @@ public class WebUI extends AbstractUIPlugin implements IPreferenceConstants { if (textEditor != null) { // If a line number was given, go to it if (offset >= 0) { - IDocument document = textEditor.getDocumentProvider() - .getDocument(textEditor.getEditorInput()); +// IDocument document = textEditor.getDocumentProvider() +// .getDocument(textEditor.getEditorInput()); textEditor.selectAndReveal(offset, length); } } diff --git a/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpeclipse/ui/editor/BrowserUtil.java b/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpeclipse/ui/editor/BrowserUtil.java index 9634f2f..fa3be6f 100644 --- a/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpeclipse/ui/editor/BrowserUtil.java +++ b/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpeclipse/ui/editor/BrowserUtil.java @@ -32,11 +32,11 @@ public class BrowserUtil { public static ShowInContextBrowser getShowInContext(IFile previewFile, boolean forceDBGPreview, String postFix) { - String extension = previewFile.getFileExtension().toLowerCase(); + //String extension = previewFile.getFileExtension().toLowerCase(); // boolean showHTMLFilesLocal = false; // boolean showXMLFilesLocal = false; - boolean isHTMLFileName = false; - boolean isXMLFileName = false; +// boolean isHTMLFileName = false; +// boolean isXMLFileName = false; String localhostURL; if (!forceDBGPreview) { // showHTMLFilesLocal = @@ -45,10 +45,10 @@ public class BrowserUtil { // showXMLFilesLocal = // ProjectPrefUtil.getPreviewBooleanValue(previewFile, // IPreferenceConstants.PHP_SHOW_XML_FILES_LOCAL); - isHTMLFileName = "html".equals(extension) - || "htm".equals(extension) || "xhtml".equals(extension); - isXMLFileName = "xml".equals(extension) || "xsd".equals(extension) - || "dtd".equals(extension); +// isHTMLFileName = "html".equals(extension) +// || "htm".equals(extension) || "xhtml".equals(extension); +// isXMLFileName = "xml".equals(extension) || "xsd".equals(extension) +// || "dtd".equals(extension); } // if (showHTMLFilesLocal && isHTMLFileName) { // localhostURL = previewFile.getLocation().toString(); diff --git a/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpeclipse/wizards/html/EditElementWizard.java b/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpeclipse/wizards/html/EditElementWizard.java index c2be185..2554429 100644 --- a/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpeclipse/wizards/html/EditElementWizard.java +++ b/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpeclipse/wizards/html/EditElementWizard.java @@ -54,7 +54,7 @@ public class EditElementWizard extends Wizard { if (targetElemName == null) { rootPage = new NewElementWizardPage(); } else { - IDocument doc = getDocument(); + //IDocument doc = getDocument(); rootPage = createElementEditPage(targetElemName); rootPage.setEditType(EditElementWizardPage.MODIFY); } diff --git a/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpeclipse/wizards/html/UnknownElementWizardPage.java b/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpeclipse/wizards/html/UnknownElementWizardPage.java index 817451d..11749c4 100644 --- a/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpeclipse/wizards/html/UnknownElementWizardPage.java +++ b/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpeclipse/wizards/html/UnknownElementWizardPage.java @@ -190,7 +190,7 @@ public class UnknownElementWizardPage extends EditElementWizardPage { addButton = createButton(parent, "&Add"); addButton.addSelectionListener(new SelectionListener() { public void widgetSelected(SelectionEvent e) { - int insertIndex = getSelectionIndex(); + //int insertIndex = getSelectionIndex(); String[] newData = inputValue(); if (newData != null) { attrs.add(newData); diff --git a/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpeclipse/xml/ui/internal/editor/XMLEditorActionContributor.java b/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpeclipse/xml/ui/internal/editor/XMLEditorActionContributor.java index 8d65d7c..e62f203 100644 --- a/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpeclipse/xml/ui/internal/editor/XMLEditorActionContributor.java +++ b/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpeclipse/xml/ui/internal/editor/XMLEditorActionContributor.java @@ -12,10 +12,10 @@ package net.sourceforge.phpeclipse.xml.ui.internal.editor; import net.sourceforge.phpeclipse.ui.editor.ShowExternalPreviewAction; -import org.eclipse.core.resources.IFile; -import org.eclipse.ui.IEditorInput; +//import org.eclipse.core.resources.IFile; +//import org.eclipse.ui.IEditorInput; import org.eclipse.ui.IEditorPart; -import org.eclipse.ui.IFileEditorInput; +//import org.eclipse.ui.IFileEditorInput; import org.eclipse.ui.texteditor.BasicTextEditorActionContributor; import org.eclipse.ui.texteditor.ITextEditor; @@ -37,12 +37,12 @@ public class XMLEditorActionContributor extends textEditor = (ITextEditor) part; if (textEditor != null) { - IFile file = null; - IEditorInput editorInput = textEditor.getEditorInput(); + //IFile file = null; + //IEditorInput editorInput = textEditor.getEditorInput(); - if (editorInput instanceof IFileEditorInput) { - file = ((IFileEditorInput) editorInput).getFile(); - } +// if (editorInput instanceof IFileEditorInput) { +// file = ((IFileEditorInput) editorInput).getFile(); +// } ShowExternalPreviewAction fShowExternalPreviewAction = ShowExternalPreviewAction .getInstance(); diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/core/JavaCore.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/core/JavaCore.java index 7e8a366..c04e2a5 100644 --- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/core/JavaCore.java +++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/core/JavaCore.java @@ -2848,7 +2848,7 @@ public class JavaCore { if (target instanceof File) { File externalFile = (File) target; if (externalFile.isFile()) { - String fileName = externalFile.getName().toLowerCase(); + //String fileName = externalFile.getName().toLowerCase(); // if (fileName.endsWith(".jar" //$NON-NLS-1$ // ) || fileName.endsWith(".zip" //$NON-NLS-1$ // )) { // external binary archive diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/core/formatter/DefaultCodeFormatterConstants.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/core/formatter/DefaultCodeFormatterConstants.java index 6ab235d..51b85d6 100644 --- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/core/formatter/DefaultCodeFormatterConstants.java +++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/core/formatter/DefaultCodeFormatterConstants.java @@ -2861,7 +2861,7 @@ public class DefaultCodeFormatterConstants { throw WRONG_ARGUMENT; } try { - int existingValue = Integer.parseInt(value); + //int existingValue = Integer.parseInt(value); // if ((existingValue & Alignment.M_INDENT_BY_ONE) != 0) { // return INDENT_BY_ONE; // } else if ((existingValue & Alignment.M_INDENT_ON_COLUMN) != 0) { diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/SourceElementParser.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/SourceElementParser.java index c120843..b0b8081 100644 --- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/SourceElementParser.java +++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/SourceElementParser.java @@ -1005,7 +1005,7 @@ public class SourceElementParser extends CommentRecorderParser {// extends if (isInterface) { if (isInRange) { int modifiers = typeDeclaration.modifiers; - boolean deprecated = false; // (modifiers & AccDeprecated) + //boolean deprecated = false; // (modifiers & AccDeprecated) // != 0; // // remember deprecation so as to not lose // it below @@ -1144,10 +1144,10 @@ public class SourceElementParser extends CommentRecorderParser {// extends try { // diet = true; - CompilationResult compilationUnitResult = new CompilationResult( - unit, 0, 0, 10); // this.options.maxProblemsPerUnit); - CompilationUnitDeclaration parsedUnit = parse(unit, - compilationUnitResult, start, end); +// CompilationResult compilationUnitResult = new CompilationResult( +// unit, 0, 0, 10); // this.options.maxProblemsPerUnit); +// CompilationUnitDeclaration parsedUnit = parse(unit, +// compilationUnitResult, start, end); // if (scanner.recordLineSeparator) { // requestor.acceptLineSeparatorPositions(scanner.getLineEnds()); // } diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/WhileStatement.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/WhileStatement.java index d7cbf11..ec7dd3e 100644 --- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/WhileStatement.java +++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/WhileStatement.java @@ -48,8 +48,8 @@ public class WhileStatement extends Statement { continueLabel = new Label(); Constant cst = this.condition.constant; - boolean isConditionTrue = cst != NotAConstant - && cst.booleanValue() == true; +// boolean isConditionTrue = cst != NotAConstant +// && cst.booleanValue() == true; boolean isConditionFalse = cst != NotAConstant && cst.booleanValue() == false; diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/batch/FileSystem.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/batch/FileSystem.java index 4ffa4a7..04b18d4 100644 --- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/batch/FileSystem.java +++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/batch/FileSystem.java @@ -67,7 +67,7 @@ public class FileSystem implements INameEnvironment, SuffixConstants { pathNames[i] = ((ClasspathDirectory) this.classpaths[i]).path; } } else { - String lowercaseClasspathName = classpathNames[i].toLowerCase(); + //String lowercaseClasspathName = classpathNames[i].toLowerCase(); // if (lowercaseClasspathName.endsWith(SUFFIX_STRING_jar) // || lowercaseClasspathName.endsWith(SUFFIX_STRING_zip)) { // this.classpaths[i] = this.getClasspathJar(file); // will diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/lookup/CompilationUnitScope.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/lookup/CompilationUnitScope.java index 0de4b0a..b92b8f3 100644 --- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/lookup/CompilationUnitScope.java +++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/lookup/CompilationUnitScope.java @@ -206,7 +206,7 @@ public class CompilationUnitScope extends Scope { nextImport: for (int i = 0; i < numberOfStatements; i++) { ImportReference importReference = referenceContext.imports[i]; IFile file = importReference.getFile(); - SourceTypeBinding typeBinding; + //SourceTypeBinding typeBinding; // char[][] compoundName = importReference.tokens; char[][] compoundName = null; if (file != null) { diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/parser/Parser.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/parser/Parser.java index 4e23483..485d208 100644 --- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/parser/Parser.java +++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/parser/Parser.java @@ -1397,7 +1397,7 @@ public class Parser implements ITerminalSymbols, CompilerModifiers, // fully_qualified_class_name do { if (token == TokenNameIdentifier) { - char[] ident = scanner.getCurrentIdentifierSource(); + //char[] ident = scanner.getCurrentIdentifierSource(); // TODO make this code working better: // SingleTypeReference ref = // ParserUtil.getTypeReference(scanner, @@ -4994,7 +4994,7 @@ public class Parser implements ITerminalSymbols, CompilerModifiers, // incastrix //String projectPath = ProjectPrefUtil.getDocumentRoot(file.getProject()) // .toString(); - String filePath = file.getFullPath().toString(); + //String filePath = file.getFullPath().toString(); String ext = file.getFileExtension(); int fileExtensionLength = ext == null ? 0 : ext.length() + 1; diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/parser/SourceTypeConverter.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/parser/SourceTypeConverter.java index 4d6d794..d59cf9d 100644 --- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/parser/SourceTypeConverter.java +++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/parser/SourceTypeConverter.java @@ -95,8 +95,8 @@ public class SourceTypeConverter implements CompilerModifiers { // not filled at this point /* only positions available */ - int start = sourceType.getNameSourceStart(); - int end = sourceType.getNameSourceEnd(); + //int start = sourceType.getNameSourceStart(); + //int end = sourceType.getNameSourceEnd(); /* convert package and imports */ // if (sourceType.getPackageName() != null diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/ClasspathEntry.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/ClasspathEntry.java index fc56c48..463e7ea 100644 --- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/ClasspathEntry.java +++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/ClasspathEntry.java @@ -279,12 +279,12 @@ public class ClasspathEntry implements IClasspathEntry { path = projectPath.append(path); } // source attachment info (optional) - IPath sourceAttachmentPath = element.hasAttribute("sourcepath") //$NON-NLS-1$ - ? new Path(element.getAttribute("sourcepath")) //$NON-NLS-1$ - : null; - IPath sourceAttachmentRootPath = element.hasAttribute("rootpath") //$NON-NLS-1$ - ? new Path(element.getAttribute("rootpath")) //$NON-NLS-1$ - : null; +// IPath sourceAttachmentPath = element.hasAttribute("sourcepath") //$NON-NLS-1$ +// ? new Path(element.getAttribute("sourcepath")) //$NON-NLS-1$ +// : null; +// IPath sourceAttachmentRootPath = element.hasAttribute("rootpath") //$NON-NLS-1$ +// ? new Path(element.getAttribute("rootpath")) //$NON-NLS-1$ +// : null; // exported flag (optional) boolean isExported = element.getAttribute("exported").equals("true"); //$NON-NLS-1$ //$NON-NLS-2$ @@ -1387,7 +1387,7 @@ public class ClasspathEntry implements IClasspathEntry { if (path != null && path.isAbsolute() && !path.isEmpty()) { IProject prereqProjectRsc = workspaceRoot.getProject(path .segment(0)); - IJavaProject prereqProject = JavaCore.create(prereqProjectRsc); + //IJavaProject prereqProject = JavaCore.create(prereqProjectRsc); try { if (!prereqProjectRsc.exists() || !prereqProjectRsc diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/DeltaProcessingState.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/DeltaProcessingState.java index 869b40b..8df22ae 100644 --- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/DeltaProcessingState.java +++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/DeltaProcessingState.java @@ -319,7 +319,7 @@ public class DeltaProcessingState implements IResourceChangeListener { return; } for (int i = 0, length = projects.length; i < length; i++) { - JavaProject project = (JavaProject) projects[i]; + //JavaProject project = (JavaProject) projects[i]; // IClasspathEntry[] classpath; // try { // classpath = diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/JavaModelManager.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/JavaModelManager.java index d2ffed9..fd46139 100644 --- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/JavaModelManager.java +++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/JavaModelManager.java @@ -1285,8 +1285,8 @@ public class JavaModelManager implements ISaveParticipant { if (returnProject) { return proj; } - int rootEnd = memento.indexOf(JavaElement.JEM_PACKAGEFRAGMENT, - projectEnd + 1); +// int rootEnd = memento.indexOf(JavaElement.JEM_PACKAGEFRAGMENT, +// projectEnd + 1); // TODO temp-del // if (rootEnd == -1) { // return model.getHandleFromMementoForRoot(memento, proj, projectEnd, diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/JavaProject.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/JavaProject.java index ab66e39..988a718 100644 --- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/JavaProject.java +++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/JavaProject.java @@ -414,8 +414,8 @@ public class JavaProject extends Openable implements IJavaProject, throw newNotPresentException(); } - IWorkspace workspace = ResourcesPlugin.getWorkspace(); - IWorkspaceRoot wRoot = workspace.getRoot(); + //IWorkspace workspace = ResourcesPlugin.getWorkspace(); + //IWorkspaceRoot wRoot = workspace.getRoot(); // cannot refresh cp markers on opening (emulate cp check on startup) // since can create deadlocks (see bug 37274) // IClasspathEntry[] resolvedClasspath = @@ -1188,7 +1188,7 @@ public class JavaProject extends Openable implements IJavaProject, String extension = path.getFileExtension(); if (extension == null) { - String packageName = path.toString().replace(IPath.SEPARATOR, '.'); + //String packageName = path.toString().replace(IPath.SEPARATOR, '.'); // IPackageFragment[] pkgFragments = // getNameLookup().findPackageFragments(packageName, false); @@ -1651,7 +1651,7 @@ public class JavaProject extends Openable implements IJavaProject, public NameLookup newNameLookup(ICompilationUnit[] workingCopies) throws JavaModelException { - JavaProjectElementInfo info = getJavaProjectElementInfo(); + //JavaProjectElementInfo info = getJavaProjectElementInfo(); // lock on the project info to avoid race condition while computing the // pkg fragment roots and package fragment caches // synchronized(info){ diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/JavaProjectElementInfo.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/JavaProjectElementInfo.java index 9d5ab81..53e57d0 100644 --- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/JavaProjectElementInfo.java +++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/JavaProjectElementInfo.java @@ -65,7 +65,7 @@ class JavaProjectElementInfo extends OpenableElementInfo { // determine if src == project and/or if bin == project IPath projectPath = project.getProject().getFullPath(); boolean srcIsProject = false; - boolean binIsProject = false; + //boolean binIsProject = false; char[][] exclusionPatterns = null; IClasspathEntry[] classpath = null; IPath projectOutput = null; @@ -82,7 +82,7 @@ class JavaProjectElementInfo extends OpenableElementInfo { } } projectOutput = project.getOutputLocation(); - binIsProject = projectPath.equals(projectOutput); + //binIsProject = projectPath.equals(projectOutput); } catch (JavaModelException e) { // ignore } @@ -97,7 +97,7 @@ class JavaProjectElementInfo extends OpenableElementInfo { switch (res.getType()) { case IResource.FILE: IPath resFullPath = res.getFullPath(); - String resName = res.getName(); + //String resName = res.getName(); // ignore a jar file on the classpath // if (ProjectPrefUtil.isArchiveFileName(resName) && diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/ModelUpdater.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/ModelUpdater.java index 9d3c1bb..cfc583a 100644 --- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/ModelUpdater.java +++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/ModelUpdater.java @@ -102,7 +102,7 @@ public class ModelUpdater { break; case IJavaElement.PACKAGE_FRAGMENT: // get rid of package fragment cache - JavaProject project = (JavaProject) element.getJavaProject(); + //JavaProject project = (JavaProject) element.getJavaProject(); // project.resetCaches(); break; } @@ -149,7 +149,7 @@ public class ModelUpdater { break; case IJavaElement.PACKAGE_FRAGMENT: // get rid of package fragment cache - JavaProject project = (JavaProject) element.getJavaProject(); + //JavaProject project = (JavaProject) element.getJavaProject(); // project.resetCaches(); break; } diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/NameLookup.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/NameLookup.java index fc9fcd8..3effa69 100644 --- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/NameLookup.java +++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/NameLookup.java @@ -212,7 +212,7 @@ public class NameLookup { .get(pkgName); if (frags != null) { for (int i = 0; i < frags.length; i++) { - IPackageFragment frag = frags[i]; + //IPackageFragment frag = frags[i]; // if (!(frag instanceof JarPackageFragment)) { // ICompilationUnit cu= frag.getCompilationUnit(cuName); // if (cu != null && cu.exists()) { diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/PackageFragment.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/PackageFragment.java index c78a9ee..3c275aa 100644 --- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/PackageFragment.java +++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/PackageFragment.java @@ -60,7 +60,7 @@ public class PackageFragment extends Openable implements IPackageFragment { if (!underlyingResource.isAccessible()) throw newNotPresentException(); - int kind = getKind(); + //int kind = getKind(); String extType; // if (kind == IPackageFragmentRoot.K_SOURCE) { extType = "php"; // EXTENSION_java; @@ -83,7 +83,7 @@ public class PackageFragment extends Openable implements IPackageFragment { .getFileExtension(); if (extension != null) { if (extension.equalsIgnoreCase(extType)) { - IJavaElement childElement; + //IJavaElement childElement; // if (kind == IPackageFragmentRoot.K_SOURCE && // ProjectPrefUtil.isValidCompilationUnitName(child.getName())) // { diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/PackageFragmentRoot.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/PackageFragmentRoot.java index bc95281..bc678a6 100644 --- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/PackageFragmentRoot.java +++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/PackageFragmentRoot.java @@ -166,7 +166,7 @@ public class PackageFragmentRoot extends Openable implements vChildren.add(pkg); } try { - JavaProject javaProject = (JavaProject) getJavaProject(); + //JavaProject javaProject = (JavaProject) getJavaProject(); IResource[] members = folder.members(); boolean hasIncluded = isIncluded; for (int i = 0, max = members.length; i < max; i++) { @@ -177,8 +177,8 @@ public class PackageFragmentRoot extends Openable implements case IResource.FOLDER: if (Util.isValidFolderNameForPackage(memberName)) { - boolean isMemberIncluded = !Util.isExcluded(member, - exclusionPatterns); +// boolean isMemberIncluded = !Util.isExcluded(member, +// exclusionPatterns); // keep looking inside as long as included already, or // may have child included due to inclusion patterns // if (isMemberIncluded || inclusionPatterns != null) { diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/PackageFragmentRootInfo.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/PackageFragmentRootInfo.java index 428728f..3f3557b 100644 --- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/PackageFragmentRootInfo.java +++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/PackageFragmentRootInfo.java @@ -10,7 +10,7 @@ *******************************************************************************/ package net.sourceforge.phpdt.internal.core; -import net.sourceforge.phpdt.core.IClasspathEntry; +//import net.sourceforge.phpdt.core.IClasspathEntry; import net.sourceforge.phpdt.core.IJavaProject; import net.sourceforge.phpdt.core.IPackageFragmentRoot; import net.sourceforge.phpdt.core.JavaModelException; @@ -66,8 +66,8 @@ class PackageFragmentRootInfo extends OpenableElementInfo { Object[] nonJavaResources = new IResource[5]; int nonJavaResourcesCounter = 0; try { - IClasspathEntry[] classpath = project - .getResolvedClasspath(true/* ignore unresolved variable */); +// IClasspathEntry[] classpath = project +// .getResolvedClasspath(true/* ignore unresolved variable */); IResource[] members = folder.members(); nextResource: for (int i = 0, max = members.length; i < max; i++) { IResource member = members[i]; diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/SetClasspathOperation.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/SetClasspathOperation.java index 6c96e82..4aa1b13 100644 --- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/SetClasspathOperation.java +++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/SetClasspathOperation.java @@ -893,7 +893,7 @@ public class SetClasspathOperation extends JavaModelOperation { .bind( "classpath.settingOutputLocationProgress", project.getElementName()), 2); //$NON-NLS-1$ - IPath oldLocation = project.getOutputLocation(); + //IPath oldLocation = project.getOutputLocation(); // see if this will cause any package fragments to be added boolean deltaToFire = false; diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/builder/BatchImageBuilder.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/builder/BatchImageBuilder.java index 8e1fd60..0eb0d43 100644 --- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/builder/BatchImageBuilder.java +++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/builder/BatchImageBuilder.java @@ -248,10 +248,10 @@ public class BatchImageBuilder extends AbstractImageBuilder { protected void copyPackages(ClasspathMultiDirectory sourceLocation) throws CoreException { - final int segmentCount = sourceLocation.sourceFolder.getFullPath() - .segmentCount(); +// final int segmentCount = sourceLocation.sourceFolder.getFullPath() +// .segmentCount(); final char[][] exclusionPatterns = sourceLocation.exclusionPatterns; - final IContainer outputFolder = sourceLocation.binaryFolder; + //final IContainer outputFolder = sourceLocation.binaryFolder; final boolean isAlsoProject = sourceLocation.sourceFolder .equals(javaBuilder.currentProject); sourceLocation.sourceFolder.accept(new IResourceProxyVisitor() { diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/builder/ClasspathDirectory.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/builder/ClasspathDirectory.java index d99d121..6e2a496 100644 --- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/builder/ClasspathDirectory.java +++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/builder/ClasspathDirectory.java @@ -62,7 +62,7 @@ class ClasspathDirectory extends ClasspathLocation { dirList = new String[members.length]; int index = 0; for (int i = 0, l = members.length; i < l; i++) { - IResource m = members[i]; + //IResource m = members[i]; // if (m.getType() == IResource.FILE && // ProjectPrefUtil.isClassFileName(m.getName())) // // add exclusion pattern check here if we want to hide diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/builder/IncrementalImageBuilder.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/builder/IncrementalImageBuilder.java index 1d382fb..20e5913 100644 --- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/builder/IncrementalImageBuilder.java +++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/builder/IncrementalImageBuilder.java @@ -495,7 +495,7 @@ public class IncrementalImageBuilder extends AbstractImageBuilder { .println("Compile this added source file " + typeLocator); //$NON-NLS-1$ sourceFiles.add(new SourceFile((IFile) resource, md, ((IFile) resource).getCharset())); - String typeName = typePath.toString(); + //String typeName = typePath.toString(); // if (!newState.isDuplicateLocator(typeName, typeLocator)) // { // adding // // dependents diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/builder/State.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/builder/State.java index e5f273f..f610700 100644 --- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/builder/State.java +++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/builder/State.java @@ -20,7 +20,7 @@ import net.sourceforge.phpdt.internal.core.util.SimpleLookupTable; import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IResource; import org.eclipse.core.resources.IResourceDelta; -import org.eclipse.core.runtime.IPath; +//import org.eclipse.core.runtime.IPath; public class State { // NOTE: this state cannot contain types that are not defined in this @@ -179,7 +179,7 @@ public class State { removePackage(children[i]); return; case IResource.FILE: - IPath typeLocatorPath = resource.getProjectRelativePath(); + //IPath typeLocatorPath = resource.getProjectRelativePath(); // if // (ProjectPrefUtil.isJavaFileName(typeLocatorPath.lastSegment())) // removeLocator(typeLocatorPath.toString()); diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/util/Util.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/util/Util.java index 1cafdf9..09ace1c 100644 --- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/util/Util.java +++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/util/Util.java @@ -32,7 +32,7 @@ import net.sourceforge.phpdt.core.Signature; import net.sourceforge.phpdt.core.compiler.CharOperation; import net.sourceforge.phpdt.internal.compiler.ast.TypeReference; import net.sourceforge.phpdt.internal.core.Assert; -import net.sourceforge.phpdt.internal.core.PackageFragmentRoot; +//import net.sourceforge.phpdt.internal.core.PackageFragmentRoot; import net.sourceforge.phpdt.internal.core.util.PHPFileUtil; import org.eclipse.core.resources.IFile; @@ -996,8 +996,8 @@ public class Util { */ public static final boolean isExcluded(IJavaElement element) { int elementType = element.getElementType(); - PackageFragmentRoot root = null; - IResource resource = null; + //PackageFragmentRoot root = null; + //IResource resource = null; switch (elementType) { case IJavaElement.JAVA_MODEL: case IJavaElement.JAVA_PROJECT: @@ -1013,9 +1013,9 @@ public class Util { // root.fullExclusionPatternChars()); case IJavaElement.COMPILATION_UNIT: - root = (PackageFragmentRoot) element - .getAncestor(IJavaElement.PACKAGE_FRAGMENT_ROOT); - resource = element.getResource(); +// root = (PackageFragmentRoot) element +// .getAncestor(IJavaElement.PACKAGE_FRAGMENT_ROOT); + //resource = element.getResource(); // if (resource != null && isExcluded(resource, // root.fullInclusionPatternChars(), // root.fullExclusionPatternChars())) diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/corext/util/JavaModelUtil.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/corext/util/JavaModelUtil.java index 8946aaa..6359918 100644 --- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/corext/util/JavaModelUtil.java +++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/corext/util/JavaModelUtil.java @@ -573,7 +573,7 @@ public class JavaModelUtil { if (semi == -1) { throw new IllegalArgumentException(); } - String name = refTypeSig.substring(arrayCount + 1, semi); + //String name = refTypeSig.substring(arrayCount + 1, semi); // String[][] resolvedNames= declaringType.resolveType(name); // if (resolvedNames != null && resolvedNames.length > 0) { 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 fc7e3c6..8874d00 100644 --- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/builder/IdentifierIndexManager.java +++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/builder/IdentifierIndexManager.java @@ -576,7 +576,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 +588,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; -- 1.7.1