Ticket #12999: patch-fix-12999.patch

src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java

@@ -346 +346 @@
     }
 
     /**
+     * Adds all registered listeners by this conflict resolver
+     * @see #unregisterListeners()
+     */
+    public void registerListeners() {
+        nodeListMerger.registerListeners();
+        relationMemberMerger.registerListeners();
+    }
+
+    /**
      * Removes all registered listeners by this conflict resolver
      */
     public void unregisterListeners() {
-        nodeListMerger.unlinkAsListener();
-        relationMemberMerger.unlinkAsListener();
+        nodeListMerger.unregisterListeners();
+        relationMemberMerger.unregisterListeners();
     }
 
     /**

src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java

@@ -882 +882 @@
         );
     }
 
-    public void unlinkAsListener() {
-        myEntriesTable.unlinkAsListener();
-        mergedEntriesTable.unlinkAsListener();
-        theirEntriesTable.unlinkAsListener();
+    /**
+     * Adds all registered listeners by this merger
+     * @see #unregisterListeners()
+     */
+    public void registerListeners() {
+        myEntriesTable.registerListeners();
+        mergedEntriesTable.registerListeners();
+        theirEntriesTable.registerListeners();
+    }
+
+    /**
+     * Removes all registered listeners by this merger
+     */
+    public void unregisterListeners() {
+        myEntriesTable.unregisterListeners();
+        mergedEntriesTable.unregisterListeners();
+        theirEntriesTable.unregisterListeners();
     }
 
     protected final <P extends OsmPrimitive> OsmDataLayer findLayerFor(P primitive) {

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

@@ -51 +51 @@
     }
 
     @Override
+    public void addNotify() {
+        super.addNotify();
+        registerListeners();
+    }
+
+    @Override
     public void setVisible(boolean isVisible) {
         String geom = getClass().getName() + ".geometry";
         if (isVisible) {
@@ -61 +67 @@
             if (isShowing()) { // Avoid IllegalComponentStateException like in #8775
                 new WindowGeometry(this).remember(geom);
             }
-            unregisterListeners();
         }
         super.setVisible(isVisible);
     }
@@ -98 +103 @@
 
     private void registerListeners() {
         resolver.addPropertyChangeListener(applyResolutionAction);
+        resolver.registerListeners();
     }
 
     private void unregisterListeners() {
@@ -125 +131 @@
 
         resolver.addPropertyChangeListener(this);
         HelpUtil.setHelpContext(this.getRootPane(), ht("Dialog/Conflict"));
-
-        registerListeners();
     }
 
     /**

src/org/openstreetmap/josm/gui/widgets/OsmPrimitivesTable.java

@@ -82 +82 @@
     protected JPopupMenu buildPopupMenu() {
         JPopupMenu menu = new JPopupMenu();
         zoomToAction = buildZoomToAction();
-        Main.getLayerManager().addLayerChangeListener(zoomToAction);
-        Main.getLayerManager().addActiveLayerChangeListener(zoomToAction);
         getSelectionModel().addListSelectionListener(zoomToAction);
         menu.add(zoomToAction);
         return menu;
     }
 
-    public void unlinkAsListener() {
+    /**
+     * Adds all registered listeners by this table
+     * @see #unregisterListeners()
+     */
+    public void registerListeners() {
+        Main.getLayerManager().addLayerChangeListener(zoomToAction);
+        Main.getLayerManager().addActiveLayerChangeListener(zoomToAction);
+    }
+
+    /**
+     * Removes all registered listeners by this table
+     */
+    public void unregisterListeners() {
         Main.getLayerManager().removeLayerChangeListener(zoomToAction);
         Main.getLayerManager().removeActiveLayerChangeListener(zoomToAction);
     }