From 145306318ce6aa83ab2ed2893314213caa3c4a01 Mon Sep 17 00:00:00 2001 From: Dmitry Jemerov Date: Thu, 25 Aug 2011 17:54:56 +0200 Subject: [PATCH] InplaceVariableIntroducer is no longer abstract; rename it accordingly --- .../IntroduceVariableBase.java | 4 ++-- ...ava => JavaVariableInplaceIntroducer.java} | 22 +++++++++---------- .../inplace/AbstractInplaceIntroducer.java | 3 ++- ...er.java => InplaceVariableIntroducer.java} | 15 ++++++++----- 4 files changed, 24 insertions(+), 20 deletions(-) rename java/java-impl/src/com/intellij/refactoring/introduceVariable/{VariableInplaceIntroducer.java => JavaVariableInplaceIntroducer.java} (94%) rename platform/lang-impl/src/com/intellij/refactoring/introduce/inplace/{AbstractInplaceVariableIntroducer.java => InplaceVariableIntroducer.java} (94%) diff --git a/java/java-impl/src/com/intellij/refactoring/introduceVariable/IntroduceVariableBase.java b/java/java-impl/src/com/intellij/refactoring/introduceVariable/IntroduceVariableBase.java index bfb1a37ffe8b..d2d130881726 100644 --- a/java/java-impl/src/com/intellij/refactoring/introduceVariable/IntroduceVariableBase.java +++ b/java/java-impl/src/com/intellij/refactoring/introduceVariable/IntroduceVariableBase.java @@ -561,8 +561,8 @@ public abstract class IntroduceVariableBase extends IntroduceHandlerBase impleme if (elementToRename != null) { editor.getCaretModel().moveToOffset(elementToRename.getTextOffset()); final boolean cantChangeFinalModifier = (hasWriteAccess || inFinalContext) && choice == OccurrencesChooser.ReplaceChoice.ALL; - final VariableInplaceIntroducer renamer = - new VariableInplaceIntroducer(project, expression, editor, elementToRename, cantChangeFinalModifier, + final JavaVariableInplaceIntroducer renamer = + new JavaVariableInplaceIntroducer(project, expression, editor, elementToRename, cantChangeFinalModifier, typeSelectorManager.getTypesForAll().length > 1, exprMarker, occurrenceMarkers, IntroduceVariableBase.REFACTORING_NAME); renamer.initInitialText(expressionText); diff --git a/java/java-impl/src/com/intellij/refactoring/introduceVariable/VariableInplaceIntroducer.java b/java/java-impl/src/com/intellij/refactoring/introduceVariable/JavaVariableInplaceIntroducer.java similarity index 94% rename from java/java-impl/src/com/intellij/refactoring/introduceVariable/VariableInplaceIntroducer.java rename to java/java-impl/src/com/intellij/refactoring/introduceVariable/JavaVariableInplaceIntroducer.java index 133cec7d944b..bb9065f2e2ab 100644 --- a/java/java-impl/src/com/intellij/refactoring/introduceVariable/VariableInplaceIntroducer.java +++ b/java/java-impl/src/com/intellij/refactoring/introduceVariable/JavaVariableInplaceIntroducer.java @@ -34,7 +34,7 @@ import com.intellij.psi.scope.processor.VariablesProcessor; import com.intellij.psi.util.PsiTreeUtil; import com.intellij.psi.util.TypeConversionUtil; import com.intellij.refactoring.JavaRefactoringSettings; -import com.intellij.refactoring.introduce.inplace.AbstractInplaceVariableIntroducer; +import com.intellij.refactoring.introduce.inplace.InplaceVariableIntroducer; import com.intellij.refactoring.introduceParameter.AbstractJavaInplaceIntroducer; import com.intellij.refactoring.ui.TypeSelectorManagerImpl; import com.intellij.ui.NonFocusableCheckBox; @@ -51,7 +51,7 @@ import java.util.List; * User: anna * Date: 12/8/10 */ -public class VariableInplaceIntroducer extends AbstractInplaceVariableIntroducer { +public class JavaVariableInplaceIntroducer extends InplaceVariableIntroducer { protected final Editor myEditor; protected final Project myProject; @@ -65,15 +65,15 @@ public class VariableInplaceIntroducer extends AbstractInplaceVariableIntroducer protected final SmartTypePointer myDefaultType; protected final TypeExpression myExpression; - public VariableInplaceIntroducer(final Project project, - final TypeExpression expression, - final Editor editor, - @NotNull final PsiVariable elementToRename, - final boolean cantChangeFinalModifier, - final boolean hasTypeSuggestion, - final RangeMarker exprMarker, - final List occurrenceMarkers, - final String title) { + public JavaVariableInplaceIntroducer(final Project project, + final TypeExpression expression, + final Editor editor, + @NotNull final PsiVariable elementToRename, + final boolean cantChangeFinalModifier, + final boolean hasTypeSuggestion, + final RangeMarker exprMarker, + final List occurrenceMarkers, + final String title) { super(elementToRename, editor, project, title, new PsiExpression[0], null); myProject = project; myEditor = editor; diff --git a/platform/lang-impl/src/com/intellij/refactoring/introduce/inplace/AbstractInplaceIntroducer.java b/platform/lang-impl/src/com/intellij/refactoring/introduce/inplace/AbstractInplaceIntroducer.java index f6b94827be0f..10ee84dcb3a2 100644 --- a/platform/lang-impl/src/com/intellij/refactoring/introduce/inplace/AbstractInplaceIntroducer.java +++ b/platform/lang-impl/src/com/intellij/refactoring/introduce/inplace/AbstractInplaceIntroducer.java @@ -61,7 +61,8 @@ import java.util.List; * User: anna * Date: 3/15/11 */ -public abstract class AbstractInplaceIntroducer extends AbstractInplaceVariableIntroducer { +public abstract class AbstractInplaceIntroducer extends + InplaceVariableIntroducer { protected final V myLocalVariable; protected RangeMarker myLocalMarker; diff --git a/platform/lang-impl/src/com/intellij/refactoring/introduce/inplace/AbstractInplaceVariableIntroducer.java b/platform/lang-impl/src/com/intellij/refactoring/introduce/inplace/InplaceVariableIntroducer.java similarity index 94% rename from platform/lang-impl/src/com/intellij/refactoring/introduce/inplace/AbstractInplaceVariableIntroducer.java rename to platform/lang-impl/src/com/intellij/refactoring/introduce/inplace/InplaceVariableIntroducer.java index 087b64c10c65..8cd1edd472a8 100644 --- a/platform/lang-impl/src/com/intellij/refactoring/introduce/inplace/AbstractInplaceVariableIntroducer.java +++ b/platform/lang-impl/src/com/intellij/refactoring/introduce/inplace/InplaceVariableIntroducer.java @@ -53,7 +53,7 @@ import java.util.List; * User: anna * Date: 3/15/11 */ -public abstract class AbstractInplaceVariableIntroducer extends VariableInplaceRenamer { +public class InplaceVariableIntroducer extends VariableInplaceRenamer { public static final Key INTRODUCE_RESTART = Key.create("INTRODUCE_RESTART"); protected E myExpr; @@ -66,10 +66,11 @@ public abstract class AbstractInplaceVariableIntroducer ex protected String myTitle; protected RelativePoint myTarget; - public AbstractInplaceVariableIntroducer(PsiNamedElement elementToRename, - Editor editor, - Project project, - String title, E[] occurrences, E expr) { + public InplaceVariableIntroducer(PsiNamedElement elementToRename, + Editor editor, + Project project, + String title, E[] occurrences, + @Nullable E expr) { super(elementToRename, editor, project); myTitle = title; myOccurrences = occurrences; @@ -79,7 +80,9 @@ public abstract class AbstractInplaceVariableIntroducer ex } @Nullable - protected abstract JComponent getComponent(); + protected JComponent getComponent() { + return null; + } public void setOccurrenceMarkers(List occurrenceMarkers) { myOccurrenceMarkers = occurrenceMarkers;