diff --git a/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightNamesUtil.java b/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightNamesUtil.java index 6d6bc87d1efb..fba89f5b24cd 100644 --- a/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightNamesUtil.java +++ b/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightNamesUtil.java @@ -97,9 +97,7 @@ public class HighlightNamesUtil { PsiMethodCallExpression methodCallExpression = PsiTreeUtil.getParentOfType(elementToHighlight, PsiMethodCallExpression.class); if (methodCallExpression != null) { PsiElement qualifier = methodCallExpression.getMethodExpression().getQualifier(); - if (qualifier == null || qualifier instanceof PsiThisExpression) { - return true; - } + return qualifier == null || qualifier instanceof PsiThisExpression; } return false; } @@ -326,7 +324,7 @@ public class HighlightNamesUtil { return textRange.getStartOffset(); } - static HighlightInfo highlightPackage(@NotNull PsiElement resolved, @NotNull PsiJavaCodeReferenceElement elementToHighlight, @NotNull TextAttributesScheme scheme) { + static @NotNull HighlightInfo highlightPackage(@NotNull PsiElement resolved, @NotNull PsiJavaCodeReferenceElement elementToHighlight, @NotNull TextAttributesScheme scheme) { PsiElement referenceNameElement = elementToHighlight.getReferenceNameElement(); TextRange range; if (referenceNameElement == null) { diff --git a/platform/platform-api/src/com/intellij/util/Alarm.java b/platform/platform-api/src/com/intellij/util/Alarm.java index 848efba6331c..a565d7665c8b 100644 --- a/platform/platform-api/src/com/intellij/util/Alarm.java +++ b/platform/platform-api/src/com/intellij/util/Alarm.java @@ -140,7 +140,7 @@ public class Alarm implements Disposable { } } - public void addRequest(@NotNull final Runnable request, final int delay, boolean runWithActiveFrameOnly) { + public void addRequest(@NotNull Runnable request, int delayMillis, boolean runWithActiveFrameOnly) { if (runWithActiveFrameOnly && !ApplicationManager.getApplication().isActive()) { final MessageBus bus = ApplicationManager.getApplication().getMessageBus(); final MessageBusConnection connection = bus.connect(this); @@ -148,12 +148,12 @@ public class Alarm implements Disposable { @Override public void applicationActivated(@NotNull IdeFrame ideFrame) { connection.disconnect(); - addRequest(request, delay); + addRequest(request, delayMillis); } }); } else { - addRequest(request, delay); + addRequest(request, delayMillis); } } diff --git a/platform/usageView/src/com/intellij/usages/impl/Node.java b/platform/usageView/src/com/intellij/usages/impl/Node.java index aff05225c552..a24538b125d9 100644 --- a/platform/usageView/src/com/intellij/usages/impl/Node.java +++ b/platform/usageView/src/com/intellij/usages/impl/Node.java @@ -133,7 +133,7 @@ public abstract class Node extends DefaultMutableTreeNode { void insertNewNode(@NotNull Node newChild, int childIndex) { ApplicationManager.getApplication().assertIsDispatchThread(); if (children == null) { - children = new Vector(); + children = new Vector(); } //noinspection unchecked children.insertElementAt(newChild, childIndex);