Using IconLoader.getIcon in case call classloader with leading slash issue

Flanker32 · Flanker32 · commit 4d63225eab35 · 2021-03-11T11:31:30.000+08:00
diff --git a/PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/azure/hdinsight/common/HDInsightHelperImpl.java b/PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/azure/hdinsight/common/HDInsightHelperImpl.java
@@ -131,7 +131,7 @@ public String getDefaultExtension() {
             @Nullable
             @Override
             public Icon getIcon() {
-                return StreamUtil.getImageResourceFile(CommonConst.SPARK_JOBVIEW_ICONPATH);
+                return PluginUtil.getIcon(CommonConst.SPARK_JOBVIEW_ICONPATH);
             }
 
             @Override
diff --git a/PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/azure/hdinsight/projects/HDInsightProjectTemplate.java b/PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/azure/hdinsight/projects/HDInsightProjectTemplate.java
@@ -10,6 +10,7 @@
 import com.intellij.platform.ProjectTemplate;
 import com.microsoft.azure.hdinsight.common.CommonConst;
 import com.microsoft.azure.hdinsight.common.StreamUtil;
+import com.microsoft.intellij.util.PluginUtil;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -58,14 +59,12 @@ public String getDescription() {
     @Override
     public Icon getIcon() {
         switch (this.templateType) {
-            case Java:
-                return StreamUtil.getImageResourceFile(CommonConst.JavaProjectIconPath);
             case Scala:
             case ScalaClusterSample:
             case ScalaFailureTaskDebugSample:
-                return StreamUtil.getImageResourceFile(CommonConst.ScalaProjectIconPath);
+                return PluginUtil.getIcon(CommonConst.ScalaProjectIconPath);
             default:
-                return StreamUtil.getImageResourceFile(CommonConst.JavaProjectIconPath);
+                return PluginUtil.getIcon(CommonConst.JavaProjectIconPath);
         }
     }
 
diff --git a/PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/azure/hdinsight/spark/run/SparkBatchJobDebugExecutor.java b/PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/azure/hdinsight/spark/run/SparkBatchJobDebugExecutor.java
@@ -10,6 +10,7 @@
 import com.intellij.icons.AllIcons;
 import com.microsoft.azure.hdinsight.common.StreamUtil;
 import com.microsoft.azuretools.azurecommons.helpers.Nullable;
+import com.microsoft.intellij.util.PluginUtil;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 
@@ -28,15 +29,15 @@ public String getToolWindowId() {
 
     @Override
     public Icon getToolWindowIcon() {
-        return Optional.ofNullable(StreamUtil.getImageResourceFile(com.microsoft.azure.hdinsight.common.CommonConst.ToolWindowSparkJobDebugIcon_13x_Path))
+        return Optional.ofNullable(PluginUtil.getIcon(com.microsoft.azure.hdinsight.common.CommonConst.ToolWindowSparkJobDebugIcon_13x_Path))
                 .map(Icon.class::cast)
                 .orElse(AllIcons.RunConfigurations.RemoteDebug);
     }
 
     @NotNull
     @Override
     public Icon getIcon() {
-        return Optional.ofNullable(StreamUtil.getImageResourceFile(com.microsoft.azure.hdinsight.common.CommonConst.ToolWindowSparkJobDebugIcon_16x_Path))
+        return Optional.ofNullable(PluginUtil.getIcon(com.microsoft.azure.hdinsight.common.CommonConst.ToolWindowSparkJobDebugIcon_16x_Path))
                 .map(Icon.class::cast)
                 .orElse(AllIcons.RunConfigurations.RemoteDebug);
     }
diff --git a/PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/azure/hdinsight/spark/run/SparkBatchJobRunExecutor.java b/PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/azure/hdinsight/spark/run/SparkBatchJobRunExecutor.java
@@ -8,6 +8,7 @@
 import com.intellij.execution.Executor;
 import com.intellij.icons.AllIcons;
 import com.microsoft.azure.hdinsight.common.StreamUtil;
+import com.microsoft.intellij.util.PluginUtil;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 
@@ -25,15 +26,15 @@ public String getToolWindowId() {
 
     @Override
     public Icon getToolWindowIcon() {
-        return Optional.ofNullable(StreamUtil.getImageResourceFile(com.microsoft.azure.hdinsight.common.CommonConst.ToolWindowSparkJobRunIcon_13x_Path))
+        return Optional.ofNullable(PluginUtil.getIcon(com.microsoft.azure.hdinsight.common.CommonConst.ToolWindowSparkJobRunIcon_13x_Path))
                 .map(Icon.class::cast)
                 .orElse(AllIcons.Actions.Upload);
     }
 
     @NotNull
     @Override
     public Icon getIcon() {
-        return Optional.ofNullable(StreamUtil.getImageResourceFile(com.microsoft.azure.hdinsight.common.CommonConst.ToolWindowSparkJobRunIcon_16x_Path))
+        return Optional.ofNullable(PluginUtil.getIcon(com.microsoft.azure.hdinsight.common.CommonConst.ToolWindowSparkJobRunIcon_16x_Path))
                 .map(Icon.class::cast)
                 .orElse(AllIcons.Actions.Upload);
     }
diff --git a/PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/azure/hdinsight/spark/run/action/SparkJobDebugAction.kt b/PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/azure/hdinsight/spark/run/action/SparkJobDebugAction.kt
@@ -32,12 +32,13 @@ import com.microsoft.azure.hdinsight.common.StreamUtil
 import com.microsoft.azure.hdinsight.spark.run.SparkBatchJobDebugExecutor.EXECUTOR_ID
 import com.microsoft.azure.hdinsight.spark.run.configuration.LivySparkBatchJobRunConfiguration
 import com.microsoft.azuretools.telemetry.TelemetryConstants
+import com.microsoft.intellij.util.PluginUtil
 
 class SparkJobDebugAction
     : SparkRunConfigurationAction(
         "SparkJobDebug",
         "Submit Apache Spark Application to remote cluster with debugging support",
-        StreamUtil.getImageResourceFile(CommonConst.ToolWindowSparkJobDebugIcon_13x_Path)?: AllIcons.Toolwindows.ToolWindowDebugger) {
+        PluginUtil.getIcon(CommonConst.ToolWindowSparkJobDebugIcon_13x_Path)?: AllIcons.Toolwindows.ToolWindowDebugger) {
     override val runExecutor: Executor
         get() = ExecutorRegistry.getInstance().getExecutorById(EXECUTOR_ID)
             ?: throw RuntimeException("Can't find executor $EXECUTOR_ID from executor registry")
diff --git a/PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/azure/hdinsight/spark/run/action/SparkJobRunAction.kt b/PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/azure/hdinsight/spark/run/action/SparkJobRunAction.kt
@@ -28,16 +28,16 @@ import com.intellij.execution.RunManagerEx
 import com.intellij.icons.AllIcons
 import com.intellij.openapi.actionSystem.AnActionEvent
 import com.microsoft.azure.hdinsight.common.CommonConst
-import com.microsoft.azure.hdinsight.common.StreamUtil
 import com.microsoft.azure.hdinsight.spark.run.SparkBatchJobRunExecutor.EXECUTOR_ID
 import com.microsoft.azure.hdinsight.spark.run.configuration.LivySparkBatchJobRunConfiguration
 import com.microsoft.azuretools.telemetry.TelemetryConstants
+import com.microsoft.intellij.util.PluginUtil
 
 class SparkJobRunAction
     : SparkRunConfigurationAction(
         "SparkJobRun",
         "Submit Apache Spark Application to remote cluster",
-        StreamUtil.getImageResourceFile(CommonConst.ToolWindowSparkJobRunIcon_13x_Path)?: AllIcons.Actions.Upload) {
+        PluginUtil.getIcon(CommonConst.ToolWindowSparkJobRunIcon_13x_Path) ?: AllIcons.Actions.Upload) {
 
     override val runExecutor: Executor
         get() = ExecutorRegistry.getInstance().getExecutorById(EXECUTOR_ID)
diff --git a/PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/azure/hdinsight/spark/ui/SparkClusterListRefreshableCombo.kt b/PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/azure/hdinsight/spark/ui/SparkClusterListRefreshableCombo.kt
@@ -44,6 +44,7 @@ import com.microsoft.intellij.forms.dsl.panel
 import com.microsoft.intellij.rxjava.DisposableObservers
 import com.microsoft.intellij.rxjava.IdeaSchedulers
 import com.microsoft.intellij.ui.util.findFirst
+import com.microsoft.intellij.util.PluginUtil
 import rx.Observable
 import rx.Observable.*
 import rx.subjects.BehaviorSubject
@@ -67,7 +68,7 @@ open class SparkClusterListRefreshableCombo: ILogger, Disposable {
         comboBox.name = getComboBoxNamePrefix() + "Combo"
         button.name = getComboBoxNamePrefix() + "Button"
 
-        setButtonIcon(StreamUtil.getImageResourceFile(REFRESH_BUTTON_PATH))
+        setButtonIcon(PluginUtil.getIcon(REFRESH_BUTTON_PATH))
 
         comboBox.apply {
             setRenderer(object : SimpleListCellRenderer<IClusterDetail>() {
diff --git a/PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/azure/hdinsight/spark/ui/SparkSubmissionJobUploadStorageAdlsCard.kt b/PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/azure/hdinsight/spark/ui/SparkSubmissionJobUploadStorageAdlsCard.kt
@@ -44,6 +44,7 @@ import com.microsoft.intellij.forms.dsl.panel
 import com.microsoft.intellij.rxjava.IdeaSchedulers
 import com.microsoft.intellij.ui.util.UIUtils
 import com.microsoft.intellij.ui.util.findFirst
+import com.microsoft.intellij.util.PluginUtil
 import org.apache.commons.lang3.StringUtils
 import org.apache.commons.lang3.exception.ExceptionUtils
 import rx.Observable
@@ -87,7 +88,7 @@ class SparkSubmissionJobUploadStorageAdlsCard
         comboBox.name = "adlsCardSubscriptionsComboBoxCombo"
         button.name = "adlsCardSubscriptionsComboBoxButton"
         button.toolTipText = "Refresh"
-        button.icon = StreamUtil.getImageResourceFile(refreshButtonIconPath)
+        button.icon = PluginUtil.getIcon(refreshButtonIconPath)
         button.addActionListener {
             //refresh subscriptions after refresh button is clicked
             if (button.isEnabled) {
diff --git a/PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/azure/hdinsight/spark/ui/SparkSubmissionJobUploadStorageAzureBlobCard.kt b/PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/azure/hdinsight/spark/ui/SparkSubmissionJobUploadStorageAzureBlobCard.kt
@@ -46,6 +46,7 @@ import com.microsoft.intellij.forms.dsl.panel
 import com.microsoft.intellij.rxjava.IdeaSchedulers
 import com.microsoft.intellij.ui.util.UIUtils
 import com.microsoft.intellij.ui.util.findFirst
+import com.microsoft.intellij.util.PluginUtil
 import com.microsoft.tooling.msservices.helpers.azure.sdk.StorageClientSDKManager
 import com.microsoft.tooling.msservices.model.storage.BlobContainer
 import com.microsoft.tooling.msservices.model.storage.ClientStorageAccount
@@ -131,7 +132,7 @@ class SparkSubmissionJobUploadStorageAzureBlobCard
 
         button.name = "blobCardStorageContainerComboBoxButton"
         button.toolTipText = "Refresh"
-        button.icon = StreamUtil.getImageResourceFile(refreshButtonIconPath)
+        button.icon = PluginUtil.getIcon(refreshButtonIconPath)
         button.addActionListener { doRefresh() }
     }
 
diff --git a/PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/intellij/util/PluginUtil.java b/PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/intellij/util/PluginUtil.java
@@ -155,7 +155,7 @@ public static String getPluginRootDirectory() {
     }
 
     public static Icon getIcon(String iconPath) {
-        return IconLoader.getIcon(iconPath);
+        return IconLoader.getIcon(iconPath, PluginUtil.class);
     }
 
     public static void dialogShaker(ValidationInfo info, DialogWrapper dialogWrapper) {
diff --git a/Utils/hdinsight-node-common/src/com/microsoft/azure/hdinsight/common/StreamUtil.java b/Utils/hdinsight-node-common/src/com/microsoft/azure/hdinsight/common/StreamUtil.java
@@ -88,18 +88,7 @@ public static File getResourceFile(String resource) throws IOException {
         return file;
     }
 
-    public static ImageIcon getImageResourceFile(String resourcePath) {
-        URL url = classLoader.getResource(resourcePath);
-
-        if(url != null) {
-            return new ImageIcon(url);
-        } else {
-            return null;
-        }
-    }
-
     private static StreamUtil streamUtil = new StreamUtil();
-    private static ClassLoader classLoader = streamUtil.getClass().getClassLoader();
     private static final String SPARK_SUBMISSION_FOLDER = "SparkSubmission";
 
     public static String uploadArtifactToADLS(@NotNull File localFile, IHDIStorageAccount storageAccount, @NotNull String uploadFolderPath) throws Exception {

Original file line number	Diff line number	Diff line change
`@@ -131,7 +131,7 @@ public String getDefaultExtension() {`
`131`	`131`	`@Nullable`
`132`	`132`	`@Override`
`133`	`133`	`public Icon getIcon() {`
`134`		`- return StreamUtil.getImageResourceFile(CommonConst.SPARK_JOBVIEW_ICONPATH);`
	`134`	`+ return PluginUtil.getIcon(CommonConst.SPARK_JOBVIEW_ICONPATH);`
`135`	`135`	`}`
`136`	`136`
`137`	`137`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -155,7 +155,7 @@ public static String getPluginRootDirectory() {`
`155`	`155`	`}`
`156`	`156`
`157`	`157`	`public static Icon getIcon(String iconPath) {`
`158`		`- return IconLoader.getIcon(iconPath);`
	`158`	`+ return IconLoader.getIcon(iconPath, PluginUtil.class);`
`159`	`159`	`}`
`160`	`160`
`161`	`161`	`public static void dialogShaker(ValidationInfo info, DialogWrapper dialogWrapper) {`