From 156c1241dbf1f73d7366d6c75d013f1e97734b0c Mon Sep 17 00:00:00 2001
From: Krystian Panek <krystian.panek@wundermanthompson.com>
Date: Thu, 3 Nov 2022 13:43:36 +0100
Subject: [PATCH] Two way sync fixed

---
 .../kotlin/io/wttech/gradle/config/gui/Gui.kt | 19 +++----------------
 1 file changed, 3 insertions(+), 16 deletions(-)

diff --git a/plugin/src/main/kotlin/io/wttech/gradle/config/gui/Gui.kt b/plugin/src/main/kotlin/io/wttech/gradle/config/gui/Gui.kt
index 591cabd..e326cc7 100644
--- a/plugin/src/main/kotlin/io/wttech/gradle/config/gui/Gui.kt
+++ b/plugin/src/main/kotlin/io/wttech/gradle/config/gui/Gui.kt
@@ -14,7 +14,6 @@ import java.awt.event.FocusEvent
 import java.awt.event.FocusListener
 import java.awt.event.WindowAdapter
 import java.awt.event.WindowEvent
-import java.util.concurrent.locks.ReentrantLock
 import javax.swing.*
 import javax.swing.text.JTextComponent
 
@@ -244,7 +243,7 @@ class Gui(val definition: Definition) {
 
     fun updatePropPanels() {
         propPanels.forEach { panel ->
-            // fix two-way syncing for text field and area (combo works fine)
+            // fix two-way syncing
             val normalizedValue by lazy {
                 when (panel.data) {
                     is ListProp -> panel.data.value()?.joinToString("\n")
@@ -255,19 +254,7 @@ class Gui(val definition: Definition) {
             when {
                 panel.field is JTextField && panel.field.text != normalizedValue -> tryMutate { panel.field.text = normalizedValue }
                 panel.field is JTextArea && panel.field.text != normalizedValue -> tryMutate { panel.field.text = normalizedValue }
-                // TODO make it nicer (sync two-way)
-                panel.field is JComboBox<*> && panel.field.selectedItem != normalizedValue -> tryMutate {
-                    panel.field.selectedItem = when (panel.data) {
-                        is StringProp -> when {
-                            panel.data.options.get().isNotEmpty() -> when (normalizedValue) {
-                                in panel.data.options.get() -> normalizedValue
-                                else -> panel.data.options.get().first()
-                            }
-                            else -> normalizedValue
-                        }
-                        else -> normalizedValue
-                    }
-                }
+                panel.field is JComboBox<*> && panel.field.selectedItem != normalizedValue -> tryMutate { panel.field.selectedItem = normalizedValue }
             }
 
             panel.container.isVisible = panel.data.visible.get()
@@ -301,7 +288,7 @@ class Gui(val definition: Definition) {
     }
 
     private fun updateMalformedData() {
-        definition.props.forEach {prop ->
+        definition.props.forEach { prop ->
             if (prop is StringProp) {
                 if (prop.options.get().isNotEmpty()) {
                     if (prop.value() !in prop.options.get()) {