Changeset 1670 in josm for trunk/src/org/openstreetmap/josm/io/OsmServerLocationReader.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/io/OsmServerLocationReader.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/io/OsmServerLocationReader.java

@@ -22 +22 @@
      * Method to download OSM files from somewhere
      */
-    public DataSet parseOsm() throws SAXException, IOException {
+    @Override
+    public DataSet parseOsm() throws OsmTransferException {
         try {
             Main.pleaseWaitDlg.progress.setValue(0);
@@ -32 +33 @@
             Main.pleaseWaitDlg.currentAction.setText(tr("Downloading OSM data..."));
             final DataSet data = OsmReader.parseDataSet(in, null, Main.pleaseWaitDlg);
-//          Bounds bounds = new Bounds(new LatLon(lat1, lon1), new LatLon(lat2, lon2));
-//          DataSource src = new DataSource(bounds, origin);
-//          data.dataSources.add(src);
             in.close();
             activeConnection = null;
@@ -41 +39 @@
             if (cancel)
                 return null;
-            throw e;
+            throw new OsmTransferException(e);
         } catch (SAXException e) {
+            throw new OsmTransferException(e);
+        } catch(OsmTransferException e) {
             throw e;
         } catch (Exception e) {
             if (cancel)
                 return null;
-            if (e instanceof RuntimeException)
-                throw (RuntimeException)e;
-            throw new RuntimeException(e);
+            throw new OsmTransferException(e);
         }
     }