Merge pull request #46

dev
bobi · Aug 28, 2022 · 1313064 · 1313064
2 parents 84cbb20 + 37e6e89
commit 1313064
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,9 +3,7 @@
 # aem-groovyconsole-plugin Changelog
 
 ## [Unreleased]
-
-## [0.4.15]
-### Added
+### Added
 - Added ability to test connection during server configuration
 
 ## [0.4.13]

diff --git a/gradle.properties b/gradle.properties
@@ -4,7 +4,7 @@
 pluginGroup = com.github.bobi.aemgroovyconsoleplugin
 pluginName = aem-groovyconsole-plugin
 # SemVer format -> https://semver.org
-pluginVersion = 0.4.15
+pluginVersion = 0.4.16
 
 # See https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html
 # for insight into build numbers and IntelliJ Platform versions.

diff --git a/src/main/kotlin/com/github/bobi/aemgroovyconsoleplugin/config/ui/AemServerEditDialog.kt b/src/main/kotlin/com/github/bobi/aemgroovyconsoleplugin/config/ui/AemServerEditDialog.kt
@@ -8,6 +8,7 @@ import com.intellij.openapi.progress.runModalTask
 import com.intellij.openapi.project.Project
 import com.intellij.openapi.ui.DialogWrapper
 import com.intellij.openapi.ui.ValidationInfo
+import com.intellij.openapi.wm.IdeFocusManager
 import com.intellij.ui.components.JBLabel
 import com.intellij.ui.components.JBTextField
 import com.intellij.ui.layout.PropertyBinding
@@ -99,7 +100,13 @@ class AemServerEditDialog(private val project: Project, private val tableItem: A
 
         testServerAction = object : DialogWrapperAction("Test") {
             override fun doAction(e: ActionEvent) {
-                testServer()
+                testConnectionToServer()
+            }
+        }
+
+        okAction.addPropertyChangeListener {
+            if ("enabled" == it.propertyName) {
+                testServerAction.isEnabled = it.newValue as Boolean
             }
         }
     }
@@ -108,7 +115,7 @@ class AemServerEditDialog(private val project: Project, private val tableItem: A
         return arrayOf(testServerAction, *super.createActions())
     }
 
-    private fun testServer() {
+    private fun testConnectionToServer() {
         val validationInfos = doValidateAll()
 
         updateErrorInfo(validationInfos)
@@ -143,6 +150,12 @@ class AemServerEditDialog(private val project: Project, private val tableItem: A
                     promise.setError(th)
                 }
             }
+        } else {
+            val firstError = validationInfos.first()
+
+            if (firstError.component?.isVisible == true) {
+                IdeFocusManager.getInstance(null).requestFocus(firstError.component!!, true)
+            }
         }
     }