mirror of
https://gitflic.ru/project/openide/openide.git
synced 2026-09-17 21:43:33 +07:00
enable show conflicts: should be shown anyway?
This commit is contained in:
+10
@@ -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();
|
||||
}
|
||||
};
|
||||
|
||||
+5
@@ -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();
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user