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

Timestamp:

2016-01-17T23:57:57+01:00 (9 years ago)

Author:

simon04

Message:

fix #4996 - Changeset manager: allow to download objects from a changeset

File:

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

trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java

@@ -36 +36 @@
 import org.openstreetmap.josm.data.osm.Changeset;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.data.osm.PrimitiveId;
 import org.openstreetmap.josm.data.osm.history.History;
 import org.openstreetmap.josm.data.osm.history.HistoryDataSet;
@@ -45 +46 @@
 import org.openstreetmap.josm.gui.history.HistoryBrowserDialogManager;
 import org.openstreetmap.josm.gui.history.HistoryLoadTask;
+import org.openstreetmap.josm.gui.io.DownloadPrimitivesWithReferrersTask;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 import org.openstreetmap.josm.gui.util.GuiHelper;
@@ -51 +53 @@
 import org.openstreetmap.josm.tools.BugReportExceptionHandler;
 import org.openstreetmap.josm.tools.ImageProvider;
+import org.openstreetmap.josm.tools.Utils;
 
 /**
@@ -70 +73 @@
 
     private final HeaderPanel pnlHeader = new HeaderPanel();
+    public DownloadObjectAction actDownloadObjectAction;
 
     protected void buildModels() {
@@ -76 +80 @@
         actDownloadContentAction = new DownloadChangesetContentAction(this);
         actDownloadContentAction.initProperties();
+
+        actDownloadObjectAction = new DownloadObjectAction();
+        model.getSelectionModel().addListSelectionListener(actDownloadObjectAction);
+
         actShowHistory = new ShowHistoryAction();
         model.getSelectionModel().addListSelectionListener(actShowHistory);
@@ -118 +126 @@
 
         tb.add(actDownloadContentAction);
+        tb.addSeparator();
+        tb.add(actDownloadObjectAction);
         tb.add(actShowHistory);
+        tb.addSeparator();
         tb.add(actSelectInCurrentLayerAction);
         tb.add(actZoomInCurrentLayerAction);
@@ -190 +201 @@
         ChangesetContentTablePopupMenu() {
             add(actDownloadContentAction);
+            add(new JSeparator());
+            add(actDownloadObjectAction);
             add(actShowHistory);
             add(new JSeparator());
@@ -280 +293 @@
     }
 
+    class DownloadObjectAction extends AbstractAction implements ListSelectionListener {
+
+        DownloadObjectAction() {
+            putValue(NAME, tr("Download objects"));
+            putValue(SMALL_ICON, ImageProvider.get("downloadprimitive"));
+            putValue(SHORT_DESCRIPTION, tr("Download the current version of the selected objects"));
+            updateEnabledState();
+        }
+
+        @Override
+        public void actionPerformed(ActionEvent arg0) {
+            final List<PrimitiveId> primitiveIds = new ArrayList<>(Utils.transform(
+                    model.getSelectedPrimitives(), new Utils.Function<HistoryOsmPrimitive, PrimitiveId>() {
+                        @Override
+                        public PrimitiveId apply(HistoryOsmPrimitive x) {
+                            return x.getPrimitiveId();
+                        }
+                    }));
+            Main.worker.submit(new DownloadPrimitivesWithReferrersTask(false, primitiveIds, true, true, null, null));
+        }
+
+        protected final void updateEnabledState() {
+            setEnabled(model.hasSelectedPrimitives());
+        }
+
+        @Override
+        public void valueChanged(ListSelectionEvent e) {
+            updateEnabledState();
+        }
+    }
+
     abstract class SelectionBasedAction extends AbstractAction implements ListSelectionListener, EditLayerChangeListener {