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

Timestamp:

2011-06-01T20:23:46+02:00 (13 years ago)

Author:

stoecker

Message:

fix #6410 - patch by bilbo - add two additional entries to popup dialog for relation entries

File:

• trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java (modified) (5 diffs)

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

@@ -27 +27 @@
 import java.util.Comparator;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
@@ -33 +34 @@
 import java.util.TreeMap;
 import java.util.Vector;
+import java.util.Set;
 
 import javax.swing.AbstractAction;
@@ -81 +83 @@
 import org.openstreetmap.josm.gui.dialogs.ToggleDialog;
 import org.openstreetmap.josm.gui.dialogs.properties.PresetListPanel.PresetHandler;
+import org.openstreetmap.josm.gui.dialogs.relation.DownloadRelationMemberTask;
 import org.openstreetmap.josm.gui.dialogs.relation.RelationEditor;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
@@ -606 +609 @@
                     menu.add(new SelectRelationAction(relation, true));
                     menu.add(new SelectRelationAction(relation, false));
+                    menu.add(new SelectRelationMembersAction(relation));
+                    menu.add(new DownloadIncompleteMembersAction(relation));
                     menu.addSeparator();
                     menu.add(helpAction);
@@ -1183 +1188 @@
         }
     }
+
+
+    /**
+     * Sets the current selection to the members of selected relation
+     *
+     */
+    class SelectRelationMembersAction extends AbstractAction {
+        Relation relation;
+        public SelectRelationMembersAction(Relation r) {
+            relation = r;
+            putValue(SHORT_DESCRIPTION,tr("Select the members of selected relation"));
+            putValue(SMALL_ICON, ImageProvider.get("selectall"));
+            putValue(NAME, tr("Select members"));
+        }
+
+        public void actionPerformed(ActionEvent e) {
+            HashSet<OsmPrimitive> members = new HashSet<OsmPrimitive>();
+            members.addAll(relation.getMemberPrimitives());
+            Main.map.mapView.getEditLayer().data.setSelected(members);
+        }
+
+    }
+
+    /**
+     * Action for downloading incomplete members of selected relation
+     *
+     */
+    class DownloadIncompleteMembersAction extends AbstractAction {
+        Relation relation;
+        public DownloadIncompleteMembersAction(Relation r) {
+            relation = r;
+            putValue(SHORT_DESCRIPTION, tr("Download incomplete members of selected relations"));
+            putValue(SMALL_ICON, ImageProvider.get("dialogs/relation", "downloadincompleteselected"));
+            putValue(NAME, tr("Download incomplete members"));
+        }
+
+        public Set<OsmPrimitive> buildSetOfIncompleteMembers(Relation r) {
+            Set<OsmPrimitive> ret = new HashSet<OsmPrimitive>();
+            ret.addAll(r.getIncompleteMembers());
+            return ret;
+        }
+
+        public void actionPerformed(ActionEvent e) {
+            if (!relation.hasIncompleteMembers()) return;
+            ArrayList<Relation> rels = new ArrayList<Relation>();
+            rels.add(relation);
+            Main.worker.submit(new DownloadRelationMemberTask(
+                    rels,
+                    buildSetOfIncompleteMembers(relation),
+                    Main.map.mapView.getEditLayer()
+            ));
+        }
+    }
+
+
 }