added changes from fixBug branch that weren't carried over during mer…

…ging
dlsc-software-consulting-gmbh · Dec 4, 2017 · 6313f39 · 6313f39
1 parent e724749
commit 6313f39
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 10 deletions.
diff --git a/formsfx-core/src/main/java/com/dlsc/formsfx/model/structure/MultiSelectionField.java b/formsfx-core/src/main/java/com/dlsc/formsfx/model/structure/MultiSelectionField.java
@@ -88,11 +88,7 @@ public class MultiSelectionField<V> extends SelectionField<V, MultiSelectionFiel
         // Changes to the user input are reflected in the value only if the new
         // user input is valid.
 
-        this.persistentSelection.addListener((observable, oldValue, newValue) -> {
-            if (validate()) {
-                this.selection.setValue(newValue);
-            }
-        });
+        this.selection.addListener((observable, oldValue, newValue) -> validate());
 
         // Clear the current selection and persistent selection whenever new
         // items are added. The selection is built back up if it is passed along

diff --git a/formsfx-core/src/main/java/com/dlsc/formsfx/model/structure/SingleSelectionField.java b/formsfx-core/src/main/java/com/dlsc/formsfx/model/structure/SingleSelectionField.java
@@ -84,11 +84,7 @@ public class SingleSelectionField<V> extends SelectionField<V, SingleSelectionFi
         // Changes to the user input are reflected in the value only if the new
         // user input is valid.
 
-        this.persistentSelection.addListener((observable, oldValue, newValue) -> {
-            if (validate()) {
-                this.selection.setValue(newValue);
-            }
-        });
+        this.selection.addListener((observable, oldValue, newValue) -> validate());
 
         // Clear the current selection and persistent selection whenever new
         // items are added. The selection is built back up if it is passed along