From 4fe016c3f6dd9ce7e9f81e1e639caf11bc4be3cd Mon Sep 17 00:00:00 2001 From: Alexey Kudravtsev Date: Mon, 28 Oct 2019 15:13:46 +0300 Subject: [PATCH] cleanup, notnull GitOrigin-RevId: b7848936a122cf853694601e011a3aa32c4a581a --- .../visibility/VisibilityInspection.java | 3 +- .../AutocreatingMoveDestination.java | 5 ++- ...eatingSingleSourceRootMoveDestination.java | 9 ++-- .../JavaMoveClassesOrPackagesHandler.java | 1 + .../MoveClassesOrPackagesDialog.java | 4 +- .../MoveClassesOrPackagesProcessor.java | 41 ++++++------------- .../MoveClassesOrPackagesUtil.java | 31 +++++++------- .../MultipleRootsMoveDestination.java | 12 +++--- .../SingleSourceRootMoveDestination.java | 14 ++++--- .../DirectoryAsPackageRenameHandler.java | 1 + .../rename/RenamePsiPackageProcessor.java | 1 + .../refactoring/util/RefactoringUtil.java | 6 ++- .../intellij/refactoring/MoveDestination.java | 8 ++-- .../src/com/intellij/psi/PsiDirectory.java | 3 +- .../daemon/impl/LocalInspectionsPass.java | 4 +- .../refactoring/BaseRefactoringProcessor.java | 2 +- .../MoveMultipleElementsViewDescriptor.java | 3 +- .../MoveDirectoryWithClassesProcessor.java | 1 + 18 files changed, 75 insertions(+), 74 deletions(-) diff --git a/java/java-analysis-impl/src/com/intellij/codeInspection/visibility/VisibilityInspection.java b/java/java-analysis-impl/src/com/intellij/codeInspection/visibility/VisibilityInspection.java index fad27ad15a42..c53429fec0b5 100644 --- a/java/java-analysis-impl/src/com/intellij/codeInspection/visibility/VisibilityInspection.java +++ b/java/java-analysis-impl/src/com/intellij/codeInspection/visibility/VisibilityInspection.java @@ -354,8 +354,7 @@ public final class VisibilityInspection extends GlobalJavaBatchInspectionTool { return null; } - private boolean isAccessible(RefJavaElement to, @PsiModifier.ModifierConstant String accessModifier) { - + private boolean isAccessible(@NotNull RefJavaElement to, @NotNull @PsiModifier.ModifierConstant String accessModifier) { for (RefElement refElement : to.getInReferences()) { if (!isAccessibleFrom(refElement, to, accessModifier)) return false; } diff --git a/java/java-impl/src/com/intellij/refactoring/move/moveClassesOrPackages/AutocreatingMoveDestination.java b/java/java-impl/src/com/intellij/refactoring/move/moveClassesOrPackages/AutocreatingMoveDestination.java index 8040696a97ae..880b6af3b35f 100644 --- a/java/java-impl/src/com/intellij/refactoring/move/moveClassesOrPackages/AutocreatingMoveDestination.java +++ b/java/java-impl/src/com/intellij/refactoring/move/moveClassesOrPackages/AutocreatingMoveDestination.java @@ -26,22 +26,25 @@ import com.intellij.refactoring.PackageWrapper; import com.intellij.refactoring.RefactoringBundle; import com.intellij.refactoring.util.RefactoringUtil; import com.intellij.util.IncorrectOperationException; +import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; /** * @author dsl */ public abstract class AutocreatingMoveDestination implements MoveDestination { + @NotNull protected final PackageWrapper myPackage; protected final PsiManager myManager; protected final ProjectFileIndex myFileIndex; - public AutocreatingMoveDestination(PackageWrapper targetPackage) { + public AutocreatingMoveDestination(@NotNull PackageWrapper targetPackage) { myPackage = targetPackage; myManager = myPackage.getManager(); myFileIndex = ProjectRootManager.getInstance(myManager.getProject()).getFileIndex(); } + @NotNull @Override public abstract PackageWrapper getTargetPackage(); diff --git a/java/java-impl/src/com/intellij/refactoring/move/moveClassesOrPackages/AutocreatingSingleSourceRootMoveDestination.java b/java/java-impl/src/com/intellij/refactoring/move/moveClassesOrPackages/AutocreatingSingleSourceRootMoveDestination.java index a85986d233b9..d4356204920d 100644 --- a/java/java-impl/src/com/intellij/refactoring/move/moveClassesOrPackages/AutocreatingSingleSourceRootMoveDestination.java +++ b/java/java-impl/src/com/intellij/refactoring/move/moveClassesOrPackages/AutocreatingSingleSourceRootMoveDestination.java @@ -34,6 +34,7 @@ public class AutocreatingSingleSourceRootMoveDestination extends AutocreatingMov mySourceRoot = sourceRoot; } + @NotNull @Override public PackageWrapper getTargetPackage() { return myPackage; @@ -45,7 +46,7 @@ public class AutocreatingSingleSourceRootMoveDestination extends AutocreatingMov } @Override - public PsiDirectory getTargetIfExists(PsiFile source) { + public PsiDirectory getTargetIfExists(@NotNull PsiFile source) { return RefactoringUtil.findPackageDirectoryInSourceRoot(myPackage, mySourceRoot); } @@ -76,13 +77,13 @@ public class AutocreatingSingleSourceRootMoveDestination extends AutocreatingMov } @Override - public void analyzeModuleConflicts(final Collection elements, - MultiMap conflicts, final UsageInfo[] usages) { + public void analyzeModuleConflicts(@NotNull final Collection elements, + @NotNull MultiMap conflicts, final UsageInfo[] usages) { RefactoringConflictsUtil.analyzeModuleConflicts(getTargetPackage().getManager().getProject(), elements, usages, mySourceRoot, conflicts); } @Override - public boolean isTargetAccessible(Project project, VirtualFile place) { + public boolean isTargetAccessible(@NotNull Project project, @NotNull VirtualFile place) { final boolean inTestSourceContent = ProjectRootManager.getInstance(project).getFileIndex().isInTestSourceContent(place); final Module module = ModuleUtilCore.findModuleForFile(place, project); if (mySourceRoot != null && diff --git a/java/java-impl/src/com/intellij/refactoring/move/moveClassesOrPackages/JavaMoveClassesOrPackagesHandler.java b/java/java-impl/src/com/intellij/refactoring/move/moveClassesOrPackages/JavaMoveClassesOrPackagesHandler.java index 34ef2f67b0af..8b741d8f58ba 100644 --- a/java/java-impl/src/com/intellij/refactoring/move/moveClassesOrPackages/JavaMoveClassesOrPackagesHandler.java +++ b/java/java-impl/src/com/intellij/refactoring/move/moveClassesOrPackages/JavaMoveClassesOrPackagesHandler.java @@ -253,6 +253,7 @@ public class JavaMoveClassesOrPackagesHandler extends MoveHandlerDelegate { return null; } return new MoveDirectoryWithClassesProcessor(project, directories, null, searchInComments, searchForTextOccurences, true, callback) { + @NotNull @Override public TargetDirectoryWrapper getTargetDirectory(PsiDirectory dir) { final PsiDirectory targetDirectory = destination.getTargetDirectory(dir); diff --git a/java/java-impl/src/com/intellij/refactoring/move/moveClassesOrPackages/MoveClassesOrPackagesDialog.java b/java/java-impl/src/com/intellij/refactoring/move/moveClassesOrPackages/MoveClassesOrPackagesDialog.java index fc21d1811527..a4745f6c22cc 100644 --- a/java/java-impl/src/com/intellij/refactoring/move/moveClassesOrPackages/MoveClassesOrPackagesDialog.java +++ b/java/java-impl/src/com/intellij/refactoring/move/moveClassesOrPackages/MoveClassesOrPackagesDialog.java @@ -34,13 +34,13 @@ import com.intellij.refactoring.util.CommonRefactoringUtil; import com.intellij.ui.*; import com.intellij.usageView.UsageViewUtil; import com.intellij.util.IncorrectOperationException; -import java.util.HashSet; import com.intellij.util.ui.UIUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import javax.swing.*; import java.awt.*; +import java.util.HashSet; import java.util.List; import java.util.Set; @@ -334,7 +334,7 @@ public class MoveClassesOrPackagesDialog extends MoveDialogBase { } @Nullable - private static String verifyDestinationForElement(final PsiElement element, final MoveDestination moveDestination) { + private static String verifyDestinationForElement(@NotNull PsiElement element, @NotNull MoveDestination moveDestination) { final String message; if (element instanceof PsiDirectory) { message = moveDestination.verify((PsiDirectory)element); diff --git a/java/java-impl/src/com/intellij/refactoring/move/moveClassesOrPackages/MoveClassesOrPackagesProcessor.java b/java/java-impl/src/com/intellij/refactoring/move/moveClassesOrPackages/MoveClassesOrPackagesProcessor.java index db42c04c3165..ff204dbb0af1 100644 --- a/java/java-impl/src/com/intellij/refactoring/move/moveClassesOrPackages/MoveClassesOrPackagesProcessor.java +++ b/java/java-impl/src/com/intellij/refactoring/move/moveClassesOrPackages/MoveClassesOrPackagesProcessor.java @@ -57,9 +57,11 @@ public class MoveClassesOrPackagesProcessor extends BaseRefactoringProcessor { private final PsiElement[] myElementsToMove; private boolean mySearchInComments; private boolean mySearchInNonJavaFiles; + @NotNull private final PackageWrapper myTargetPackage; private final MoveCallback myMoveCallback; - protected @NotNull final MoveDestination myMoveDestination; + @NotNull + protected final MoveDestination myMoveDestination; protected NonCodeUsageInfo[] myNonCodeUsages; private boolean myOpenInEditor; private MultiMap myConflicts; @@ -85,7 +87,8 @@ public class MoveClassesOrPackagesProcessor extends BaseRefactoringProcessor { else { toMove.add(element); } - } else { + } + else { toMove.add(element); } } @@ -132,13 +135,6 @@ public class MoveClassesOrPackagesProcessor extends BaseRefactoringProcessor { return true; } - private boolean hasClasses() { - for (PsiElement element : getElements()) { - if (element instanceof PsiClass) return true; - } - return false; - } - public boolean isSearchInComments() { return mySearchInComments; } @@ -253,10 +249,8 @@ public class MoveClassesOrPackagesProcessor extends BaseRefactoringProcessor { } private void detectPackageLocalsMoved(final UsageInfo[] usages, final MultiMap conflicts) { -// final HashSet reportedPackageLocalUsed = new HashSet(); - final HashSet movedClasses = new HashSet<>(); - final HashMap> reportedClassToContainers = new HashMap<>(); - final PackageWrapper aPackage = myTargetPackage; + Set movedClasses = new HashSet<>(); + Map> reportedClassToContainers = new HashMap<>(); for (UsageInfo usage : usages) { PsiElement element = usage.getElement(); if (element == null) continue; @@ -267,11 +261,7 @@ public class MoveClassesOrPackagesProcessor extends BaseRefactoringProcessor { if (aClass != null && aClass.hasModifierProperty(PsiModifier.PACKAGE_LOCAL)) { if (PsiTreeUtil.getParentOfType(element, PsiImportStatement.class) != null) continue; PsiElement container = ConflictsUtil.getContainer(element); - HashSet reported = reportedClassToContainers.get(aClass); - if (reported == null) { - reported = new HashSet<>(); - reportedClassToContainers.put(aClass, reported); - } + Set reported = reportedClassToContainers.computeIfAbsent(aClass, __ -> new HashSet<>()); if (!reported.contains(container)) { reported.add(container); @@ -280,8 +270,7 @@ public class MoveClassesOrPackagesProcessor extends BaseRefactoringProcessor { PsiDirectory directory = containingFile.getContainingDirectory(); if (directory != null) { PsiPackage usagePackage = JavaDirectoryService.getInstance().getPackage(directory); - if (aPackage != null && usagePackage != null && !aPackage.equalToPackage(usagePackage)) { - + if (usagePackage != null && !myTargetPackage.equalToPackage(usagePackage)) { final String message = RefactoringBundle.message("a.package.local.class.0.will.no.longer.be.accessible.from.1", CommonRefactoringUtil.htmlEmphasize(aClass.getName()), RefactoringUIUtil.getDescription( @@ -493,7 +482,7 @@ public class MoveClassesOrPackagesProcessor extends BaseRefactoringProcessor { final RefactoringElementListener elementListener = getTransaction().getElementListener(element); if (element instanceof PsiPackage) { final PsiDirectory[] directories = ((PsiPackage)element).getDirectories(); - final PsiPackage newElement = MoveClassesOrPackagesUtil.doMovePackage((PsiPackage)element, myRefactoringScope, myMoveDestination); + final PsiPackage newElement = MoveClassesOrPackagesUtil.doMovePackage((PsiPackage)element, myMoveDestination); LOG.assertTrue(newElement != null, element); oldToNewElementsMapping.put(element, newElement); int i = 0; @@ -587,8 +576,8 @@ public class MoveClassesOrPackagesProcessor extends BaseRefactoringProcessor { private class MyClassInstanceReferenceVisitor implements ClassInstanceScanner.ClassInstanceReferenceVisitor { private final MultiMap myConflicts; - private final HashMap> myReportedElementToContainer = new HashMap<>(); - private final HashMap myIsDescendantOfCache = new HashMap<>(); + private final Map> myReportedElementToContainer = new HashMap<>(); + private final Map myIsDescendantOfCache = new HashMap<>(); MyClassInstanceReferenceVisitor(MultiMap conflicts) { myConflicts = conflicts; @@ -638,11 +627,7 @@ public class MoveClassesOrPackagesProcessor extends BaseRefactoringProcessor { private void visitPackageLocalMemberReference(PsiJavaCodeReferenceElement qualified, PsiModifierListOwner member) { PsiElement container = ConflictsUtil.getContainer(qualified); - HashSet reportedContainers = myReportedElementToContainer.get(member); - if (reportedContainers == null) { - reportedContainers = new HashSet<>(); - myReportedElementToContainer.put(member, reportedContainers); - } + Set reportedContainers = myReportedElementToContainer.computeIfAbsent(member, __ -> new HashSet<>()); if (!reportedContainers.contains(container)) { reportedContainers.add(container); diff --git a/java/java-impl/src/com/intellij/refactoring/move/moveClassesOrPackages/MoveClassesOrPackagesUtil.java b/java/java-impl/src/com/intellij/refactoring/move/moveClassesOrPackages/MoveClassesOrPackagesUtil.java index df354cc6c977..a2e6eabd2288 100644 --- a/java/java-impl/src/com/intellij/refactoring/move/moveClassesOrPackages/MoveClassesOrPackagesUtil.java +++ b/java/java-impl/src/com/intellij/refactoring/move/moveClassesOrPackages/MoveClassesOrPackagesUtil.java @@ -41,7 +41,7 @@ public class MoveClassesOrPackagesUtil { private MoveClassesOrPackagesUtil() { } - /** @deprecated Use {@link MoveClassesOrPackagesUtil#findUsages(PsiElement, SearchScope, boolean, boolean, String)} */ + /** @deprecated Use {@link #findUsages(PsiElement, SearchScope, boolean, boolean, String)} */ @Deprecated public static UsageInfo[] findUsages(final PsiElement element, boolean searchInStringsAndComments, @@ -122,7 +122,6 @@ public class MoveClassesOrPackagesUtil { // Does not process non-code usages! public static PsiPackage doMovePackage(@NotNull PsiPackage aPackage, - @NotNull SearchScope searchScope, @NotNull MoveDestination moveDestination) throws IncorrectOperationException { final PackageWrapper targetPackage = moveDestination.getTargetPackage(); @@ -165,21 +164,23 @@ public class MoveClassesOrPackagesUtil { final PsiPackage aPackage = JavaDirectoryService.getInstance().getPackage(dir); if (aPackage != null) { final String sourcePackageName = aPackage.getName(); - if (!sourcePackageName.equals(targetName)) { + if (sourcePackageName != null && !sourcePackageName.equals(targetName)) { targetName = sourcePackageName; } } final PsiDirectory subdirectoryInDest; final boolean isSourceRoot = RefactoringUtil.isSourceRoot(dir); if (VfsUtilCore.isAncestor(sourceVFile, destVFile, false) || isSourceRoot) { - PsiDirectory exitsingSubdir = destination.findSubdirectory(targetName); - if (exitsingSubdir == null) { + PsiDirectory existingSubdir = destination.findSubdirectory(targetName); + if (existingSubdir == null) { subdirectoryInDest = destination.createSubdirectory(targetName); movedPaths.add(subdirectoryInDest.getVirtualFile()); - } else { - subdirectoryInDest = exitsingSubdir; } - } else { + else { + subdirectoryInDest = existingSubdir; + } + } + else { subdirectoryInDest = destination.findSubdirectory(targetName); } @@ -282,17 +283,13 @@ public class MoveClassesOrPackagesUtil { return null; } - public static String getPackageName(PackageWrapper aPackage) { - if (aPackage == null) { - return null; - } + @NotNull + public static String getPackageName(@NotNull PackageWrapper aPackage) { String name = aPackage.getQualifiedName(); - if (name.length() > 0) { + if (!name.isEmpty()) { return name; } - else { - return JavaFindUsagesProvider.DEFAULT_PACKAGE_NAME; - } + return JavaFindUsagesProvider.DEFAULT_PACKAGE_NAME; } @Nullable @@ -366,7 +363,7 @@ public class MoveClassesOrPackagesUtil { qNameToCreate = RefactoringUtil.qNameToCreateInSourceRoot(aPackage, root); } catch (IncorrectOperationException e) { - continue sourceRoots; + continue; } PsiDirectory currentDirectory = aPackage.getManager().findDirectory(root); if (currentDirectory == null) continue; diff --git a/java/java-impl/src/com/intellij/refactoring/move/moveClassesOrPackages/MultipleRootsMoveDestination.java b/java/java-impl/src/com/intellij/refactoring/move/moveClassesOrPackages/MultipleRootsMoveDestination.java index 4944310c5304..ac77f75acc5e 100644 --- a/java/java-impl/src/com/intellij/refactoring/move/moveClassesOrPackages/MultipleRootsMoveDestination.java +++ b/java/java-impl/src/com/intellij/refactoring/move/moveClassesOrPackages/MultipleRootsMoveDestination.java @@ -27,9 +27,10 @@ import com.intellij.refactoring.util.RefactoringUtil; import com.intellij.usageView.UsageInfo; import com.intellij.util.IncorrectOperationException; import com.intellij.util.containers.MultiMap; +import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import java.util.Collection; +import java.util.*; /** * @author dsl @@ -42,6 +43,7 @@ public class MultipleRootsMoveDestination extends AutocreatingMoveDestination { super(aPackage); } + @NotNull @Override public PackageWrapper getTargetPackage() { return myPackage; @@ -60,7 +62,7 @@ public class MultipleRootsMoveDestination extends AutocreatingMoveDestination { } @Override - public PsiDirectory getTargetIfExists(PsiFile source) { + public PsiDirectory getTargetIfExists(@NotNull PsiFile source) { return findTargetDirectoryForSource(source.getVirtualFile()); } @@ -103,12 +105,12 @@ public class MultipleRootsMoveDestination extends AutocreatingMoveDestination { } @Override - public void analyzeModuleConflicts(final Collection elements, - MultiMap conflicts, final UsageInfo[] usages) { + public void analyzeModuleConflicts(@NotNull final Collection elements, + @NotNull MultiMap conflicts, final UsageInfo[] usages) { } @Override - public boolean isTargetAccessible(Project project, VirtualFile place) { + public boolean isTargetAccessible(@NotNull Project project, @NotNull VirtualFile place) { return true; } diff --git a/java/java-impl/src/com/intellij/refactoring/move/moveClassesOrPackages/SingleSourceRootMoveDestination.java b/java/java-impl/src/com/intellij/refactoring/move/moveClassesOrPackages/SingleSourceRootMoveDestination.java index c28ce53d4583..38471d52b10f 100644 --- a/java/java-impl/src/com/intellij/refactoring/move/moveClassesOrPackages/SingleSourceRootMoveDestination.java +++ b/java/java-impl/src/com/intellij/refactoring/move/moveClassesOrPackages/SingleSourceRootMoveDestination.java @@ -14,6 +14,7 @@ import com.intellij.refactoring.PackageWrapper; import com.intellij.refactoring.util.RefactoringConflictsUtil; import com.intellij.usageView.UsageInfo; import com.intellij.util.containers.MultiMap; +import org.jetbrains.annotations.NotNull; import java.util.Collection; @@ -23,15 +24,18 @@ import java.util.Collection; public class SingleSourceRootMoveDestination implements MoveDestination { private static final Logger LOG = Logger.getInstance( "#com.intellij.refactoring.move.moveClassesOrPackages.SingleSourceRootMoveDestination"); + @NotNull private final PackageWrapper myPackage; + @NotNull private final PsiDirectory myTargetDirectory; - public SingleSourceRootMoveDestination(PackageWrapper aPackage, PsiDirectory targetDirectory) { + public SingleSourceRootMoveDestination(@NotNull PackageWrapper aPackage, @NotNull PsiDirectory targetDirectory) { LOG.assertTrue(aPackage.equalToPackage(JavaDirectoryService.getInstance().getPackage(targetDirectory))); myPackage = aPackage; myTargetDirectory = targetDirectory; } + @NotNull @Override public PackageWrapper getTargetPackage() { return myPackage; @@ -43,7 +47,7 @@ public class SingleSourceRootMoveDestination implements MoveDestination { } @Override - public PsiDirectory getTargetIfExists(PsiFile source) { + public PsiDirectory getTargetIfExists(@NotNull PsiFile source) { return myTargetDirectory; } @@ -68,13 +72,13 @@ public class SingleSourceRootMoveDestination implements MoveDestination { } @Override - public void analyzeModuleConflicts(final Collection elements, - MultiMap conflicts, final UsageInfo[] usages) { + public void analyzeModuleConflicts(@NotNull final Collection elements, + @NotNull MultiMap conflicts, final UsageInfo[] usages) { RefactoringConflictsUtil.analyzeModuleConflicts(myPackage.getManager().getProject(), elements, usages, myTargetDirectory, conflicts); } @Override - public boolean isTargetAccessible(Project project, VirtualFile place) { + public boolean isTargetAccessible(@NotNull Project project, @NotNull VirtualFile place) { final boolean inTestSourceContent = ProjectRootManager.getInstance(project).getFileIndex().isInTestSourceContent(place); final Module module = ModuleUtilCore.findModuleForFile(place, project); final VirtualFile targetVirtualFile = myTargetDirectory.getVirtualFile(); diff --git a/java/java-impl/src/com/intellij/refactoring/rename/DirectoryAsPackageRenameHandler.java b/java/java-impl/src/com/intellij/refactoring/rename/DirectoryAsPackageRenameHandler.java index 7ce350c48fcc..ddadcfcd8124 100644 --- a/java/java-impl/src/com/intellij/refactoring/rename/DirectoryAsPackageRenameHandler.java +++ b/java/java-impl/src/com/intellij/refactoring/rename/DirectoryAsPackageRenameHandler.java @@ -55,6 +55,7 @@ public class DirectoryAsPackageRenameHandler extends DirectoryAsPackageRenameHan final PsiDirectory[] dirsToRename, boolean searchInComments, boolean searchInNonJavaFiles) { return new MoveDirectoryWithClassesProcessor(project, dirsToRename, null, searchInComments, searchInNonJavaFiles, false, null) { + @NotNull @Override public TargetDirectoryWrapper getTargetDirectory(final PsiDirectory dir) { return new TargetDirectoryWrapper(dir.getParentDirectory(), StringUtil.getShortName(newQName)); diff --git a/java/java-impl/src/com/intellij/refactoring/rename/RenamePsiPackageProcessor.java b/java/java-impl/src/com/intellij/refactoring/rename/RenamePsiPackageProcessor.java index 9c39ce271e5e..29fcd9617e9c 100644 --- a/java/java-impl/src/com/intellij/refactoring/rename/RenamePsiPackageProcessor.java +++ b/java/java-impl/src/com/intellij/refactoring/rename/RenamePsiPackageProcessor.java @@ -90,6 +90,7 @@ public class RenamePsiPackageProcessor extends RenamePsiElementProcessor { return new MoveDirectoryWithClassesProcessor(project, directories, null, searchInComments, searchInNonJavaFiles, false, null) { + @NotNull @Override public TargetDirectoryWrapper getTargetDirectory(final PsiDirectory dir) { final VirtualFile vFile = dir.getVirtualFile(); diff --git a/java/java-impl/src/com/intellij/refactoring/util/RefactoringUtil.java b/java/java-impl/src/com/intellij/refactoring/util/RefactoringUtil.java index e6947a417648..1264536dea96 100644 --- a/java/java-impl/src/com/intellij/refactoring/util/RefactoringUtil.java +++ b/java/java-impl/src/com/intellij/refactoring/util/RefactoringUtil.java @@ -1205,11 +1205,13 @@ public class RefactoringUtil { } } - private static PsiDocTag createParamTag(PsiParameter parameter) { + @NotNull + private static PsiDocTag createParamTag(@NotNull PsiParameter parameter) { return JavaPsiFacade.getElementFactory(parameter.getProject()).createParamTag(parameter.getName(), ""); } - public static PsiDirectory createPackageDirectoryInSourceRoot(PackageWrapper aPackage, final VirtualFile sourceRoot) + @NotNull + public static PsiDirectory createPackageDirectoryInSourceRoot(@NotNull PackageWrapper aPackage, final VirtualFile sourceRoot) throws IncorrectOperationException { final PsiDirectory[] directories = aPackage.getDirectories(); for (PsiDirectory directory : directories) { diff --git a/java/openapi/src/com/intellij/refactoring/MoveDestination.java b/java/openapi/src/com/intellij/refactoring/MoveDestination.java index cc08c828d72e..ab85a7af56cf 100644 --- a/java/openapi/src/com/intellij/refactoring/MoveDestination.java +++ b/java/openapi/src/com/intellij/refactoring/MoveDestination.java @@ -24,6 +24,7 @@ import com.intellij.psi.PsiPackage; import com.intellij.usageView.UsageInfo; import com.intellij.util.IncorrectOperationException; import com.intellij.util.containers.MultiMap; +import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import java.util.Collection; @@ -50,10 +51,11 @@ public interface MoveDestination { */ PsiDirectory getTargetDirectory(PsiFile source) throws IncorrectOperationException; + @NotNull PackageWrapper getTargetPackage(); PsiDirectory getTargetIfExists(PsiDirectory source); - PsiDirectory getTargetIfExists(PsiFile source); + PsiDirectory getTargetIfExists(@NotNull PsiFile source); @Nullable String verify(PsiFile source); @@ -62,7 +64,7 @@ public interface MoveDestination { @Nullable String verify(PsiPackage source); - void analyzeModuleConflicts(final Collection elements, MultiMap conflicts, final UsageInfo[] usages); + void analyzeModuleConflicts(@NotNull Collection elements, @NotNull MultiMap conflicts, final UsageInfo[] usages); - boolean isTargetAccessible(Project project, VirtualFile place); + boolean isTargetAccessible(@NotNull Project project, @NotNull VirtualFile place); } diff --git a/platform/core-api/src/com/intellij/psi/PsiDirectory.java b/platform/core-api/src/com/intellij/psi/PsiDirectory.java index 453e6650b27b..8e869e45b765 100644 --- a/platform/core-api/src/com/intellij/psi/PsiDirectory.java +++ b/platform/core-api/src/com/intellij/psi/PsiDirectory.java @@ -100,7 +100,8 @@ public interface PsiDirectory extends PsiFileSystemItem { * @return the created directory instance. * @throws IncorrectOperationException if the operation failed for some reason. */ - @NotNull PsiDirectory createSubdirectory(@NotNull String name) throws IncorrectOperationException; + @NotNull + PsiDirectory createSubdirectory(@NotNull String name) throws IncorrectOperationException; /** * Checks if it's possible to create a subdirectory with the specified name in the directory, diff --git a/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/LocalInspectionsPass.java b/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/LocalInspectionsPass.java index 593fa29e122e..aaa9bbae04d0 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/LocalInspectionsPass.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/LocalInspectionsPass.java @@ -206,7 +206,9 @@ public class LocalInspectionsPass extends ProgressableTextEditorHighlightingPass myInfos = new ArrayList<>(); addHighlightsFromResults(myInfos); - if (isOnTheFly) highlightRedundantSuppressions(toolWrappers, iManager, inside, outside, elementDialectIds); + if (isOnTheFly) { + highlightRedundantSuppressions(toolWrappers, iManager, inside, outside, elementDialectIds); + } } private void highlightRedundantSuppressions(@NotNull List toolWrappers, diff --git a/platform/lang-impl/src/com/intellij/refactoring/BaseRefactoringProcessor.java b/platform/lang-impl/src/com/intellij/refactoring/BaseRefactoringProcessor.java index b73df1f862c6..c98658b36a71 100644 --- a/platform/lang-impl/src/com/intellij/refactoring/BaseRefactoringProcessor.java +++ b/platform/lang-impl/src/com/intellij/refactoring/BaseRefactoringProcessor.java @@ -76,7 +76,7 @@ public abstract class BaseRefactoringProcessor implements Runnable { private RefactoringTransaction myTransaction; private boolean myIsPreviewUsages; protected Runnable myPrepareSuccessfulSwingThreadCallback; - private UsageView myUsageView = null; + private UsageView myUsageView; protected BaseRefactoringProcessor(@NotNull Project project) { this(project, null); diff --git a/platform/lang-impl/src/com/intellij/refactoring/move/MoveMultipleElementsViewDescriptor.java b/platform/lang-impl/src/com/intellij/refactoring/move/MoveMultipleElementsViewDescriptor.java index 91b28ee6bc42..2e6006f190a7 100644 --- a/platform/lang-impl/src/com/intellij/refactoring/move/MoveMultipleElementsViewDescriptor.java +++ b/platform/lang-impl/src/com/intellij/refactoring/move/MoveMultipleElementsViewDescriptor.java @@ -29,8 +29,7 @@ public class MoveMultipleElementsViewDescriptor implements UsageViewDescriptor { private String myProcessedElementsHeader; private final String myCodeReferencesText; - public MoveMultipleElementsViewDescriptor(PsiElement[] psiElements, - String targetName) { + public MoveMultipleElementsViewDescriptor(@NotNull PsiElement[] psiElements, @NotNull String targetName) { myPsiElements = psiElements; if (psiElements.length == 1) { myProcessedElementsHeader = StringUtil.capitalize( diff --git a/platform/lang-impl/src/com/intellij/refactoring/move/moveClassesOrPackages/MoveDirectoryWithClassesProcessor.java b/platform/lang-impl/src/com/intellij/refactoring/move/moveClassesOrPackages/MoveDirectoryWithClassesProcessor.java index 0f3b5616e272..711eea093965 100644 --- a/platform/lang-impl/src/com/intellij/refactoring/move/moveClassesOrPackages/MoveDirectoryWithClassesProcessor.java +++ b/platform/lang-impl/src/com/intellij/refactoring/move/moveClassesOrPackages/MoveDirectoryWithClassesProcessor.java @@ -299,6 +299,7 @@ public class MoveDirectoryWithClassesProcessor extends BaseRefactoringProcessor return RefactoringBundle.message("moving.directories.command"); } + @NotNull public TargetDirectoryWrapper getTargetDirectory(PsiDirectory dir) { return new TargetDirectoryWrapper(myTargetDirectory); }