enable show conflicts: should be shown anyway?

This commit is contained in:
anna
2011-03-14 14:08:36 +01:00
parent 43d38a32ca
commit ee3f2e6740
2 changed files with 15 additions and 0 deletions
@@ -123,6 +123,11 @@ public class MoveClassesOrPackagesHandlerBase extends MoveHandlerDelegate {
new MoveDirectoryWithClassesProcessor(project, directories, (PsiDirectory)targetContainer,
refactoringSettings.RENAME_SEARCH_IN_COMMENTS_FOR_PACKAGE,
refactoringSettings.RENAME_SEARCH_IN_COMMENTS_FOR_PACKAGE, true, callback);
processor.setPrepareSuccessfulSwingThreadCallback(new Runnable() {
@Override
public void run() {
}
});
processor.run();
}
else {
@@ -137,6 +142,11 @@ public class MoveClassesOrPackagesHandlerBase extends MoveHandlerDelegate {
final MoveDirectoryWithClassesProcessor processor =
new MoveDirectoryWithClassesProcessor(project, directories, targetDirectory, searchInComments, searchForTextOccurences,
true, callback);
processor.setPrepareSuccessfulSwingThreadCallback(new Runnable() {
@Override
public void run() {
}
});
processor.run();
}
};
@@ -206,6 +206,11 @@ public class MoveClassesOrPackagesToNewDirectoryDialog extends DialogWrapper {
searchInComments, searchForTextOccurences,
myMoveCallback);
if (processor.verifyValidPackageName()) {
processor.setPrepareSuccessfulSwingThreadCallback(new Runnable() {
@Override
public void run() {
}
});
processor.run();
}
}