Changeset 5297 in josm for trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java

Timestamp:

2012-06-24T19:14:38+02:00 (12 years ago)

Author:

Don-vip

Message:

fix #4493, fix #7750: conflict dialog, nodes and members tab: allow selection via double-click, allow zoom via contexual menu, plus various fix in EDT violations

File:

• trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java

@@ -9 +9 @@
 import java.awt.Dimension;
 import java.awt.FlowLayout;
-import java.awt.Point;
 import java.awt.event.ActionEvent;
 import java.beans.PropertyChangeEvent;
@@ -100 +99 @@
     private void unregisterListeners() {
         resolver.removePropertyChangeListener(applyResolutionAction);
+        resolver.unregisterListeners();
     }