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

Timestamp:

10.03.2010 10:00:20 (2 years ago)

Author:

Gubaer

Message:

fixed #4651: Ability to download incomplete relation from selection
fixed #4098: Popup Menu entry "download relation members" in relation dialog should be "download incomplete relation members"
fixed two NPEs in RelationListDialog and SelectionListDialog
refactored SelectionListDialog to support better user feedback (enabled/disabled buttons and menu items)
Finally removed the sort() method on DataSet, marked as FIXME since a long time.

CAVEAT: DataSet.getSelected() now returns an unmodifiable list instead of a copy of the selection list. This may lead to UnsupportedOperationExceptions in the next few days. I tried to make sure the JOSM core uses getSelected() only for reading, but I didn't check the plugins.

File:

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

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

@@ -15 +15 @@
 import java.util.Comparator;
 import java.util.HashSet;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Set;
@@ -52 +53 @@
 import org.openstreetmap.josm.gui.SideButton;
 import org.openstreetmap.josm.gui.MapView.LayerChangeListener;
+import org.openstreetmap.josm.gui.dialogs.relation.DownloadRelationMemberTask;
 import org.openstreetmap.josm.gui.dialogs.relation.DownloadRelationTask;
 import org.openstreetmap.josm.gui.dialogs.relation.RelationEditor;
@@ -234 +236 @@
 
         @Override public void mouseClicked(MouseEvent e) {
+            if (Main.main.getEditLayer() == null) return;
             if (e.getClickCount() == 2 && SwingUtilities.isLeftMouseButton(e)) {
                 if (e.isControlDown()) {
@@ -254 +257 @@
         }
         @Override public void mousePressed(MouseEvent e) {
+            if (Main.main.getEditLayer() == null) return;
             if (e.isPopupTrigger()) {
                 openPopup(e);
@@ -259 +263 @@
         }
         @Override public void mouseReleased(MouseEvent e) {
+            if (Main.main.getEditLayer() == null) return;
             if (e.isPopupTrigger()) {
                 openPopup(e);
@@ -507 +512 @@
                     Main.map.mapView.getEditLayer())
             );
+        }
+    }
+
+    /**
+     * Action for downloading incomplete members of selected relations
+     * 
+     */
+    class DownloadSelectedIncompleteMembersAction extends AbstractAction implements ListSelectionListener{
+        public DownloadSelectedIncompleteMembersAction() {
+            putValue(SHORT_DESCRIPTION, tr("Download incomplete members of selected relations"));
+            putValue(SMALL_ICON, ImageProvider.get("dialogs/relation", "downloadincompleteselected"));
+            putValue(NAME, tr("Download incomplete members"));
+            updateEnabledState();
+        }
+
+        public Set<OsmPrimitive> buildSetOfIncompleteMembers(List<Relation> rels) {
+            Set<OsmPrimitive> ret = new HashSet<OsmPrimitive>();
+            for(Relation r: rels) {
+                ret.addAll(r.getIncompleteMembers());
+            }
+            return ret;
+        }
+
+        public void actionPerformed(ActionEvent e) {
+            if (!isEnabled())
+                return;
+            List<Relation> rels = model.getSelectedRelationsWithIncompleteMembers();
+            if (rels.isEmpty()) return;
+            Main.worker.submit(new DownloadRelationMemberTask(
+                    rels,
+                    buildSetOfIncompleteMembers(rels),
+                    Main.map.mapView.getEditLayer()
+            ));
+        }
+
+        protected void updateEnabledState() {
+            setEnabled(!model.getSelectedRelationsWithIncompleteMembers().isEmpty());
+        }
+
+        public void valueChanged(ListSelectionEvent e) {
+            updateEnabledState();
         }
     }
@@ -623 +669 @@
         }
 
+        /**
+         * Replies the list of selected relations with incomplete members
+         * 
+         * @return the list of selected relations with incomplete members
+         */
+        public List<Relation> getSelectedRelationsWithIncompleteMembers() {
+            List<Relation> ret = getSelectedNonNewRelations();
+            Iterator<Relation> it = ret.iterator();
+            while(it.hasNext()) {
+                Relation r = it.next();
+                if (!r.hasIncompleteMembers()) {
+                    it.remove();
+                }
+            }
+            return ret;
+        }
+
         public Object getElementAt(int index) {
             return relations.get(index);
@@ -715 +778 @@
             add(downloadMembersAction);
 
+            // -- download incomplete members action
+            //
+            DownloadSelectedIncompleteMembersAction downloadSelectedIncompleteMembers = new DownloadSelectedIncompleteMembersAction();
+            displaylist.addListSelectionListener(downloadSelectedIncompleteMembers);
+            add(downloadSelectedIncompleteMembers);
+
+            addSeparator();
+
             // -- select members action
             //