Use cloud device icon in cloud device configuration.

Also, centralize the location of cloud-themed icons.

Change-Id: Ic7526664d2614705d8732f33dd6eecd7ea210b3a

4 files changed, 25 insertions, 22 deletions

diff --git a/src/com/google/gct/testing/CloudConfigurationProviderImpl.java b/src/com/google/gct/testing/CloudConfigurationProviderImpl.java
index 10eaada..386a423 100644
--- a/src/com/google/gct/testing/CloudConfigurationProviderImpl.java
+++ b/src/com/google/gct/testing/CloudConfigurationProviderImpl.java
@@ -59,7 +59,6 @@ import org.jetbrains.android.run.testing.AndroidTestRunConfiguration;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-import javax.imageio.ImageIO;
 import javax.swing.*;
 import java.io.File;
 import java.io.FilenameFilter;
@@ -386,11 +385,7 @@ public class CloudConfigurationProviderImpl extends CloudConfigurationProvider {
   @Nullable
   @Override
   public Icon getCloudDeviceIcon() {
-    try {
-      return new ImageIcon(ImageIO.read(CloudConfigurationProviderImpl.class.getResourceAsStream("CloudDevice.png")));
-    } catch (Exception e) {
-      return null;
-    }
+    return CloudTestingUtils.CLOUD_DEVICE_ICON;
   }
 
   @Nullable
diff --git a/src/com/google/gct/testing/CloudTestingUtils.java b/src/com/google/gct/testing/CloudTestingUtils.java
index be35290..d1ed7a9 100644
--- a/src/com/google/gct/testing/CloudTestingUtils.java
+++ b/src/com/google/gct/testing/CloudTestingUtils.java
@@ -16,6 +16,7 @@
 package com.google.gct.testing;
 
 import com.android.tools.idea.run.CloudConfiguration;
+import com.intellij.icons.AllIcons;
 import com.intellij.notification.Notification;
 import com.intellij.notification.NotificationListener;
 import com.intellij.notification.NotificationType;
@@ -28,11 +29,13 @@ import com.intellij.openapi.wm.StatusBar;
 import com.intellij.openapi.wm.WindowManager;
 import com.intellij.ui.awt.RelativePoint;
 import com.intellij.util.ui.UIUtil;
+import icons.AndroidIcons;
 import org.jetbrains.android.facet.AndroidFacet;
 import org.jetbrains.android.run.testing.AndroidTestRunConfiguration;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+import javax.imageio.ImageIO;
 import javax.swing.*;
 import javax.swing.event.HyperlinkEvent;
 import java.awt.*;
@@ -54,6 +57,24 @@ public class CloudTestingUtils {
   public static final String TEST_CONFIGURATION_SCHEDULED = "testConfigurationScheduled";
   public static final String TEST_CONFIGURATION_FINISHED = "testConfigurationFinished";
 
+  public static Icon CLOUD_DEVICE_ICON;
+  public static Icon CLOUD_DEBUG_ICON;
+
+  static {
+    try {
+      CLOUD_DEBUG_ICON = new ImageIcon(ImageIO.read(CloudTestingUtils.class.getResourceAsStream("CloudDebug.png")));
+    }
+    catch (Exception e) { // If something goes wrong, just use the original debug icon.
+      CLOUD_DEBUG_ICON = AllIcons.General.Debug;
+    }
+    try {
+      CLOUD_DEVICE_ICON = new ImageIcon(ImageIO.read(CloudTestingUtils.class.getResourceAsStream("CloudDevice.png")));
+    } catch (Exception e) { // If something goes wrong, just use the default device icon.
+      CLOUD_DEVICE_ICON = AndroidIcons.Views.DeviceScreen;
+    }
+  }
+
+
   public static enum ConfigurationStopReason {
     FINISHED, INFRASTRUCTURE_FAILURE, TRIGGERING_ERROR, TIMED_OUT
   }
diff --git a/src/com/google/gct/testing/DebugConfigurationAction.java b/src/com/google/gct/testing/DebugConfigurationAction.java
index 7ef8990..cbea10c 100644
--- a/src/com/google/gct/testing/DebugConfigurationAction.java
+++ b/src/com/google/gct/testing/DebugConfigurationAction.java
@@ -28,7 +28,6 @@ import com.intellij.execution.runners.ExecutionEnvironment;
 import com.intellij.execution.runners.ExecutionEnvironmentBuilder;
 import com.intellij.execution.runners.ProgramRunner;
 import com.intellij.execution.testframework.AbstractTestProxy;
-import com.intellij.icons.AllIcons;
 import com.intellij.openapi.actionSystem.AnAction;
 import com.intellij.openapi.actionSystem.AnActionEvent;
 import com.intellij.openapi.actionSystem.LangDataKeys;
@@ -41,27 +40,15 @@ import org.jetbrains.android.run.testing.AndroidTestRunConfiguration;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-import javax.imageio.ImageIO;
 import javax.swing.*;
 
 public class DebugConfigurationAction extends AnAction {
 
   private final static String TEXT = "Debug Configuration in Cloud";
   private final static String DESCRIPTION = "Debug Configuration on a Cloud Device";
-  private static Icon ICON;
-
-  static {
-    try {
-      ICON = new ImageIcon(ImageIO.read(DebugConfigurationAction.class.getResourceAsStream("CloudDebug.png")));
-    }
-    catch (Exception e) { // If something goes wrong, just use the original debug icon.
-      ICON = AllIcons.General.Debug;
-    }
-  }
-
 
   public DebugConfigurationAction() {
-    super(TEXT, DESCRIPTION, ICON);
+    super(TEXT, DESCRIPTION, CloudTestingUtils.CLOUD_DEBUG_ICON);
     getTemplatePresentation().setEnabled(false);
   }
 
diff --git a/src/com/google/gct/testing/dimension/DeviceDimension.java b/src/com/google/gct/testing/dimension/DeviceDimension.java
index a5913ec..93a8c34 100644
--- a/src/com/google/gct/testing/dimension/DeviceDimension.java
+++ b/src/com/google/gct/testing/dimension/DeviceDimension.java
@@ -19,7 +19,7 @@ import com.google.api.services.testing.model.AndroidDeviceCatalog;
 import com.google.api.services.testing.model.AndroidModel;
 import com.google.common.collect.ImmutableList;
 import com.google.gct.testing.CloudConfigurationImpl;
-import icons.AndroidIcons;
+import com.google.gct.testing.CloudTestingUtils;
 
 import javax.swing.*;
 import java.util.HashMap;
@@ -92,7 +92,7 @@ public class DeviceDimension extends CloudConfigurationDimension {
 
   @Override
   public Icon getIcon() {
-    return AndroidIcons.Views.DeviceScreen;
+    return CloudTestingUtils.CLOUD_DEVICE_ICON;
   }
 
   @Override