Merge pull request fabioz#21 from AndrewFerr/unused_things

Remove some unused imports/variables.
AndrewFerr · Jun 24, 2013 · c821ef4 · c821ef4
2 parents 5c385bd + 569bb9c
commit c821ef4
Show file tree

Hide file tree

Showing 31 changed files with 5 additions and 44 deletions.
diff --git a/...com.python.pydev.analysis/src/com/python/pydev/analysis/actions/GlobalsDialogFactory.java b/...com.python.pydev.analysis/src/com/python/pydev/analysis/actions/GlobalsDialogFactory.java
@@ -11,7 +11,6 @@
 
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.ui.dialogs.SelectionDialog;
-import org.python.pydev.core.IPythonNature;
 import org.python.pydev.core.log.Log;
 
 import com.python.pydev.analysis.additionalinfo.AbstractAdditionalTokensInfo;

diff --git a/...nalysis/src/com/python/pydev/analysis/additionalinfo/AbstractAdditionalInfoWithBuild.java b/...nalysis/src/com/python/pydev/analysis/additionalinfo/AbstractAdditionalInfoWithBuild.java
@@ -18,7 +18,6 @@
 import org.python.pydev.core.IPythonNature;
 import org.python.pydev.core.MisconfigurationException;
 import org.python.pydev.core.ModulesKey;
-import org.python.pydev.core.docutils.StringUtils;
 import org.python.pydev.core.log.Log;
 import org.python.pydev.editor.codecompletion.revisited.PythonPathHelper;
 import org.python.pydev.parser.PyParser;

diff --git a/...ev.analysis/src/com/python/pydev/analysis/system_info_builder/InterpreterInfoBuilder.java b/...ev.analysis/src/com/python/pydev/analysis/system_info_builder/InterpreterInfoBuilder.java
@@ -10,7 +10,6 @@
 import org.eclipse.core.runtime.jobs.Job;
 import org.python.pydev.core.IInterpreterManager;
 import org.python.pydev.core.ModulesKey;
-import org.python.pydev.core.docutils.StringUtils;
 import org.python.pydev.core.log.Log;
 import org.python.pydev.editor.codecompletion.revisited.ModulesFoundStructure;
 import org.python.pydev.editor.codecompletion.revisited.PyPublicTreeMap;

diff --git a/plugins/com.python.pydev.debug/src/com/python/pydev/debug/model/ProcessServer.java b/plugins/com.python.pydev.debug/src/com/python/pydev/debug/model/ProcessServer.java
@@ -9,7 +9,6 @@
 import java.io.InputStream;
 import java.io.OutputStream;
 
-import org.python.pydev.core.docutils.StringUtils;
 import org.python.pydev.core.log.Log;
 import org.python.pydev.shared_core.io.PipedInputStream;
 

diff --git a/plugins/com.python.pydev.refactoring/src/com/python/pydev/refactoring/changes/PyChange.java b/plugins/com.python.pydev.refactoring/src/com/python/pydev/refactoring/changes/PyChange.java
@@ -20,7 +20,6 @@
 import org.eclipse.jface.text.IDocumentExtension4;
 import org.eclipse.ltk.core.refactoring.Change;
 import org.eclipse.ltk.core.refactoring.RefactoringStatus;
