fixed wrong listener invocation

tomtzook · tomtzook · commit 78faddfcc5e8 · 2020-05-19T17:58:02.000+03:00
diff --git a/src/main/java/com/beans/observables/ObservableFactory.java b/src/main/java/com/beans/observables/ObservableFactory.java
@@ -1,7 +1,6 @@
 package com.beans.observables;
 
 import com.beans.observables.binding.AtomicPropertyBindingController;
-import com.beans.observables.listeners.ObservableEventController;
 import com.beans.observables.properties.ObservableBooleanProperty;
 import com.beans.observables.properties.ObservableDoubleProperty;
 import com.beans.observables.properties.ObservableIntProperty;
@@ -29,70 +28,70 @@ public ObservableFactory(EventController eventController) {
 
     public <T> ObservableProperty<T> newProperty(T initialValue) {
         return new SimpleObservableProperty<T>(
-                new ObservableEventController.Impl<>(mEventController),
+                mEventController,
                 new AtomicPropertyBindingController<>(),
                 initialValue);
     }
 
     public <T> ObservableProperty<T> newConcurrentProperty(T initialValue) {
         return new AtomicObservableProperty<>(
-                new ObservableEventController.Impl<>(mEventController),
+                mEventController,
                 new AtomicPropertyBindingController<>(),
                 initialValue);
     }
 
     public ObservableBooleanProperty newBooleanProperty(boolean initialValue) {
         return new SimpleObservableBooleanProperty(
-                new ObservableEventController.Impl<>(mEventController),
+                mEventController,
                 new AtomicPropertyBindingController<>(),
                 initialValue);
     }
 
     public ObservableBooleanProperty newConcurrentBooleanProperty(boolean initialValue) {
         return new AtomicObservableBooleanProperty(
-                new ObservableEventController.Impl<>(mEventController),
+                mEventController,
                 new AtomicPropertyBindingController<>(),
                 initialValue);
     }
 
     public ObservableIntProperty newIntProperty(int initialValue) {
         return new SimpleObservableIntProperty(
-                new ObservableEventController.Impl<>(mEventController),
+                mEventController,
                 new AtomicPropertyBindingController<>(),
                 initialValue);
     }
 
     public ObservableIntProperty newConcurrentIntProperty(int initialValue) {
         return new AtomicObservableIntProperty(
-                new ObservableEventController.Impl<>(mEventController),
+                mEventController,
                 new AtomicPropertyBindingController<>(),
                 initialValue);
     }
 
     public ObservableDoubleProperty newDoubleProperty(double initialValue) {
         return new SimpleObservableDoubleProperty(
-                new ObservableEventController.Impl<>(mEventController),
+                mEventController,
                 new AtomicPropertyBindingController<>(),
                 initialValue);
     }
 
     public ObservableDoubleProperty newConcurrentDoubleProperty(double initialValue) {
         return new AtomicObservableDoubleProperty(
-                new ObservableEventController.Impl<>(mEventController),
+                mEventController,
                 new AtomicPropertyBindingController<>(),
                 initialValue);
     }
 
     public ObservableLongProperty newLongProperty(long initialValue) {
         return new SimpleObservableLongProperty(
-                new ObservableEventController.Impl<>(mEventController),
+                mEventController,
                 new AtomicPropertyBindingController<>(),
                 initialValue);
     }
 
     public ObservableLongProperty newConcurrentLongProperty(long initialValue) {
         return new AtomicObservableLongProperty(
-                new ObservableEventController.Impl<>(mEventController),
+                mEventController,
                 new AtomicPropertyBindingController<>(),
                 initialValue);
     }
diff --git a/src/main/java/com/beans/observables/listeners/ListenerPredicate.java b/src/main/java/com/beans/observables/listeners/ListenerPredicate.java
@@ -0,0 +1,25 @@
+package com.beans.observables.listeners;
+
+import com.beans.observables.ObservableValue;
+import com.notifier.Event;
+
+import java.util.function.Predicate;
+
+public class ListenerPredicate implements Predicate<Event> {
+
+    private final ObservableValue<?> mObservable;
+
+    public ListenerPredicate(ObservableValue<?> observable) {
+        mObservable = observable;
+    }
+
+    @Override
+    public boolean test(Event event) {
+        if (mObservable == null) {
+            return true;
+        }
+
+        return event instanceof ChangeEvent &&
+                ((ChangeEvent)event).getObservableValue().equals(mObservable);
+    }
+}
diff --git a/src/main/java/com/beans/observables/listeners/ObservableEventController.java b/src/main/java/com/beans/observables/listeners/ObservableEventController.java
@@ -1,8 +1,11 @@
 package com.beans.observables.listeners;
 
+import com.beans.observables.ObservableValue;
+import com.notifier.Event;
 import com.notifier.EventController;
 
 import java.util.Arrays;
+import java.util.function.Predicate;
 
 public interface ObservableEventController<T> {
 
@@ -12,20 +15,23 @@ public interface ObservableEventController<T> {
 
     class Impl<T> implements ObservableEventController<T> {
         private final EventController mEventController;
+        private final Predicate<Event> mEventPredicate;
 
-        public Impl(EventController eventController) {
+        public Impl(EventController eventController, ObservableValue<T> thisObservable) {
             mEventController = eventController;
+            mEventPredicate = new ListenerPredicate(thisObservable);
         }
 
         @SafeVarargs
-        public Impl(EventController eventController, ChangeListener<? super T>... listeners) {
+        public Impl(EventController eventController, ObservableValue<T> thisObservable, ChangeListener<? super T>... listeners) {
             mEventController = eventController;
+            mEventPredicate = new ListenerPredicate(thisObservable);
             Arrays.asList(listeners).forEach(this::addListener);
         }
 
         @Override
         public void addListener(ChangeListener<? super T> listener) {
-            mEventController.registerListener(listener);
+            mEventController.registerListener(listener, mEventPredicate);
         }
 
         @Override
diff --git a/src/main/java/com/beans/observables/properties/ObservableBooleanProperty.java b/src/main/java/com/beans/observables/properties/ObservableBooleanProperty.java
@@ -3,6 +3,7 @@
 import com.beans.BooleanProperty;
 import com.beans.observables.binding.PropertyBindingController;
 import com.beans.observables.listeners.ObservableEventController;
+import com.notifier.EventController;
 
 import java.util.Objects;
 import java.util.Optional;
@@ -30,6 +31,11 @@ protected ObservableBooleanProperty(ObservableEventController<Boolean> eventCont
         super(eventController, bindingController);
     }
 
+    protected ObservableBooleanProperty(EventController eventController,
+                                        PropertyBindingController<Boolean> bindingController) {
+        super(eventController, bindingController);
+    }
+
     /**
      * {@inheritDoc}
      * <p>
diff --git a/src/main/java/com/beans/observables/properties/ObservableDoubleProperty.java b/src/main/java/com/beans/observables/properties/ObservableDoubleProperty.java
@@ -3,6 +3,7 @@
 import com.beans.DoubleProperty;
 import com.beans.observables.binding.PropertyBindingController;
 import com.beans.observables.listeners.ObservableEventController;
+import com.notifier.EventController;
 
 import java.util.Objects;
 import java.util.Optional;
@@ -30,6 +31,11 @@ protected ObservableDoubleProperty(ObservableEventController<Double> eventContro
         super(eventController, bindingController);
     }
 
+    protected ObservableDoubleProperty(EventController eventController,
+                                        PropertyBindingController<Double> bindingController) {
+        super(eventController, bindingController);
+    }
+
     /**
      * {@inheritDoc}
      * <p>
diff --git a/src/main/java/com/beans/observables/properties/ObservableIntProperty.java b/src/main/java/com/beans/observables/properties/ObservableIntProperty.java
@@ -3,6 +3,7 @@
 import com.beans.IntProperty;
 import com.beans.observables.binding.PropertyBindingController;
 import com.beans.observables.listeners.ObservableEventController;
+import com.notifier.EventController;
 
 import java.util.Objects;
 import java.util.Optional;
@@ -30,6 +31,10 @@ protected ObservableIntProperty(ObservableEventController<Integer> eventControll
         super(eventController, bindingController);
     }
 
+    protected ObservableIntProperty(EventController eventController,
+                                        PropertyBindingController<Integer> bindingController) {
+        super(eventController, bindingController);
+    }
     /**
      * {@inheritDoc}
      * <p>
diff --git a/src/main/java/com/beans/observables/properties/ObservableLongProperty.java b/src/main/java/com/beans/observables/properties/ObservableLongProperty.java
@@ -3,6 +3,7 @@
 import com.beans.LongProperty;
 import com.beans.observables.binding.PropertyBindingController;
 import com.beans.observables.listeners.ObservableEventController;
+import com.notifier.EventController;
 
 import java.util.Objects;
 import java.util.Optional;
@@ -30,6 +31,11 @@ protected ObservableLongProperty(ObservableEventController<Long> eventController
         super(eventController, bindingController);
     }
 
+    protected ObservableLongProperty(EventController eventController,
+                                        PropertyBindingController<Long> bindingController) {
+        super(eventController, bindingController);
+    }
+
     /**
      * {@inheritDoc}
      * <p>
diff --git a/src/main/java/com/beans/observables/properties/ObservablePropertyBase.java b/src/main/java/com/beans/observables/properties/ObservablePropertyBase.java
@@ -6,6 +6,7 @@
 import com.beans.observables.listeners.ChangeEvent;
 import com.beans.observables.listeners.ChangeListener;
 import com.beans.observables.listeners.ObservableEventController;
+import com.notifier.EventController;
 
 import java.util.Optional;
 
@@ -40,6 +41,11 @@ protected ObservablePropertyBase(ObservableEventController<T> eventController, P
         mBindingController = bindingController;
     }
 
+    protected ObservablePropertyBase(EventController eventController, PropertyBindingController<T> bindingController) {
+        mEventController = new ObservableEventController.Impl<>(eventController, this);
+        mBindingController = bindingController;
+    }
+
     @Override
     public final void addChangeListener(ChangeListener<? super T> changeListener) {
         mEventController.addListener(changeListener);
diff --git a/src/main/java/com/beans/observables/properties/SimpleObservableBooleanProperty.java b/src/main/java/com/beans/observables/properties/SimpleObservableBooleanProperty.java
@@ -2,6 +2,7 @@
 
 import com.beans.observables.binding.PropertyBindingController;
 import com.beans.observables.listeners.ObservableEventController;
+import com.notifier.EventController;
 
 /**
  * <p>
@@ -23,6 +24,13 @@ public SimpleObservableBooleanProperty(ObservableEventController<Boolean> eventC
         mValue = initialValue;
     }
 
+    public SimpleObservableBooleanProperty(EventController eventController,
+                                        PropertyBindingController<Boolean> bindingController,
+                                              boolean initialValue) {
+        super(eventController, bindingController);
+        mValue = initialValue;
+    }
+
     public SimpleObservableBooleanProperty(ObservableEventController<Boolean> eventController,
                                            PropertyBindingController<Boolean> bindingController) {
         this(eventController, bindingController, false);
diff --git a/src/main/java/com/beans/observables/properties/SimpleObservableDoubleProperty.java b/src/main/java/com/beans/observables/properties/SimpleObservableDoubleProperty.java
@@ -2,6 +2,7 @@
 
 import com.beans.observables.binding.PropertyBindingController;
 import com.beans.observables.listeners.ObservableEventController;
+import com.notifier.EventController;
 
 /**
  * <p>
@@ -23,6 +24,13 @@ public SimpleObservableDoubleProperty(ObservableEventController<Double> eventCon
         mValue = initialValue;
     }
 
+    public SimpleObservableDoubleProperty(EventController eventController,
+                                              PropertyBindingController<Double> bindingController,
+                                              double initialValue) {
+        super(eventController, bindingController);
+        mValue = initialValue;
+    }
+
     public SimpleObservableDoubleProperty(ObservableEventController<Double> eventController,
                                           PropertyBindingController<Double> bindingController) {
         this(eventController, bindingController, 0.0);
diff --git a/src/main/java/com/beans/observables/properties/SimpleObservableIntProperty.java b/src/main/java/com/beans/observables/properties/SimpleObservableIntProperty.java
@@ -2,6 +2,7 @@
 
 import com.beans.observables.binding.PropertyBindingController;
 import com.beans.observables.listeners.ObservableEventController;
+import com.notifier.EventController;
 
 /**
  * <p>
@@ -23,6 +24,13 @@ public SimpleObservableIntProperty(ObservableEventController<Integer> eventContr
         mValue = initialValue;
     }
 
+    public SimpleObservableIntProperty(EventController eventController,
+                                              PropertyBindingController<Integer> bindingController,
+                                              int initialValue) {
+        super(eventController, bindingController);
+        mValue = initialValue;
+    }
+
     public SimpleObservableIntProperty(ObservableEventController<Integer> eventController,
                                        PropertyBindingController<Integer> bindingController) {
         this(eventController, bindingController, 0);
diff --git a/src/main/java/com/beans/observables/properties/SimpleObservableLongProperty.java b/src/main/java/com/beans/observables/properties/SimpleObservableLongProperty.java
@@ -2,6 +2,7 @@
 
 import com.beans.observables.binding.PropertyBindingController;
 import com.beans.observables.listeners.ObservableEventController;
+import com.notifier.EventController;
 
 /**
  * <p>
@@ -23,6 +24,13 @@ public SimpleObservableLongProperty(ObservableEventController<Long> eventControl
         mValue = initialValue;
     }
 
+    public SimpleObservableLongProperty(EventController eventController,
+                                              PropertyBindingController<Long> bindingController,
+                                              long initialValue) {
+        super(eventController, bindingController);
+        mValue = initialValue;
+    }
+
     public SimpleObservableLongProperty(ObservableEventController<Long> eventController,
                                         PropertyBindingController<Long> bindingController) {
         this(eventController, bindingController, 0);
diff --git a/src/main/java/com/beans/observables/properties/SimpleObservableProperty.java b/src/main/java/com/beans/observables/properties/SimpleObservableProperty.java
@@ -2,6 +2,7 @@
 
 import com.beans.observables.binding.PropertyBindingController;
 import com.beans.observables.listeners.ObservableEventController;
+import com.notifier.EventController;
 
 import java.util.Objects;
 import java.util.Optional;
@@ -28,6 +29,13 @@ public SimpleObservableProperty(ObservableEventController<T> eventController,
         mValue = initialValue;
     }
 
+    public SimpleObservableProperty(EventController eventController,
+                                    PropertyBindingController<T> bindingController,
+                                    T initialValue) {
+        super(eventController, bindingController);
+        mValue = initialValue;
+    }
+
     public SimpleObservableProperty(ObservableEventController<T> eventController,
                                     PropertyBindingController<T> bindingController) {
         this(eventController, bindingController, null);
diff --git a/src/main/java/com/beans/observables/properties/atomic/AtomicObservableBooleanProperty.java b/src/main/java/com/beans/observables/properties/atomic/AtomicObservableBooleanProperty.java
@@ -3,6 +3,7 @@
 import com.beans.observables.binding.PropertyBindingController;
 import com.beans.observables.listeners.ObservableEventController;
 import com.beans.observables.properties.ObservableBooleanProperty;
+import com.notifier.EventController;
 
 import java.util.concurrent.atomic.AtomicBoolean;
 
@@ -30,6 +31,13 @@ public AtomicObservableBooleanProperty(ObservableEventController<Boolean> eventC
         mValue = new AtomicBoolean(initialValue);
     }
 
+    public AtomicObservableBooleanProperty(EventController eventController,
+                                              PropertyBindingController<Boolean> bindingController,
+                                              boolean initialValue) {
+        super(eventController, bindingController);
+        mValue = new AtomicBoolean(initialValue);
+    }
+
     public AtomicObservableBooleanProperty(ObservableEventController<Boolean> eventController,
                                            PropertyBindingController<Boolean> bindingController) {
         this(eventController, bindingController, false);
diff --git a/src/main/java/com/beans/observables/properties/atomic/AtomicObservableDoubleProperty.java b/src/main/java/com/beans/observables/properties/atomic/AtomicObservableDoubleProperty.java
diff --git a/src/main/java/com/beans/observables/properties/atomic/AtomicObservableIntProperty.java b/src/main/java/com/beans/observables/properties/atomic/AtomicObservableIntProperty.java
diff --git a/src/main/java/com/beans/observables/properties/atomic/AtomicObservableLongProperty.java b/src/main/java/com/beans/observables/properties/atomic/AtomicObservableLongProperty.java
diff --git a/src/main/java/com/beans/observables/properties/atomic/AtomicObservableProperty.java b/src/main/java/com/beans/observables/properties/atomic/AtomicObservableProperty.java
diff --git a/src/test/java/com/beans/observables/properties/ObservablePropertyImplTest.java b/src/test/java/com/beans/observables/properties/ObservablePropertyImplTest.java
