From 3d59865c731c2d81b69e4d1727c6c108da944db6 Mon Sep 17 00:00:00 2001
From: Alexey Kudravtsev <cdr@intellij.com>
Date: Thu, 26 Mar 2020 16:58:28 +0300
Subject: [PATCH] cleanup

GitOrigin-RevId: 5e21a5f4b85e506bcf78a738672bbf6a4f926490
---
 .../daemon/impl/analysis/HighlightNamesUtil.java            | 6 ++----
 platform/platform-api/src/com/intellij/util/Alarm.java      | 6 +++---
 platform/usageView/src/com/intellij/usages/impl/Node.java   | 2 +-
 3 files changed, 6 insertions(+), 8 deletions(-)

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<Node>();
     }
     //noinspection unchecked
     children.insertElementAt(newChild, childIndex);