MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

InplaceVariableIntroducer is no longer abstract; rename it accordingly

Browse Source
This commit is contained in:
Dmitry Jemerov
2011-08-25 17:57:02 +02:00
parent 9f01f15e91
commit 145306318c
4 changed files with 24 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/refactoring/introduceVariable/IntroduceVariableBase.java
+2 -2
View File
@@ -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);
java/java-impl/src/com/intellij/refactoring/introduceVariable/VariableInplaceIntroducer.java → java/java-impl/src/com/intellij/refactoring/introduceVariable/JavaVariableInplaceIntroducer.java
+11 -11
View File
@@ -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<PsiExpression> {
public class JavaVariableInplaceIntroducer extends InplaceVariableIntroducer<PsiExpression> {
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<RangeMarker> 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<RangeMarker> occurrenceMarkers,
final String title) {
super(elementToRename, editor, project, title, new PsiExpression[0], null);
myProject = project;
myEditor = editor;
platform/lang-impl/src/com/intellij/refactoring/introduce/inplace/AbstractInplaceIntroducer.java
+2 -1
View File
@@ -61,7 +61,8 @@ import java.util.List;
* User: anna
* Date: 3/15/11
*/
public abstract class AbstractInplaceIntroducer<V extends PsiNameIdentifierOwner, E extends PsiElement> extends AbstractInplaceVariableIntroducer<E> {
public abstract class AbstractInplaceIntroducer<V extends PsiNameIdentifierOwner, E extends PsiElement> extends
InplaceVariableIntroducer<E> {
protected final V myLocalVariable;
protected RangeMarker myLocalMarker;
platform/lang-impl/src/com/intellij/refactoring/introduce/inplace/AbstractInplaceVariableIntroducer.java → platform/lang-impl/src/com/intellij/refactoring/introduce/inplace/InplaceVariableIntroducer.java
+9 -6
View File
@@ -53,7 +53,7 @@ import java.util.List;
* User: anna
* Date: 3/15/11
*/
public abstract class AbstractInplaceVariableIntroducer<E extends PsiElement> extends VariableInplaceRenamer {
public class InplaceVariableIntroducer<E extends PsiElement> extends VariableInplaceRenamer {
public static final Key<Boolean> INTRODUCE_RESTART = Key.create("INTRODUCE_RESTART");
protected E myExpr;
@@ -66,10 +66,11 @@ public abstract class AbstractInplaceVariableIntroducer<E extends PsiElement> 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<E extends PsiElement> ex
}
@Nullable
protected abstract JComponent getComponent();
protected JComponent getComponent() {
return null;
}
public void setOccurrenceMarkers(List<RangeMarker> occurrenceMarkers) {
myOccurrenceMarkers = occurrenceMarkers;