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

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

@@ -7 +7 @@
 import java.io.InputStream;
 
+import javax.swing.JOptionPane;
+
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.osm.DataSet;
+import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
 import org.xml.sax.SAXException;
-
-import javax.swing.JOptionPane;
 
 public class OsmServerObjectReader extends OsmServerReader {
 
-    public final static  String TYPE_WAY = "way";
-    public final static  String TYPE_REL = "relation";
-    public final static  String TYPE_NODE = "node";
-
     long id;
-    String type;
+    OsmPrimitiveType type;
     boolean full;
 
-    public OsmServerObjectReader(long id, String type, boolean full) {
+    public OsmServerObjectReader(long id, OsmPrimitiveType type, boolean full) {
         this.id = id;
         this.type = type;
@@ -34 +31 @@
      * @throws IOException
      */
-    public DataSet parseOsm() throws SAXException, IOException {
+    @Override
+    public DataSet parseOsm() throws OsmTransferException {
         try {
             Main.pleaseWaitDlg.progress.setValue(0);
             Main.pleaseWaitDlg.currentAction.setText(tr("Contacting OSM Server..."));
             StringBuffer sb = new StringBuffer();
-            sb.append(type);
+            sb.append(type.getAPIName());
             sb.append("/");
             sb.append(id);
-            if (full)
+            if (full && ! type.equals(OsmPrimitiveType.NODE)) {
                 sb.append("/full");
+            }
 
             final InputStream in = getInputStream(sb.toString(), Main.pleaseWaitDlg);
@@ -52 +51 @@
             final DataSet data = osm.getDs();
 
-//          Bounds bounds = new Bounds(new LatLon(lat1, lon1), new LatLon(lat2, lon2));
-//          DataSource src = new DataSource(bounds, origin);
-//          data.dataSources.add(src);
             if (osm.getParseNotes().length() != 0) {
                 JOptionPane.showMessageDialog(Main.parent, osm.getParseNotes());
@@ -64 +60 @@
             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);
         }
     }