Changeset 1810 in josm for trunk/src/org

Timestamp:

2009-07-19T14:57:34+02:00 (15 years ago)

Author:

Gubaer

Message:

new: DownloadReferrersAction - downloads the set of primitives referring to the currently selected primitives

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/DownloadReferrersAction.java (added)
• actions/downloadtasks/DownloadOsmTask.java (modified) (2 diffs)
• gui/MainMenu.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java

@@ -53 +53 @@
         }
 
+        protected OsmDataLayer getEditLayer() {
+            if (Main.map == null) return null;
+            if (Main.map.mapView == null) return null;
+            return Main.map.mapView.getEditLayer();
+        }
+
         @Override protected void finish() {
             if (dataSet == null)
@@ -66 +72 @@
             }
             rememberDownloadedData(dataSet);
-            if (newLayer) {
+            if (newLayer || getEditLayer() == null) {
                 OsmDataLayer layer = new OsmDataLayer(dataSet, OsmDataLayer.createNewName(), null);
                 Main.main.addLayer(layer);
             } else {
-                Main.main.createOrGetEditLayer().mergeFrom(dataSet);
+                getEditLayer().mergeFrom(dataSet);
             }
 

trunk/src/org/openstreetmap/josm/gui/MainMenu.java

@@ -34 +34 @@
 import org.openstreetmap.josm.actions.DistributeAction;
 import org.openstreetmap.josm.actions.DownloadAction;
+import org.openstreetmap.josm.actions.DownloadReferrersAction;
 import org.openstreetmap.josm.actions.DuplicateAction;
 import org.openstreetmap.josm.actions.ExitAction;
@@ -97 +98 @@
     public final JosmAction gpxExport = new GpxExportAction();
     public final DownloadAction download = new DownloadAction();
+    public final DownloadReferrersAction downloadReferrers = new DownloadReferrersAction();
     public final JosmAction update = new UpdateDataAction();
     public final JosmAction updateSelection = new UpdateSelectionAction();
@@ -198 +200 @@
         fileMenu.addSeparator();
         add(fileMenu, download);
+        add(fileMenu, downloadReferrers);
         add(fileMenu, upload);
         add(fileMenu, update);