Merge pull request #38 from OneAndOlaf/master

Actually fix notifications for arrays.

Author: Hanseter

pom.xml

@@ -6,7 +6,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.github.hanseter</groupId>
     <artifactId>json-properties-fx</artifactId>
-    <version>1.0.14</version>
+    <version>1.0.15</version>
 
     <packaging>bundle</packaging>
     <name>JSON Properties Editor Fx</name>

src/main/kotlin/com/github/hanseter/json/editor/actions/ArrayActions.kt

@@ -7,6 +7,7 @@ import com.github.hanseter.json.editor.extensions.EffectiveSchemaInArray
 import com.github.hanseter.json.editor.i18n.JsonPropertiesMl
 import com.github.hanseter.json.editor.types.SupportedType
 import com.github.hanseter.json.editor.types.TypeModel
+import com.github.hanseter.json.editor.util.shallowClone
 import javafx.event.Event
 import org.everit.json.schema.ArraySchema
 import org.json.JSONArray
@@ -30,8 +31,12 @@ object AddToArrayAction : EditorAction {
         model: TypeModel<*, *>,
         mouseEvent: Event?
     ): PropertiesEditResult? {
-        val children = (model as TypeModel<JSONArray?, SupportedType.ComplexType.ArrayType>).value
-            ?: JSONArray().also {
+        // Because this calls model.setValue instead of returning an edit result, we need to ensure
+        // the internal value does not change before we invoke setValue, otherwise, it would return
+        // immediately. Hence a shallow copy.
+        val children = (model as TypeModel<JSONArray?, SupportedType.ComplexType.ArrayType>).value?.let {
+            JSONArray().putAll(it)
+        } ?: JSONArray().also {
                 model.value = it
             }
         val childDefaultValue =

src/main/kotlin/com/github/hanseter/json/editor/util/BindableJsonArray.kt

@@ -8,7 +8,7 @@ class BindableJsonArray(parent: BindableJsonType?, private val arr: JSONArray) :
     BindableJsonType(parent) {
 
     override fun updateFromChild(child: BindableJsonType, schema: EffectiveSchema<*>) {
-        super.setValue(schema, child.getValue())
+        super.updateAfterChange(schema, child.getValue())
     }
 
     override fun setValueInternal(schema: EffectiveSchema<*>, value: Any?) =

src/main/kotlin/com/github/hanseter/json/editor/util/BindableJsonType.kt

@@ -17,7 +17,7 @@ abstract class BindableJsonType(private val parent: BindableJsonType?) {
         updateAfterChange(schema.nonSyntheticAncestor!!, child.getValue())
     }
 
-    private fun updateAfterChange(
+    protected fun updateAfterChange(
         schema: EffectiveSchema<*>,
         value: Any?,
     ) {

src/main/kotlin/com/github/hanseter/json/editor/util/JsonExtensions.kt

@@ -0,0 +1,8 @@
+package com.github.hanseter.json.editor.util
+
+import org.json.JSONArray
+
+fun JSONArray.shallowClone(): JSONArray {
+    return JSONArray().putAll(this)
+}
+

src/test/kotlin/com/github/hanseter/json/editor/ArrayTest.kt

@@ -14,6 +14,7 @@ import org.junit.jupiter.api.extension.ExtendWith
 import org.testfx.framework.junit5.ApplicationExtension
 import org.testfx.framework.junit5.Start
 import org.testfx.util.WaitForAsyncUtils
+import java.util.concurrent.atomic.AtomicInteger
 
 @ExtendWith(ApplicationExtension::class)
 class ArrayTest {
@@ -26,19 +27,24 @@ class ArrayTest {
 
     @Test
     fun updateArrayValue() {
+        val updateCounter = AtomicInteger(0)
+
         val schema = JSONObject(
             """{"type":"object","properties":{"bar":{"type":"array",
             "items":{"type":"string"}
             }}}"""
         )
         val json = JSONObject("""{"bar":["hello", "world"]}""")
-        editor.display("1", "1", json, schema) { it }
+        editor.display("1", "1", json, schema) { it.also { updateCounter.incrementAndGet() } }
         val itemTable = editor.getItemTable()
         val arrayEntry = itemTable.root.children[0].findChildWithKey("bar")!!
         val textField = arrayEntry.children.first().value.createControl()!!.control as TextField
         assertThat(textField.text, `is`("hello"))
         textField.text = "bye bye"
+
+        WaitForAsyncUtils.waitForFxEvents()
         assertThat(json.getJSONArray("bar").getString(0), `is`("bye bye"))
+        assertThat(updateCounter.get(), `is`(1))
     }
 
     @Test
@@ -116,13 +122,15 @@ class ArrayTest {
 
     @Test
     fun arrayElementCanBeAddedByButtonPress() {
+        val updateCounter = AtomicInteger(0)
+
         val schema = JSONObject(
             """{"type":"object","properties":{"bar":{"type":"array",
             "items":{"type":"string"}
             }}}"""
         )
         val data = JSONObject()
-        editor.display("1", "1", data, schema) { it }
+        editor.display("1", "1", data, schema) { it.also { updateCounter.incrementAndGet() } }
         val itemTable = editor.getItemTable()
         val arrayEntry = itemTable.root.children[0].findChildWithKey("bar")!!
         val addButton = arrayEntry.value.createActions()!!.children[1] as Button
@@ -139,6 +147,7 @@ class ArrayTest {
         }
         WaitForAsyncUtils.waitForFxEvents()
         assertThat(data.getJSONArray("bar").toList(), contains(null, null, null))
+        assertThat(updateCounter.get(), `is`(3))
     }
 
     @Test