inplace introduce: do not succeed if conflicts were found (IDEA-66499)

This commit is contained in:
anna
2011-03-11 17:59:09 +01:00
parent b7383c0db4
commit 08e1a29a86
@@ -284,13 +284,16 @@ class InplaceIntroduceParameterPopup extends IntroduceParameterSettingsUI {
getReplaceFieldsWithGetters(), myMustBeFinal || myFinal, isGenerateDelegate(),
myParameterTypePointer.getType(),
parametersToRemove);
final boolean [] conflictsFound = new boolean[] {true};
processor.setPrepareSuccessfulSwingThreadCallback(new Runnable() {
@Override
public void run() {
conflictsFound[0] = false;
}
});
processor.run();
normalizeParameterIdxAccordingToRemovedParams(parametersToRemove);
success = !conflictsFound[0];
}
super.moveOffsetAfter(success);
}