From c8b29b02a2712fd00a0ba35c50c43df5cdbb7910 Mon Sep 17 00:00:00 2001 From: Rui Fang Date: Wed, 25 Aug 2021 10:34:57 +0800 Subject: [PATCH] Address PR comments --- .../serverexplore/ui/AddNewClusterForm.form | 2 +- .../serverexplore/ui/AddNewClusterForm.java | 4 ++-- .../spark/ui/SparkSubmissionContentPanel.kt | 14 +++++++------- .../ui/{JLabelWithTheme.kt => ErrorLabel.kt} | 2 +- .../ui/{JTextAreaWithTheme.kt => ErrorTextArea.kt} | 2 +- 5 files changed, 12 insertions(+), 12 deletions(-) rename PluginsAndFeatures/azure-toolkit-for-intellij/src/main/kotlin/com/microsoft/intellij/ui/{JLabelWithTheme.kt => ErrorLabel.kt} (91%) rename PluginsAndFeatures/azure-toolkit-for-intellij/src/main/kotlin/com/microsoft/intellij/ui/{JTextAreaWithTheme.kt => ErrorTextArea.kt} (94%) diff --git a/PluginsAndFeatures/azure-toolkit-for-intellij/src/main/java/com/microsoft/azure/hdinsight/serverexplore/ui/AddNewClusterForm.form b/PluginsAndFeatures/azure-toolkit-for-intellij/src/main/java/com/microsoft/azure/hdinsight/serverexplore/ui/AddNewClusterForm.form index ee4a612dd9c..8f58cd4b1ab 100644 --- a/PluginsAndFeatures/azure-toolkit-for-intellij/src/main/java/com/microsoft/azure/hdinsight/serverexplore/ui/AddNewClusterForm.form +++ b/PluginsAndFeatures/azure-toolkit-for-intellij/src/main/java/com/microsoft/azure/hdinsight/serverexplore/ui/AddNewClusterForm.form @@ -321,7 +321,7 @@ - + diff --git a/PluginsAndFeatures/azure-toolkit-for-intellij/src/main/java/com/microsoft/azure/hdinsight/serverexplore/ui/AddNewClusterForm.java b/PluginsAndFeatures/azure-toolkit-for-intellij/src/main/java/com/microsoft/azure/hdinsight/serverexplore/ui/AddNewClusterForm.java index 39308d01062..f41d99202b7 100644 --- a/PluginsAndFeatures/azure-toolkit-for-intellij/src/main/java/com/microsoft/azure/hdinsight/serverexplore/ui/AddNewClusterForm.java +++ b/PluginsAndFeatures/azure-toolkit-for-intellij/src/main/java/com/microsoft/azure/hdinsight/serverexplore/ui/AddNewClusterForm.java @@ -36,7 +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.JTextAreaWithTheme; +import com.microsoft.intellij.ui.ErrorTextArea; import com.microsoft.tooling.msservices.serviceexplorer.RefreshableNode; import org.apache.commons.lang3.StringUtils; import org.joda.time.DateTime; @@ -70,7 +70,7 @@ public class AddNewClusterForm extends DialogWrapper implements SettableControl< protected JTextField clusterNameOrUrlField; private JPanel livyServiceCard; protected JTextField livyEndpointField; - protected JTextAreaWithTheme validationErrorMessageField; + protected ErrorTextArea validationErrorMessageField; private JPanel authComboBoxPanel; protected JComboBox authComboBox; protected JPanel authCardsPanel; diff --git a/PluginsAndFeatures/azure-toolkit-for-intellij/src/main/kotlin/com/microsoft/azure/hdinsight/spark/ui/SparkSubmissionContentPanel.kt b/PluginsAndFeatures/azure-toolkit-for-intellij/src/main/kotlin/com/microsoft/azure/hdinsight/spark/ui/SparkSubmissionContentPanel.kt index 8e040312728..1fdf146e7db 100644 --- a/PluginsAndFeatures/azure-toolkit-for-intellij/src/main/kotlin/com/microsoft/azure/hdinsight/spark/ui/SparkSubmissionContentPanel.kt +++ b/PluginsAndFeatures/azure-toolkit-for-intellij/src/main/kotlin/com/microsoft/azure/hdinsight/spark/ui/SparkSubmissionContentPanel.kt @@ -63,7 +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.JLabelWithTheme +import com.microsoft.intellij.ui.ErrorLabel import com.microsoft.intellij.ui.util.findFirst import org.apache.commons.lang3.StringUtils import java.awt.Dimension @@ -103,14 +103,14 @@ open class SparkSubmissionContentPanel(private val myProject: Project, val type: // All view components private val errorMessageLabels = arrayOf( - JLabelWithTheme(getErrorMessageClusterNameNull(isSignedIn)), - JLabelWithTheme("Artifact should not be null!"), - JLabelWithTheme("Could not find the local jar package for Artifact"), - JLabelWithTheme("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 { isVisible = true }, - JLabelWithTheme() + ErrorLabel() // Don't add more we won't like to add more message labels ) @@ -138,7 +138,7 @@ open class SparkSubmissionContentPanel(private val myProject: Project, val type: }} private val hdiReaderErrorLabel: JLabel = - JLabelWithTheme("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." isVisible = false } diff --git a/PluginsAndFeatures/azure-toolkit-for-intellij/src/main/kotlin/com/microsoft/intellij/ui/JLabelWithTheme.kt b/PluginsAndFeatures/azure-toolkit-for-intellij/src/main/kotlin/com/microsoft/intellij/ui/ErrorLabel.kt similarity index 91% rename from PluginsAndFeatures/azure-toolkit-for-intellij/src/main/kotlin/com/microsoft/intellij/ui/JLabelWithTheme.kt rename to PluginsAndFeatures/azure-toolkit-for-intellij/src/main/kotlin/com/microsoft/intellij/ui/ErrorLabel.kt index 0e4f3716088..da5fb706ef3 100644 --- a/PluginsAndFeatures/azure-toolkit-for-intellij/src/main/kotlin/com/microsoft/intellij/ui/JLabelWithTheme.kt +++ b/PluginsAndFeatures/azure-toolkit-for-intellij/src/main/kotlin/com/microsoft/intellij/ui/ErrorLabel.kt @@ -9,7 +9,7 @@ import com.microsoft.azure.hdinsight.common.DarkThemeManager import org.apache.commons.lang3.StringUtils import javax.swing.JLabel -class JLabelWithTheme(text: String = ""): JLabel(text) { +class ErrorLabel(text: String = ""): JLabel(text) { override fun setText(text: String?) { foreground = DarkThemeManager.getInstance().errorMessageColor background = if (StringUtils.isEmpty(text)) { diff --git a/PluginsAndFeatures/azure-toolkit-for-intellij/src/main/kotlin/com/microsoft/intellij/ui/JTextAreaWithTheme.kt b/PluginsAndFeatures/azure-toolkit-for-intellij/src/main/kotlin/com/microsoft/intellij/ui/ErrorTextArea.kt similarity index 94% rename from PluginsAndFeatures/azure-toolkit-for-intellij/src/main/kotlin/com/microsoft/intellij/ui/JTextAreaWithTheme.kt rename to PluginsAndFeatures/azure-toolkit-for-intellij/src/main/kotlin/com/microsoft/intellij/ui/ErrorTextArea.kt index 620e48179b1..61117f6fa0e 100644 --- a/PluginsAndFeatures/azure-toolkit-for-intellij/src/main/kotlin/com/microsoft/intellij/ui/JTextAreaWithTheme.kt +++ b/PluginsAndFeatures/azure-toolkit-for-intellij/src/main/kotlin/com/microsoft/intellij/ui/ErrorTextArea.kt @@ -9,7 +9,7 @@ import com.microsoft.azure.hdinsight.common.DarkThemeManager import org.apache.commons.lang3.StringUtils import javax.swing.JTextArea -class JTextAreaWithTheme : JTextArea() { +class ErrorTextArea : JTextArea() { override fun setText(text: String?) { foreground = DarkThemeManager.getInstance().errorMessageColor background = if (StringUtils.isEmpty(text)) {