MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-13 21:55:01 +07:00
Code Issues Packages Projects Releases Wiki Activity

Move InputValidator to UpperLevel

Browse Source
This commit is contained in:
Olesya Smirnova
2005-04-14 20:43:06 +04:00
parent cd83933d83
commit 84f584a875
3 changed files with 90 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/com/intellij/refactoring/introduceVariable/InputValidator.java
+75
View File
@@ -0,0 +1,75 @@
package com.intellij.refactoring.introduceVariable;
import com.intellij.openapi.project.Project;
import com.intellij.psi.PsiElement;
import com.intellij.psi.PsiVariable;
import com.intellij.psi.PsiField;
import com.intellij.psi.PsiExpression;
import com.intellij.refactoring.util.occurences.ExpressionOccurenceManager;
import com.intellij.refactoring.util.ConflictsUtil;
import com.intellij.refactoring.rename.RenameUtil;
import com.intellij.util.containers.HashSet;
import java.util.ArrayList;
public class InputValidator implements IntroduceVariableBase.Validator {
private final Project myProject;
private final PsiElement myAnchorStatementIfAll;
private final PsiElement myAnchorStatement;
private final ExpressionOccurenceManager myOccurenceManager;
private IntroduceVariableBase myIntroduceVariableBase;
public boolean isOK(IntroduceVariableSettings settings) {
String name = settings.getEnteredName();
final PsiElement anchor;
final boolean replaceAllOccurrences = settings.isReplaceAllOccurrences();
if (replaceAllOccurrences) {
anchor = myAnchorStatementIfAll;
} else {
anchor = myAnchorStatement;
}
final PsiElement scope = anchor.getParent();
if(scope == null) return true;
final ArrayList<String> conflicts = new ArrayList<String>();
final HashSet<PsiVariable> reportedVariables = new HashSet<PsiVariable>();
RenameUtil.CollidingVariableVisitor visitor = new RenameUtil.CollidingVariableVisitor() {
public void visitCollidingElement(PsiVariable collidingVariable) {
if (collidingVariable instanceof PsiField) return;
if (!reportedVariables.contains(collidingVariable)) {
reportedVariables.add(collidingVariable);
String message = "Introduced variable will conflict with " + ConflictsUtil.getDescription(collidingVariable, true);
conflicts.add(message);
}
}
};
RenameUtil.visitLocalsCollisions(anchor, name, scope, anchor, visitor);
if (replaceAllOccurrences) {
final PsiExpression[] occurences = myOccurenceManager.getOccurences();
for (int i = 0; i < occurences.length; i++) {
PsiExpression occurence = occurences[i];
IntroduceVariableBase.checkInLoopCondition(occurence, conflicts);
}
} else {
IntroduceVariableBase.checkInLoopCondition(myOccurenceManager.getMainOccurence(), conflicts);
}
if (conflicts.size() > 0) {
return myIntroduceVariableBase.reportConflicts(conflicts, myProject);
} else {
return true;
}
}
public InputValidator(final IntroduceVariableBase introduceVariableBase,
Project project,
PsiElement anchorStatementIfAll,
PsiElement anchorStatement,
ExpressionOccurenceManager occurenceManager) {
myIntroduceVariableBase = introduceVariableBase;
myProject = project;
myAnchorStatementIfAll = anchorStatementIfAll;
myAnchorStatement = anchorStatement;
myOccurenceManager = occurenceManager;
}
}
source/com/intellij/refactoring/introduceVariable/IntroduceVariableBase.java
+5 -65
View File
@@ -24,7 +24,6 @@ import com.intellij.psi.util.PsiTreeUtil;
import com.intellij.psi.util.PsiUtil;
import com.intellij.refactoring.IntroduceHandlerBase;
import com.intellij.refactoring.RefactoringActionHandler;
import com.intellij.refactoring.rename.RenameUtil;
import com.intellij.refactoring.ui.TypeSelectorManagerImpl;
import com.intellij.refactoring.util.ConflictsUtil;
import com.intellij.refactoring.util.FieldConflictsResolver;
@@ -33,7 +32,6 @@ import com.intellij.refactoring.util.RefactoringUtil;
import com.intellij.refactoring.util.occurences.ExpressionOccurenceManager;
import com.intellij.refactoring.util.occurences.NotInSuperCallOccurenceFilter;
import com.intellij.util.IncorrectOperationException;
import com.intellij.util.containers.HashSet;
import java.util.ArrayList;
import java.util.Iterator;
@@ -173,13 +171,10 @@ public abstract class IntroduceVariableBase extends IntroduceHandlerBase impleme
}
IntroduceVariableSettings settings = null;
/*
getSettings(project, editor, expr, occurrences, anyAssignmentLHS, declareFinalIfAll,
IntroduceVariableSettings settings = getSettings(project, editor, expr, occurrences, anyAssignmentLHS, declareFinalIfAll,
originalType,
new TypeSelectorManagerImpl(project, originalType, expr, occurrences),
new InputValidator(project, anchorStatementIfAll, anchorStatement, occurenceManager));
*/
new InputValidator(this, project, anchorStatementIfAll, anchorStatement, occurenceManager));
if (!settings.isOK()) {
return false;
@@ -370,7 +365,9 @@ public abstract class IntroduceVariableBase extends IntroduceHandlerBase impleme
protected abstract void highlightReplacedOccurences(Project project, Editor editor, PsiElement[] replacedOccurences);
protected abstract void getSettings();
protected abstract IntroduceVariableSettings getSettings(Project project, Editor editor, PsiExpression expr, final PsiElement[] occurrences,
boolean anyAssignmentLHS, final boolean declareFinalIfAll, final PsiType type,
TypeSelectorManagerImpl typeSelectorManager, InputValidator validator);
protected abstract void showErrorMessage(String message, Project project);
@@ -406,63 +403,6 @@ public abstract class IntroduceVariableBase extends IntroduceHandlerBase impleme
boolean isOK(IntroduceVariableSettings dialog);
}
public class InputValidator implements Validator {
private final Project myProject;
private final PsiElement myAnchorStatementIfAll;
private final PsiElement myAnchorStatement;
private final ExpressionOccurenceManager myOccurenceManager;
public boolean isOK(IntroduceVariableSettings settings) {
String name = settings.getEnteredName();
final PsiElement anchor;
final boolean replaceAllOccurrences = settings.isReplaceAllOccurrences();
if (replaceAllOccurrences) {
anchor = myAnchorStatementIfAll;
} else {
anchor = myAnchorStatement;
}
final PsiElement scope = anchor.getParent();
if(scope == null) return true;
final ArrayList<String> conflicts = new ArrayList<String>();
final HashSet<PsiVariable> reportedVariables = new HashSet<PsiVariable>();
RenameUtil.CollidingVariableVisitor visitor = new RenameUtil.CollidingVariableVisitor() {
public void visitCollidingElement(PsiVariable collidingVariable) {
if (collidingVariable instanceof PsiField) return;
if (!reportedVariables.contains(collidingVariable)) {
reportedVariables.add(collidingVariable);
String message = "Introduced variable will conflict with " + ConflictsUtil.getDescription(collidingVariable, true);
conflicts.add(message);
}
}
};
RenameUtil.visitLocalsCollisions(anchor, name, scope, anchor, visitor);
if (replaceAllOccurrences) {
final PsiExpression[] occurences = myOccurenceManager.getOccurences();
for (int i = 0; i < occurences.length; i++) {
PsiExpression occurence = occurences[i];
checkInLoopCondition(occurence, conflicts);
}
} else {
checkInLoopCondition(myOccurenceManager.getMainOccurence(), conflicts);
}
if (conflicts.size() > 0) {
return reportConflicts(conflicts, myProject);
} else {
return true;
}
}
public InputValidator(Project project, PsiElement anchorStatementIfAll, PsiElement anchorStatement,
ExpressionOccurenceManager occurenceManager) {
myProject = project;
myAnchorStatementIfAll = anchorStatementIfAll;
myAnchorStatement = anchorStatement;
myOccurenceManager = occurenceManager;
}
}
protected abstract boolean reportConflicts(ArrayList<String> conflicts, final Project project);
source/com/intellij/refactoring/introduceVariable/IntroduceVariableHandler.java
+10 -5
View File
@@ -9,16 +9,22 @@ import com.intellij.openapi.editor.markup.TextAttributes;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.wm.WindowManager;
import com.intellij.psi.PsiElement;
import com.intellij.psi.PsiExpression;
import com.intellij.psi.PsiType;
import com.intellij.refactoring.HelpID;
import com.intellij.refactoring.ui.ConflictsDialog;
import com.intellij.refactoring.ui.TypeSelectorManagerImpl;
import com.intellij.refactoring.util.RefactoringMessageUtil;
import java.util.ArrayList;
public class IntroduceVariableHandler extends IntroduceVariableBase {
protected void getSettings() {
/*
protected IntroduceVariableSettings getSettings(final Project project, Editor editor, PsiExpression expr,
PsiElement[] occurrences, boolean anyAssignmentLHS,
boolean declareFinalIfAll, PsiType type,
TypeSelectorManagerImpl typeSelectorManager,
InputValidator validator) {
ArrayList highlighters = new ArrayList();
HighlightManager highlightManager = null;
if (editor != null) {
@@ -47,9 +53,8 @@ public class IntroduceVariableHandler extends IntroduceVariableBase {
}
}
}
*/
//return dialog;
return dialog;
}
protected void showErrorMessage(String message, final Project project) {
@@ -71,4 +76,4 @@ public class IntroduceVariableHandler extends IntroduceVariableBase {
conflictsDialog.show();
return conflictsDialog.isOK();
}
}
}