Merge remote-tracking branch 'remotes/origin/java-17'

Hanseter · Nov 4, 2024 · dc1d8a1 · dc1d8a1
2 parents 51d9810 + 3e7ff6d
commit dc1d8a1
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 18 deletions.
diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.github.hanseter</groupId>
     <artifactId>json-properties-fx</artifactId>
-    <version>2.0.3</version>
+    <version>2.0.4</version>
 
     <packaging>bundle</packaging>
     <name>JSON Properties Editor Fx</name>

diff --git a/src/main/kotlin/com/github/hanseter/json/editor/JsonPropertiesEditor.kt b/src/main/kotlin/com/github/hanseter/json/editor/JsonPropertiesEditor.kt
@@ -122,7 +122,7 @@ class JsonPropertiesEditor @JvmOverloads constructor(
         callback: OnEditCallback
     ) {
         if (idsToPanes.contains(objId)) {
-            updateObject(objId, obj)
+            updateObject(objId, obj, schema)
             return
         }
 
@@ -155,17 +155,17 @@ class JsonPropertiesEditor @JvmOverloads constructor(
 
     fun updateObject(
         objId: String,
-        obj: JSONObject
+        obj: JSONObject,
+        schema: JSONObject
     ) {
         val pane = idsToPanes[objId] ?: return
         pane.fillData(obj)
+        pane.updateSchemaIfChanged(schema)
     }
 
     fun removeObject(objId: String) {
         (idsToPanes.remove(objId)?.treeItem)?.also {
-            (treeTableView.root as FilterableTreeItem).remove(
-                it
-            )
+            (treeTableView.root as FilterableTreeItem).remove(it)
         }
         rebindValidProperty()
     }

diff --git a/src/main/kotlin/com/github/hanseter/json/editor/JsonPropertiesPane.kt b/src/main/kotlin/com/github/hanseter/json/editor/JsonPropertiesPane.kt
@@ -161,6 +161,23 @@ class JsonPropertiesPane(
         contentHandler.updateData(data)
     }
 
+    fun updateSchemaIfChanged(new: JSONObject) {
+        if (new.similar(rawSchema)) return
+        val data = contentHandler.data
+        updateSchema(new)
+        fillData(data)
+    }
+
+    private fun updateSchema(new: JSONObject) {
+        rawSchema = new
+
+        val parsedSchema = SchemaNormalizer.parseSchema(new, resolutionScope, readOnly)
+
+        schema = SimpleEffectiveSchema(null, parsedSchema, title)
+
+        rebuildControlTree()
+    }
+
     private fun fillSheet(data: JSONObject) {
         val type = RootBindableType(data)
         objectControl?.bindTo(type)
@@ -171,18 +188,7 @@ class JsonPropertiesPane(
                 val newData = changeListener(PropertiesEditInput(type.getValue()!!, rawSchema))
 
                 if (newData.schema != null) {
-
-                    rawSchema = newData.schema
-
-                    val parsedSchema = SchemaNormalizer.parseSchema(
-                        newData.schema,
-                        resolutionScope,
-                        readOnly,
-                    )
-
-                    schema = SimpleEffectiveSchema(null, parsedSchema, title)
-
-                    rebuildControlTree()
+                    updateSchema(newData.schema)
                 }
 
                 fillData(newData.data)