Changeset 13210 in josm for trunk/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java

Timestamp:

2017-12-17T15:37:11+01:00 (7 years ago)

Author:

Don-vip

Message:

fix #15606 - export relation to GPX file or convert to a new GPX layer (patch by cmuelle8, modified)

File:

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

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

@@ -13 +13 @@
 import java.util.Collection;
 import java.util.Collections;
+import java.util.EnumSet;
 import java.util.HashSet;
 import java.util.List;
@@ -29 +30 @@
 import javax.swing.KeyStroke;
 import javax.swing.ListSelectionModel;
+import javax.swing.event.PopupMenuEvent;
+import javax.swing.event.PopupMenuListener;
 
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.ExpertToggleAction;
+import org.openstreetmap.josm.actions.OsmPrimitiveAction;
 import org.openstreetmap.josm.actions.relation.AddSelectionToRelations;
 import org.openstreetmap.josm.actions.relation.DeleteRelationsAction;
@@ -38 +42 @@
 import org.openstreetmap.josm.actions.relation.DuplicateRelationAction;
 import org.openstreetmap.josm.actions.relation.EditRelationAction;
+import org.openstreetmap.josm.actions.relation.ExportRelationToGpxAction;
+import org.openstreetmap.josm.actions.relation.ExportRelationToGpxAction.Mode;
 import org.openstreetmap.josm.actions.relation.RecentRelationsAction;
 import org.openstreetmap.josm.actions.relation.SelectMembersAction;
@@ -122 +128 @@
     private transient JMenuItem addSelectionToRelationMenuItem;
 
+    /** export relation to GPX track action */
+    private final ExportRelationToGpxAction exportRelationFromFirstAction =
+            new ExportRelationToGpxAction(EnumSet.of(Mode.FROM_FIRST_MEMBER, Mode.TO_FILE));
+    private final ExportRelationToGpxAction exportRelationFromLastAction =
+            new ExportRelationToGpxAction(EnumSet.of(Mode.FROM_LAST_MEMBER, Mode.TO_FILE));
+    private final ExportRelationToGpxAction exportRelationFromFirstToLayerAction =
+            new ExportRelationToGpxAction(EnumSet.of(Mode.FROM_FIRST_MEMBER, Mode.TO_LAYER));
+    private final ExportRelationToGpxAction exportRelationFromLastToLayerAction =
+            new ExportRelationToGpxAction(EnumSet.of(Mode.FROM_LAST_MEMBER, Mode.TO_LAYER));
+
     private final transient HighlightHelper highlightHelper = new HighlightHelper();
     private final boolean highlightEnabled = Config.getPref().getBoolean("draw.target-highlight", true);
@@ -603 +619 @@
 
     private void setupPopupMenuHandler() {
+        List<JMenuItem> checkDisabled = new ArrayList<>();
 
         // -- select action
@@ -612 +629 @@
         popupMenuHandler.addAction(addMembersToSelectionAction);
 
+        // -- download members action
         popupMenuHandler.addSeparator();
-        // -- download members action
         popupMenuHandler.addAction(downloadMembersAction);
-
-        // -- download incomplete members action
         popupMenuHandler.addAction(downloadSelectedIncompleteMembersAction);
+
+        // -- export relation to gpx action
+        popupMenuHandler.addSeparator();
+        checkDisabled.add(popupMenuHandler.addAction(exportRelationFromFirstAction));
+        checkDisabled.add(popupMenuHandler.addAction(exportRelationFromLastAction));
+        popupMenuHandler.addSeparator();
+        checkDisabled.add(popupMenuHandler.addAction(exportRelationFromFirstToLayerAction));
+        checkDisabled.add(popupMenuHandler.addAction(exportRelationFromLastToLayerAction));
 
         popupMenuHandler.addSeparator();
@@ -625 +648 @@
 
         addSelectionToRelationMenuItem = popupMenuHandler.addAction(addSelectionToRelations);
+
+        popupMenuHandler.addListener(new PopupMenuListener() {
+            @Override
+            public void popupMenuWillBecomeVisible(PopupMenuEvent e) {
+                for (JMenuItem mi: checkDisabled) {
+                    mi.setVisible(((OsmPrimitiveAction) mi.getAction()).isEnabled());
+
+                    Component sep = popupMenu.getComponent(
+                            Math.max(0, popupMenu.getComponentIndex(mi)-1));
+                    if (!(sep instanceof JMenuItem)) {
+                        sep.setVisible(mi.isVisible());
+                    }
+                }
+            }
+
+            @Override
+            public void popupMenuWillBecomeInvisible(PopupMenuEvent e) {
+            }
+
+            @Override
+            public void popupMenuCanceled(PopupMenuEvent e) {
+            }
+        });
     }