Changeset 9365 in josm for trunk/src/org

Timestamp:

2016-01-09T21:55:09+01:00 (9 years ago)

Author:

simon04

Message:

see #8749 - Make "Add selection to relation" an expert action

File:

• trunk/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java (modified) (8 diffs)

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

@@ -25 +25 @@
 import javax.swing.JComponent;
 import javax.swing.JList;
+import javax.swing.JMenuItem;
 import javax.swing.JPanel;
 import javax.swing.JPopupMenu;
@@ -34 +35 @@
 
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.actions.ExpertToggleAction;
 import org.openstreetmap.josm.actions.relation.AddSelectionToRelations;
 import org.openstreetmap.josm.actions.relation.DeleteRelationsAction;
@@ -86 +88 @@
  * objects are visible on the map and can be selected there. Relations are not.
  */
-public class RelationListDialog extends ToggleDialog implements DataSetListener, NavigatableComponent.ZoomChangeListener {
+public class RelationListDialog extends ToggleDialog
+        implements DataSetListener, NavigatableComponent.ZoomChangeListener, ExpertToggleAction.ExpertModeChangeListener {
     /** The display list. */
     private final JList<Relation> displaylist;
@@ -116 +119 @@
     /** add all selected primitives to the given relations */
     private final AddSelectionToRelations addSelectionToRelations = new AddSelectionToRelations();
+    private transient JMenuItem addSelectionToRelationMenuItem;
 
     private final transient HighlightHelper highlightHelper = new HighlightHelper();
@@ -212 +216 @@
         DataSet.addSelectionListener(addSelectionToRelations);
         dataChanged(null);
+        ExpertToggleAction.addExpertModeChangeListener(this);
+        expertChanged(ExpertToggleAction.isExpert());
     }
 
@@ -220 +226 @@
         DatasetEventManager.getInstance().removeDatasetListener(this);
         DataSet.removeSelectionListener(addSelectionToRelations);
+        ExpertToggleAction.removeExpertModeChangeListener(this);
     }
 
@@ -595 +602 @@
         popupMenuHandler.addAction(deleteRelationsAction).setVisible(false);
 
-        popupMenuHandler.addAction(addSelectionToRelations);
+        addSelectionToRelationMenuItem = popupMenuHandler.addAction(addSelectionToRelations);
     }
 
@@ -682 +689 @@
         }
     }
+
+    @Override
+    public void expertChanged(boolean isExpert) {
+        addSelectionToRelationMenuItem.setVisible(isExpert);
+    }
 }