Changeset 7575 in josm for trunk/src/org/openstreetmap/josm/actions

Timestamp:

2014-09-21T23:00:38+02:00 (10 years ago)

Author:

Don-vip

Message:

fix #7976 - Get downloaded gpx areas, on the same model as osm data

Location:

trunk/src/org/openstreetmap/josm/actions

Files:

• UpdateDataAction.java (modified) (1 diff)
• downloadtasks/DownloadGpsTask.java (modified) (2 diffs)
• downloadtasks/DownloadOsmTask.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/actions/UpdateDataAction.java

@@ -14 +14 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.downloadtasks.DownloadTaskList;
-import org.openstreetmap.josm.data.osm.DataSource;
+import org.openstreetmap.josm.data.DataSource;
 import org.openstreetmap.josm.gui.progress.PleaseWaitProgressMonitor;
 import org.openstreetmap.josm.io.OnlineResource;

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

@@ -106 +106 @@
         }
 
-        @Override public void realRun() throws IOException, SAXException, OsmTransferException {
+        @Override
+        public void realRun() throws IOException, SAXException, OsmTransferException {
             try {
                 if (isCanceled())
@@ -123 +124 @@
         }
 
-        @Override protected void finish() {
+        @Override
+        protected void finish() {
             if (isCanceled() || isFailed())
                 return;

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

@@ -14 +14 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.Bounds;
+import org.openstreetmap.josm.data.DataSource;
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.osm.DataSet;
-import org.openstreetmap.josm.data.osm.DataSource;
 import org.openstreetmap.josm.data.osm.visitor.BoundingXYVisitor;
 import org.openstreetmap.josm.gui.PleaseWaitRunnable;