From 2c083f424523cafc0c3e61f500b74bad97d14fd2 Mon Sep 17 00:00:00 2001 From: Fabio Zadrozny Date: Sun, 22 Sep 2024 07:25:05 -0300 Subject: [PATCH] Move RefactoringInfo to non-ui plugin. --- .../refactoring/tdd/AbstractPyCreateAction.java | 2 +- .../tdd/AbstractPyCreateClassOrMethodOrField.java | 2 +- .../pydev/refactoring/tdd/NullPyCreateAction.java | 2 +- .../pydev/refactoring/tdd/PyCreateClass.java | 2 +- .../refactoring/tdd/PyCreateMethodOrField.java | 2 +- .../tdd/TddCodeGenerationQuickFixParticipant.java | 9 +++++++-- .../refactoring/tdd/TddRefactorCompletion.java | 2 +- .../pydev/refactoring/tdd/PyCreateClassTest.java | 2 +- .../pydev/refactoring/tdd/PyCreateMethodTest.java | 2 +- .../pydev/ast/refactoring}/RefactoringInfo.java | 15 +++------------ .../ConstructorFieldChangeProcessor.java | 2 +- .../ConstructorFieldRefactoring.java | 2 +- .../GeneratePropertiesChangeProcessor.java | 2 +- .../GeneratePropertiesRefactoring.java | 2 +- .../OverrideMethodsChangeProcessor.java | 2 +- .../OverrideMethodsRefactoring.java | 2 +- .../extractlocal/ExtractLocalChangeProcessor.java | 2 +- .../extractlocal/ExtractLocalRefactoring.java | 6 +++--- .../ExtractLocalRequestProcessor.java | 2 +- .../edit/CreateLocalVariableEdit.java | 4 ++-- .../extractlocal/request/ExtractLocalRequest.java | 2 +- .../ExtractMethodChangeProcessor.java | 2 +- .../extractmethod/ExtractMethodRefactoring.java | 6 +++--- .../inlinelocal/InlineLocalChangeProcessor.java | 2 +- .../inlinelocal/InlineLocalRefactoring.java | 4 ++-- .../inlinelocal/InlineLocalRequestProcessor.java | 2 +- .../inlinelocal/InlineLocalTest.java | 2 +- .../inlinelocal/request/InlineLocalRequest.java | 2 +- .../core/base/AbstractFileChangeProcessor.java | 1 + .../core/base/AbstractPythonRefactoring.java | 1 + .../ui/actions/ConstructorFieldAction.java | 2 +- .../ui/actions/ExtractLocalAction.java | 2 +- .../ui/actions/ExtractMethodAction.java | 2 +- .../ui/actions/GeneratePropertiesAction.java | 2 +- .../refactoring/ui/actions/InlineLocalAction.java | 2 +- .../ui/actions/OverrideMethodsAction.java | 2 +- .../internal/AbstractRefactoringAction.java | 2 +- .../extractlocal/ExtractLocalTestCase.java | 2 +- .../extractmethod/ExtractMethodTestCase.java | 6 +++--- .../inlinelocal/InlineLocalTestCase.java | 2 +- .../visitors/SelectionExtensionTestCase.java | 6 +++--- 41 files changed, 59 insertions(+), 61 deletions(-) rename plugins/{org.python.pydev.refactoring/src/org/python/pydev/refactoring/core/base => org.python.pydev.ast/src/org/python/pydev/ast/refactoring}/RefactoringInfo.java (97%) diff --git a/plugins/com.python.pydev.refactoring/src/com/python/pydev/refactoring/tdd/AbstractPyCreateAction.java b/plugins/com.python.pydev.refactoring/src/com/python/pydev/refactoring/tdd/AbstractPyCreateAction.java index 6f4ff18a88..66675dc0b8 100644 --- a/plugins/com.python.pydev.refactoring/src/com/python/pydev/refactoring/tdd/AbstractPyCreateAction.java +++ b/plugins/com.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/plugins/com.python.pydev.refactoring/src/com/python/pydev/refactoring/tdd/AbstractPyCreateClassOrMethodOrField.java b/plugins/com.python.pydev.refactoring/src/com/python/pydev/refactoring/tdd/AbstractPyCreateClassOrMethodOrField.java index 2d68977004..6274a334d4 100644 --- a/plugins/com.python.pydev.refactoring/src/com/python/pydev/refactoring/tdd/AbstractPyCreateClassOrMethodOrField.java +++ b/plugins/com.python.pydev.refactoring/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/plugins/com.python.pydev.refactoring/src/com/python/pydev/refactoring/tdd/NullPyCreateAction.java b/plugins/com.python.pydev.refactoring/src/com/python/pydev/refactoring/tdd/NullPyCreateAction.java index f1885acaf2..630993b2ae 100644 --- a/plugins/com.python.pydev.refactoring/src/com/python/pydev/refactoring/tdd/NullPyCreateAction.java +++ b/plugins/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 index 133ce44976..d15a92a727 100644 --- 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/plugins/com.python.pydev.refactoring/src/com/python/pydev/refactoring/tdd/PyCreateMethodOrField.java b/plugins/com.python.pydev.refactoring/src/com/python/pydev/refactoring/tdd/PyCreateMethodOrField.java index 8387d7f9ca..8f3a6bfef6 100644 --- a/plugins/com.python.pydev.refactoring/src/com/python/pydev/refactoring/tdd/PyCreateMethodOrField.java +++ b/plugins/com.python.pydev.refactoring/src/com/python/pydev/refactoring/tdd/PyCreateMethodOrField.java @@ -14,6 +14,7 @@ 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; @@ -21,7 +22,6 @@ 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/plugins/com.python.pydev.refactoring/src/com/python/pydev/refactoring/tdd/TddCodeGenerationQuickFixParticipant.java b/plugins/com.python.pydev.refactoring/src/com/python/pydev/refactoring/tdd/TddCodeGenerationQuickFixParticipant.java index 2bc0376e65..a477151f39 100644 --- a/plugins/com.python.pydev.refactoring/src/com/python/pydev/refactoring/tdd/TddCodeGenerationQuickFixParticipant.java +++ b/plugins/com.python.pydev.refactoring/src/com/python/pydev/refactoring/tdd/TddCodeGenerationQuickFixParticipant.java @@ -78,9 +78,14 @@ public List getProps(PySelection ps, IImageCache imag return ret; } - public static List getTddProps(PySelection ps, IImageCache imageCache, File f, + public static List getTddProps( + PySelection ps, + IImageCache imageCache, + File f, IPythonNature nature, - IPyEdit edit, int offset, List ret) { + IPyEdit edit, + int offset, + List ret) { if (ret == null) { ret = new ArrayList(); } diff --git a/plugins/com.python.pydev.refactoring/src/com/python/pydev/refactoring/tdd/TddRefactorCompletion.java b/plugins/com.python.pydev.refactoring/src/com/python/pydev/refactoring/tdd/TddRefactorCompletion.java index 33ee0ab691..8adf0d2baa 100644 --- a/plugins/com.python.pydev.refactoring/src/com/python/pydev/refactoring/tdd/TddRefactorCompletion.java +++ b/plugins/com.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/plugins/com.python.pydev.refactoring/tests/com/python/pydev/refactoring/tdd/PyCreateClassTest.java b/plugins/com.python.pydev.refactoring/tests/com/python/pydev/refactoring/tdd/PyCreateClassTest.java index 390513689d..1f19e17540 100644 --- a/plugins/com.python.pydev.refactoring/tests/com/python/pydev/refactoring/tdd/PyCreateClassTest.java +++ b/plugins/com.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/plugins/com.python.pydev.refactoring/tests/com/python/pydev/refactoring/tdd/PyCreateMethodTest.java b/plugins/com.python.pydev.refactoring/tests/com/python/pydev/refactoring/tdd/PyCreateMethodTest.java index b0ae6f3ff4..5ea275f99e 100644 --- a/plugins/com.python.pydev.refactoring/tests/com/python/pydev/refactoring/tdd/PyCreateMethodTest.java +++ b/plugins/com.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/plugins/org.python.pydev.refactoring/src/org/python/pydev/refactoring/core/base/RefactoringInfo.java b/plugins/org.python.pydev.ast/src/org/python/pydev/ast/refactoring/RefactoringInfo.java similarity index 97% rename from plugins/org.python.pydev.refactoring/src/org/python/pydev/refactoring/core/base/RefactoringInfo.java rename to plugins/org.python.pydev.ast/src/org/python/pydev/ast/refactoring/RefactoringInfo.java index f2bf4aa10b..56080df07b 100644 --- a/plugins/org.python.pydev.refactoring/src/org/python/pydev/refactoring/core/base/RefactoringInfo.java +++ b/plugins/org.python.pydev.ast/src/org/python/pydev/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 infoForFile = InterpreterManagersAPI.getInfoForFile(this.realFile); diff --git a/plugins/org.python.pydev.refactoring/src/org/python/pydev/refactoring/codegenerator/constructorfield/ConstructorFieldChangeProcessor.java b/plugins/org.python.pydev.refactoring/src/org/python/pydev/refactoring/codegenerator/constructorfield/ConstructorFieldChangeProcessor.java index af447903cc..94759709fc 100644 --- a/plugins/org.python.pydev.refactoring/src/org/python/pydev/refactoring/codegenerator/constructorfield/ConstructorFieldChangeProcessor.java +++ b/plugins/org.python.pydev.refactoring/src/org/python/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/plugins/org.python.pydev.refactoring/src/org/python/pydev/refactoring/codegenerator/constructorfield/ConstructorFieldRefactoring.java b/plugins/org.python.pydev.refactoring/src/org/python/pydev/refactoring/codegenerator/constructorfield/ConstructorFieldRefactoring.java index 9f6f658161..2703969c2b 100644 --- a/plugins/org.python.pydev.refactoring/src/org/python/pydev/refactoring/codegenerator/constructorfield/ConstructorFieldRefactoring.java +++ b/plugins/org.python.pydev.refactoring/src/org/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/plugins/org.python.pydev.refactoring/src/org/python/pydev/refactoring/codegenerator/generateproperties/GeneratePropertiesChangeProcessor.java b/plugins/org.python.pydev.refactoring/src/org/python/pydev/refactoring/codegenerator/generateproperties/GeneratePropertiesChangeProcessor.java index ec6089eb6a..4064ea70f8 100644 --- a/plugins/org.python.pydev.refactoring/src/org/python/pydev/refactoring/codegenerator/generateproperties/GeneratePropertiesChangeProcessor.java +++ b/plugins/org.python.pydev.refactoring/src/org/python/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/plugins/org.python.pydev.refactoring/src/org/python/pydev/refactoring/codegenerator/generateproperties/GeneratePropertiesRefactoring.java b/plugins/org.python.pydev.refactoring/src/org/python/pydev/refactoring/codegenerator/generateproperties/GeneratePropertiesRefactoring.java index d3f5c837af..8c30165f80 100644 --- a/plugins/org.python.pydev.refactoring/src/org/python/pydev/refactoring/codegenerator/generateproperties/GeneratePropertiesRefactoring.java +++ b/plugins/org.python.pydev.refactoring/src/org/python/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/plugins/org.python.pydev.refactoring/src/org/python/pydev/refactoring/codegenerator/overridemethods/OverrideMethodsChangeProcessor.java b/plugins/org.python.pydev.refactoring/src/org/python/pydev/refactoring/codegenerator/overridemethods/OverrideMethodsChangeProcessor.java index 7f214a0c39..19a5be776e 100644 --- a/plugins/org.python.pydev.refactoring/src/org/python/pydev/refactoring/codegenerator/overridemethods/OverrideMethodsChangeProcessor.java +++ b/plugins/org.python.pydev.refactoring/src/org/python/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/plugins/org.python.pydev.refactoring/src/org/python/pydev/refactoring/codegenerator/overridemethods/OverrideMethodsRefactoring.java b/plugins/org.python.pydev.refactoring/src/org/python/pydev/refactoring/codegenerator/overridemethods/OverrideMethodsRefactoring.java index e3fe921c65..c2948542c4 100644 --- a/plugins/org.python.pydev.refactoring/src/org/python/pydev/refactoring/codegenerator/overridemethods/OverrideMethodsRefactoring.java +++ b/plugins/org.python.pydev.refactoring/src/org/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/plugins/org.python.pydev.refactoring/src/org/python/pydev/refactoring/coderefactoring/extractlocal/ExtractLocalChangeProcessor.java b/plugins/org.python.pydev.refactoring/src/org/python/pydev/refactoring/coderefactoring/extractlocal/ExtractLocalChangeProcessor.java index 88ba0ddb6b..81a0910fd6 100644 --- a/plugins/org.python.pydev.refactoring/src/org/python/pydev/refactoring/coderefactoring/extractlocal/ExtractLocalChangeProcessor.java +++ b/plugins/org.python.pydev.refactoring/src/org/python/pydev/refactoring/coderefactoring/extractlocal/ExtractLocalChangeProcessor.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.parser.jython.SimpleNode; import org.python.pydev.refactoring.coderefactoring.extractlocal.edit.CreateLocalVariableEdit; @@ -33,7 +34,6 @@ 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/plugins/org.python.pydev.refactoring/src/org/python/pydev/refactoring/coderefactoring/extractlocal/ExtractLocalRefactoring.java b/plugins/org.python.pydev.refactoring/src/org/python/pydev/refactoring/coderefactoring/extractlocal/ExtractLocalRefactoring.java index 46eed2cbcb..94a055497f 100644 --- a/plugins/org.python.pydev.refactoring/src/org/python/pydev/refactoring/coderefactoring/extractlocal/ExtractLocalRefactoring.java +++ b/plugins/org.python.pydev.refactoring/src/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/plugins/org.python.pydev.refactoring/src/org/python/pydev/refactoring/coderefactoring/extractlocal/ExtractLocalRequestProcessor.java b/plugins/org.python.pydev.refactoring/src/org/python/pydev/refactoring/coderefactoring/extractlocal/ExtractLocalRequestProcessor.java index 8723202e65..e48aa76971 100644 --- a/plugins/org.python.pydev.refactoring/src/org/python/pydev/refactoring/coderefactoring/extractlocal/ExtractLocalRequestProcessor.java +++ b/plugins/org.python.pydev.refactoring/src/org/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/plugins/org.python.pydev.refactoring/src/org/python/pydev/refactoring/coderefactoring/extractlocal/edit/CreateLocalVariableEdit.java b/plugins/org.python.pydev.refactoring/src/org/python/pydev/refactoring/coderefactoring/extractlocal/edit/CreateLocalVariableEdit.java index 5a4f379699..09b9519fbb 100644 --- a/plugins/org.python.pydev.refactoring/src/org/python/pydev/refactoring/coderefactoring/extractlocal/edit/CreateLocalVariableEdit.java +++ b/plugins/org.python.pydev.refactoring/src/org/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/plugins/org.python.pydev.refactoring/src/org/python/pydev/refactoring/coderefactoring/extractlocal/request/ExtractLocalRequest.java b/plugins/org.python.pydev.refactoring/src/org/python/pydev/refactoring/coderefactoring/extractlocal/request/ExtractLocalRequest.java index 9fff1f1fc2..82915540ab 100644 --- a/plugins/org.python.pydev.refactoring/src/org/python/pydev/refactoring/coderefactoring/extractlocal/request/ExtractLocalRequest.java +++ b/plugins/org.python.pydev.refactoring/src/org/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/plugins/org.python.pydev.refactoring/src/org/python/pydev/refactoring/coderefactoring/extractmethod/ExtractMethodChangeProcessor.java b/plugins/org.python.pydev.refactoring/src/org/python/pydev/refactoring/coderefactoring/extractmethod/ExtractMethodChangeProcessor.java index 147a3d5ab7..7601d36202 100644 --- a/plugins/org.python.pydev.refactoring/src/org/python/pydev/refactoring/coderefactoring/extractmethod/ExtractMethodChangeProcessor.java +++ b/plugins/org.python.pydev.refactoring/src/org/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/plugins/org.python.pydev.refactoring/src/org/python/pydev/refactoring/coderefactoring/extractmethod/ExtractMethodRefactoring.java b/plugins/org.python.pydev.refactoring/src/org/python/pydev/refactoring/coderefactoring/extractmethod/ExtractMethodRefactoring.java index 495996e38a..c8af939ef6 100644 --- a/plugins/org.python.pydev.refactoring/src/org/python/pydev/refactoring/coderefactoring/extractmethod/ExtractMethodRefactoring.java +++ b/plugins/org.python.pydev.refactoring/src/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/plugins/org.python.pydev.refactoring/src/org/python/pydev/refactoring/coderefactoring/inlinelocal/InlineLocalChangeProcessor.java b/plugins/org.python.pydev.refactoring/src/org/python/pydev/refactoring/coderefactoring/inlinelocal/InlineLocalChangeProcessor.java index 2c896f2ecb..2c81caec6e 100644 --- a/plugins/org.python.pydev.refactoring/src/org/python/pydev/refactoring/coderefactoring/inlinelocal/InlineLocalChangeProcessor.java +++ b/plugins/org.python.pydev.refactoring/src/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/plugins/org.python.pydev.refactoring/src/org/python/pydev/refactoring/coderefactoring/inlinelocal/InlineLocalRefactoring.java b/plugins/org.python.pydev.refactoring/src/org/python/pydev/refactoring/coderefactoring/inlinelocal/InlineLocalRefactoring.java index a3fef889b1..fddf62117f 100644 --- a/plugins/org.python.pydev.refactoring/src/org/python/pydev/refactoring/coderefactoring/inlinelocal/InlineLocalRefactoring.java +++ b/plugins/org.python.pydev.refactoring/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/plugins/org.python.pydev.refactoring/src/org/python/pydev/refactoring/coderefactoring/inlinelocal/InlineLocalRequestProcessor.java b/plugins/org.python.pydev.refactoring/src/org/python/pydev/refactoring/coderefactoring/inlinelocal/InlineLocalRequestProcessor.java index dd8f6cdcd4..c0ec40d5ca 100644 --- a/plugins/org.python.pydev.refactoring/src/org/python/pydev/refactoring/coderefactoring/inlinelocal/InlineLocalRequestProcessor.java +++ b/plugins/org.python.pydev.refactoring/src/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/plugins/org.python.pydev.refactoring/src/org/python/pydev/refactoring/coderefactoring/inlinelocal/InlineLocalTest.java b/plugins/org.python.pydev.refactoring/src/org/python/pydev/refactoring/coderefactoring/inlinelocal/InlineLocalTest.java index 449c17b8ec..f91355b9ff 100644 --- a/plugins/org.python.pydev.refactoring/src/org/python/pydev/refactoring/coderefactoring/inlinelocal/InlineLocalTest.java +++ b/plugins/org.python.pydev.refactoring/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; diff --git a/plugins/org.python.pydev.refactoring/src/org/python/pydev/refactoring/coderefactoring/inlinelocal/request/InlineLocalRequest.java b/plugins/org.python.pydev.refactoring/src/org/python/pydev/refactoring/coderefactoring/inlinelocal/request/InlineLocalRequest.java index 42514aa8f0..18beecee3d 100644 --- a/plugins/org.python.pydev.refactoring/src/org/python/pydev/refactoring/coderefactoring/inlinelocal/request/InlineLocalRequest.java +++ b/plugins/org.python.pydev.refactoring/src/org/python/pydev/refactoring/coderefactoring/inlinelocal/request/InlineLocalRequest.java @@ -24,11 +24,11 @@ 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.Assign; import org.python.pydev.parser.jython.ast.Name; 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; public class InlineLocalRequest implements IRefactoringRequest { diff --git a/plugins/org.python.pydev.refactoring/src/org/python/pydev/refactoring/core/base/AbstractFileChangeProcessor.java b/plugins/org.python.pydev.refactoring/src/org/python/pydev/refactoring/core/base/AbstractFileChangeProcessor.java index eeab0aa45a..0274761ffa 100644 --- a/plugins/org.python.pydev.refactoring/src/org/python/pydev/refactoring/core/base/AbstractFileChangeProcessor.java +++ b/plugins/org.python.pydev.refactoring/src/org/python/pydev/refactoring/core/base/AbstractFileChangeProcessor.java @@ -31,6 +31,7 @@ import org.eclipse.text.edits.MultiTextEdit; import org.eclipse.text.edits.TextEdit; import org.eclipse.text.edits.TextEditGroup; +import org.python.pydev.ast.refactoring.RefactoringInfo; import org.python.pydev.core.MisconfigurationException; import org.python.pydev.refactoring.core.change.IChangeProcessor; import org.python.pydev.refactoring.core.edit.AbstractTextEdit; diff --git a/plugins/org.python.pydev.refactoring/src/org/python/pydev/refactoring/core/base/AbstractPythonRefactoring.java b/plugins/org.python.pydev.refactoring/src/org/python/pydev/refactoring/core/base/AbstractPythonRefactoring.java index e14023ae4e..fc0041c428 100644 --- a/plugins/org.python.pydev.refactoring/src/org/python/pydev/refactoring/core/base/AbstractPythonRefactoring.java +++ b/plugins/org.python.pydev.refactoring/src/org/python/pydev/refactoring/core/base/AbstractPythonRefactoring.java @@ -31,6 +31,7 @@ import org.eclipse.ltk.core.refactoring.Change; import org.eclipse.ltk.core.refactoring.Refactoring; import org.eclipse.ltk.core.refactoring.RefactoringStatus; +import org.python.pydev.ast.refactoring.RefactoringInfo; import org.python.pydev.core.MisconfigurationException; import org.python.pydev.refactoring.core.change.CompositeChangeProcessor; import org.python.pydev.refactoring.core.change.IChangeProcessor; diff --git a/plugins/org.python.pydev.refactoring/src/org/python/pydev/refactoring/ui/actions/ConstructorFieldAction.java b/plugins/org.python.pydev.refactoring/src/org/python/pydev/refactoring/ui/actions/ConstructorFieldAction.java index 667efdc09b..6c5769c4de 100644 --- a/plugins/org.python.pydev.refactoring/src/org/python/pydev/refactoring/ui/actions/ConstructorFieldAction.java +++ b/plugins/org.python.pydev.refactoring/src/org/python/pydev/refactoring/ui/actions/ConstructorFieldAction.java @@ -25,9 +25,9 @@ package org.python.pydev.refactoring.ui.actions; import org.eclipse.jface.wizard.IWizardPage; +import org.python.pydev.ast.refactoring.RefactoringInfo; import org.python.pydev.refactoring.codegenerator.constructorfield.ConstructorFieldRefactoring; import org.python.pydev.refactoring.core.base.AbstractPythonRefactoring; -import org.python.pydev.refactoring.core.base.RefactoringInfo; import org.python.pydev.refactoring.core.model.constructorfield.ClassFieldTreeProvider; import org.python.pydev.refactoring.ui.actions.internal.AbstractRefactoringAction; import org.python.pydev.refactoring.ui.pages.ConstructorFieldPage; diff --git a/plugins/org.python.pydev.refactoring/src/org/python/pydev/refactoring/ui/actions/ExtractLocalAction.java b/plugins/org.python.pydev.refactoring/src/org/python/pydev/refactoring/ui/actions/ExtractLocalAction.java index 7c52a5ff51..5f097304d2 100644 --- a/plugins/org.python.pydev.refactoring/src/org/python/pydev/refactoring/ui/actions/ExtractLocalAction.java +++ b/plugins/org.python.pydev.refactoring/src/org/python/pydev/refactoring/ui/actions/ExtractLocalAction.java @@ -26,9 +26,9 @@ import org.eclipse.jface.wizard.IWizardPage; import org.eclipse.ltk.ui.refactoring.RefactoringWizard; +import org.python.pydev.ast.refactoring.RefactoringInfo; import org.python.pydev.refactoring.coderefactoring.extractlocal.ExtractLocalRefactoring; import org.python.pydev.refactoring.core.base.AbstractPythonRefactoring; -import org.python.pydev.refactoring.core.base.RefactoringInfo; import org.python.pydev.refactoring.ui.actions.internal.AbstractRefactoringAction; import org.python.pydev.refactoring.ui.pages.extractlocal.ExtractLocalInputPage; diff --git a/plugins/org.python.pydev.refactoring/src/org/python/pydev/refactoring/ui/actions/ExtractMethodAction.java b/plugins/org.python.pydev.refactoring/src/org/python/pydev/refactoring/ui/actions/ExtractMethodAction.java index 9947e2125c..5887e56801 100644 --- a/plugins/org.python.pydev.refactoring/src/org/python/pydev/refactoring/ui/actions/ExtractMethodAction.java +++ b/plugins/org.python.pydev.refactoring/src/org/python/pydev/refactoring/ui/actions/ExtractMethodAction.java @@ -25,9 +25,9 @@ package org.python.pydev.refactoring.ui.actions; import org.eclipse.jface.wizard.IWizardPage; +import org.python.pydev.ast.refactoring.RefactoringInfo; import org.python.pydev.refactoring.coderefactoring.extractmethod.ExtractMethodRefactoring; import org.python.pydev.refactoring.core.base.AbstractPythonRefactoring; -import org.python.pydev.refactoring.core.base.RefactoringInfo; import org.python.pydev.refactoring.ui.actions.internal.AbstractRefactoringAction; import org.python.pydev.refactoring.ui.pages.extractmethod.ExtractMethodPage; diff --git a/plugins/org.python.pydev.refactoring/src/org/python/pydev/refactoring/ui/actions/GeneratePropertiesAction.java b/plugins/org.python.pydev.refactoring/src/org/python/pydev/refactoring/ui/actions/GeneratePropertiesAction.java index 4276bb3dbc..ca997d2354 100644 --- a/plugins/org.python.pydev.refactoring/src/org/python/pydev/refactoring/ui/actions/GeneratePropertiesAction.java +++ b/plugins/org.python.pydev.refactoring/src/org/python/pydev/refactoring/ui/actions/GeneratePropertiesAction.java @@ -25,9 +25,9 @@ package org.python.pydev.refactoring.ui.actions; import org.eclipse.jface.wizard.IWizardPage; +import org.python.pydev.ast.refactoring.RefactoringInfo; import org.python.pydev.refactoring.codegenerator.generateproperties.GeneratePropertiesRefactoring; import org.python.pydev.refactoring.core.base.AbstractPythonRefactoring; -import org.python.pydev.refactoring.core.base.RefactoringInfo; import org.python.pydev.refactoring.core.model.generateproperties.PropertyTreeProvider; import org.python.pydev.refactoring.ui.actions.internal.AbstractRefactoringAction; import org.python.pydev.refactoring.ui.pages.GeneratePropertiesPage; diff --git a/plugins/org.python.pydev.refactoring/src/org/python/pydev/refactoring/ui/actions/InlineLocalAction.java b/plugins/org.python.pydev.refactoring/src/org/python/pydev/refactoring/ui/actions/InlineLocalAction.java index 3fadd87c03..bee817edd6 100644 --- a/plugins/org.python.pydev.refactoring/src/org/python/pydev/refactoring/ui/actions/InlineLocalAction.java +++ b/plugins/org.python.pydev.refactoring/src/org/python/pydev/refactoring/ui/actions/InlineLocalAction.java @@ -23,9 +23,9 @@ import org.eclipse.jface.wizard.IWizardPage; import org.eclipse.ltk.ui.refactoring.RefactoringWizard; +import org.python.pydev.ast.refactoring.RefactoringInfo; import org.python.pydev.refactoring.coderefactoring.inlinelocal.InlineLocalRefactoring; import org.python.pydev.refactoring.core.base.AbstractPythonRefactoring; -import org.python.pydev.refactoring.core.base.RefactoringInfo; import org.python.pydev.refactoring.ui.actions.internal.AbstractRefactoringAction; import org.python.pydev.refactoring.ui.pages.inlinelocal.InlineTempInputPage; diff --git a/plugins/org.python.pydev.refactoring/src/org/python/pydev/refactoring/ui/actions/OverrideMethodsAction.java b/plugins/org.python.pydev.refactoring/src/org/python/pydev/refactoring/ui/actions/OverrideMethodsAction.java index 4370beaacd..1a9c9d126b 100644 --- a/plugins/org.python.pydev.refactoring/src/org/python/pydev/refactoring/ui/actions/OverrideMethodsAction.java +++ b/plugins/org.python.pydev.refactoring/src/org/python/pydev/refactoring/ui/actions/OverrideMethodsAction.java @@ -25,10 +25,10 @@ package org.python.pydev.refactoring.ui.actions; import org.eclipse.jface.wizard.IWizardPage; +import org.python.pydev.ast.refactoring.RefactoringInfo; import org.python.pydev.core.MisconfigurationException; import org.python.pydev.refactoring.codegenerator.overridemethods.OverrideMethodsRefactoring; import org.python.pydev.refactoring.core.base.AbstractPythonRefactoring; -import org.python.pydev.refactoring.core.base.RefactoringInfo; import org.python.pydev.refactoring.core.model.overridemethods.ClassMethodsTreeProvider; import org.python.pydev.refactoring.ui.actions.internal.AbstractRefactoringAction; import org.python.pydev.refactoring.ui.pages.OverrideMethodsPage; diff --git a/plugins/org.python.pydev.refactoring/src/org/python/pydev/refactoring/ui/actions/internal/AbstractRefactoringAction.java b/plugins/org.python.pydev.refactoring/src/org/python/pydev/refactoring/ui/actions/internal/AbstractRefactoringAction.java index 890e529d1e..f7c03d2f4a 100644 --- a/plugins/org.python.pydev.refactoring/src/org/python/pydev/refactoring/ui/actions/internal/AbstractRefactoringAction.java +++ b/plugins/org.python.pydev.refactoring/src/org/python/pydev/refactoring/ui/actions/internal/AbstractRefactoringAction.java @@ -39,10 +39,10 @@ import org.eclipse.ui.IEditorPart; import org.eclipse.ui.ide.IDE; import org.eclipse.ui.texteditor.ITextEditor; +import org.python.pydev.ast.refactoring.RefactoringInfo; import org.python.pydev.core.log.Log; import org.python.pydev.editor.PyEdit; import org.python.pydev.refactoring.core.base.AbstractPythonRefactoring; -import org.python.pydev.refactoring.core.base.RefactoringInfo; import org.python.pydev.refactoring.ui.core.PythonRefactoringWizard; import org.python.pydev.shared_core.SharedCorePlugin; import org.python.pydev.shared_ui.EditorUtils; diff --git a/plugins/org.python.pydev.refactoring/tests/org/python/pydev/refactoring/tests/coderefactoring/extractlocal/ExtractLocalTestCase.java b/plugins/org.python.pydev.refactoring/tests/org/python/pydev/refactoring/tests/coderefactoring/extractlocal/ExtractLocalTestCase.java index 0a786e7390..ae8205604a 100644 --- a/plugins/org.python.pydev.refactoring/tests/org/python/pydev/refactoring/tests/coderefactoring/extractlocal/ExtractLocalTestCase.java +++ b/plugins/org.python.pydev.refactoring/tests/org/python/pydev/refactoring/tests/coderefactoring/extractlocal/ExtractLocalTestCase.java @@ -26,10 +26,10 @@ 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.refactoring.coderefactoring.extractlocal.ExtractLocalRefactoring; import org.python.pydev.refactoring.coderefactoring.extractlocal.ExtractLocalRequestProcessor; -import org.python.pydev.refactoring.core.base.RefactoringInfo; import org.python.pydev.refactoring.tests.core.AbstractIOTestCase; import org.python.pydev.shared_core.io.FileUtils; import org.python.pydev.shared_core.string.CoreTextSelection; diff --git a/plugins/org.python.pydev.refactoring/tests/org/python/pydev/refactoring/tests/coderefactoring/extractmethod/ExtractMethodTestCase.java b/plugins/org.python.pydev.refactoring/tests/org/python/pydev/refactoring/tests/coderefactoring/extractmethod/ExtractMethodTestCase.java index 240d3fcf59..61bb543895 100644 --- a/plugins/org.python.pydev.refactoring/tests/org/python/pydev/refactoring/tests/coderefactoring/extractmethod/ExtractMethodTestCase.java +++ b/plugins/org.python.pydev.refactoring/tests/org/python/pydev/refactoring/tests/coderefactoring/extractmethod/ExtractMethodTestCase.java @@ -31,6 +31,9 @@ import org.eclipse.text.edits.MultiTextEdit; import org.python.pydev.ast.adapters.AbstractScopeNode; import org.python.pydev.ast.adapters.ModuleAdapter; +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.IGrammarVersionProvider; import org.python.pydev.core.MisconfigurationException; import org.python.pydev.parser.jython.ParseException; @@ -39,9 +42,6 @@ import org.python.pydev.refactoring.coderefactoring.extractmethod.edit.ExtractMethodEdit; import org.python.pydev.refactoring.coderefactoring.extractmethod.edit.ParameterReturnDeduce; import org.python.pydev.refactoring.coderefactoring.extractmethod.request.ExtractMethodRequest; -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.tests.adapter.PythonNatureStub; import org.python.pydev.refactoring.tests.core.AbstractIOTestCase; import org.python.pydev.shared_core.io.FileUtils; diff --git a/plugins/org.python.pydev.refactoring/tests/org/python/pydev/refactoring/tests/coderefactoring/inlinelocal/InlineLocalTestCase.java b/plugins/org.python.pydev.refactoring/tests/org/python/pydev/refactoring/tests/coderefactoring/inlinelocal/InlineLocalTestCase.java index 02cacc23d1..a57b36bb09 100644 --- a/plugins/org.python.pydev.refactoring/tests/org/python/pydev/refactoring/tests/coderefactoring/inlinelocal/InlineLocalTestCase.java +++ b/plugins/org.python.pydev.refactoring/tests/org/python/pydev/refactoring/tests/coderefactoring/inlinelocal/InlineLocalTestCase.java @@ -26,10 +26,10 @@ 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.coderefactoring.inlinelocal.InlineLocalRefactoring; -import org.python.pydev.refactoring.core.base.RefactoringInfo; import org.python.pydev.refactoring.tests.core.AbstractIOTestCase; import org.python.pydev.shared_core.io.FileUtils; import org.python.pydev.shared_core.string.CoreTextSelection; diff --git a/plugins/org.python.pydev.refactoring/tests/org/python/pydev/refactoring/tests/visitors/SelectionExtensionTestCase.java b/plugins/org.python.pydev.refactoring/tests/org/python/pydev/refactoring/tests/visitors/SelectionExtensionTestCase.java index 308c8cec37..2041e807ba 100644 --- a/plugins/org.python.pydev.refactoring/tests/org/python/pydev/refactoring/tests/visitors/SelectionExtensionTestCase.java +++ b/plugins/org.python.pydev.refactoring/tests/org/python/pydev/refactoring/tests/visitors/SelectionExtensionTestCase.java @@ -23,12 +23,12 @@ import org.eclipse.jface.text.Document; import org.eclipse.jface.text.IDocument; +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.IGrammarVersionProvider; import org.python.pydev.core.MisconfigurationException; import org.python.pydev.parser.prettyprinterv2.Rewriter; -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.tests.core.AbstractIOTestCase; import org.python.pydev.shared_core.string.CoreTextSelection; import org.python.pydev.shared_core.string.ICoreTextSelection;