fix listeners

Author: thomasnield

src/main/kotlin/org/nield/dirtyfx/collections/DirtyObservableList.kt

@@ -19,6 +19,15 @@ class DirtyObservableList<T> private constructor(_originalList: List<T> = listOf
     private val _originalList = FXCollections.observableArrayList(_originalList)
     private val _isDirtyProperty = SimpleBooleanProperty()
 
+
+    private val listener = ListChangeListener<T> { _ ->
+        _isDirtyProperty.set(_originalList != this)
+    }
+    init {
+        addListener(WeakListChangeListener(listener))
+    }
+
+
     /** Sets this `ObservableList` to now be the "original" list **/
     override fun rebaseline() {
         _originalList.setAll(this)
@@ -30,13 +39,6 @@ class DirtyObservableList<T> private constructor(_originalList: List<T> = listOf
         _isDirtyProperty.set(false)
     }
 
-    init {
-        addListener(
-                ListChangeListener<T> { _ ->
-                    _isDirtyProperty.set(_originalList != this)
-                }
-        )
-    }
 
     val originalList get() = FXCollections.unmodifiableObservableList(_originalList)
 

src/main/kotlin/org/nield/dirtyfx/collections/DirtyObservableMap.kt

@@ -15,8 +15,16 @@ class DirtyObservableMap<K,V> private constructor(_originalMap: Map<K,V>,
     private val _originalMap = FXCollections.observableMap(_originalMap)
     private val _isDirtyProperty = SimpleBooleanProperty()
 
+    private val listener = MapChangeListener<K,V> {
+        _isDirtyProperty.set(_originalMap != this)
+    }
+
     constructor(originalMap: Map<K,V> = mapOf()): this(originalMap, FXCollections.observableMap(HashMap<K,V>(originalMap)))
 
+    init {
+        addListener(WeakMapChangeListener(listener))
+    }
+
     override fun rebaseline() {
         _originalMap.clear()
         forEach { k, v -> _originalMap[k] = v }
@@ -27,13 +35,7 @@ class DirtyObservableMap<K,V> private constructor(_originalMap: Map<K,V>,
         _originalMap.forEach { k, v -> set(k,v) }
         _isDirtyProperty.set(false)
     }
-    init {
-        addListener(
-                MapChangeListener<K,V> {
-                    _isDirtyProperty.set(_originalMap != this)
-                }
-        )
-    }
+
     val originalMap get() = FXCollections.unmodifiableObservableMap(_originalMap)
 
     override fun isDirtyProperty(): ObservableValue<Boolean> = _isDirtyProperty

src/main/kotlin/org/nield/dirtyfx/collections/DirtyObservableSet.kt

@@ -2,6 +2,7 @@ package org.nield.dirtyfx.collections
 
 import javafx.beans.property.SimpleBooleanProperty
 import javafx.beans.value.ObservableValue
+import javafx.beans.value.WeakChangeListener
 import javafx.collections.FXCollections
 import javafx.collections.ObservableSet
 import javafx.collections.SetChangeListener
@@ -17,12 +18,12 @@ class DirtyObservableSet<T> private constructor(_originalSet: Set<T> = setOf(),
     private val _originalSet = FXCollections.observableSet(HashSet<T>(_originalSet))
     private val _isDirtyProperty = SimpleBooleanProperty()
 
+    private val listener = SetChangeListener<T> {
+        _isDirtyProperty.set(_originalSet != this)
+    }
+
     init {
-        addListener(
-                SetChangeListener<T> {
-                    _isDirtyProperty.set(_originalSet != this)
-                }
-        )
+        addListener(WeakSetChangeListener(listener))
     }
 
     override fun rebaseline() {

src/main/kotlin/org/nield/dirtyfx/tracking/CompositeDirtyProperty.kt

@@ -13,16 +13,16 @@ class CompositeDirtyProperty: DirtyProperty, ObservableValue<Boolean> {
     private val items = FXCollections.observableArrayList<DirtyProperty> { arrayOf(it.isDirtyProperty()) }
     private val _dirtyStateProperty = SimpleBooleanProperty()
 
-    init {
-        items.addListener(
-            ListChangeListener<DirtyProperty> { _ ->
-                _dirtyStateProperty.set(
-                        items.any { it.isDirty }
-                )
-            }
+    private val listener = ListChangeListener<DirtyProperty> { _ ->
+        _dirtyStateProperty.set(
+                items.any { it.isDirty }
         )
     }
 
+    init {
+        items.addListener(WeakListChangeListener(listener))
+    }
+
     /**
      * Indicates if any tracked DirtyProperties are dirty
      */