MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-26 05:48:37 +07:00
Code Issues Packages Projects Releases Wiki Activity

choose class to introduce field/constant to

Browse Source
This commit is contained in:
anna
2011-03-17 15:02:39 +01:00
parent f82cbec6d5
commit 828bdcac9b
4 changed files with 100 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/refactoring/introduceField/BaseExpressionToFieldHandler.java
+61 -26
View File
@@ -29,8 +29,10 @@ import com.intellij.codeInsight.ChangeContextUtil;
import com.intellij.codeInsight.TestUtil;
import com.intellij.codeInsight.highlighting.HighlightManager;
import com.intellij.codeInsight.lookup.LookupManager;
import com.intellij.codeInsight.navigation.NavigationUtil;
import com.intellij.ide.util.DirectoryChooserUtil;
import com.intellij.ide.util.PackageUtil;
import com.intellij.ide.util.PsiClassListCellRenderer;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.application.Result;
import com.intellij.openapi.command.CommandProcessor;
@@ -51,6 +53,7 @@ import com.intellij.psi.codeStyle.CodeStyleManager;
import com.intellij.psi.codeStyle.JavaCodeStyleManager;
import com.intellij.psi.impl.source.codeStyle.CodeEditUtil;
import com.intellij.psi.search.GlobalSearchScope;
import com.intellij.psi.search.PsiElementProcessor;
import com.intellij.psi.util.PsiTreeUtil;
import com.intellij.psi.util.PsiUtil;
import com.intellij.psi.util.PsiUtilBase;
@@ -83,8 +86,13 @@ public abstract class BaseExpressionToFieldHandler extends IntroduceHandlerBase
IN_SETUP_METHOD
}
private boolean myIsConstant;
private PsiClass myParentClass;
protected BaseExpressionToFieldHandler(boolean isConstant) {
myIsConstant = isConstant;
}
protected boolean invokeImpl(final Project project, @NotNull final PsiExpression selectedExpr, final Editor editor) {
final PsiElement element = getPhysicalElement(selectedExpr);
@@ -95,24 +103,7 @@ public abstract class BaseExpressionToFieldHandler extends IntroduceHandlerBase
LOG.debug("expression:" + selectedExpr);
}
myParentClass = getParentClass(selectedExpr);
if (myParentClass == null) {
if (JspPsiUtil.isInJspFile(file)) {
CommonRefactoringUtil.showErrorHint(project, editor, RefactoringBundle.message("error.not.supported.for.jsp", getRefactoringName()),
getRefactoringName(), getHelpID());
return false;
}
else {
LOG.assertTrue(false);
return false;
}
}
if (!validClass(myParentClass, editor)) {
return false;
}
PsiType tempType = getTypeByExpression(selectedExpr);
final PsiType tempType = getTypeByExpression(selectedExpr);
if (tempType == null) {
String message = RefactoringBundle.getCannotRefactorMessage(RefactoringBundle.message("unknown.expression.type"));
CommonRefactoringUtil.showErrorHint(project, editor, message, getRefactoringName(), getHelpID());
@@ -125,11 +116,55 @@ public abstract class BaseExpressionToFieldHandler extends IntroduceHandlerBase
return false;
}
myParentClass = getParentClass(selectedExpr);
final List<PsiClass> classes = new ArrayList<PsiClass>();
PsiClass aClass = myParentClass;
while (aClass != null) {
classes.add(aClass);
aClass = PsiTreeUtil.getParentOfType(aClass, PsiClass.class, true);
}
if (classes.size() == 1 || ApplicationManager.getApplication().isUnitTestMode()) {
return !convertExpressionToField(selectedExpr, editor, file, project, tempType);
}
else {
NavigationUtil.getPsiElementPopup(classes.toArray(new PsiClass[classes.size()]), new PsiClassListCellRenderer(),
"Choose class to introduce " + (myIsConstant ? "constant" : "field"),
new PsiElementProcessor<PsiClass>() {
@Override
public boolean execute(PsiClass aClass) {
myParentClass = aClass;
convertExpressionToField(selectedExpr, editor, file, project, tempType);
return false;
}
}).showInBestPositionFor(editor);
}
return true;
}
if (!CommonRefactoringUtil.checkReadOnlyStatus(project, file)) return false;
private boolean convertExpressionToField(PsiExpression selectedExpr,
Editor editor,
PsiFile file,
final Project project,
PsiType tempType) {
if (myParentClass == null) {
if (JspPsiUtil.isInJspFile(file)) {
CommonRefactoringUtil.showErrorHint(project, editor, RefactoringBundle.message("error.not.supported.for.jsp", getRefactoringName()),
getRefactoringName(), getHelpID());
return true;
}
else {
LOG.assertTrue(false);
return true;
}
}
final PsiClass parentClass = myParentClass;
final OccurenceManager occurenceManager = createOccurenceManager(selectedExpr, parentClass);
if (!validClass(myParentClass, editor)) {
return true;
}
if (!CommonRefactoringUtil.checkReadOnlyStatus(project, file)) return true;
final OccurenceManager occurenceManager = createOccurenceManager(selectedExpr, myParentClass);
final PsiExpression[] occurrences = occurenceManager.getOccurences();
final PsiElement anchorStatementIfAll = occurenceManager.getAnchorStatementForAll();
@@ -140,13 +175,14 @@ public abstract class BaseExpressionToFieldHandler extends IntroduceHandlerBase
PsiElement tempAnchorElement = RefactoringUtil.getParentExpressionAnchorElement(selectedExpr);
if (!Comparing.strEqual(IntroduceConstantHandler.REFACTORING_NAME, getRefactoringName()) &&
IntroduceVariableBase.checkAnchorBeforeThisOrSuper(project, editor, tempAnchorElement, getRefactoringName(), getHelpID())) return false;
IntroduceVariableBase.checkAnchorBeforeThisOrSuper(project, editor, tempAnchorElement, getRefactoringName(), getHelpID()))
return true;
final Settings settings =
showRefactoringDialog(project, editor, myParentClass, selectedExpr, tempType,
occurrences, tempAnchorElement, anchorStatementIfAll);
if (settings == null) return false;
if (settings == null) return true;
if (settings.getForcedType() != null) {
tempType = settings.getForcedType();
@@ -172,8 +208,7 @@ public abstract class BaseExpressionToFieldHandler extends IntroduceHandlerBase
runnable.run();
}
}.execute();
return true;
return false;
}
public static void setModifiers(PsiField field, Settings settings, final boolean declareStatic) {
@@ -251,7 +286,7 @@ public abstract class BaseExpressionToFieldHandler extends IntroduceHandlerBase
if (element == null) element = initializerExpression.getParent();
PsiElement parent = element;
while (parent != null) {
if (parent instanceof PsiClass && !(parent instanceof PsiAnonymousClass)) {
if (parent instanceof PsiClass && !(parent instanceof PsiAnonymousClass && myIsConstant)) {
return (PsiClass)parent;
}
parent = parent.getParent();
java/java-impl/src/com/intellij/refactoring/introduceField/IntroduceConstantHandler.java
+4
View File
@@ -44,6 +44,10 @@ import java.util.ArrayList;
public class IntroduceConstantHandler extends BaseExpressionToFieldHandler {
public static final String REFACTORING_NAME = RefactoringBundle.message("introduce.constant.title");
public IntroduceConstantHandler() {
super(true);
}
protected String getHelpID() {
return HelpID.INTRODUCE_CONSTANT;
}
java/java-impl/src/com/intellij/refactoring/introduceField/IntroduceFieldHandler.java
+4
View File
@@ -36,6 +36,10 @@ public class IntroduceFieldHandler extends BaseExpressionToFieldHandler {
public static final String REFACTORING_NAME = RefactoringBundle.message("introduce.field.title");
private static final MyOccurenceFilter MY_OCCURENCE_FILTER = new MyOccurenceFilter();
public IntroduceFieldHandler() {
super(false);
}
protected String getRefactoringName() {
return REFACTORING_NAME;
}
java/java-impl/src/com/intellij/refactoring/introduceField/LocalToFieldHandler.java
+31 -9
View File
@@ -17,6 +17,8 @@ package com.intellij.refactoring.introduceField;
import com.intellij.codeInsight.CodeInsightUtil;
import com.intellij.codeInsight.TestUtil;
import com.intellij.codeInsight.navigation.NavigationUtil;
import com.intellij.ide.util.PsiClassListCellRenderer;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.command.CommandProcessor;
import com.intellij.openapi.diagnostic.Logger;
@@ -25,17 +27,23 @@ import com.intellij.openapi.project.Project;
import com.intellij.psi.*;
import com.intellij.psi.codeStyle.CodeStyleManager;
import com.intellij.psi.search.GlobalSearchScope;
import com.intellij.psi.search.PsiElementProcessor;
import com.intellij.psi.search.searches.ReferencesSearch;
import com.intellij.psi.util.PsiTreeUtil;
import com.intellij.refactoring.HelpID;
import com.intellij.refactoring.RefactoringBundle;
import com.intellij.refactoring.ui.ClassCellRenderer;
import com.intellij.refactoring.util.CommonRefactoringUtil;
import com.intellij.refactoring.util.EnumConstantsUtil;
import com.intellij.refactoring.util.RefactoringUtil;
import com.intellij.ui.components.panels.OpaquePanel;
import com.intellij.util.IncorrectOperationException;
import com.intellij.util.VisibilityUtil;
import org.jetbrains.annotations.NonNls;
import java.util.ArrayList;
import java.util.List;
import static com.intellij.refactoring.introduceField.BaseExpressionToFieldHandler.InitializationPlace.IN_CONSTRUCTOR;
import static com.intellij.refactoring.introduceField.BaseExpressionToFieldHandler.InitializationPlace.IN_FIELD_DECLARATION;
@@ -54,14 +62,12 @@ public abstract class LocalToFieldHandler {
protected abstract BaseExpressionToFieldHandler.Settings showRefactoringDialog(PsiClass aClass, PsiLocalVariable local, PsiExpression[] occurences, boolean isStatic);
public boolean convertLocalToField(final PsiLocalVariable local, final Editor editor) {
PsiClass aClass;
boolean tempIsStatic = myIsConstant;
PsiElement parent = local.getParent();
while (true) {
if (parent instanceof PsiClass && !(parent instanceof PsiAnonymousClass)) {
aClass = (PsiClass)parent;
break;
List<PsiClass> classes = new ArrayList<PsiClass>();
while (parent != null && parent.getContainingFile() != null) {
if (parent instanceof PsiClass && !(myIsConstant && parent instanceof PsiAnonymousClass)) {
classes.add((PsiClass)parent);
}
if (parent instanceof PsiFile && JspPsiUtil.isInJspFile(parent)) {
String message = RefactoringBundle.message("error.not.supported.for.jsp", REFACTORING_NAME);
@@ -74,15 +80,31 @@ public abstract class LocalToFieldHandler {
parent = parent.getParent();
}
final boolean isStatic = tempIsStatic;
if (classes.isEmpty()) return false;
if (classes.size() == 1 || ApplicationManager.getApplication().isUnitTestMode()) {
if (convertLocalToField(local, classes.get(0), editor, tempIsStatic)) return false;
} else {
final boolean isStatic = tempIsStatic;
NavigationUtil.getPsiElementPopup(classes.toArray(new PsiClass[classes.size()]), new PsiClassListCellRenderer(), "Choose class to introduce " + (myIsConstant ? "constant" : "field"), new PsiElementProcessor<PsiClass>() {
@Override
public boolean execute(PsiClass aClass) {
convertLocalToField(local, aClass, editor, isStatic);
return false;
}
}).showInBestPositionFor(editor);
}
return true;
}
private boolean convertLocalToField(PsiLocalVariable local, PsiClass aClass, Editor editor, boolean isStatic) {
final PsiExpression[] occurences = CodeInsightUtil.findReferenceExpressions(RefactoringUtil.getVariableScope(local), local);
if (editor != null) {
RefactoringUtil.highlightAllOccurences(myProject, occurences, editor);
}
final BaseExpressionToFieldHandler.Settings settings = showRefactoringDialog(aClass, local, occurences, isStatic);
if (settings == null) return false;
if (settings == null) return true;
//LocalToFieldDialog dialog = new LocalToFieldDialog(project, aClass, local, isStatic);
final PsiClass destinationClass = settings.getDestinationClass();
boolean rebindNeeded = false;
@@ -100,7 +122,7 @@ public abstract class LocalToFieldHandler {
ApplicationManager.getApplication().runWriteAction(runnable);
}
}, REFACTORING_NAME, null);
return true;
return false;
}
private static PsiField createField(PsiLocalVariable local, PsiType forcedType, String fieldName, boolean includeInitializer) {