Changeset 1670 in josm for trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java

Timestamp:

15.06.2009 20:22:46 (3 years ago)

Author:

Gubaer

Message:

fixed: bug in OsmApi.getOsmApi()
cleanup: exception handling in interfacing with OSM API
new: new action for updating individual elements with the their current state on the server (including new menu item in the file menu)
new: improved user feedback in case of conflicts
new: handles 410 Gone conflicts when uploading a changeset
new: undoable command for "purging" a primitive from the current dataset (necessary if the primitive is already deleted on the server and the user wants to remove it from its local dataset)
new: undoable command for "undeleting" an already deleted primitive on the server (kind of "cloning")
new: after a full upload, checks whether there are primitives in the local dataset which might be deleted on the server.
new: data structures for history data
new: history download support in io package

File:

• trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java (modified) (9 diffs)

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

@@ -22 +22 @@
 import org.openstreetmap.josm.io.OsmServerLocationReader;
 import org.openstreetmap.josm.io.OsmServerReader;
+import org.openstreetmap.josm.io.OsmTransferException;
 import org.xml.sax.SAXException;
 
@@ -32 +33 @@
     private static Bounds currentBounds;
     private Future<Task> task = null;
+    private DataSet downloadedData;
 
-    private static class Task extends PleaseWaitRunnable {
+    private class Task extends PleaseWaitRunnable {
         private OsmServerReader reader;
         private DataSet dataSet;
@@ -49 +51 @@
         }
 
-        @Override public void realRun() throws IOException, SAXException {
+        @Override public void realRun() throws IOException, SAXException, OsmTransferException {
             Main.pleaseWaitDlg.setCustomText(msg);
             dataSet = reader.parseOsm();
@@ -59 +61 @@
             if (dataSet.allPrimitives().isEmpty()) {
                 // If silent is set to true, we don't want to see information messages
-                if(!silent)
+                if(!silent) {
                     errorMessage = tr("No data imported.");
+                }
                 // need to synthesize a download bounds lest the visual indication of downloaded
                 // area doesn't work
                 dataSet.dataSources.add(new DataSource(currentBounds, "OpenStreetMap server"));
             }
-
+            rememberDownloadedData(dataSet);
             OsmDataLayer layer = new OsmDataLayer(dataSet, tr("Data Layer {0}", num), null);
-            if (newLayer)
+            if (newLayer) {
                 Main.main.addLayer(layer);
-            else
+            } else {
                 Main.main.editLayer().mergeFrom(layer);
+            }
 
             Main.pleaseWaitDlg.setCustomText("");
@@ -76 +80 @@
 
         @Override protected void cancel() {
-            if (reader != null)
+            if (reader != null) {
                 reader.cancel();
+            }
             Main.pleaseWaitDlg.cancel.setEnabled(false);
         }
     }
     private JCheckBox checkBox = new JCheckBox(tr("OpenStreetMap data"), true);
+
+    private void rememberDownloadedData(DataSet ds) {
+        this.downloadedData = ds;
+    }
+
+    public DataSet getDownloadedData() {
+        return downloadedData;
+    }
 
     public void download(DownloadAction action, double minlat, double minlon,
@@ -96 +109 @@
 
         boolean newLayer = action != null
-                                && (action.dialog == null || action.dialog.newLayer.isSelected());
+        && (action.dialog == null || action.dialog.newLayer.isSelected());
 
         Task t = new Task(newLayer,
@@ -124 +137 @@
                 false,
                 getDataLayersCount(),
-                "");
+        "");
         task = Main.worker.submit(t, t);
     }
@@ -145 +158 @@
         int num = 0;
         for(Layer l : Main.map.mapView.getAllLayers())
-            if(l instanceof OsmDataLayer)
+            if(l instanceof OsmDataLayer) {
                 num++;
+            }
         return num;
     }
 
-   /*
-    * (non-Javadoc)
-    * @see org.openstreetmap.josm.gui.download.DownloadDialog.DownloadTask#getErrorMessage()
-    */
+    /*
+     * (non-Javadoc)
+     * @see org.openstreetmap.josm.gui.download.DownloadDialog.DownloadTask#getErrorMessage()
+     */
     public String getErrorMessage() {
         if(task == null)
@@ -161 +175 @@
             Task t = task.get();
             return t.errorMessage == null
-                ? ""
-                : t.errorMessage;
+            ? ""
+                    : t.errorMessage;
         } catch (Exception e) {
             return "";