Ticket #5781: 5781-unregister.patch

src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java

@@ -187 +187 @@
     private SearchAction searchActionSame = new SearchAction(true);
     private SearchAction searchActionAny = new SearchAction(false);
     private AddAction addAction = new AddAction();
+    private EditAction editAction = new EditAction();
+    private DeleteAction deleteAction = new DeleteAction();
 
     @Override
     public void showNotify() {
@@ -201 +203 @@
         DatasetEventManager.getInstance().removeDatasetListener(dataChangedAdapter);
         SelectionEventManager.getInstance().removeSelectionListener(this);
         MapView.removeEditLayerChangeListener(this);
+        Main.unregisterActionShortcut(addAction);
+        Main.unregisterActionShortcut(editAction);
+        Main.unregisterActionShortcut(deleteAction);
     }
 
     /**
@@ -794 +799 @@
 
         // -- edit action
         //
-        EditAction editAction = new EditAction();
         propertyTable.getSelectionModel().addListSelectionListener(editAction);
         membershipTable.getSelectionModel().addListSelectionListener(editAction);
         this.btnEdit = new SideButton(editAction);
 
         // -- delete action
         //
-        DeleteAction deleteAction = new DeleteAction();
         this.btnDel = new SideButton(deleteAction);
         membershipTable.getSelectionModel().addListSelectionListener(deleteAction);
         propertyTable.getSelectionModel().addListSelectionListener(deleteAction);
@@ -1090 +1093 @@
         @Override
         protected void updateEnabledState() {
             setEnabled(
-                    PropertiesDialog.this.propertyTable.getSelectedRowCount() >0
-                    || PropertiesDialog.this.membershipTable.getSelectedRowCount() > 0
+                    (propertyTable != null && propertyTable.getSelectedRowCount() == 1)
+                    ^ (membershipTable != null && membershipTable.getSelectedRowCount() == 1)
             );
         }
 
@@ -1138 +1141 @@
         @Override
         protected void updateEnabledState() {
             setEnabled(
-                    propertyTable.getSelectedRowCount() == 1
-                    ^ membershipTable.getSelectedRowCount() == 1
+                    (propertyTable != null && propertyTable.getSelectedRowCount() == 1)
+                    ^ (membershipTable != null && membershipTable.getSelectedRowCount() == 1)
             );
         }