Merge pull request #5742 from t-rufang/rufan/color_contrast

Fix color contrast issue

Author: shenqianjin

PluginsAndFeatures/azure-toolkit-for-intellij/src/main/java/com/microsoft/azure/hdinsight/common/DarkThemeManager.java

@@ -5,6 +5,9 @@
 
 package com.microsoft.azure.hdinsight.common;
 
+import com.intellij.execution.ui.ConsoleViewContentType;
+import com.intellij.openapi.editor.colors.EditorColorsManager;
+import com.intellij.openapi.editor.colors.EditorColorsScheme;
 import com.intellij.util.ui.UIUtil;
 
 import java.awt.*;
@@ -47,13 +50,18 @@ public String getWarningColor() {
         return Gold;
     }
 
-    public Color getErrorMessageColor() {
-        // TODO: fix the Color with JBColor
-        if (UIUtil.isUnderDarcula()) {
-            return new Color(255, 80, 80);
-        }
+    public Color getErrorTextBackgroundColor() {
+        final EditorColorsScheme editorColorsScheme =
+                EditorColorsManager.getInstance().getGlobalScheme();
+        final Color consoleBackgroundColor =
+                editorColorsScheme.getColor(ConsoleViewContentType.CONSOLE_BACKGROUND_KEY);
+        return consoleBackgroundColor != null
+                ? consoleBackgroundColor
+                : editorColorsScheme.getDefaultBackground();
+    }
 
-        return Color.red;
+    public Color getErrorMessageColor() {
+        return UIUtil.getErrorForeground();
     }
 
     public Color getWarningMessageColor() {

PluginsAndFeatures/azure-toolkit-for-intellij/src/main/java/com/microsoft/azure/hdinsight/serverexplore/ui/AddNewClusterForm.form

@@ -321,7 +321,7 @@
               </grid>
             </children>
           </grid>
-          <component id="fab29" class="javax.swing.JTextArea" binding="validationErrorMessageField">
+          <component id="fab29" class="com.microsoft.intellij.ui.ErrorTextArea" binding="validationErrorMessageField">
             <constraints>
               <grid row="2" column="0" row-span="1" col-span="1" vsize-policy="2" hsize-policy="0" anchor="8" fill="1" indent="0" use-parent-layout="false">
                 <preferred-size width="150" height="-1"/>

PluginsAndFeatures/azure-toolkit-for-intellij/src/main/java/com/microsoft/azure/hdinsight/serverexplore/ui/AddNewClusterForm.java

@@ -36,6 +36,7 @@
 import com.microsoft.intellij.hdinsight.messages.HDInsightBundle;
 import com.microsoft.intellij.rxjava.IdeaSchedulers;
 import com.microsoft.intellij.ui.HintTextField;
+import com.microsoft.intellij.ui.ErrorTextArea;
 import com.microsoft.tooling.msservices.serviceexplorer.RefreshableNode;
 import org.apache.commons.lang3.StringUtils;
 import org.joda.time.DateTime;
@@ -69,7 +70,7 @@ public class AddNewClusterForm extends DialogWrapper implements SettableControl<
     protected JTextField clusterNameOrUrlField;
     private JPanel livyServiceCard;
     protected JTextField livyEndpointField;
-    protected JTextArea validationErrorMessageField;
+    protected ErrorTextArea validationErrorMessageField;
     private JPanel authComboBoxPanel;
     protected JComboBox<AuthType> authComboBox;
     protected JPanel authCardsPanel;

PluginsAndFeatures/azure-toolkit-for-intellij/src/main/kotlin/com/microsoft/azure/hdinsight/spark/ui/SparkSubmissionContentPanel.kt

@@ -63,6 +63,7 @@ import com.microsoft.intellij.forms.dsl.panel
 import com.microsoft.intellij.lang.containsInvisibleChars
 import com.microsoft.intellij.lang.tagInvisibleChars
 import com.microsoft.intellij.rxjava.DisposableObservers
+import com.microsoft.intellij.ui.ErrorLabel
 import com.microsoft.intellij.ui.util.findFirst
 import org.apache.commons.lang3.StringUtils
 import java.awt.Dimension
@@ -102,18 +103,14 @@ open class SparkSubmissionContentPanel(private val myProject: Project, val type:
 
     // All view components
     private val errorMessageLabels = arrayOf(
-            JLabel(getErrorMessageClusterNameNull(isSignedIn))
-                    .apply { foreground = currentErrorColor },
-            JLabel("Artifact should not be null!")
-                    .apply { foreground = currentErrorColor },
-            JLabel("Could not find the local jar package for Artifact")
-                    .apply { foreground = currentErrorColor },
-            JLabel("Main class name should not be null")
+            ErrorLabel(getErrorMessageClusterNameNull(isSignedIn)),
+            ErrorLabel("Artifact should not be null!"),
+            ErrorLabel("Could not find the local jar package for Artifact"),
+            ErrorLabel("Main class name should not be null")
                     .apply {
-                        foreground = currentErrorColor
                         isVisible = true
                     },
-            JLabel().apply { foreground = currentErrorColor }
+            ErrorLabel()
             // Don't add more we won't like to add more message labels
     )
 
@@ -141,9 +138,8 @@ open class SparkSubmissionContentPanel(private val myProject: Project, val type:
     }}
 
     private val hdiReaderErrorLabel: JLabel =
-        JLabel("No Ambari permission to submit job to the selected cluster...").apply {
+        ErrorLabel("No Ambari permission to submit job to the selected cluster...").apply {
             toolTipText = "No Ambari permission to submit job to the selected cluster. Please ask the cluster owner or user access administrator to upgrade your role to HDInsight Cluster Operator in the Azure Portal, or link to the selected cluster."
-            foreground = currentErrorColor
             isVisible = false
         }
 

PluginsAndFeatures/azure-toolkit-for-intellij/src/main/kotlin/com/microsoft/intellij/ui/ErrorLabel.kt

@@ -0,0 +1,23 @@
+/*
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for license information.
+ */
+
+package com.microsoft.intellij.ui
+
+import com.microsoft.azure.hdinsight.common.DarkThemeManager
+import org.apache.commons.lang3.StringUtils
+import javax.swing.JLabel
+
+class ErrorLabel(text: String = ""): JLabel(text) {
+    override fun setText(text: String?) {
+        foreground = DarkThemeManager.getInstance().errorMessageColor
+        background = if (StringUtils.isEmpty(text)) {
+            null
+        } else {
+            DarkThemeManager.getInstance().errorTextBackgroundColor
+        }
+
+        super.setText(text)
+    }
+}

PluginsAndFeatures/azure-toolkit-for-intellij/src/main/kotlin/com/microsoft/intellij/ui/ErrorTextArea.kt

@@ -0,0 +1,23 @@
+/*
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for license information.
+ */
+
+package com.microsoft.intellij.ui
+
+import com.microsoft.azure.hdinsight.common.DarkThemeManager
+import org.apache.commons.lang3.StringUtils
+import javax.swing.JTextArea
+
+class ErrorTextArea : JTextArea() {
+    override fun setText(text: String?) {
+        foreground = DarkThemeManager.getInstance().errorMessageColor
+        background = if (StringUtils.isEmpty(text)) {
+            null
+        } else {
+            DarkThemeManager.getInstance().errorTextBackgroundColor
+        }
+
+        super.setText(text)
+    }
+}