Move RefactoringInfo to non-ui plugin.

fabioz · Sep 22, 2024 · 2c083f4 · 2c083f4
1 parent 1a31b48
commit 2c083f4
Show file tree

Hide file tree

Showing 41 changed files with 59 additions and 61 deletions.
diff --git a/...python.pydev.refactoring/src/com/python/pydev/refactoring/tdd/AbstractPyCreateAction.java b/...python.pydev.refactoring/src/com/python/pydev/refactoring/tdd/AbstractPyCreateAction.java
@@ -17,9 +17,9 @@
 import org.eclipse.ui.IEditorActionDelegate;
 import org.eclipse.ui.IEditorPart;
 import org.eclipse.ui.texteditor.ITextEditor;
+import org.python.pydev.ast.refactoring.RefactoringInfo;
 import org.python.pydev.core.IPyEdit;
 import org.python.pydev.core.log.Log;
-import org.python.pydev.refactoring.core.base.RefactoringInfo;
 import org.python.pydev.shared_core.SharedCorePlugin;
 import org.python.pydev.shared_core.code_completion.ICompletionProposalHandle;
 import org.python.pydev.shared_ui.EditorUtils;

diff --git a/...efactoring/src/com/python/pydev/refactoring/tdd/AbstractPyCreateClassOrMethodOrField.java b/...efactoring/src/com/python/pydev/refactoring/tdd/AbstractPyCreateClassOrMethodOrField.java
@@ -22,6 +22,7 @@
 import org.python.pydev.ast.adapters.offsetstrategy.BeginOffset;
 import org.python.pydev.ast.adapters.offsetstrategy.EndOffset;
 import org.python.pydev.ast.adapters.offsetstrategy.IOffsetStrategy;
+import org.python.pydev.ast.refactoring.RefactoringInfo;
 import org.python.pydev.core.docutils.PySelection;
 import org.python.pydev.core.docutils.PySelection.LineStartingScope;
 import org.python.pydev.core.docutils.PyStringUtils;
@@ -33,7 +34,6 @@
 import org.python.pydev.parser.jython.ast.ClassDef;
 import org.python.pydev.parser.jython.ast.Pass;
 import org.python.pydev.parser.visitors.NodeUtils;
-import org.python.pydev.refactoring.core.base.RefactoringInfo;
 import org.python.pydev.shared_core.code_completion.ICompletionProposalHandle;
 import org.python.pydev.shared_core.string.FastStringBuffer;
 import org.python.pydev.shared_core.string.StringUtils;

diff --git a/...com.python.pydev.refactoring/src/com/python/pydev/refactoring/tdd/NullPyCreateAction.java b/...com.python.pydev.refactoring/src/com/python/pydev/refactoring/tdd/NullPyCreateAction.java
@@ -8,7 +8,7 @@
 
 import java.util.List;
 
