Changeset 14471 in josm for trunk/src/org/openstreetmap/josm

Timestamp:

2018-12-01T11:40:47+01:00 (5 years ago)

Author:

GerdP

Message:

see #17040 Move call of UndoRedoHandler.removeCommandQueueListener() to the action that adds itself

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/relation/RecentRelationsAction.java (modified) (1 diff)
• gui/dialogs/RelationListDialog.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/actions/relation/RecentRelationsAction.java

@@ -112 +112 @@
     public void destroy() {
         MainApplication.unregisterActionShortcut(launchAction, shortcut);
+        UndoRedoHandler.getInstance().removeCommandQueueListener(this);
         super.destroy();
     }

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

@@ -46 +46 @@
 import org.openstreetmap.josm.actions.relation.SelectMembersAction;
 import org.openstreetmap.josm.actions.relation.SelectRelationAction;
-import org.openstreetmap.josm.data.UndoRedoHandler;
 import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.DefaultNameFormatter;
@@ -210 +209 @@
     @Override
     public void destroy() {
-        UndoRedoHandler.getInstance().removeCommandQueueListener(recentRelationsAction);
         recentRelationsAction.destroy();
+        exportRelationFromFirstAction.setPrimitives(Collections.emptyList());
+        exportRelationFromFirstToLayerAction.setPrimitives(Collections.emptyList());
+        exportRelationFromLastAction.setPrimitives(Collections.emptyList());
+        exportRelationFromLastToLayerAction.setPrimitives(Collections.emptyList());
         model.clear();
         super.destroy();