From 05e6797ec79e91c29e66dc88d7f7e4977e14cd2d Mon Sep 17 00:00:00 2001
From: Alexey Kudravtsev <cdr@intellij.com>
Date: Wed, 16 May 2018 17:53:16 +0300
Subject: [PATCH] cleanup

---
 .../src/com/intellij/internal/IconsLoadTime.java   | 14 ++++++++------
 .../util/src/com/intellij/util/ImageLoader.java    |  1 -
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/platform/platform-impl/src/com/intellij/internal/IconsLoadTime.java b/platform/platform-impl/src/com/intellij/internal/IconsLoadTime.java
index 4ba9d49726b6..cfbf6ce9fc07 100644
--- a/platform/platform-impl/src/com/intellij/internal/IconsLoadTime.java
+++ b/platform/platform-impl/src/com/intellij/internal/IconsLoadTime.java
@@ -56,7 +56,7 @@ public class IconsLoadTime extends DumbAwareAction {
     public final float averageTime;
     public final float medianTime;
 
-    private StatData(Type type, boolean startup, int totalTime, int averageTime, int medianTime, int count) {
+    private StatData(@NotNull Type type, boolean startup, int totalTime, int averageTime, int medianTime, int count) {
       this.type = type;
       this.startup = startup;
       this.count = count;
@@ -86,14 +86,15 @@ public class IconsLoadTime extends DumbAwareAction {
     log(measureStartupLoad, Type.SVG);
   }
 
-  private static void log(boolean measureStartupLoad, Type type) {
+  private static void log(boolean measureStartupLoad, @NotNull Type type) {
     StatData data = getStatData(measureStartupLoad, type);
     if (data != null) LOG.info(data.toString());
   }
 
-  public static @Nullable StatData getStatData(boolean measureStartupLoad, Type type) {
+  @Nullable
+  public static StatData getStatData(boolean measureStartupLoad, @NotNull Type type) {
     List<Integer> stats = getStats(type);
-    if (stats == null || stats.isEmpty()) return null;
+    if (stats.isEmpty()) return null;
 
     synchronized (stats) {
       int size = stats.size();
@@ -104,7 +105,7 @@ public class IconsLoadTime extends DumbAwareAction {
     }
   }
 
-  private static Image measure(LoadFunction func, Type type) throws IOException {
+  private static Image measure(@NotNull LoadFunction func, @NotNull Type type) throws IOException {
     List<Integer> stats = getStats(type);
     boolean measure = stats.size() < STATS_LIMIT;
     long t = measure ? System.nanoTime() : 0;
@@ -122,7 +123,8 @@ public class IconsLoadTime extends DumbAwareAction {
     return img;
   }
 
-  private static List<Integer> getStats(Type type) {
+  @NotNull
+  private static List<Integer> getStats(@NotNull Type type) {
     return type == Type.SVG ? statsSVG : statsPNG;
   }
 
diff --git a/platform/util/src/com/intellij/util/ImageLoader.java b/platform/util/src/com/intellij/util/ImageLoader.java
index 11e7d1478daa..fc37d29add8c 100644
--- a/platform/util/src/com/intellij/util/ImageLoader.java
+++ b/platform/util/src/com/intellij/util/ImageLoader.java
@@ -314,7 +314,6 @@ public class ImageLoader implements Serializable {
   public static final Component ourComponent = new Component() {
   };
 
-  @SuppressWarnings("UnusedReturnValue")
   private static boolean waitForImage(Image image) {
     if (image == null) return false;
     if (image.getWidth(null) > 0) return true;