Changeset 12196 in josm for trunk/src/org

Timestamp:

2017-05-16T21:25:34+02:00 (8 years ago)

Author:

michael2402

Message:

Remove listeners from parent preference if they were added to both cild and parent.

Location:

trunk/src/org/openstreetmap/josm/data/preferences

Files:

• AbstractProperty.java (modified) (4 diffs)
• AbstractToStringProperty.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/data/preferences/AbstractProperty.java

@@ -7 +7 @@
 import org.openstreetmap.josm.data.Preferences.PreferenceChangedListener;
 import org.openstreetmap.josm.tools.ListenableWeakReference;
+import org.openstreetmap.josm.tools.bugreport.BugReport;
 
 /**
@@ -238 +239 @@
      */
     public void addListener(ValueChangeListener<? super T> listener) {
-        addListenerImpl(new PreferenceChangedListenerAdapter(listener));
+        try {
+            addListenerImpl(new PreferenceChangedListenerAdapter(listener));
+        } catch (RuntimeException e) {
+            throw BugReport.intercept(e).put("listener", listener).put("preference", key);
+        }
     }
 
@@ -251 +256 @@
      */
     public void addWeakListener(ValueChangeListener<? super T> listener) {
-        ValueChangeListener<T> weakListener = new WeakPreferenceAdapter(listener);
-        PreferenceChangedListenerAdapter adapter = new PreferenceChangedListenerAdapter(weakListener);
-        addListenerImpl(adapter);
+        try {
+            ValueChangeListener<T> weakListener = new WeakPreferenceAdapter(listener);
+            PreferenceChangedListenerAdapter adapter = new PreferenceChangedListenerAdapter(weakListener);
+            addListenerImpl(adapter);
+        } catch (RuntimeException e) {
+            throw BugReport.intercept(e).put("listener", listener).put("preference", key);
+        }
     }
 
@@ -281 +290 @@
      */
     public void removeListener(ValueChangeListener<? super T> listener) {
-        removeListenerImpl(new PreferenceChangedListenerAdapter(listener));
+        try {
+            removeListenerImpl(new PreferenceChangedListenerAdapter(listener));
+        } catch (RuntimeException e) {
+            throw BugReport.intercept(e).put("listener", listener).put("preference", key);
+        }
     }
 

trunk/src/org/openstreetmap/josm/data/preferences/AbstractToStringProperty.java

@@ -57 +57 @@
             super.addListenerImpl(adapter);
             parent.addListenerImpl(adapter);
+        }
+
+        @Override
+        protected void removeListenerImpl(PreferenceChangedListener adapter) {
+            super.removeListenerImpl(adapter);
+            parent.removeListenerImpl(adapter);
         }