From 6b108dbbbcf7a33098dd38e2d876899b8ed177b7 Mon Sep 17 00:00:00 2001 From: Alexey Kudravtsev Date: Mon, 3 Jun 2013 17:38:38 +0400 Subject: [PATCH] cleanup, notnull --- .../deadCode/RefUnreachableFilter.java | 3 +- .../deadCode/UnreferencedFilter.java | 3 +- .../deadCode/UnusedDeclarationInspection.java | 5 ++- .../daemon/impl/HighlightInfoType.java | 41 ------------------- .../daemon/impl/SeverityRegistrar.java | 21 ++++------ .../ex/DescriptorProviderInspection.java | 2 +- .../codeInspection/ui/InspectionNode.java | 2 + 7 files changed, 19 insertions(+), 58 deletions(-) diff --git a/java/java-impl/src/com/intellij/codeInspection/deadCode/RefUnreachableFilter.java b/java/java-impl/src/com/intellij/codeInspection/deadCode/RefUnreachableFilter.java index b6ca8f42ec67..650e7c527edf 100644 --- a/java/java-impl/src/com/intellij/codeInspection/deadCode/RefUnreachableFilter.java +++ b/java/java-impl/src/com/intellij/codeInspection/deadCode/RefUnreachableFilter.java @@ -27,11 +27,12 @@ package com.intellij.codeInspection.deadCode; import com.intellij.codeInspection.ex.InspectionTool; import com.intellij.codeInspection.reference.*; import com.intellij.codeInspection.util.RefFilter; +import org.jetbrains.annotations.NotNull; public class RefUnreachableFilter extends RefFilter { protected InspectionTool myTool; - public RefUnreachableFilter(final InspectionTool tool) { + public RefUnreachableFilter(@NotNull InspectionTool tool) { myTool = tool; } diff --git a/java/java-impl/src/com/intellij/codeInspection/deadCode/UnreferencedFilter.java b/java/java-impl/src/com/intellij/codeInspection/deadCode/UnreferencedFilter.java index b82c6fa0fc29..32dc52252e95 100644 --- a/java/java-impl/src/com/intellij/codeInspection/deadCode/UnreferencedFilter.java +++ b/java/java-impl/src/com/intellij/codeInspection/deadCode/UnreferencedFilter.java @@ -26,9 +26,10 @@ package com.intellij.codeInspection.deadCode; import com.intellij.codeInspection.ex.InspectionTool; import com.intellij.codeInspection.reference.*; +import org.jetbrains.annotations.NotNull; public class UnreferencedFilter extends RefUnreachableFilter { - public UnreferencedFilter(final InspectionTool tool) { + public UnreferencedFilter(@NotNull InspectionTool tool) { super(tool); } diff --git a/java/java-impl/src/com/intellij/codeInspection/deadCode/UnusedDeclarationInspection.java b/java/java-impl/src/com/intellij/codeInspection/deadCode/UnusedDeclarationInspection.java index e4086d5b864a..70f22c0765fc 100644 --- a/java/java-impl/src/com/intellij/codeInspection/deadCode/UnusedDeclarationInspection.java +++ b/java/java-impl/src/com/intellij/codeInspection/deadCode/UnusedDeclarationInspection.java @@ -528,7 +528,7 @@ public class UnusedDeclarationInspection extends FilteringInspectionTool { } private static class WeakUnreferencedFilter extends UnreferencedFilter { - private WeakUnreferencedFilter(final InspectionTool tool) { + private WeakUnreferencedFilter(@NotNull InspectionTool tool) { super(tool); } @@ -770,7 +770,8 @@ public class UnusedDeclarationInspection extends FilteringInspectionTool { if (descriptor instanceof ProblemDescriptor) { if (DELETE.equals(hint)) { return new PermanentDeleteFix(((ProblemDescriptor)descriptor).getPsiElement()); - } else if (COMMENT.equals(hint)) { + } + if (COMMENT.equals(hint)) { return new CommentOutFix(((ProblemDescriptor)descriptor).getPsiElement()); } } diff --git a/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/HighlightInfoType.java b/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/HighlightInfoType.java index e4a96c447d52..d5d456163f09 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/HighlightInfoType.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/HighlightInfoType.java @@ -200,45 +200,4 @@ public interface HighlightInfoType { return myToolKey; } } - - class HighlightInfoTypeSeverityByKeyAttrBySeverity implements HighlightInfoType { - static final Logger LOG = Logger.getInstance("#com.intellij.codeInsight.daemon.impl.HighlightInfoType.HighlightInfoTypeSeverityByKeyAttrBySeverity"); - - private final HighlightDisplayKey mySeverityKey; - - public HighlightInfoTypeSeverityByKeyAttrBySeverity(HighlightDisplayKey severityKey) { - mySeverityKey = severityKey; - } - - @Override - @NotNull - public HighlightSeverity getSeverity(final PsiElement psiElement) { - InspectionProfile profile = psiElement == null - ? (InspectionProfile)InspectionProfileManager.getInstance().getRootProfile() - : InspectionProjectProfileManager.getInstance(psiElement.getProject()).getInspectionProfile(); - HighlightDisplayLevel level = profile.getErrorLevel(mySeverityKey, psiElement); - LOG.assertTrue(level != HighlightDisplayLevel.DO_NOT_SHOW); - return level.getSeverity(); - } - - @Override - public TextAttributesKey getAttributesKey() { - final HighlightSeverity severity = getSeverity(null); - final HighlightInfoTypeImpl infoType = SeverityRegistrar.getInstance().getHighlightInfoTypeBySeverity(severity); - return infoType != null - ? infoType.getAttributesKey() - : severity == HighlightSeverity.ERROR - ? CodeInsightColors.ERRORS_ATTRIBUTES - : severity == HighlightSeverity.WARNING - ? CodeInsightColors.WARNINGS_ATTRIBUTES - : severity == HighlightSeverity.WEAK_WARNING - ? CodeInsightColors.WEAK_WARNING_ATTRIBUTES - : CodeInsightColors.INFO_ATTRIBUTES; - } - - @SuppressWarnings({"HardCodedStringLiteral"}) - public String toString() { - return "HighlightInfoTypeSeverityByKeyAttrBySeverity[severity=" + mySeverityKey + "]"; - } - } } diff --git a/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/SeverityRegistrar.java b/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/SeverityRegistrar.java index b11864b912e1..660d804aaebd 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/SeverityRegistrar.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/SeverityRegistrar.java @@ -30,7 +30,6 @@ import com.intellij.openapi.util.JDOMExternalizableStringList; import com.intellij.openapi.util.WriteExternalException; import com.intellij.profile.codeInspection.InspectionProfileManager; import com.intellij.profile.codeInspection.InspectionProfileManagerImpl; -import com.intellij.profile.codeInspection.InspectionProjectProfileManager; import com.intellij.profile.codeInspection.InspectionProjectProfileManagerImpl; import com.intellij.util.containers.ContainerUtil; import gnu.trove.THashMap; @@ -151,20 +150,18 @@ public class SeverityRegistrar implements JDOMExternalizable, Comparator getProblemDescriptors() { return getProblemToElements().keySet(); } @@ -143,7 +144,6 @@ public abstract class DescriptorProviderInspection extends InspectionTool implem @Override public void ignoreElement(@NotNull final RefEntity refEntity) { - if (refEntity == null) return; getProblemElements().remove(refEntity); getQuickFixActions().remove(refEntity); } diff --git a/platform/lang-impl/src/com/intellij/codeInspection/ui/InspectionNode.java b/platform/lang-impl/src/com/intellij/codeInspection/ui/InspectionNode.java index 29240572f08f..e49ab6c1b380 100644 --- a/platform/lang-impl/src/com/intellij/codeInspection/ui/InspectionNode.java +++ b/platform/lang-impl/src/com/intellij/codeInspection/ui/InspectionNode.java @@ -20,6 +20,7 @@ import com.intellij.codeInspection.ex.InspectionTool; import com.intellij.icons.AllIcons; import com.intellij.ui.LayeredIcon; import com.intellij.util.IconUtil; +import org.jetbrains.annotations.NotNull; import javax.swing.*; import java.util.Enumeration; @@ -44,6 +45,7 @@ public class InspectionNode extends InspectionTreeNode { return getTool().getDisplayName(); } + @NotNull public InspectionTool getTool() { return (InspectionTool)getUserObject(); }