MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

nullability checks

Browse Source
This commit is contained in:
Anna Kozlova
2018-01-22 17:07:38 +03:00
parent 04b7efb5cd
commit 28cb5031d0
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/refactoring/move/moveClassesOrPackages/JavaMoveClassesOrPackagesHandler.java
+2 -1
View File
@@ -45,13 +45,13 @@ import com.intellij.refactoring.util.CommonRefactoringUtil;
import com.intellij.refactoring.util.RadioUpDownListener;
import com.intellij.refactoring.util.RefactoringUtil;
import com.intellij.util.IncorrectOperationException;
import java.util.HashSet;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import javax.swing.*;
import java.awt.*;
import java.util.Arrays;
import java.util.HashSet;
public class JavaMoveClassesOrPackagesHandler extends MoveHandlerDelegate {
private static final Logger LOG = Logger.getInstance(JavaMoveClassesOrPackagesHandler.class);
@@ -221,6 +221,7 @@ public class JavaMoveClassesOrPackagesHandler extends MoveHandlerDelegate {
boolean searchInComments,
boolean searchForTextOccurences) {
final MoveDestination destination = createDestination(aPackage, targetDirectory);
if (destination == null) return null;
try {
for (PsiDirectory dir: directories) {
MoveFilesOrDirectoriesUtil.checkIfMoveIntoSelf(dir, WriteAction.compute(() -> destination.getTargetDirectory(dir)));
java/java-impl/src/com/intellij/refactoring/move/moveClassesOrPackages/MoveClassesOrPackagesToNewDirectoryDialog.java
+2
View File
@@ -216,6 +216,7 @@ public class MoveClassesOrPackagesToNewDirectoryDialog extends MoveDialogBase {
boolean searchInComments,
boolean searchForTextOccurences) {
final MoveDestination destination = createDestination(aPackage, directory);
if (destination == null) return null;
MoveClassesOrPackagesProcessor processor = createMoveClassesOrPackagesProcessor(myDirectory.getProject(), myElementsToMove, destination,
searchInComments, searchForTextOccurences, myMoveCallback);
@@ -227,6 +228,7 @@ public class MoveClassesOrPackagesToNewDirectoryDialog extends MoveDialogBase {
return null;
}
@Nullable
protected MoveDestination createDestination(PsiPackage aPackage, PsiDirectory directory) {
final Project project = aPackage.getProject();
final VirtualFile sourceRoot = ProjectRootManager.getInstance(project).getFileIndex().getSourceRootForFile(directory.getVirtualFile());