Changeset 1670 in josm for trunk/src/org/openstreetmap/josm/actions/search

Timestamp:

2009-06-15T20:22:46+02:00 (15 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/search/SelectionWebsiteLoader.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java

@@ -22 +22 @@
 import org.openstreetmap.josm.gui.PleaseWaitRunnable;
 import org.openstreetmap.josm.io.OsmIdReader;
+import org.openstreetmap.josm.io.OsmTransferException;
 import org.openstreetmap.josm.io.ProgressInputStream;
 import org.xml.sax.SAXException;
@@ -47 +48 @@
             for (OsmPrimitive osm : Main.ds.allNonDeletedPrimitives()) {
                 if (ids.containsKey(osm.id) && osm.getClass().getName().toLowerCase().endsWith(ids.get(osm.id))) {
-                    if (mode == SearchAction.SearchMode.remove)
+                    if (mode == SearchAction.SearchMode.remove) {
                         sel.remove(osm);
-                    else
+                    } else {
                         sel.add(osm);
+                    }
                 }
             }
@@ -59 +61 @@
             e.printStackTrace();
             JOptionPane.showMessageDialog(Main.parent,tr("Parsing error in URL: \"{0}\"",url));
+        } catch(OsmTransferException e) {
+            e.printStackTrace();
+            if (e.getCause() != null) {
+                if (e.getCause() instanceof IOException ) {
+                    JOptionPane.showMessageDialog(Main.parent, tr("Could not read from URL: \"{0}\"",url),
+                            tr("Error"), JOptionPane.ERROR_MESSAGE);
+                } else if (e.getCause() instanceof SAXException) {
+                    JOptionPane.showMessageDialog(Main.parent,tr("Parsing error in URL: \"{0}\"",url),
+                            tr("Error"), JOptionPane.ERROR_MESSAGE);
+                }
+            } else {
+                JOptionPane.showMessageDialog(Main.parent,tr("Error while communicating with server.",url),
+                        tr("Error"), JOptionPane.ERROR_MESSAGE);
+            }
+
         }
     }
@@ -66 +83 @@
     }
     @Override protected void finish() {
-        if (sel != null)
+        if (sel != null) {
             Main.ds.setSelected(sel);
+        }
     }
 }