From a5c7c51188237ea28dd7caac9706d684688aa655 Mon Sep 17 00:00:00 2001
From: Hendrik Ebbers <hendrik.ebbers@web.de>
Date: Thu, 23 Feb 2017 23:15:51 +0100
Subject: [PATCH] merge

---
 impl/src/main/java/com/guigarage/binding/Binding.java       | 2 +-
 impl/src/main/java/com/guigarage/binding/SwingBinding.java  | 2 +-
 impl/src/main/java/com/guigarage/examples/TimeObserver.java | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/impl/src/main/java/com/guigarage/binding/Binding.java b/impl/src/main/java/com/guigarage/binding/Binding.java
index e05153a..2de13aa 100644
--- a/impl/src/main/java/com/guigarage/binding/Binding.java
+++ b/impl/src/main/java/com/guigarage/binding/Binding.java
@@ -41,7 +41,7 @@ private <U, V> Subscription bind(Observable<U> observable, Property<V> property,
                     if(!bindingCalled) {
                         bindingCalled = true;
                         try {
-                            property.setValue(converter.apply(e.getNewValue()));
+                            property.setValue(converter.apply(e.getValue()));
                         } catch (Exception ex) {
                             errorHandler.accept(ex);
                         } finally {
diff --git a/impl/src/main/java/com/guigarage/binding/SwingBinding.java b/impl/src/main/java/com/guigarage/binding/SwingBinding.java
index 9e66057..d0851a4 100644
--- a/impl/src/main/java/com/guigarage/binding/SwingBinding.java
+++ b/impl/src/main/java/com/guigarage/binding/SwingBinding.java
@@ -112,7 +112,7 @@ private <U> Subscription bind(Observable<U> observable, Function<U, T> converter
                                 if (!bindingCalled.get()) {
                                     bindingCalled.set(true);
                                     try {
-                                        propertyEditor.setValue(converter.apply(e.getNewValue()));
+                                        propertyEditor.setValue(converter.apply(e.getValue()));
                                     } catch (Exception e1) {
                                         errorHandler.accept(e1);
                                     } finally {
diff --git a/impl/src/main/java/com/guigarage/examples/TimeObserver.java b/impl/src/main/java/com/guigarage/examples/TimeObserver.java
index dfbcd6c..ad5274d 100644
--- a/impl/src/main/java/com/guigarage/examples/TimeObserver.java
+++ b/impl/src/main/java/com/guigarage/examples/TimeObserver.java
@@ -23,7 +23,7 @@ public TimeObserver() {
 
     public static void main(String[] args) {
         TimeObserver observer = new TimeObserver();
-        observer.onChanged(e -> System.out.println(e.getNewValue()));
+        observer.onChanged(e -> System.out.println(e.getValue()));
     }
 
 }