wrap in command

This commit is contained in:
anna
2011-03-23 17:41:36 +01:00
parent 978b6686c1
commit de9339da11
@@ -247,20 +247,25 @@ class InplaceIntroduceParameterPopup extends IntroduceParameterSettingsUI {
getReplaceFieldsWithGetters(), myMustBeFinal || myFinal, isGenerateDelegate(),
myParameterTypePointer.getType(),
parametersToRemove);
ApplicationManager.getApplication().invokeLater(new Runnable() {
final Runnable runnable = new Runnable() {
public void run() {
final boolean [] conflictsFound = new boolean[] {true};
processor.setPrepareSuccessfulSwingThreadCallback(new Runnable() {
@Override
ApplicationManager.getApplication().invokeLater(new Runnable() {
public void run() {
conflictsFound[0] = processor.hasConflicts();
final boolean [] conflictsFound = new boolean[] {true};
processor.setPrepareSuccessfulSwingThreadCallback(new Runnable() {
@Override
public void run() {
conflictsFound[0] = processor.hasConflicts();
}
});
processor.run();
normalizeParameterIdxAccordingToRemovedParams(parametersToRemove);
ParameterInplaceIntroducer.super.moveOffsetAfter(!conflictsFound[0]);
}
});
processor.run();
normalizeParameterIdxAccordingToRemovedParams(parametersToRemove);
ParameterInplaceIntroducer.super.moveOffsetAfter(!conflictsFound[0]);
}
});
};
CommandProcessor.getInstance().executeCommand(myProject, runnable, IntroduceParameterHandler.REFACTORING_NAME, null);
} else {
super.moveOffsetAfter(success);
}