replaced InformationDialog by Messages.showMessageDialog

Signed-off-by: Andre Dietisheim <[email protected]>

Author: adietish

src/main/kotlin/com/redhat/devtools/gateway/util/ExceptionUtils.kt

@@ -11,6 +11,9 @@
  */
 package com.redhat.devtools.gateway.util
 
+import com.google.gson.Gson
+import io.kubernetes.client.openapi.ApiException
+
 
 fun Throwable.rootMessage(): String {
     var cause: Throwable? = this
@@ -25,4 +28,23 @@ fun Throwable.rootMessage(): String {
 fun Throwable.messageWithoutPrefix(): String? {
     return message?.trim()
         ?: message?.substringAfter(":")?.trim()
-}
+}
+
+fun Throwable.message(): String {
+    return if (this is ApiException) {
+        message()
+    } else {
+        message.orEmpty()
+    }
+}
+
+fun ApiException.message(): String {
+    val response = Gson().fromJson(responseBody, Map::class.java)
+    val msg = try {
+        response["message"]?.toString()
+    } catch (e: Exception) {
+        e.rootMessage()
+    }
+    return "Reason: $msg"
+}
+

src/main/kotlin/com/redhat/devtools/gateway/view/InformationDialog.kt

@@ -11,8 +11,6 @@
  */
 package com.redhat.devtools.gateway.view.steps
 
-import com.google.gson.Gson
-import com.intellij.openapi.application.ApplicationManager
 import com.intellij.openapi.components.service
 import com.intellij.openapi.progress.ProgressManager
 import com.intellij.openapi.wm.impl.welcomeScreen.WelcomeScreenUIManager
@@ -27,11 +25,10 @@ import com.redhat.devtools.gateway.openshift.OpenShiftClientFactory
 import com.redhat.devtools.gateway.openshift.Projects
 import com.redhat.devtools.gateway.openshift.kube.KubeConfigBuilder
 import com.redhat.devtools.gateway.settings.DevSpacesSettings
-import com.redhat.devtools.gateway.util.rootMessage
-import com.redhat.devtools.gateway.view.InformationDialog
+import com.redhat.devtools.gateway.util.message
+import com.redhat.devtools.gateway.view.ui.Dialogs
 import com.redhat.devtools.gateway.view.ui.FilteringComboBox
 import com.redhat.devtools.gateway.view.ui.PasteClipboardMenu
-import io.kubernetes.client.openapi.ApiException
 import io.kubernetes.client.openapi.auth.ApiKeyAuth
 import io.kubernetes.client.util.Config
 import javax.swing.JComboBox
@@ -91,10 +88,7 @@ class DevSpacesServerStepView(private var devSpacesContext: DevSpacesContext) :
                     Projects(client).list()
                     success = true
                 } catch (e: Exception) {
-                    val errorMsg = getMessage(e)
-                    ApplicationManager.getApplication().invokeLater {
-                        InformationDialog("Connection failed", errorMsg, component).show()
-                    }
+                    Dialogs.error(e.message(), "Connection failed")
                     throw e
                 }
             },
@@ -111,24 +105,6 @@ class DevSpacesServerStepView(private var devSpacesContext: DevSpacesContext) :
         return success
     }
 
-    private fun getMessage(e: Exception): String {
-        return if (e is ApiException) {
-            getMessage(e)
-        } else {
-            e.message.orEmpty()
-        }
-    }
-
-    private fun getMessage(e: ApiException): String {
-        val response = Gson().fromJson(e.responseBody, Map::class.java)
-        val msg = try {
-            response["message"]?.toString()
-        } catch (e: Exception) {
-            e.rootMessage()
-        }
-        return String.format("Reason: %s", msg)
-    }
-
     private fun loadOpenShiftConnectionSettings() {
         tfServer.removeAllItems()
         allServers.forEach { tfServer.addItem(it) }

src/main/kotlin/com/redhat/devtools/gateway/view/steps/DevSpacesServerStepView.kt

@@ -30,7 +30,6 @@ import com.redhat.devtools.gateway.openshift.DevWorkspaces
 import com.redhat.devtools.gateway.openshift.Projects
 import com.redhat.devtools.gateway.openshift.Utils
 import com.redhat.devtools.gateway.util.messageWithoutPrefix
-import com.redhat.devtools.gateway.view.InformationDialog
 import com.redhat.devtools.gateway.view.ui.Dialogs
 import java.awt.Component
 import javax.swing.DefaultListModel
@@ -179,14 +178,9 @@ class DevSpacesWorkspacesStepView(private var devSpacesContext: DevSpacesContext
 
     private fun connect() {
         if (devSpacesContext.isConnected) {
-            InformationDialog(
-                "Connection failed",
-                String.format(
-                    "Already connected to %s",
-                    devSpacesContext.devWorkspace.name
-                ),
-                component
-            ).show()
+            Dialogs.error("Connection failed",
+                "Already connected to ${devSpacesContext.devWorkspace.name}",
+            )
             return
         }