-import org.python.pydev.refactoring.core.base.RefactoringInfo;
+import org.python.pydev.ast.refactoring.RefactoringInfo;
 import org.python.pydev.shared_core.code_completion.ICompletionProposalHandle;
 
 public class NullPyCreateAction extends AbstractPyCreateAction {

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
@@ -9,8 +9,8 @@
 import java.util.List;
 
 import org.python.pydev.ast.adapters.ModuleAdapter;
+import org.python.pydev.ast.refactoring.RefactoringInfo;
 import org.python.pydev.core.docutils.PySelection;
-import org.python.pydev.refactoring.core.base.RefactoringInfo;
 import org.python.pydev.shared_core.code_completion.ICompletionProposalHandle;
 import org.python.pydev.shared_core.string.FastStringBuffer;
 import org.python.pydev.shared_core.string.StringUtils;

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
@@ -14,14 +14,14 @@
 import org.python.pydev.ast.adapters.FunctionDefAdapter;
 import org.python.pydev.ast.adapters.IClassDefAdapter;
 import org.python.pydev.ast.adapters.ModuleAdapter;
+import org.python.pydev.ast.refactoring.RefactoringInfo;
 import org.python.pydev.core.docutils.PySelection;
 import org.python.pydev.core.log.Log;
 import org.python.pydev.parser.jython.SimpleNode;
 import org.python.pydev.parser.jython.ast.FunctionDef;
 import org.python.pydev.parser.jython.ast.Pass;
 import org.python.pydev.parser.jython.ast.stmtType;
 import org.python.pydev.parser.visitors.NodeUtils;
-import org.python.pydev.refactoring.core.base.RefactoringInfo;
 import org.python.pydev.shared_core.code_completion.ICompletionProposalHandle;
 import org.python.pydev.shared_core.string.StringUtils;
 import org.python.pydev.shared_core.structure.Tuple;

diff --git a/...efactoring/src/com/python/pydev/refactoring/tdd/TddCodeGenerationQuickFixParticipant.java b/...efactoring/src/com/python/pydev/refactoring/tdd/TddCodeGenerationQuickFixParticipant.java
@@ -78,9 +78,14 @@ public List<ICompletionProposalHandle> getProps(PySelection ps, IImageCache imag
         return ret;
     }
 
-    public static List<ICompletionProposalHandle> getTddProps(PySelection ps, IImageCache imageCache, File f,
+    public static List<ICompletionProposalHandle> getTddProps(
+            PySelection ps,
+            IImageCache imageCache,
+            File f,
             IPythonNature nature,
-            IPyEdit edit, int offset, List<ICompletionProposalHandle> ret) {
+            IPyEdit edit,
+            int offset,
+            List<ICompletionProposalHandle> ret) {
         if (ret == null) {
             ret = new ArrayList<ICompletionProposalHandle>();
         }

diff --git a/....python.pydev.refactoring/src/com/python/pydev/refactoring/tdd/TddRefactorCompletion.java b/....python.pydev.refactoring/src/com/python/pydev/refactoring/tdd/TddRefactorCompletion.java
@@ -14,12 +14,12 @@
 import org.eclipse.jface.text.contentassist.IContextInformation;
 import org.eclipse.jface.text.templates.TemplateProposal;
 import org.eclipse.swt.graphics.Point;
+import org.python.pydev.ast.refactoring.RefactoringInfo;
 import org.python.pydev.core.IPyEdit;
 import org.python.pydev.core.MisconfigurationException;
 import org.python.pydev.core.docutils.PySelection;
 import org.python.pydev.core.log.Log;
 import org.python.pydev.parser.PyParser;
-import org.python.pydev.refactoring.core.base.RefactoringInfo;
 import org.python.pydev.shared_core.image.IImageHandle;
 
 /**

diff --git a/...om.python.pydev.refactoring/tests/com/python/pydev/refactoring/tdd/PyCreateClassTest.java b/...om.python.pydev.refactoring/tests/com/python/pydev/refactoring/tdd/PyCreateClassTest.java
@@ -10,12 +10,12 @@
 
 import org.eclipse.jface.text.Document;
 import org.eclipse.jface.text.IDocument;
+import org.python.pydev.ast.refactoring.RefactoringInfo;
 import org.python.pydev.core.IGrammarVersionProvider;
 import org.python.pydev.core.MisconfigurationException;
 import org.python.pydev.core.TestCaseUtils;
 import org.python.pydev.core.proposals.CompletionProposalFactory;
 import org.python.pydev.editor.codecompletion.proposals.DefaultCompletionProposalFactory;
-import org.python.pydev.refactoring.core.base.RefactoringInfo;
 import org.python.pydev.shared_core.string.CoreTextSelection;
 import org.python.pydev.shared_core.string.ICoreTextSelection;
 

diff --git a/...m.python.pydev.refactoring/tests/com/python/pydev/refactoring/tdd/PyCreateMethodTest.java b/...m.python.pydev.refactoring/tests/com/python/pydev/refactoring/tdd/PyCreateMethodTest.java
@@ -10,12 +10,12 @@
 
 import org.eclipse.jface.text.Document;
 import org.eclipse.jface.text.IDocument;
+import org.python.pydev.ast.refactoring.RefactoringInfo;
 import org.python.pydev.core.IGrammarVersionProvider;
 import org.python.pydev.core.MisconfigurationException;
 import org.python.pydev.core.TestCaseUtils;
 import org.python.pydev.core.proposals.CompletionProposalFactory;
 import org.python.pydev.editor.codecompletion.proposals.DefaultCompletionProposalFactory;
-import org.python.pydev.refactoring.core.base.RefactoringInfo;
 import org.python.pydev.shared_core.string.CoreTextSelection;
 import org.python.pydev.shared_core.string.ICoreTextSelection;
 

diff --git a/...efactoring/core/base/RefactoringInfo.java → ...ydev/ast/refactoring/RefactoringInfo.java b/...efactoring/core/base/RefactoringInfo.java → ...ydev/ast/refactoring/RefactoringInfo.java
@@ -22,7 +22,7 @@
  *
  */
 
-package org.python.pydev.refactoring.core.base;
+package org.python.pydev.ast.refactoring;
 
 import java.io.File;
 import java.util.List;
@@ -33,8 +33,6 @@
 import org.eclipse.jface.text.Document;
 import org.eclipse.jface.text.IDocument;
 import org.eclipse.jface.text.TextUtilities;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IFileEditorInput;
 import org.python.pydev.ast.adapters.AbstractScopeNode;
 import org.python.pydev.ast.adapters.IClassDefAdapter;
 import org.python.pydev.ast.adapters.ModuleAdapter;
@@ -98,18 +96,11 @@ public RefactoringInfo(IDocument document, ICoreTextSelection selection, IGramma
     }
 
     public RefactoringInfo(IPyEdit edit, ICoreTextSelection selection) throws MisconfigurationException {
-        IEditorInput input = (IEditorInput) edit.getEditorInput();
         this.indentPrefs = edit.getIndentPrefs();
         IPythonNature localNature = edit.getPythonNature();
 
-        if (input instanceof IFileEditorInput) {
-            IFileEditorInput editorInput = (IFileEditorInput) input;
-            this.sourceFile = editorInput.getFile();
-            this.realFile = sourceFile != null ? sourceFile.getLocation().toFile() : null;
-        } else {
-            this.sourceFile = null;
-            this.realFile = edit.getEditorFile();
-        }
+        this.sourceFile = edit.getIFile();
+        this.realFile = edit.getEditorFile();
 
         if (localNature == null) {
             Tuple<IPythonNature, String> infoForFile = InterpreterManagersAPI.getInfoForFile(this.realFile);

diff --git a/...hon/pydev/refactoring/codegenerator/constructorfield/ConstructorFieldChangeProcessor.java b/...hon/pydev/refactoring/codegenerator/constructorfield/ConstructorFieldChangeProcessor.java
@@ -24,11 +24,11 @@
 
 package org.python.pydev.refactoring.codegenerator.constructorfield;
 
+import org.python.pydev.ast.refactoring.RefactoringInfo;
 import org.python.pydev.core.MisconfigurationException;
 import org.python.pydev.refactoring.codegenerator.constructorfield.edit.ConstructorMethodEdit;
 import org.python.pydev.refactoring.codegenerator.constructorfield.request.ConstructorFieldRequest;
 import org.python.pydev.refactoring.core.base.AbstractFileChangeProcessor;
-import org.python.pydev.refactoring.core.base.RefactoringInfo;
 import org.python.pydev.refactoring.core.request.IRequestProcessor;
 import org.python.pydev.refactoring.messages.Messages;
 

diff --git a/.../python/pydev/refactoring/codegenerator/constructorfield/ConstructorFieldRefactoring.java b/.../python/pydev/refactoring/codegenerator/constructorfield/ConstructorFieldRefactoring.java
@@ -31,8 +31,8 @@
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.ltk.core.refactoring.RefactoringStatus;
 import org.python.pydev.ast.adapters.IClassDefAdapter;
+import org.python.pydev.ast.refactoring.RefactoringInfo;
 import org.python.pydev.refactoring.core.base.AbstractPythonRefactoring;
-import org.python.pydev.refactoring.core.base.RefactoringInfo;
 import org.python.pydev.refactoring.core.change.IChangeProcessor;
 import org.python.pydev.refactoring.messages.Messages;
 

diff --git a/...pydev/refactoring/codegenerator/generateproperties/GeneratePropertiesChangeProcessor.java b/...pydev/refactoring/codegenerator/generateproperties/GeneratePropertiesChangeProcessor.java
@@ -26,6 +26,7 @@
 
 import java.util.List;
 
+import org.python.pydev.ast.refactoring.RefactoringInfo;
 import org.python.pydev.core.MisconfigurationException;
 import org.python.pydev.refactoring.codegenerator.generateproperties.edit.DeleteMethodEdit;
 import org.python.pydev.refactoring.codegenerator.generateproperties.edit.GetterMethodEdit;
@@ -34,7 +35,6 @@
 import org.python.pydev.refactoring.codegenerator.generateproperties.request.GeneratePropertiesRequest;
 import org.python.pydev.refactoring.codegenerator.generateproperties.request.SelectionState;
 import org.python.pydev.refactoring.core.base.AbstractFileChangeProcessor;
-import org.python.pydev.refactoring.core.base.RefactoringInfo;
 import org.python.pydev.refactoring.core.edit.AbstractTextEdit;
 import org.python.pydev.refactoring.core.request.IRequestProcessor;
 import org.python.pydev.refactoring.messages.Messages;

diff --git a/...hon/pydev/refactoring/codegenerator/generateproperties/GeneratePropertiesRefactoring.java b/...hon/pydev/refactoring/codegenerator/generateproperties/GeneratePropertiesRefactoring.java
@@ -31,8 +31,8 @@
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.ltk.core.refactoring.RefactoringStatus;
 import org.python.pydev.ast.adapters.IClassDefAdapter;
+import org.python.pydev.ast.refactoring.RefactoringInfo;
 import org.python.pydev.refactoring.core.base.AbstractPythonRefactoring;
-import org.python.pydev.refactoring.core.base.RefactoringInfo;
 import org.python.pydev.refactoring.core.change.IChangeProcessor;
 import org.python.pydev.refactoring.messages.Messages;
 

diff --git a/...ython/pydev/refactoring/codegenerator/overridemethods/OverrideMethodsChangeProcessor.java b/...ython/pydev/refactoring/codegenerator/overridemethods/OverrideMethodsChangeProcessor.java
@@ -24,11 +24,11 @@
 
 package org.python.pydev.refactoring.codegenerator.overridemethods;
 
+import org.python.pydev.ast.refactoring.RefactoringInfo;
 import org.python.pydev.core.MisconfigurationException;
 import org.python.pydev.refactoring.codegenerator.overridemethods.edit.MethodEdit;
 import org.python.pydev.refactoring.codegenerator.overridemethods.request.OverrideMethodsRequest;
 import org.python.pydev.refactoring.core.base.AbstractFileChangeProcessor;
-import org.python.pydev.refactoring.core.base.RefactoringInfo;
 import org.python.pydev.refactoring.core.request.IRequestProcessor;
 import org.python.pydev.refactoring.messages.Messages;
 

diff --git a/...rg/python/pydev/refactoring/codegenerator/overridemethods/OverrideMethodsRefactoring.java b/...rg/python/pydev/refactoring/codegenerator/overridemethods/OverrideMethodsRefactoring.java
@@ -31,8 +31,8 @@
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.ltk.core.refactoring.RefactoringStatus;
 import org.python.pydev.ast.adapters.IClassDefAdapter;
+import org.python.pydev.ast.refactoring.RefactoringInfo;
 import org.python.pydev.refactoring.core.base.AbstractPythonRefactoring;
-import org.python.pydev.refactoring.core.base.RefactoringInfo;
 import org.python.pydev.refactoring.core.change.IChangeProcessor;
 import org.python.pydev.refactoring.messages.Messages;
 

diff --git a/...rg/python/pydev/refactoring/coderefactoring/extractlocal/ExtractLocalChangeProcessor.java b/...rg/python/pydev/refactoring/coderefactoring/extractlocal/ExtractLocalChangeProcessor.java
@@ -26,14 +26,14 @@
 
 import java.util.List;
 
+import org.python.pydev.ast.refactoring.RefactoringInfo;
 import org.python.pydev.core.MisconfigurationException;
 import org.python.pydev.parser.jython.SimpleNode;
 import org.python.pydev.refactoring.coderefactoring.extractlocal.edit.CreateLocalVariableEdit;
 import org.python.pydev.refactoring.coderefactoring.extractlocal.edit.ReplaceDuplicateWithVariableEdit;
 import org.python.pydev.refactoring.coderefactoring.extractlocal.edit.ReplaceWithVariableEdit;
 import org.python.pydev.refactoring.coderefactoring.extractlocal.request.ExtractLocalRequest;
 import org.python.pydev.refactoring.core.base.AbstractFileChangeProcessor;
-import org.python.pydev.refactoring.core.base.RefactoringInfo;
 import org.python.pydev.refactoring.core.request.IRequestProcessor;
 import org.python.pydev.refactoring.messages.Messages;
 import org.python.pydev.shared_core.string.ICoreTextSelection;

diff --git a/...rc/org/python/pydev/refactoring/coderefactoring/extractlocal/ExtractLocalRefactoring.java b/...rc/org/python/pydev/refactoring/coderefactoring/extractlocal/ExtractLocalRefactoring.java
@@ -31,11 +31,11 @@
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.ltk.core.refactoring.RefactoringStatus;
 import org.python.pydev.ast.adapters.AbstractScopeNode;
+import org.python.pydev.ast.refactoring.RefactoringInfo;
+import org.python.pydev.ast.refactoring.RefactoringInfo.SelectionComputer;
+import org.python.pydev.ast.refactoring.RefactoringInfo.SelectionComputer.SelectionComputerKind;
 import org.python.pydev.parser.jython.ast.exprType;
 import org.python.pydev.refactoring.core.base.AbstractPythonRefactoring;
-import org.python.pydev.refactoring.core.base.RefactoringInfo;
-import org.python.pydev.refactoring.core.base.RefactoringInfo.SelectionComputer;
-import org.python.pydev.refactoring.core.base.RefactoringInfo.SelectionComputer.SelectionComputerKind;
 import org.python.pydev.refactoring.core.change.IChangeProcessor;
 import org.python.pydev.refactoring.core.validator.NameValidator;
 import org.python.pydev.refactoring.messages.Messages;

diff --git a/...g/python/pydev/refactoring/coderefactoring/extractlocal/ExtractLocalRequestProcessor.java b/...g/python/pydev/refactoring/coderefactoring/extractlocal/ExtractLocalRequestProcessor.java
@@ -26,10 +26,10 @@
 
 import java.util.List;
 
+import org.python.pydev.ast.refactoring.RefactoringInfo;
 import org.python.pydev.parser.jython.SimpleNode;
 import org.python.pydev.parser.jython.ast.exprType;
 import org.python.pydev.refactoring.coderefactoring.extractlocal.request.ExtractLocalRequest;
-import org.python.pydev.refactoring.core.base.RefactoringInfo;
 import org.python.pydev.refactoring.core.request.IRequestProcessor;
 import org.python.pydev.refactoring.utils.ListUtils;
 import org.python.pydev.shared_core.string.ICoreTextSelection;

diff --git a/...g/python/pydev/refactoring/coderefactoring/extractlocal/edit/CreateLocalVariableEdit.java b/...g/python/pydev/refactoring/coderefactoring/extractlocal/edit/CreateLocalVariableEdit.java
@@ -29,6 +29,8 @@
 
 import org.python.pydev.ast.adapters.ModuleAdapter;
 import org.python.pydev.ast.codecompletion.revisited.visitors.FindScopeVisitor;
+import org.python.pydev.ast.refactoring.RefactoringInfo;
+import org.python.pydev.ast.refactoring.RefactoringInfo.SelectionComputer.SelectionComputerKind;
 import org.python.pydev.core.ILocalScope;
 import org.python.pydev.core.docutils.PySelection;
 import org.python.pydev.core.log.Log;
@@ -41,8 +43,6 @@
 import org.python.pydev.parser.jython.ast.expr_contextType;
 import org.python.pydev.parser.visitors.scope.GetNodeForExtractLocalVisitor;
 import org.python.pydev.refactoring.coderefactoring.extractlocal.request.ExtractLocalRequest;
-import org.python.pydev.refactoring.core.base.RefactoringInfo;
-import org.python.pydev.refactoring.core.base.RefactoringInfo.SelectionComputer.SelectionComputerKind;
 import org.python.pydev.refactoring.core.edit.AbstractInsertEdit;
 import org.python.pydev.shared_core.string.ICoreTextSelection;
 import org.python.pydev.shared_core.structure.FastStack;

diff --git a/...rg/python/pydev/refactoring/coderefactoring/extractlocal/request/ExtractLocalRequest.java b/...rg/python/pydev/refactoring/coderefactoring/extractlocal/request/ExtractLocalRequest.java
@@ -27,10 +27,10 @@
 import java.util.List;
 
 import org.python.pydev.ast.adapters.IASTNodeAdapter;
+import org.python.pydev.ast.refactoring.RefactoringInfo;
 import org.python.pydev.parser.jython.SimpleNode;
 import org.python.pydev.parser.jython.ast.exprType;
 import org.python.pydev.parser.jython.ast.factory.AdapterPrefs;
-import org.python.pydev.refactoring.core.base.RefactoringInfo;
 import org.python.pydev.refactoring.core.request.IRefactoringRequest;
 import org.python.pydev.shared_core.string.ICoreTextSelection;
 import org.python.pydev.shared_core.structure.Tuple;

diff --git a/.../python/pydev/refactoring/coderefactoring/extractmethod/ExtractMethodChangeProcessor.java b/.../python/pydev/refactoring/coderefactoring/extractmethod/ExtractMethodChangeProcessor.java
@@ -24,12 +24,12 @@
 
 package org.python.pydev.refactoring.coderefactoring.extractmethod;
 
+import org.python.pydev.ast.refactoring.RefactoringInfo;
 import org.python.pydev.core.MisconfigurationException;
 import org.python.pydev.refactoring.coderefactoring.extractmethod.edit.ExtractCallEdit;
 import org.python.pydev.refactoring.coderefactoring.extractmethod.edit.ExtractMethodEdit;
 import org.python.pydev.refactoring.coderefactoring.extractmethod.request.ExtractMethodRequest;
 import org.python.pydev.refactoring.core.base.AbstractFileChangeProcessor;
-import org.python.pydev.refactoring.core.base.RefactoringInfo;
 import org.python.pydev.refactoring.core.request.IRequestProcessor;
 import org.python.pydev.refactoring.messages.Messages;
 

diff --git a/.../org/python/pydev/refactoring/coderefactoring/extractmethod/ExtractMethodRefactoring.java b/.../org/python/pydev/refactoring/coderefactoring/extractmethod/ExtractMethodRefactoring.java
@@ -33,11 +33,11 @@
 import org.python.pydev.ast.adapters.IClassDefAdapter;
 import org.python.pydev.ast.adapters.ModuleAdapter;
 import org.python.pydev.ast.adapters.visitors.selection.SelectionException;
+import org.python.pydev.ast.refactoring.RefactoringInfo;
+import org.python.pydev.ast.refactoring.RefactoringInfo.SelectionComputer;
+import org.python.pydev.ast.refactoring.RefactoringInfo.SelectionComputer.SelectionComputerKind;
 import org.python.pydev.core.log.Log;
 import org.python.pydev.refactoring.core.base.AbstractPythonRefactoring;
-import org.python.pydev.refactoring.core.base.RefactoringInfo;
-import org.python.pydev.refactoring.core.base.RefactoringInfo.SelectionComputer;
-import org.python.pydev.refactoring.core.base.RefactoringInfo.SelectionComputer.SelectionComputerKind;
 import org.python.pydev.refactoring.core.change.IChangeProcessor;
 import org.python.pydev.refactoring.messages.Messages;
 

diff --git a/.../org/python/pydev/refactoring/coderefactoring/inlinelocal/InlineLocalChangeProcessor.java b/.../org/python/pydev/refactoring/coderefactoring/inlinelocal/InlineLocalChangeProcessor.java
@@ -21,13 +21,13 @@
 
 package org.python.pydev.refactoring.coderefactoring.inlinelocal;
 
+import org.python.pydev.ast.refactoring.RefactoringInfo;
 import org.python.pydev.core.MisconfigurationException;
 import org.python.pydev.parser.jython.ast.Name;
 import org.python.pydev.refactoring.coderefactoring.inlinelocal.edit.RemoveAssignment;
 import org.python.pydev.refactoring.coderefactoring.inlinelocal.edit.ReplaceWithExpression;
 import org.python.pydev.refactoring.coderefactoring.inlinelocal.request.InlineLocalRequest;
 import org.python.pydev.refactoring.core.base.AbstractFileChangeProcessor;
-import org.python.pydev.refactoring.core.base.RefactoringInfo;
 import org.python.pydev.refactoring.core.request.IRequestProcessor;
 import org.python.pydev.refactoring.messages.Messages;
 

diff --git a/.../src/org/python/pydev/refactoring/coderefactoring/inlinelocal/InlineLocalRefactoring.java b/.../src/org/python/pydev/refactoring/coderefactoring/inlinelocal/InlineLocalRefactoring.java
@@ -29,14 +29,14 @@
 import org.eclipse.ltk.core.refactoring.RefactoringStatus;
 import org.python.pydev.ast.adapters.AbstractScopeNode;
 import org.python.pydev.ast.adapters.visitors.LocalVariablesVisitor;
+import org.python.pydev.ast.refactoring.RefactoringInfo;
+import org.python.pydev.ast.refactoring.RefactoringInfo.SelectionComputer.SelectionComputerKind;
 import org.python.pydev.parser.jython.SimpleNode;
 import org.python.pydev.parser.jython.ast.Assign;
 import org.python.pydev.parser.jython.ast.Name;
 import org.python.pydev.parser.jython.ast.exprType;
 import org.python.pydev.parser.jython.ast.expr_contextType;
 import org.python.pydev.refactoring.core.base.AbstractPythonRefactoring;
-import org.python.pydev.refactoring.core.base.RefactoringInfo;
-import org.python.pydev.refactoring.core.base.RefactoringInfo.SelectionComputer.SelectionComputerKind;
 import org.python.pydev.refactoring.core.change.IChangeProcessor;
 import org.python.pydev.refactoring.messages.Messages;
 import org.python.pydev.shared_core.string.ICoreTextSelection;

diff --git a/...org/python/pydev/refactoring/coderefactoring/inlinelocal/InlineLocalRequestProcessor.java b/...org/python/pydev/refactoring/coderefactoring/inlinelocal/InlineLocalRequestProcessor.java
@@ -23,10 +23,10 @@
 
 import java.util.List;
 
+import org.python.pydev.ast.refactoring.RefactoringInfo;
 import org.python.pydev.parser.jython.ast.Assign;
 import org.python.pydev.parser.jython.ast.Name;
 import org.python.pydev.refactoring.coderefactoring.inlinelocal.request.InlineLocalRequest;
-import org.python.pydev.refactoring.core.base.RefactoringInfo;
 import org.python.pydev.refactoring.core.request.IRequestProcessor;
 import org.python.pydev.refactoring.utils.ListUtils;
 

diff --git a/...ctoring/src/org/python/pydev/refactoring/coderefactoring/inlinelocal/InlineLocalTest.java b/...ctoring/src/org/python/pydev/refactoring/coderefactoring/inlinelocal/InlineLocalTest.java
@@ -7,9 +7,9 @@
 import org.eclipse.jface.text.IDocument;
 import org.eclipse.ltk.core.refactoring.Change;
 import org.eclipse.ltk.core.refactoring.RefactoringStatus;
+import org.python.pydev.ast.refactoring.RefactoringInfo;
 import org.python.pydev.core.IGrammarVersionProvider;
 import org.python.pydev.core.MisconfigurationException;
-import org.python.pydev.refactoring.core.base.RefactoringInfo;
 import org.python.pydev.shared_core.string.CoreTextSelection;
 import org.python.pydev.shared_core.string.ICoreTextSelection;