-import org.python.pydev.core.docutils.StringUtils;
 
 /**
  * Largely gotten from JDTChange

diff --git a/...actoring/src/com/python/pydev/refactoring/refactorer/search/copied/FileLabelProvider.java b/...actoring/src/com/python/pydev/refactoring/refactorer/search/copied/FileLabelProvider.java
@@ -89,9 +89,9 @@ public String getStyledText(Object element) {
         String pathString = BasicElementLabels.getPathLabel(resource.getParent().getFullPath(), false);
         if (fOrder == SHOW_LABEL_PATH) {
             String str = new String(name);
-            String decorated = Messages.format(fgSeparatorFormat, new String[] { str, pathString });
+            //          String decorated = Messages.format(fgSeparatorFormat, new String[] { str, pathString });
 
-            //			decorateColoredString(str, decorated, String.QUALIFIER_STYLER);
+            //          decorateColoredString(str, decorated, String.QUALIFIER_STYLER);
             return getColoredLabelWithCounts(resource, str);
         }
 

diff --git a/...pydev.refactoring/src/com/python/pydev/refactoring/search/FindOccurrencesSearchQuery.java b/...pydev.refactoring/src/com/python/pydev/refactoring/search/FindOccurrencesSearchQuery.java
@@ -23,7 +23,6 @@
 import org.eclipse.search.ui.ISearchResult;
 import org.python.pydev.core.FileUtilsFileBuffer;
 import org.python.pydev.core.docutils.PySelection;
-import org.python.pydev.core.docutils.StringUtils;
 import org.python.pydev.core.log.Log;
 import org.python.pydev.editor.refactoring.RefactoringRequest;
 import org.python.pydev.editorinput.PySourceLocatorBase;

diff --git a/plugins/com.python.pydev.refactoring/src/com/python/pydev/refactoring/tdd/PyCreateClass.java b/plugins/com.python.pydev.refactoring/src/com/python/pydev/refactoring/tdd/PyCreateClass.java
@@ -10,7 +10,6 @@
 
 import org.eclipse.jface.text.contentassist.ICompletionProposal;
 import org.python.pydev.core.docutils.PySelection;
-import org.python.pydev.core.docutils.StringUtils;
 import org.python.pydev.refactoring.ast.adapters.ModuleAdapter;
 import org.python.pydev.refactoring.core.base.RefactoringInfo;
 import org.python.pydev.shared_core.string.FastStringBuffer;

diff --git a/....python.pydev.refactoring/src/com/python/pydev/refactoring/tdd/PyCreateMethodOrField.java b/....python.pydev.refactoring/src/com/python/pydev/refactoring/tdd/PyCreateMethodOrField.java
@@ -13,7 +13,6 @@
 import org.eclipse.jface.text.IRegion;
 import org.eclipse.jface.text.contentassist.ICompletionProposal;
 import org.python.pydev.core.docutils.PySelection;
-import org.python.pydev.core.docutils.StringUtils;
 import org.python.pydev.core.log.Log;
 import org.python.pydev.parser.jython.SimpleNode;
 import org.python.pydev.parser.jython.ast.FunctionDef;

diff --git a/...c/com/python/pydev/refactoring/wizards/rename/AbstractRenameWorkspaceRefactorProcess.java b/...c/com/python/pydev/refactoring/wizards/rename/AbstractRenameWorkspaceRefactorProcess.java
@@ -20,8 +20,6 @@
 import org.python.pydev.core.IProjectModulesManager;
 import org.python.pydev.core.IPythonNature;
 import org.python.pydev.core.ModulesKey;
-import org.python.pydev.core.docutils.StringUtils;
-import org.python.pydev.editor.codecompletion.revisited.CompletionCache;
 import org.python.pydev.editor.codecompletion.revisited.modules.SourceModule;
 import org.python.pydev.editor.codecompletion.revisited.visitors.Definition;
 import org.python.pydev.editor.refactoring.RefactoringRequest;
@@ -66,12 +64,13 @@ public AbstractRenameWorkspaceRefactorProcess(Definition definition) {
      */
     protected List<ASTEntry> getOccurrencesInOtherModule(RefactoringStatus status, String initialName,
             SourceModule module, PythonNature nature) {
-        CompletionCache completionCache = new CompletionCache();
         List<ASTEntry> entryOccurrences = findReferencesOnOtherModule(status, initialName, module);
 
         //Removed this check: it made subclasses work badly, also, in Python because of duck-typing, many of those
         //matches are actually wanted.
         //
+        //        CompletionCache completionCache = new CompletionCache();
+        //
         //        if(getRecheckWhereDefinitionWasFound()){
         //            for (Iterator<ASTEntry> iter = entryOccurrences.iterator(); iter.hasNext();) {
         //                ASTEntry entry = iter.next();

diff --git a/plugins/org.python.pydev.core/src/org/python/pydev/core/cache/DiskCache.java b/plugins/org.python.pydev.core/src/org/python/pydev/core/cache/DiskCache.java
@@ -24,7 +24,6 @@
 import org.python.pydev.core.FastBufferedReader;
 import org.python.pydev.core.ObjectsPool;
 import org.python.pydev.core.ObjectsPool.ObjectsPoolMap;
-import org.python.pydev.core.docutils.StringUtils;
 import org.python.pydev.shared_core.cache.Cache;
 import org.python.pydev.shared_core.callbacks.ICallback;
 import org.python.pydev.shared_core.io.FileUtils;
@@ -169,7 +168,6 @@ public static DiskCache loadFrom(FastBufferedReader reader, ObjectsPoolMap objec
         }
         diskCache.suffix = line.toString();
 
-        Map<CompleteIndexKey, CompleteIndexKey> diskKeys = diskCache.keys;
         FastStringBuffer buf = new FastStringBuffer();
         CompleteIndexKey key = null;
         char[] internalCharsArray = line.getInternalCharsArray();

diff --git a/...org.python.pydev.debug/src/org/python/pydev/debug/model/PyExceptionBreakPointManager.java b/...org.python.pydev.debug/src/org/python/pydev/debug/model/PyExceptionBreakPointManager.java
@@ -15,7 +15,6 @@
 import org.python.pydev.core.IPythonNature;
 import org.python.pydev.core.IToken;
 import org.python.pydev.core.ListenerList;
-import org.python.pydev.core.docutils.StringUtils;
 import org.python.pydev.debug.core.ConfigureExceptionsFileUtils;
 import org.python.pydev.ui.interpreters.ChooseInterpreterManager;
 

diff --git a/...ns/org.python.pydev.django/src/org/python/pydev/django/debug/ui/actions/DjangoAction.java b/...ns/org.python.pydev.django/src/org/python/pydev/django/debug/ui/actions/DjangoAction.java
@@ -35,7 +35,6 @@
 import org.eclipse.ui.dialogs.FilteredItemsSelectionDialog;
 import org.eclipse.ui.internal.ide.dialogs.OpenResourceDialog;
 import org.python.pydev.core.IPythonPathNature;
-import org.python.pydev.core.docutils.StringUtils;
 import org.python.pydev.core.log.Log;
 import org.python.pydev.django.launching.DjangoConstants;
 import org.python.pydev.django.launching.PythonFileRunner;

diff --git a/...thon.pydev.django/src/org/python/pydev/django/debug/ui/actions/PyDjangoOfflineAction.java b/...thon.pydev.django/src/org/python/pydev/django/debug/ui/actions/PyDjangoOfflineAction.java
@@ -10,7 +10,6 @@
 
 import org.eclipse.jface.action.Action;
 import org.eclipse.jface.action.IAction;
-import org.python.pydev.core.docutils.StringUtils;
 import org.python.pydev.editor.IOfflineActionWithParameters;
 import org.python.pydev.editor.PyEdit;
 

diff --git a/.../org.python.pydev.django/src/org/python/pydev/django/nature/DjangoRemoveNatureAction.java b/.../org.python.pydev.django/src/org/python/pydev/django/nature/DjangoRemoveNatureAction.java
@@ -9,7 +9,6 @@
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.jface.action.IAction;
 import org.eclipse.jface.dialogs.MessageDialog;
-import org.python.pydev.core.docutils.StringUtils;
 import org.python.pydev.core.log.Log;
 import org.python.pydev.ui.actions.project.PyRemoveNature;
 

diff --git a/plugins/org.python.pydev.django/src/org/python/pydev/django/ui/DjangoProjectProperties.java b/plugins/org.python.pydev.django/src/org/python/pydev/django/ui/DjangoProjectProperties.java
@@ -18,11 +18,9 @@
 import org.python.pydev.core.ICodeCompletionASTManager;
 import org.python.pydev.core.IModule;
 import org.python.pydev.core.IPythonPathNature;
-import org.python.pydev.core.docutils.StringUtils;
 import org.python.pydev.core.log.Log;
 import org.python.pydev.django.launching.DjangoConstants;
 import org.python.pydev.editor.codecompletion.revisited.ProjectModulesManager;
-import org.python.pydev.plugin.PydevPlugin;
 import org.python.pydev.plugin.nature.PythonNature;
 
 

diff --git a/...ython.pydev.django/src/org/python/pydev/django/ui/wizards/project/DjangoSettingsPage.java b/...ython.pydev.django/src/org/python/pydev/django/ui/wizards/project/DjangoSettingsPage.java
@@ -28,7 +28,6 @@
 import org.python.pydev.core.IInterpreterInfo;
 import org.python.pydev.core.IInterpreterManager;
 import org.python.pydev.core.IPythonNature;
-import org.python.pydev.core.docutils.StringUtils;
 import org.python.pydev.core.log.Log;
 import org.python.pydev.plugin.PydevPlugin;
 import org.python.pydev.plugin.nature.PythonNature;

diff --git a/plugins/org.python.pydev.parser/src/org/python/pydev/parser/grammarcommon/CtxVisitor.java b/plugins/org.python.pydev.parser/src/org/python/pydev/parser/grammarcommon/CtxVisitor.java
@@ -6,7 +6,6 @@
  */
 package org.python.pydev.parser.grammarcommon;
 
-import org.python.pydev.core.docutils.StringUtils;
 import org.python.pydev.parser.jython.ParseException;
 import org.python.pydev.parser.jython.SimpleNode;
 import org.python.pydev.parser.jython.Visitor;

diff --git a/plugins/org.python.pydev.parser/src/org/python/pydev/parser/prettyprinterv2/IFormatter.java b/plugins/org.python.pydev.parser/src/org/python/pydev/parser/prettyprinterv2/IFormatter.java
@@ -10,7 +10,6 @@
 package org.python.pydev.parser.prettyprinterv2;
 
 import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.IRegion;
 import org.python.pydev.core.IPyEdit;
 import org.python.pydev.core.docutils.SyntaxErrorException;
 import org.python.pydev.core.docutils.PySelection;

diff --git a/...ctoring/src/org/python/pydev/refactoring/ui/pages/extractlocal/ExtractLocalInputPage.java b/...ctoring/src/org/python/pydev/refactoring/ui/pages/extractlocal/ExtractLocalInputPage.java
@@ -19,7 +19,6 @@
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Text;
-import org.python.pydev.core.docutils.StringUtils;
 import org.python.pydev.plugin.preferences.PydevPrefs;
 import org.python.pydev.refactoring.coderefactoring.extractlocal.ExtractLocalRefactoring;
 import org.python.pydev.refactoring.coderefactoring.extractlocal.ExtractLocalRequestProcessor;

diff --git a/...ared_core/src/org/python/pydev/shared_core/auto_edit/AutoEditStrategyBackspaceHelper.java b/...ared_core/src/org/python/pydev/shared_core/auto_edit/AutoEditStrategyBackspaceHelper.java
@@ -281,7 +281,6 @@ private void eraseUntilLastChar(TextSelectionUtils ps, int lastCharPosition) thr
      */
     private void eraseToIndentation(TextSelectionUtils ps, String lineContentsToCursor) throws BadLocationException {
         final int cursorOffset = ps.getAbsoluteCursorOffset();
-        final int cursorLine = ps.getCursorLine();
         final int lineContentsToCursorLen = lineContentsToCursor.length();
 
         if (lineContentsToCursorLen > 0) {
@@ -309,6 +308,7 @@ private void eraseToIndentation(TextSelectionUtils ps, String lineContentsToCurs
         }
 
         IDocument doc = ps.getDoc();
+        //        final int cursorLine = ps.getCursorLine();
         //        if (cursorLine > 0) {
         //            IRegion prevLineInfo = doc.getLineInformation(cursorLine - 1);
         //            int prevLineEndOffset = prevLineInfo.getOffset() + prevLineInfo.getLength();

diff --git a/plugins/org.python.pydev/src/org/python/pydev/editor/PyEditTitle.java b/plugins/org.python.pydev/src/org/python/pydev/editor/PyEditTitle.java
@@ -40,7 +40,6 @@
 import org.eclipse.ui.PlatformUI;
 import org.python.pydev.core.FullRepIterable;
 import org.python.pydev.core.concurrency.SingleJobRunningPool;
-import org.python.pydev.core.docutils.StringUtils;
 import org.python.pydev.core.log.Log;
 import org.python.pydev.plugin.PydevPlugin;
 import org.python.pydev.plugin.nature.PythonNature;

diff --git a/plugins/org.python.pydev/src/org/python/pydev/editor/actions/PyBackspace.java b/plugins/org.python.pydev/src/org/python/pydev/editor/actions/PyBackspace.java
@@ -23,7 +23,6 @@
 import org.python.pydev.core.IIndentPrefs;
 import org.python.pydev.core.docutils.PySelection;
 import org.python.pydev.core.docutils.PythonPairMatcher;
-import org.python.pydev.core.docutils.StringUtils;
 import org.python.pydev.editor.PyEdit;
 import org.python.pydev.editor.autoedit.DefaultIndentPrefs;
 import org.python.pydev.editor.autoedit.PyAutoIndentStrategy;

diff --git a/plugins/org.python.pydev/src/org/python/pydev/editor/actions/PyPeerLinker.java b/plugins/org.python.pydev/src/org/python/pydev/editor/actions/PyPeerLinker.java
@@ -25,7 +25,6 @@
 import org.python.pydev.core.IIndentPrefs;
 import org.python.pydev.core.docutils.ParsingUtils;
 import org.python.pydev.core.docutils.PySelection;
-import org.python.pydev.core.docutils.StringUtils;
 import org.python.pydev.core.docutils.SyntaxErrorException;
 import org.python.pydev.core.log.Log;
 import org.python.pydev.editor.autoedit.DefaultIndentPrefs;

diff --git a/...hon.pydev/src/org/python/pydev/editor/correctionassist/docstrings/DocstringsPrefPage.java b/...hon.pydev/src/org/python/pydev/editor/correctionassist/docstrings/DocstringsPrefPage.java
@@ -10,12 +10,10 @@
 import java.util.Map;
 import java.util.StringTokenizer;
 
-import org.eclipse.jface.dialogs.InputDialog;
 import org.eclipse.jface.preference.FieldEditorPreferencePage;
 import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.jface.preference.RadioGroupFieldEditor;
 import org.eclipse.jface.util.IPropertyChangeListener;
-import org.eclipse.jface.util.PropertyChangeEvent;
 import org.eclipse.swt.layout.RowLayout;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Group;

diff --git a/...org.python.pydev/src/org/python/pydev/editor/refactoring/PyRefactoringFindDefinition.java b/...org.python.pydev/src/org/python/pydev/editor/refactoring/PyRefactoringFindDefinition.java
@@ -30,7 +30,6 @@
 import org.python.pydev.editor.model.ItemPointer;
 import org.python.pydev.parser.jython.ast.ImportFrom;
 import org.python.pydev.plugin.PydevPlugin;
-import org.python.pydev.plugin.nature.SystemPythonNature;
 import org.python.pydev.shared_core.io.FileUtils;
 import org.python.pydev.shared_core.structure.Location;
 import org.python.pydev.shared_core.structure.Tuple;

diff --git a/.../org.python.pydev/src/org/python/pydev/ui/actions/container/PyDeletePycAndClassFiles.java b/.../org.python.pydev/src/org/python/pydev/ui/actions/container/PyDeletePycAndClassFiles.java
@@ -12,7 +12,6 @@
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.jface.dialogs.MessageDialog;
-import org.python.pydev.core.docutils.StringUtils;
 import org.python.pydev.core.log.Log;
 
 

diff --git a/...ins/org.python.pydev/src/org/python/pydev/ui/interpreters/AbstractInterpreterManager.java b/...ins/org.python.pydev/src/org/python/pydev/ui/interpreters/AbstractInterpreterManager.java
@@ -12,7 +12,6 @@
 package org.python.pydev.ui.interpreters;
 
 import java.io.File;
-import java.lang.reflect.InvocationTargetException;
 import java.util.ArrayList;
 import java.util.Enumeration;
 import java.util.HashMap;
@@ -28,13 +27,10 @@
 import org.eclipse.core.runtime.NullProgressMonitor;
 import org.eclipse.core.runtime.Status;
 import org.eclipse.jface.dialogs.ErrorDialog;
-import org.eclipse.jface.dialogs.ProgressMonitorDialog;
-import org.eclipse.jface.operation.IRunnableWithProgress;
 import org.eclipse.jface.preference.IPersistentPreferenceStore;
 import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.jface.preference.PreferenceDialog;
 import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Shell;
 import org.eclipse.ui.dialogs.PreferencesUtil;
 import org.eclipse.ui.progress.UIJob;
 import org.python.copiedfromeclipsesrc.JDTNotAvailableException;
@@ -48,7 +44,6 @@
 import org.python.pydev.core.IToken;
 import org.python.pydev.core.MisconfigurationException;
 import org.python.pydev.core.NotConfiguredInterpreterException;
-import org.python.pydev.core.docutils.StringUtils;
 import org.python.pydev.core.log.Log;
 import org.python.pydev.editor.codecompletion.revisited.PythonPathHelper;
 import org.python.pydev.editor.codecompletion.shell.AbstractShell;
@@ -57,7 +52,6 @@
 import org.python.pydev.plugin.nature.PythonNatureListenersManager;
 import org.python.pydev.shared_core.string.FastStringBuffer;
 import org.python.pydev.shared_core.structure.Tuple;
-import org.python.pydev.shared_ui.utils.AsynchronousProgressMonitorDialog;
 import org.python.pydev.ui.dialogs.PyDialogHelpers;
 import org.python.pydev.ui.pythonpathconf.AbstractInterpreterPreferencesPage;
 import org.python.pydev.ui.pythonpathconf.InterpreterInfo;

diff --git a/...ython.pydev/src_completions/org/python/pydev/editor/codecompletion/CompletionRequest.java b/...ython.pydev/src_completions/org/python/pydev/editor/codecompletion/CompletionRequest.java
@@ -14,16 +14,13 @@
 import java.io.File;
 
 import org.eclipse.jface.text.IDocument;
-import org.python.pydev.core.ICodeCompletionASTManager;
 import org.python.pydev.core.ICompletionRequest;
-import org.python.pydev.core.ICompletionState;
 import org.python.pydev.core.IModule;
 import org.python.pydev.core.IPythonNature;
 import org.python.pydev.core.MisconfigurationException;
 import org.python.pydev.core.docutils.PySelection;
 import org.python.pydev.core.docutils.PySelection.ActivationTokenAndQual;
 import org.python.pydev.editor.codecompletion.revisited.AbstractASTManager;
-import org.python.pydev.editor.codecompletion.revisited.modules.SourceModule;
 import org.python.pydev.shared_core.string.FastStringBuffer;
 
 /**

diff --git a/...dev/src_completions/org/python/pydev/editor/codecompletion/shell/ProcessCreationInfo.java b/...dev/src_completions/org/python/pydev/editor/codecompletion/shell/ProcessCreationInfo.java
@@ -10,7 +10,6 @@
 import java.io.IOException;
 import java.util.Arrays;
 
-import org.python.pydev.core.docutils.StringUtils;
 import org.python.pydev.shared_core.io.ThreadStreamReader;
 
 public class ProcessCreationInfo {

diff --git a/...org.python.pydev/src_navigator/org/python/pydev/navigator/actions/copied/PasteAction.java b/...org.python.pydev/src_navigator/org/python/pydev/navigator/actions/copied/PasteAction.java
@@ -37,7 +37,6 @@
 import org.eclipse.ui.actions.SelectionListenerAction;
 import org.eclipse.ui.ide.IDE;
 import org.eclipse.ui.part.ResourceTransfer;
-import org.python.pydev.core.docutils.StringUtils;
 import org.python.pydev.core.log.Log;
 import org.python.pydev.editor.actions.PyAction;