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

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

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/UpdateDataAction.java (modified) (5 diffs)
• actions/UpdateSelectionAction.java (added)
• actions/UploadAction.java (modified) (6 diffs)
• actions/downloadtasks/DownloadOsmTask.java (modified) (9 diffs)
• actions/downloadtasks/DownloadOsmTaskList.java (modified) (3 diffs)
• actions/search/SelectionWebsiteLoader.java (modified) (4 diffs)
• command/CoordinateConflictResolveCommand.java (modified) (1 diff)
• command/PurgePrimitivesCommand.java (added)
• command/TagConflictResolveCommand.java (modified) (3 diffs)
• command/UndeletePrimitivesCommand.java (added)
• command/VersionConflictResolveCommand.java (modified) (2 diffs)
• data/osm/DataSet.java (modified) (10 diffs)
• data/osm/OsmPrimitiveType.java (added)
• data/osm/Relation.java (modified) (4 diffs)
• data/osm/history (added)
• data/osm/history/History.java (added)
• data/osm/history/HistoryDataSet.java (added)
• data/osm/history/HistoryNode.java (added)
• data/osm/history/HistoryOsmPrimitive.java (added)
• data/osm/history/HistoryRelation.java (added)
• data/osm/history/HistoryWay.java (added)
• data/osm/history/RelationMember.java (added)
• gui/MainMenu.java (modified) (3 diffs)
• gui/PleaseWaitRunnable.java (modified) (4 diffs)
• gui/dialogs/relation/GenericRelationEditor.java (modified) (20 diffs)
• gui/layer/OsmDataLayer.java (modified) (15 diffs)
• io/BoundingBoxDownloader.java (modified) (3 diffs)
• io/OsmApi.java (modified) (14 diffs)
• io/OsmConnection.java (modified) (4 diffs)
• io/OsmHistoryReader.java (added)
• io/OsmServerHistoryReader.java (added)
• io/OsmServerLocationReader.java (modified) (3 diffs)
• io/OsmServerObjectReader.java (modified) (4 diffs)
• io/OsmServerReader.java (modified) (4 diffs)
• io/OsmServerWriter.java (modified) (1 diff)
• io/OsmWriter.java (modified) (12 diffs)
• io/ProgressInputStream.java (modified) (7 diffs)

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

@@ -15 +15 @@
 import org.openstreetmap.josm.actions.downloadtasks.DownloadOsmTaskList;
 import org.openstreetmap.josm.data.osm.DataSource;
-import org.openstreetmap.josm.gui.ExtendedDialog;
 import org.openstreetmap.josm.tools.Shortcut;
 
@@ -26 +25 @@
                         tr("Update Data"),
                         KeyEvent.VK_U,
-                        Shortcut.GROUP_NONE),
-                true);
+                        Shortcut.GROUP_HOTKEY),
+                        true);
     }
 
@@ -33 +32 @@
         int bboxCount = 0;
         List<Area> areas = new ArrayList<Area>();
-        for(DataSource ds : Main.main.editLayer().data.dataSources)
+        for(DataSource ds : Main.main.editLayer().data.dataSources) {
             areas.add(new Area(ds.bounds.asRect()));
-
-        // This would loop over all DataLayers but download all data to the currently
-        // selected one
-        /*for(Layer l : Main.map.mapView.getAllLayers()) {
-            if(!(l instanceof OsmDataLayer)) continue;
-
-            for(DataSource ds : ((OsmDataLayer)l).data.dataSources)
-                areas.add(new Area(ds.bounds.asRect()));
-        }*/
+        }
 
         // The next two blocks removes every intersection from every DataSource Area
@@ -62 +53 @@
 
         for(Area a : areas) {
-            if(a.isEmpty())
+            if(a.isEmpty()) {
                 continue;
+            }
             bboxCount++;
         }
@@ -69 +61 @@
         if(bboxCount == 0) {
             JOptionPane.showMessageDialog(Main.parent,
-                        tr("No data to update found. Have you already opened or downloaded a data layer?"));
-                return;
+                    tr("No data to update found. Have you already opened or downloaded a data layer?"));
+            return;
         }
-
-        int result = new ExtendedDialog(Main.parent,
-                tr("Update Data"),
-                tr("This action will require {0} individual download requests. "
-                        + "Do you wish to continue?", bboxCount),
-                new String[] { tr("Update Data"), tr("Cancel") },
-                new String[] { "updatedata.png", "cancel.png" }).getValue();
-
-        if(result != 1)
-            return;
 
         new DownloadOsmTaskList().download(false, areas);
     }
-
 }

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

@@ -4 +4 @@
 import static org.openstreetmap.josm.tools.I18n.tr;
 
-import java.awt.EventQueue;
 import java.awt.GridBagLayout;
 import java.awt.event.ActionEvent;
@@ -13 +12 @@
 import java.util.LinkedList;
 import java.util.List;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.FutureTask;
+import java.util.logging.Logger;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -23 +21 @@
 import javax.swing.JPanel;
 import javax.swing.JScrollPane;
-import javax.swing.SwingUtilities;
 
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
-import org.openstreetmap.josm.data.osm.visitor.CreateOsmChangeVisitor;
 import org.openstreetmap.josm.gui.ExtendedDialog;
 import org.openstreetmap.josm.gui.OsmPrimitivRenderer;
 import org.openstreetmap.josm.gui.PleaseWaitRunnable;
 import org.openstreetmap.josm.gui.historycombobox.SuggestingJHistoryComboBox;
-import org.openstreetmap.josm.io.DiffResultReader;
 import org.openstreetmap.josm.io.OsmApi;
 import org.openstreetmap.josm.io.OsmApiException;
@@ -47 +42 @@
  * An dialog is displayed asking the user to specify a rectangle to grab.
  * The url and account settings from the preferences are used.
+ * 
+ * If the upload fails this action offers various options to resolve conflicts.
  *
  * @author imi
  */
 public class UploadAction extends JosmAction {
+    static private Logger logger = Logger.getLogger(UploadAction.class.getName());
 
     public static final String HISTORY_KEY = "upload.comment.history";
@@ -215 +213 @@
                         return;
                     }
-                    System.out.println("got exception: " + sxe.toString());
                     uploadFailed = true;
                     lastException = sxe;
@@ -230 +227 @@
                 server.disconnectActiveConnection();
                 uploadCancelled = true;
-            };
-
-        }
+            }
+        }
+
         Main.worker.execute(new UploadDiffTask());
     }
 
-    public void handleFailedUpload(Exception e) {
+    /**
+     * Synchronizes the local state of an {@see OsmPrimitive} with its state on the
+     * server. The method uses an individual GET for the primitive.
+     * 
+     * @param id the primitive ID
+     */
+    protected void synchronizePrimitive(final String id) {
+
+        /**
+         * The asynchronous task to update a a specific id
+         *
+         */
+        class UpdatePrimitiveTask extends  PleaseWaitRunnable {
+
+            private boolean uploadCancelled = false;
+            private boolean uploadFailed = false;
+            private Exception lastException = null;
+
+            public UpdatePrimitiveTask() {
+                super(tr("Updating primitive"),false /* don't ignore exceptions */);
+            }
+
+            @Override protected void realRun() throws SAXException, IOException {
+                try {
+                    UpdateSelectionAction act = new UpdateSelectionAction();
+                    act.updatePrimitive(Long.parseLong(id));
+                } catch (Exception sxe) {
+                    if (uploadCancelled) {
+                        System.out.println("Ignoring exception caught because upload is cancelled. Exception is: " + sxe.toString());
+                        return;
+                    }
+                    uploadFailed = true;
+                    lastException = sxe;
+                }
+            }
+
+            @Override protected void finish() {
+                if (uploadFailed) {
+                    handleFailedUpload(lastException);
+                }
+            }
+
+            @Override protected void cancel() {
+                OsmApi.getOsmApi().cancel();
+                uploadCancelled = true;
+            }
+        }
+
+        Main.worker.execute(new UpdatePrimitiveTask());
+    }
+
+    /**
+     * Synchronizes the local state of the dataset with the state on the server.
+     * 
+     * Reuses the functionality of {@see UpdateDataAction}.
+     * 
+     * @see UpdateDataAction#actionPerformed(ActionEvent)
+     */
+    protected void synchronizeDataSet() {
+        UpdateDataAction act = new UpdateDataAction();
+        act.actionPerformed(new ActionEvent(this,0,""));
+    }
+
+    /**
+     * Handles the case that a conflict in a specific {@see OsmPrimitive} was detected while
+     * uploading
+     * 
+     * @param primitiveType  the type of the primitive, either <code>node</code>, <code>way</code> or
+     *    <code>relation</code>
+     * @param id  the id of the primitive
+     * @param serverVersion  the version of the primitive on the server
+     * @param myVersion  the version of the primitive in the local dataset
+     */
+    protected void handleUploadConflictForKnownConflict(String primitiveType, String id, String serverVersion, String myVersion) {
+        Object[] options = new Object[] {
+                tr("Synchronize {0} {1} only", tr(primitiveType), id),
+                tr("Synchronize entire dataset"),
+                tr("Cancel")
+        };
+        Object defaultOption = options[0];
+        String msg =  tr("<html>Uploading <strong>failed</strong> because the server has a newer version of one<br>"
+                + "of your nodes, ways, or relations.<br>"
+                + "The conflict is caused by the <strong>{0}</strong> with id <strong>{1}</strong>,<br>"
+                + "the server has version {2}, your version is {3}.<br>"
+                + "<br>"
+                + "Click <strong>{4}</strong> to synchronize the conflicting primitive only.<br>"
+                + "Click <strong>{5}</strong> to synchronize the entire local dataset with the server.<br>"
+                + "Click <strong>{6}</strong> to abort and continue editing.<br></html>",
+                tr(primitiveType), id, serverVersion, myVersion,
+                options[0], options[1], options[2]
+        );
+        int optionsType = JOptionPane.YES_NO_CANCEL_OPTION;
+        int ret = JOptionPane.showOptionDialog(
+                null,
+                msg,
+                tr("Conflict detected"),
+                optionsType,
+                JOptionPane.ERROR_MESSAGE,
+                null,
+                options,
+                defaultOption
+        );
+        switch(ret) {
+        case JOptionPane.CLOSED_OPTION: return;
+        case JOptionPane.CANCEL_OPTION: return;
+        case 0: synchronizePrimitive(id); break;
+        case 1: synchronizeDataSet(); break;
+        default:
+            // should not happen
+            throw new IllegalStateException(tr("unexpected return value. Got {0}", ret));
+        }
+    }
+
+    /**
+     * Handles the case that a conflict was detected while uploading where we don't
+     * know what {@see OsmPrimitive} actually caused the conflict (for whatever reason)
+     * 
+     */
+    protected void handleUploadConflictForUnknownConflict() {
+        Object[] options = new Object[] {
+                tr("Synchronize entire dataset"),
+                tr("Cancel")
+        };
+        Object defaultOption = options[0];
+        String msg =  tr("<html>Uploading <strong>failed</strong> because the server has a newer version of one<br>"
+                + "of your nodes, ways, or relations.<br>"
+                + "<br>"
+                + "Click <strong>{0}</strong> to synchronize the entire local dataset with the server.<br>"
+                + "Click <strong>{1}</strong> to abort and continue editing.<br></html>",
+                options[0], options[1]
+        );
+        int optionsType = JOptionPane.YES_NO_OPTION;
+        int ret = JOptionPane.showOptionDialog(
+                null,
+                msg,
+                tr("Conflict detected"),
+                optionsType,
+                JOptionPane.ERROR_MESSAGE,
+                null,
+                options,
+                defaultOption
+        );
+        switch(ret) {
+        case JOptionPane.CLOSED_OPTION: return;
+        case 1: return;
+        case 0: synchronizeDataSet(); break;
+        default:
+            // should not happen
+            throw new IllegalStateException(tr("unexpected return value. Got {0}", ret));
+        }
+    }
+
+    /**
+     * handles an upload conflict, i.e. an error indicated by a HTTP return code 409.
+     * 
+     * @param e  the exception
+     */
+    protected void handleUploadConflict(OsmApiException e) {
+        String pattern = "Version mismatch: Provided (\\d+), server had: (\\d+) of (\\S+) (\\d+)";
+        Pattern p = Pattern.compile(pattern);
+        Matcher m = p.matcher(e.getErrorHeader());
+        if (m.matches()) {
+            handleUploadConflictForKnownConflict(m.group(3), m.group(4), m.group(2),m.group(1));
+        } else {
+            logger.warning(tr("Warning: error header \"{0}\" did not match expected pattern \"{1}\"", e.getErrorHeader(),pattern));
+            handleUploadConflictForUnknownConflict();
+        }
+    }
+
+    /**
+     * Handles an upload error due to a violated precondition, i.e. a HTTP return code 412
+     * 
+     * @param e the exception
+     */
+    protected void handlePreconditionFailed(OsmApiException e) {
+        JOptionPane.showMessageDialog(
+                Main.parent,
+                tr("<html>Uploading to the server <strong>failed</strong> because your current<br>"
+                        +"dataset violates a precondition.<br>"
+                        +"The error message is:<br>"
+                        + "{0}"
+                        + "</html>",
+                        e.getMessage()
+                ),
+                tr("Precondition violation"),
+                JOptionPane.ERROR_MESSAGE
+        );
+        e.printStackTrace();
+    }
+
+
+    /**
+     * Handles an error due to a delete request on an already deleted
+     * {@see OsmPrimitive}, i.e. a HTTP response code 410, where we know what
+     * {@see OsmPrimitive} is responsible for the error.
+     * 
+     *  Reuses functionality of the {@see UpdateSelectionAction} to resolve
+     *  conflicts due to mismatches in the deleted state.
+     * 
+     * @param primitiveType the type of the primitive
+     * @param id the id of the primitive
+     * 
+     * @see UpdateSelectionAction#handlePrimitiveGoneException(long)
+     */
+    protected void handleGoneForKnownPrimitive(String primitiveType, String id) {
+        UpdateSelectionAction act = new UpdateSelectionAction();
+        act.handlePrimitiveGoneException(Long.parseLong(id));
+    }
+
+    /**
+     * handles the case of an error due to a delete request on an already deleted
+     * {@see OsmPrimitive}, i.e. a HTTP response code 410, where we don't know which
+     * {@see OsmPrimitive} is causing the error.
+     * 
+     * @param e the exception
+     */
+    protected void handleGoneForUnknownPrimitive(OsmApiException e) {
+        String msg =  tr("<html>Uploading <strong>failed</strong> because a primitive you tried to<br>"
+                + "delete on the server is already deleted.<br>"
+                + "<br>"
+                + "The error message is:<br>"
+                + "{0}"
+                + "</html>",
+                e.getMessage()
+        );
+        JOptionPane.showMessageDialog(
+                Main.parent,
+                msg,
+                tr("Primitive already deleted"),
+                JOptionPane.ERROR_MESSAGE
+        );
+
+    }
+
+    /**
+     * Handles an error which is caused by a delete request for an already deleted
+     * {@see OsmPrimitive} on the server, i.e. a HTTP response code of 410.
+     * Note that an <strong>update</strong> on an already deleted object results
+     * in a 409, not a 410.
+     * 
+     * @param e the exception
+     */
+    protected void handleGone(OsmApiException e) {
+        String pattern = "The (\\S+) with the id (\\d+) has already been deleted";
+        Pattern p = Pattern.compile(pattern);
+        Matcher m = p.matcher(e.getErrorHeader());
+        if (m.matches()) {
+            handleGoneForKnownPrimitive(m.group(1), m.group(2));
+        } else {
+            logger.warning(tr("Error header \"{0}\" doesn't match expected pattern \"{1}\"",e.getErrorHeader(), pattern));
+            handleGoneForUnknownPrimitive(e);
+        }
+    }
+
+
+    /**
+     * error handler for any exception thrown during upload
+     * 
+     * @param e the exception
+     */
+    protected void handleFailedUpload(Exception e) {
+        // API initialization failed. Notify the user and return.
+        //
         if (e instanceof OsmApiInitializationException) {
-            handleOsmApiInitializationException(e);
+            handleOsmApiInitializationException((OsmApiInitializationException)e);
             return;
         }
+
         if (e instanceof OsmApiException) {
             OsmApiException ex = (OsmApiException)e;
+            // There was an upload conflict. Let the user decide whether
+            // and how to resolve it
+            //
             if(ex.getResponseCode() == HttpURLConnection.HTTP_CONFLICT) {
-                Pattern p = Pattern.compile("Version mismatch: Provided (\\d+), server had: (\\d+) of (\\S+) (\\d+)");
-                Matcher m = p.matcher(ex.getErrorHeader());
-                String msg;
-                if (m.matches()) {
-                    msg =  tr("<html>Uploading <strong>failed</strong> because the server has a newer version of one<br>"
-                            + "of your nodes, ways or relations.<br>"
-                            + "The conflict is caused by the <strong>{0}</strong> with id <strong>{1}</strong>,<br>"
-                            + "the server has version {2}, your version is {3}.<br>"
-                            + "Please synchronize your local dataset using <br>"
-                            + "<strong>File-&gt;Update Data</strong>, resolve<br>"
-                            + "any conflicts and try to upload again.</html>",
-                            m.group(3),m.group(4), m.group(2), m.group(1)
-                    );
-                } else {
-                    msg =  tr("<html>Uploading failed because the server has a newer version of one<br>"
-                            + "of your nodes, ways or relations.<br>"
-                            + "Please synchronize your local dataset using <br>"
-                            + "<strong>File-&gt;Update Data</strong>, resolve<br>"
-                            + "any conflicts and try to upload again.</html>"
-                    );
-                }
-                JOptionPane.showMessageDialog(
-                        null,
-                        msg,
-                        tr("Upload to OSM API failed"),
-                        JOptionPane.WARNING_MESSAGE
-                );
+                handleUploadConflict(ex);
                 return;
             }
-        }
+            // There was a precondition failed. Notify the user.
+            //
+            else if (ex.getResponseCode() == HttpURLConnection.HTTP_PRECON_FAILED) {
+                handlePreconditionFailed(ex);
+                return;
+            }
+            // Tried to delete an already deleted primitive? Let the user
+            // decide whether and how to resolve this conflict.
+            //
+            else if (ex.getResponseCode() == HttpURLConnection.HTTP_GONE) {
+                handleGone(ex);
+                return;
+            }
+        }
+
+        // For any other exception just notify the user
+        //
+        String msg = e.getMessage().substring(0,Math.min(80, e.getMessage().length()));
+        if (msg.length() < e.getMessage().length()) {
+            msg += " ...";
+        }
+        e.printStackTrace();
         JOptionPane.showMessageDialog(
                 null,
-                e.getMessage(),
+                msg,
                 tr("Upload to OSM API failed"),
                 JOptionPane.ERROR_MESSAGE
         );
-    }
-
-    protected void handleOsmApiInitializationException(Exception e) {
+
+    }
+
+    /**
+     * handles an exception caught during OSM API initialization
+     * 
+     * @param e the exception
+     */
+    protected void handleOsmApiInitializationException(OsmApiInitializationException e) {
         JOptionPane.showMessageDialog(
-                null,
+                Main.parent,
                 tr(   "Failed to initialize communication with the OSM server {0}.\n"
                         + "Check the server URL in your preferences and your internet connection.",

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 "";

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

@@ -4 +4 @@
 import static org.openstreetmap.josm.tools.I18n.tr;
 
+import java.awt.EventQueue;
+import java.awt.event.ActionEvent;
 import java.awt.geom.Area;
 import java.awt.geom.Rectangle2D;
+import java.util.ArrayList;
 import java.util.Collection;
+import java.util.HashSet;
 import java.util.LinkedList;
 import java.util.List;
+import java.util.Set;
 
 import javax.swing.JOptionPane;
 
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.actions.UpdateSelectionAction;
 import org.openstreetmap.josm.data.osm.DataSet;
+import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
 import org.openstreetmap.josm.gui.download.DownloadDialog.DownloadTask;
 import org.openstreetmap.josm.gui.layer.Layer;
@@ -62 +70 @@
     public void download(boolean newLayer, Collection<Area> areas) {
         List<Rectangle2D> rects = new LinkedList<Rectangle2D>();
-        for(Area a : areas)
+        for(Area a : areas) {
             rects.add(a.getBounds2D());
+        }
 
         download(newLayer, rects);
@@ -76 +85 @@
         for(DownloadTask dt : osmTasks) {
             String err = dt.getErrorMessage();
-            if(err.equals(""))
+            if(err.equals("")) {
                 continue;
+            }
             errors += "* " + err + "\r\n";
         }
 
-        osmTasks.clear();
-        if(errors.equals(""))
+        if(! errors.equals("")) {
+            JOptionPane.showMessageDialog(Main.parent,
+                    tr("The following errors occured during mass download:") + "\r\n" + errors,
+                    tr("Errors during Download"),
+                    JOptionPane.ERROR_MESSAGE);
             return;
+        }
 
-        JOptionPane.showMessageDialog(Main.parent,
-                tr("The following errors occured during mass download:") + "\r\n" + errors,
-                tr("Errors during Download"),
-                JOptionPane.ERROR_MESSAGE);
+        Set<Long> myPrimitiveIds = Main.main.editLayer().data.getPrimitiveIds();
+        Set<Long> downloadedIds = getDownloadedIds();
+        myPrimitiveIds.removeAll(downloadedIds);
+        if (! myPrimitiveIds.isEmpty()) {
+            handlePotentiallyDeletedPrimitives(myPrimitiveIds);
+        }
+    }
+
+    protected void checkPotentiallyDeletedPrimitives(Set<Long> potentiallyDeleted) {
+        DataSet ds =  Main.main.editLayer().data;
+        ArrayList<OsmPrimitive> toSelect = new ArrayList<OsmPrimitive>();
+        for (Long id : potentiallyDeleted) {
+            OsmPrimitive primitive = ds.getPrimitiveById(id);
+            if (primitive != null) {
+                toSelect.add(primitive);
+            }
+        }
+        ds.setSelected(toSelect);
+        EventQueue.invokeLater(
+                new Runnable() {
+                    public void run() {
+                        new UpdateSelectionAction().actionPerformed(new ActionEvent(this, 0, ""));
+                    }
+                }
+        );
+    }
+
+    protected void handlePotentiallyDeletedPrimitives(Set<Long> potentiallyDeleted) {
+        String [] options = {
+                "Check individually",
+                "Ignore"
+        };
+
+        String message = tr("<html>"
+                +  "There are {0} primitives in your local dataset which<br>"
+                + "might be deleted on the server. If you later try to delete or<br>"
+                + "update them on the server the server is likely to report a<br>"
+                + "conflict.<br>"
+                + "<br>"
+                + "Click <strong>{1}</strong> to check these primitives individually.<br>"
+                + "Click <strong>{2}</strong> to ignore.<br>"
+                + "</html>",
+                potentiallyDeleted.size(), options[0], options[1]
+        );
+
+        int ret = JOptionPane.showOptionDialog(
+                Main.parent,
+                message,
+                tr("Deleted or moved primitives"),
+                JOptionPane.YES_NO_OPTION,
+                JOptionPane.WARNING_MESSAGE,
+                null,
+                options,
+                options[0]
+        );
+        switch(ret) {
+        case JOptionPane.CLOSED_OPTION: return;
+        case JOptionPane.NO_OPTION: return;
+        case JOptionPane.YES_OPTION: checkPotentiallyDeletedPrimitives(potentiallyDeleted); break;
+        }
+    }
+
+    protected boolean wasDownloaded(long id, DataSet ds) {
+        OsmPrimitive primitive = ds.getPrimitiveById(id);
+        return primitive != null;
+    }
+
+    public boolean wasDownloaded(long id) {
+        for (DownloadTask task : osmTasks) {
+            if(task instanceof DownloadOsmTask) {
+                DataSet ds = ((DownloadOsmTask)task).getDownloadedData();
+                if(wasDownloaded(id,ds)) return true;
+            }
+        }
+        return false;
+    }
+
+
+    public Set<Long> getDownloadedIds() {
+        HashSet<Long> ret = new HashSet<Long>();
+        for (DownloadTask task : osmTasks) {
+            if(task instanceof DownloadOsmTask) {
+                DataSet ds = ((DownloadOsmTask)task).getDownloadedData();
+                ret.addAll(ds.getPrimitiveIds());
+            }
+        }
+        return ret;
     }
 }

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);
+        }
     }
 }

trunk/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java

@@ -33 +33 @@
     /** the merge decision */
     private final MergeDecisionType decision;
-
-
-    /**
-     * replies a (localized) display name for the type of an OSM primitive
-     * 
-     * @param primitive the primitive
-     * @return a localized display name
-     */
-    protected String getPrimitiveTypeAsString(OsmPrimitive primitive) {
-        if (primitive instanceof Node) return tr("node");
-        if (primitive instanceof Way) return tr("way");
-        if (primitive instanceof Relation) return tr("relation");
-        return "";
-    }
 
     /**

trunk/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java

@@ -14 +14 @@
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
 import org.openstreetmap.josm.data.osm.Relation;
 import org.openstreetmap.josm.data.osm.Way;
@@ -52 +53 @@
 
     /**
-     * replies a (localized) display name for the type of an OSM primitive
-     * 
-     * @param primitive the primitive
-     * @return a localized display name
-     */
-    protected String getPrimitiveTypeAsString(OsmPrimitive primitive) {
-        if (primitive instanceof Node) return tr("node");
-        if (primitive instanceof Way) return tr("way");
-        if (primitive instanceof Relation) return tr("relation");
-        return "";
-    }
-
-    /**
      * constructor
      * 
@@ -82 +70 @@
         return new DefaultMutableTreeNode(
                 new JLabel(
-                        tr("Resolve {0} tag conflicts in {1} {2}",getNumDecidedConflicts(), getPrimitiveTypeAsString(my), my.id),
+                        tr("Resolve {0} tag conflicts in {1} {2}",getNumDecidedConflicts(), OsmPrimitiveType.from(my).getLocalizedDisplayNameSingular(), my.id),
                         ImageProvider.get("data", "object"),
                         JLabel.HORIZONTAL

trunk/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java

@@ -13 +13 @@
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
 import org.openstreetmap.josm.data.osm.Relation;
 import org.openstreetmap.josm.data.osm.Way;
@@ -37 +38 @@
     }
 
-    //FIXME copied from TagConflictResolveCommand -> refactor
-    /**
-     * replies a (localized) display name for the type of an OSM primitive
-     * 
-     * @param primitive the primitive
-     * @return a localized display name
-     */
-    protected String getPrimitiveTypeAsString(OsmPrimitive primitive) {
-        if (primitive instanceof Node) return tr("node");
-        if (primitive instanceof Way) return tr("way");
-        if (primitive instanceof Relation) return tr("relation");
-        return "";
-    }
-
     @Override
     public MutableTreeNode description() {
         return new DefaultMutableTreeNode(
                 new JLabel(
-                        tr("Resolve version conflicts for {0} {1}",getPrimitiveTypeAsString(my), my.id),
+                        tr("Resolve version conflicts for {0} {1}",OsmPrimitiveType.from(my).getLocalizedDisplayNameSingular(), my.id),
                         ImageProvider.get("data", "object"),
                         JLabel.HORIZONTAL

trunk/src/org/openstreetmap/josm/data/osm/DataSet.java

@@ -10 +10 @@
 import java.util.LinkedList;
 import java.util.List;
+import java.util.Set;
 
 import org.openstreetmap.josm.data.SelectionChangedListener;
+import static org.openstreetmap.josm.tools.I18n.tr;
 
 /**
@@ -78 +80 @@
         Collection<OsmPrimitive> o = new LinkedList<OsmPrimitive>();
         for (OsmPrimitive osm : allPrimitives())
-            if (!osm.deleted)
+            if (!osm.deleted) {
                 o.add(osm);
+            }
         return o;
     }
@@ -86 +89 @@
         Collection<OsmPrimitive> o = new LinkedList<OsmPrimitive>();
         for (OsmPrimitive osm : allPrimitives())
-            if (!osm.deleted && !osm.incomplete)
+            if (!osm.deleted && !osm.incomplete) {
                 o.add(osm);
+            }
         return o;
     }
@@ -94 +98 @@
         Collection<OsmPrimitive> o = new LinkedList<OsmPrimitive>();
         for (OsmPrimitive osm : allPrimitives())
-            if (!osm.deleted && !osm.incomplete && !(osm instanceof Relation))
+            if (!osm.deleted && !osm.incomplete && !(osm instanceof Relation)) {
                 o.add(osm);
+            }
         return o;
     }
@@ -150 +155 @@
         clearSelection(ways);
         clearSelection(relations);
-        for (OsmPrimitive osm : selection)
+        for (OsmPrimitive osm : selection) {
             osm.selected = true;
+        }
         fireSelectionChanged(selection);
     }
@@ -164 +170 @@
         clearSelection(relations);
         for (OsmPrimitive o : osm)
-            if (o != null)
+            if (o != null) {
                 o.selected = true;
+            }
         fireSelectionChanged(Arrays.asList(osm));
     }
@@ -176 +183 @@
         if (list == null)
             return;
-        for (OsmPrimitive osm : list)
+        for (OsmPrimitive osm : list) {
             osm.selected = false;
+        }
     }
 
@@ -189 +197 @@
             return sel;
         for (OsmPrimitive osm : list)
-            if (osm.selected && !osm.deleted)
+            if (osm.selected && !osm.deleted) {
                 sel.add(osm);
+            }
         return sel;
     }
@@ -200 +209 @@
      */
     public static void fireSelectionChanged(Collection<? extends OsmPrimitive> sel) {
-        for (SelectionChangedListener l : selListeners)
+        for (SelectionChangedListener l : selListeners) {
             l.selectionChanged(sel);
+        }
     }
 
     @Override public DataSet clone() {
         DataSet ds = new DataSet();
-        for (Node n : nodes)
+        for (Node n : nodes) {
             ds.nodes.add(new Node(n));
-        for (Way w : ways)
+        }
+        for (Way w : ways) {
             ds.ways.add(new Way(w));
-        for (Relation e : relations)
+        }
+        for (Relation e : relations) {
             ds.relations.add(new Relation(e));
-        for (DataSource source : dataSources)
+        }
+        for (DataSource source : dataSources) {
             ds.dataSources.add(new DataSource(source.bounds, source.origin));
+        }
         ds.version = version;
         return ds;
@@ -260 +274 @@
         return selArr;
     }
+
+    /**
+     * returns a  primitive with a given id from the data set. null, if no such primitive
+     * exists
+     * 
+     * @param id  the id, > 0 required
+     * @return the primitive
+     * @exception IllegalArgumentException thrown, if id <= 0
+     */
+    public OsmPrimitive getPrimitiveById(long id) {
+        if (id <= 0)
+            throw new IllegalArgumentException(tr("parameter {0} > 0 required. Got {1}.", "id", id));
+        for (OsmPrimitive primitive : nodes) {
+            if (primitive.id == id) return primitive;
+        }
+        for (OsmPrimitive primitive : ways) {
+            if (primitive.id == id) return primitive;
+        }
+        for (OsmPrimitive primitive : relations) {
+            if (primitive.id == id) return primitive;
+        }
+        return null;
+    }
+
+    public Set<Long> getPrimitiveIds() {
+        HashSet<Long> ret = new HashSet<Long>();
+        for (OsmPrimitive primitive : nodes) {
+            ret.add(primitive.id);
+        }
+        for (OsmPrimitive primitive : ways) {
+            ret.add(primitive.id);
+        }
+        for (OsmPrimitive primitive : relations) {
+            ret.add(primitive.id);
+        }
+        return ret;
+    }
 }

trunk/src/org/openstreetmap/josm/data/osm/Relation.java

@@ -78 +78 @@
     }
 
+    @Override
     public String getName() {
         String name;
@@ -84 +85 @@
         } else {
             name = get("type");
-            if (name == null)
+            if (name == null) {
                 name = tr("relation");
+            }
 
             name += " (";
-            if(names == null)
-              names = Main.pref.getCollection("relation.nameOrder", Arrays.asList(defnames));
+            if(names == null) {
+                names = Main.pref.getCollection("relation.nameOrder", Arrays.asList(defnames));
+            }
             String nameTag = null;
             for (String n : names) {
                 nameTag = get(n);
-                if (nameTag != null) break;
+                if (nameTag != null) {
+                    break;
+                }
             }
-            if (nameTag != null)
+            if (nameTag != null) {
                 name += "\"" + nameTag + "\", ";
+            }
 
             int mbno = members.size();
             name += trn("{0} member", "{0} members", mbno, mbno) + ")";
-            if(errors != null)
+            if(errors != null) {
                 name = "*"+name;
+            }
         }
         return name;
@@ -113 +120 @@
         return false;
     }
-    
+
     public RelationMember firstMember() {
         if (incomplete) return null;
@@ -122 +129 @@
         return (members.size() == 0) ? null : members.get(members.size() -1);
     }
+
+    /**
+     * removes all members with member.member == primitive
+     * 
+     * @param primitive the primitive to check for
+     */
+    public void removeMembersFor(OsmPrimitive primitive) {
+        if (primitive == null)
+            return;
+
+        ArrayList<RelationMember> todelete = new ArrayList<RelationMember>();
+        for (RelationMember member: members) {
+            if (member.member == primitive) {
+                todelete.add(member);
+            }
+        }
+        members.removeAll(todelete);
+    }
 }

trunk/src/org/openstreetmap/josm/gui/MainMenu.java

@@ -62 +62 @@
 import org.openstreetmap.josm.actions.UnselectAllAction;
 import org.openstreetmap.josm.actions.UpdateDataAction;
+import org.openstreetmap.josm.actions.UpdateSelectionAction;
 import org.openstreetmap.josm.actions.UploadAction;
 import org.openstreetmap.josm.actions.ZoomInAction;
@@ -94 +95 @@
     public final DownloadAction download = new DownloadAction();
     public final JosmAction update = new UpdateDataAction();
+    public final JosmAction updateSelection = new UpdateSelectionAction();
     public final JosmAction upload = new UploadAction();
     public final JosmAction exit = new ExitAction();
@@ -194 +196 @@
         add(fileMenu, upload);
         add(fileMenu, update);
+        add(fileMenu, updateSelection);
         fileMenu.addSeparator();
         add(fileMenu, exit);

trunk/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java

@@ -17 +17 @@
 
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.io.OsmTransferException;
 import org.xml.sax.SAXException;
 
@@ -109 +110 @@
                 x.printStackTrace();
                 errorMessage = x.getMessage();
+            } catch(OsmTransferException x) {
+                x.printStackTrace();
+                if (x.getCause() != null) {
+                    errorMessage = x.getCause().getMessage();
+                } else {
+                    errorMessage = x.getMessage();
+                }
             } finally {
                 closeDialog();
@@ -134 +142 @@
      * is called. finish() is called in any case.
      */
-    protected abstract void realRun() throws SAXException, IOException;
+    protected abstract void realRun() throws SAXException, IOException, OsmTransferException;
 
     /**
@@ -158 +166 @@
                         Main.pleaseWaitDlg.dispose();
                     }
-                    if (errorMessage != null && !silent)
+                    if (errorMessage != null && !silent) {
                         JOptionPane.showMessageDialog(Main.parent, errorMessage);
+                    }
                 }
             };
 
             // make sure, this is called in the dispatcher thread ASAP
-            if (EventQueue.isDispatchThread())
+            if (EventQueue.isDispatchThread()) {
                 runnable.run();
-            else
+            } else {
                 EventQueue.invokeAndWait(runnable);
+            }
 
         } catch (InterruptedException e) {

trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java

@@ -36 +36 @@
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
 import org.openstreetmap.josm.data.osm.Relation;
 import org.openstreetmap.josm.data.osm.RelationMember;
@@ -44 +45 @@
 import org.openstreetmap.josm.gui.dialogs.ConflictDialog;
 import org.openstreetmap.josm.io.OsmServerObjectReader;
+import org.openstreetmap.josm.io.OsmTransferException;
 import org.openstreetmap.josm.tools.GBC;
 import org.openstreetmap.josm.tools.Shortcut;
@@ -145 +147 @@
                             String key = propertyData.getValueAt(i, 0).toString();
                             String value = propertyData.getValueAt(i, 1).toString();
-                            if (key.length() > 0 && value.length() > 0) clone.put(key, value);
+                            if (key.length() > 0 && value.length() > 0) {
+                                clone.put(key, value);
+                            }
                         }
                         refreshTables();
@@ -175 +179 @@
                 {
                     sel = new ArrayList<OsmPrimitive>(cnt);
-                    for (int i : memberTable.getSelectedRows())
+                    for (int i : memberTable.getSelectedRows()) {
                         sel.add((OsmPrimitive)memberTable.getValueAt(i, 1));
+                    }
                 }
                 else
@@ -182 +187 @@
                     cnt = memberTable.getRowCount();
                     sel = new ArrayList<OsmPrimitive>(cnt);
-                    for (int i = 0; i < cnt; ++i)
+                    for (int i = 0; i < cnt; ++i) {
                         sel.add((OsmPrimitive)memberTable.getValueAt(i, 1));
+                    }
                 }
                 Main.ds.setSelected(sel);
@@ -239 +245 @@
 
         buttonPanel.add(createButton(marktr("Add Selected"),"addselected",
-        tr("Add all currently selected objects as members"), KeyEvent.VK_D, new ActionListener() {
+                tr("Add all currently selected objects as members"), KeyEvent.VK_D, new ActionListener() {
             public void actionPerformed(ActionEvent e) {
                 addSelected();
@@ -246 +252 @@
 
         buttonPanel.add(createButton(marktr("Remove Selected"),"removeselected",
-        tr("Remove all currently selected objects from relation"), KeyEvent.VK_S, new ActionListener() {
+                tr("Remove all currently selected objects from relation"), KeyEvent.VK_S, new ActionListener() {
             public void actionPerformed(ActionEvent e) {
                 deleteSelected();
@@ -259 +265 @@
 
         buttonPanel.add(createButton(marktr("Remove"),"remove",
-        tr("Remove the member in the current table row from this relation"), KeyEvent.VK_M, new ActionListener() {
+                tr("Remove the member in the current table row from this relation"), KeyEvent.VK_M, new ActionListener() {
             public void actionPerformed(ActionEvent e) {
                 int[] rows = memberTable.getSelectedRows();
@@ -273 +279 @@
 
         buttonPanel.add(createButton(marktr("Download Members"),"downloadincomplete",
-        tr("Download all incomplete ways and nodes in relation"), KeyEvent.VK_K, new ActionListener() {
+                tr("Download all incomplete ways and nodes in relation"), KeyEvent.VK_K, new ActionListener() {
             public void actionPerformed(ActionEvent e) {
                 downloadRelationMembers();
@@ -303 +309 @@
     protected void buttonAction(ActionEvent evt) {
         String a = evt.getActionCommand();
-        if(applyChangesText.equals(a))
+        if(applyChangesText.equals(a)) {
             applyChanges();
+        }
 
         setVisible(false);
@@ -348 +355 @@
                     break;
                 } else if (m.member instanceof Relation) {
-                    if (m.member == this.relation)
+                    if (m.member == this.relation) {
                         break;
+                    }
                     m = ((Relation)m.member).lastMember();
                     depth++;
@@ -366 +374 @@
                             break;
                         } else if (m.member instanceof Relation) {
-                            if (m.member == this.relation)
+                            if (m.member == this.relation) {
                                 break;
+                            }
                             m = ((Relation)(m.member)).firstMember();
                             depth++;
@@ -374 +383 @@
                         }
                     }
-                    if (way2 != null)
+                    if (way2 != null) {
                         break;
+                    }
                 }
             }
@@ -404 +414 @@
                 }
 
-                // end of section to determine linkedness. 
+                // end of section to determine linkedness.
 
                 memberData.addRow(new Object[]{em.role, em.member, linked ? tr("yes") : tr("no")});
@@ -416 +426 @@
     private SideButton createButton(String name, String iconName, String tooltip, int mnemonic, ActionListener actionListener) {
         return
-            new SideButton(name, iconName, "relationEditor",
+        new SideButton(name, iconName, "relationEditor",
                 tooltip,
                 Shortcut.registerShortcut("relationeditor:"+iconName,
@@ -422 +432 @@
                         mnemonic,
                         Shortcut.GROUP_MNEMONIC),
-                actionListener
-            );
+                        actionListener
+        );
     }
 
@@ -483 +493 @@
         for (RelationMember rm : clone.members) {
             if (rm != null) {
-                while (m[i] != null) i++;
+                while (m[i] != null) {
+                    i++;
+                }
                 m[i++] = rm;
             }
@@ -509 +521 @@
         }
         if (download) {
-            OsmServerObjectReader reader = new OsmServerObjectReader(clone.id, OsmServerObjectReader.TYPE_REL, true);
+            OsmServerObjectReader reader = new OsmServerObjectReader(clone.id, OsmPrimitiveType.RELATION, true);
             try {
                 DataSet dataSet = reader.parseOsm();
@@ -515 +527 @@
                     final MergeVisitor visitor = new MergeVisitor(Main.main
                             .editLayer().data, dataSet);
-                    for (final OsmPrimitive osm : dataSet.allPrimitives())
+                    for (final OsmPrimitive osm : dataSet.allPrimitives()) {
                         osm.visit(visitor);
+                    }
                     visitor.fixReferences();
 
                     // copy the merged layer's data source info
-                    for (DataSource src : dataSet.dataSources)
+                    for (DataSource src : dataSet.dataSources) {
                         Main.main.editLayer().data.dataSources.add(src);
+                    }
                     Main.main.editLayer().fireDataChange();
 
@@ -530 +544 @@
                     JOptionPane.showMessageDialog(Main.parent,
                             tr("There were conflicts during import."));
-                    if (!dlg.isVisible())
+                    if (!dlg.isVisible()) {
                         dlg.action
-                                .actionPerformed(new ActionEvent(this, 0, ""));
-                }
-
-            } catch (SAXException e) {
+                        .actionPerformed(new ActionEvent(this, 0, ""));
+                    }
+                }
+            } catch(OsmTransferException e) {
                 e.printStackTrace();
-                JOptionPane.showMessageDialog(this,tr("Error parsing server response.")+": "+e.getMessage(),
-                tr("Error"), JOptionPane.ERROR_MESSAGE);
-            } catch (IOException e) {
-                e.printStackTrace();
-                JOptionPane.showMessageDialog(this,tr("Cannot connect to server.")+": "+e.getMessage(),
-                tr("Error"), JOptionPane.ERROR_MESSAGE);
+                if (e.getCause() != null) {
+                    if (e.getCause() instanceof SAXException) {
+                        JOptionPane.showMessageDialog(this,tr("Error parsing server response.")+": "+e.getCause().getMessage(),
+                                tr("Error"), JOptionPane.ERROR_MESSAGE);
+                    } else if(e.getCause() instanceof IOException) {
+                        JOptionPane.showMessageDialog(this,tr("Cannot connect to server.")+": "+e.getCause().getMessage(),
+                                tr("Error"), JOptionPane.ERROR_MESSAGE);
+                    }
+                } else {
+                    JOptionPane.showMessageDialog(this,tr("Error when communicating with server.")+": "+e.getMessage(),
+                            tr("Error"), JOptionPane.ERROR_MESSAGE);
+                }
             }
         }

trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java

@@ -51 +51 @@
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
 import org.openstreetmap.josm.data.osm.Relation;
 import org.openstreetmap.josm.data.osm.Way;
@@ -77 +78 @@
         public final int[] normal = new int[3];
         public final int[] deleted = new int[3];
-        public final String[] names = {"node", "way", "relation"};
+        public final String[] names = {
+                OsmPrimitiveType.NODE.getAPIName(),
+                OsmPrimitiveType.WAY.getAPIName(),
+                OsmPrimitiveType.RELATION.getAPIName()
+        };
 
         private void inc(final OsmPrimitive osm, final int i) {
             normal[i]++;
-            if (osm.deleted)
+            if (osm.deleted) {
                 deleted[i]++;
+            }
         }
 
@@ -201 +207 @@
 
         SimplePaintVisitor painter;
-        if (Main.pref.getBoolean("draw.wireframe"))
+        if (Main.pref.getBoolean("draw.wireframe")) {
             painter = new SimplePaintVisitor();
-        else
+        } else {
             painter = new MapPaintVisitor();
+        }
         painter.setGraphics(g);
         painter.setNavigatableComponent(mv);
@@ -216 +223 @@
         tool += undeletedSize(data.nodes)+" "+trn("node", "nodes", undeletedSize(data.nodes))+", ";
         tool += undeletedSize(data.ways)+" "+trn("way", "ways", undeletedSize(data.ways));
-        if (data.version != null) tool += ", " + tr("version {0}", data.version);
+        if (data.version != null) {
+            tool += ", " + tr("version {0}", data.version);
+        }
         File f = getAssociatedFile();
-        if (f != null)
+        if (f != null) {
             tool = "<html>"+tool+"<br>"+f.getPath()+"</html>";
+        }
         return tool;
     }
 
     @Override public void mergeFrom(final Layer from) {
-        final MergeVisitor visitor = new MergeVisitor(data,((OsmDataLayer)from).data);
-        for (final OsmPrimitive osm : ((OsmDataLayer)from).data.allPrimitives()) {
-//            i++;
-//            if(i%100 == 0) {
-//                double perc = (((double)i) / ((double)max) * 100.0);
-//                System.out.format(" " + (int)perc + "%%");
-//            }
+        mergeFrom(((OsmDataLayer)from).data);
+    }
+
+    /**
+     * merges the primitives in dataset <code>from</code> into the dataset of
+     * this layer
+     * 
+     * @param from  the source data set
+     */
+    public void mergeFrom(final DataSet from) {
+        final MergeVisitor visitor = new MergeVisitor(data,from);
+        for (final OsmPrimitive osm : from.allPrimitives()) {
             osm.visit(visitor);
         }
         visitor.fixReferences();
-//        System.out.println("");
 
         Area a = data.getDataSourceArea();
-        
-        // copy the merged layer's data source info; 
+
+        // copy the merged layer's data source info;
         // only add source rectangles if they are not contained in the
         // layer already.
-        for (DataSource src : ((OsmDataLayer)from).data.dataSources) {
-            if (a == null || !a.contains(src.bounds.asRect()))
+        for (DataSource src : from.dataSources) {
+            if (a == null || !a.contains(src.bounds.asRect())) {
                 data.dataSources.add(src);
-        }
-        
+            }
+        }
+
         // copy the merged layer's API version, downgrade if required
         if (data.version == null) {
-            data.version = ((OsmDataLayer)from).data.version;
+            data.version = from.version;
         } else {
-            if ("0.5".equals(data.version) ^ "0.5".equals(((OsmDataLayer)from).data.version)) {
-                System.err.println("Warning: mixing 0.6 and 0.5 data results in version 0.5");
+            if ("0.5".equals(data.version) ^ "0.5".equals(from.version)) {
+                System.err.println(tr("Warning: mixing 0.6 and 0.5 data results in version 0.5"));
                 data.version = "0.5";
             }
@@ -263 +278 @@
         final ConflictDialog dlg = Main.map.conflictDialog;
         dlg.add(visitor.conflicts);
-        JOptionPane.showMessageDialog(Main.parent,tr("There were conflicts during import."));
-        if (!dlg.isVisible())
+        JOptionPane.showMessageDialog(Main.parent,tr("There were {0} conflicts during import.", visitor.conflicts.size()));
+        if (!dlg.isVisible()) {
             dlg.action.actionPerformed(new ActionEvent(this, 0, ""));
+        }
     }
 
@@ -274 +290 @@
     @Override public void visitBoundingBox(final BoundingXYVisitor v) {
         for (final Node n : data.nodes)
-            if (!n.deleted && !n.incomplete)
+            if (!n.deleted && !n.incomplete) {
                 v.visit(n);
+            }
     }
 
@@ -299 +316 @@
         if (processed != null) {
             final Set<OsmPrimitive> processedSet = new HashSet<OsmPrimitive>(processed);
-            for (final Iterator<Node> it = data.nodes.iterator(); it.hasNext();)
+            for (final Iterator<Node> it = data.nodes.iterator(); it.hasNext();) {
                 cleanIterator(it, processedSet);
-            for (final Iterator<Way> it = data.ways.iterator(); it.hasNext();)
+            }
+            for (final Iterator<Way> it = data.ways.iterator(); it.hasNext();) {
                 cleanIterator(it, processedSet);
-            for (final Iterator<Relation> it = data.relations.iterator(); it.hasNext();)
+            }
+            for (final Iterator<Relation> it = data.relations.iterator(); it.hasNext();) {
                 cleanIterator(it, processedSet);
+            }
         }
 
@@ -330 +350 @@
             return;
         osm.modified = false;
-        if (osm.deleted)
+        if (osm.deleted) {
             it.remove();
+        }
     }
 
@@ -342 +363 @@
             return;
         this.modified = modified;
-        for (final ModifiedChangedListener l : listenerModified)
+        for (final ModifiedChangedListener l : listenerModified) {
             l.modifiedChanged(modified, this);
+        }
     }
 
@@ -352 +374 @@
         int size = 0;
         for (final OsmPrimitive osm : list)
-            if (!osm.deleted)
+            if (!osm.deleted) {
                 size++;
+            }
         return size;
     }
@@ -359 +382 @@
     @Override public Object getInfoComponent() {
         final DataCountVisitor counter = new DataCountVisitor();
-        for (final OsmPrimitive osm : data.allPrimitives())
+        for (final OsmPrimitive osm : data.allPrimitives()) {
             osm.visit(counter);
+        }
         final JPanel p = new JPanel(new GridBagLayout());
         p.add(new JLabel(tr("{0} consists of:", name)), GBC.eol());
         for (int i = 0; i < counter.normal.length; ++i) {
             String s = counter.normal[i]+" "+trn(counter.names[i],counter.names[i]+"s",counter.normal[i]);
-            if (counter.deleted[i] > 0)
+            if (counter.deleted[i] > 0) {
                 s += tr(" ({0} deleted.)",counter.deleted[i]);
+            }
             p.add(new JLabel(s, ImageProvider.get("data", counter.names[i]), JLabel.HORIZONTAL), GBC.eop().insets(15,0,0,0));
         }
@@ -375 +400 @@
 
     @Override public Component[] getMenuEntries() {
-        if (Main.applet) {
+        if (Main.applet)
             return new Component[]{
-                    new JMenuItem(new LayerListDialog.ShowHideLayerAction(this)),
-                    new JMenuItem(new LayerListDialog.DeleteLayerAction(this)),
-                    new JSeparator(),
-                    new JMenuItem(new RenameLayerAction(getAssociatedFile(), this)),
-                    new JSeparator(),
-                    new JMenuItem(new LayerListPopup.InfoAction(this))};
-        }
+                new JMenuItem(new LayerListDialog.ShowHideLayerAction(this)),
+                new JMenuItem(new LayerListDialog.DeleteLayerAction(this)),
+                new JSeparator(),
+                new JMenuItem(new RenameLayerAction(getAssociatedFile(), this)),
+                new JSeparator(),
+                new JMenuItem(new LayerListPopup.InfoAction(this))};
         return new Component[]{
                 new JMenuItem(new LayerListDialog.ShowHideLayerAction(this)),
@@ -409 +433 @@
         HashSet<Node> doneNodes = new HashSet<Node>();
         for (Way w : data.ways) {
-            if (w.incomplete || w.deleted) continue;
+            if (w.incomplete || w.deleted) {
+                continue;
+            }
             GpxTrack trk = new GpxTrack();
             gpxData.tracks.add(trk);
 
-            if (w.get("name") != null)
+            if (w.get("name") != null) {
                 trk.attr.put("name", w.get("name"));
+            }
 
             ArrayList<WayPoint> trkseg = null;
@@ -429 +456 @@
                     doneNodes.add(n);
                 }
-                WayPoint wpt = new WayPoint(n.getCoor());                
+                WayPoint wpt = new WayPoint(n.getCoor());
                 if (!n.isTimestampEmpty())
                 {
@@ -442 +469 @@
         // records them?
         for (Node n : data.nodes) {
-            if (n.incomplete || n.deleted || doneNodes.contains(n)) continue;
+            if (n.incomplete || n.deleted || doneNodes.contains(n)) {
+                continue;
+            }
             WayPoint wpt = new WayPoint(n.getCoor());
             if (!n.isTimestampEmpty()) {

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

@@ -50 +50 @@
                 Main.pleaseWaitDlg.currentAction.setText(tr("Downloading points {0} to {1}...", i * 5000, ((i + 1) * 5000)));
                 InputStream in = getInputStream(url+i, Main.pleaseWaitDlg);
-                if (in == null)
+                if (in == null) {
                     break;
+                }
                 GpxData currentGpx = new GpxReader(in, null).data;
                 if (result == null) {
@@ -89 +90 @@
      * @return A data set containing all data retrieved from that url
      */
-    public DataSet parseOsm() throws SAXException, IOException {
+    @Override
+    public DataSet parseOsm() throws OsmTransferException {
         try {
             Main.pleaseWaitDlg.progress.setValue(0);
@@ -106 +108 @@
             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);
         }
     }

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

@@ -29 +29 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.osm.Changeset;
-import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
-import org.openstreetmap.josm.data.osm.Relation;
-import org.openstreetmap.josm.data.osm.Way;
+import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
 import org.openstreetmap.josm.data.osm.visitor.CreateOsmChangeVisitor;
 import org.xml.sax.Attributes;
@@ -67 +65 @@
         if (api == null) {
             api = new OsmApi(serverUrl);
+            instances.put(serverUrl,api);
         }
         return api;
@@ -80 +79 @@
         String serverUrl = Main.pref.get("osm-server.url");
         if (serverUrl == null)
-            throw new IllegalStateException(tr("preference {0} missing. Can't initialize OsmApi", "osm-server.url"));
+            throw new IllegalStateException(tr("preference ''{0}'' missing. Can't initialize OsmApi", "osm-server.url"));
         return getOsmApi(serverUrl);
     }
@@ -96 +95 @@
      */
     private String version = null;
-
-    /**
-     * Maximum downloadable area from server (degrees squared), from capabilities response
-     * FIXME: make download dialog use this, instead of hard-coded default.
-     */
-    private String maxArea = null;
 
     /** the api capabilities */
@@ -143 +136 @@
 
     /**
-     * creates an instance of the OSM API. Initializes the server URL with the
-     * value of the preference <code>osm-server.url</code>
-     * 
-     * @exception IllegalStateException thrown, if the preference <code>osm-server.url</code> is not set
-     */
-    protected OsmApi() {
-        this.serverUrl = Main.pref.get("osm-server.url");
-        if (serverUrl == null)
-            throw new IllegalStateException(tr("preference {0} missing. Can't initialize OsmApi", "osm-server.url"));
-    }
-
-    /**
-     * Helper that returns the lower-case type name of an OsmPrimitive
-     * @param o the primitive
-     * @return "node", "way", "relation", or "changeset"
-     */
-    public static String which(OsmPrimitive o) {
-        if (o instanceof Node) return "node";
-        if (o instanceof Way) return "way";
-        if (o instanceof Relation) return "relation";
-        if (o instanceof Changeset) return "changeset";
-        return "";
-    }
-
-    /**
      * Returns the OSM protocol version we use to talk to the server.
      * @return protocol version, or null if not yet negotiated.
@@ -185 +153 @@
     /**
      * Initializes this component by negotiating a protocol version with the server.
-     * 
-     * @exception UnknownHostException thrown, if the API host is unknown
-     * @exception SocketTimeoutException thrown, if the connection to the API host  times out
-     * @exception ConnectException throw, if the connection to the API host fails
-     * @exception Exception any other exception
+     *
+     * @exception OsmApiInitializationException thrown, if an exception occurs
      */
     public void initialize() throws OsmApiInitializationException {
@@ -238 +203 @@
 
     /**
-     * Helper that makes an int from the first whitespace separated token in a string.
-     * @param s the string
-     * @return the integer represenation of the first token in the string
-     * @throws OsmTransferException if the string is empty or does not represent a number
-     */
-    public static int parseInt(String s) throws OsmTransferException {
-        StringTokenizer t = new StringTokenizer(s);
-        try {
-            return Integer.parseInt(t.nextToken());
-        } catch (Exception x) {
-            throw new OsmTransferException(tr("Cannot read numeric value from response"));
-        }
-    }
-
-    /**
-     * Helper that makes a long from the first whitespace separated token in a string.
-     * @param s the string
-     * @return the long represenation of the first token in the string
-     * @throws OsmTransferException if the string is empty or does not represent a number
-     */
-    public static long parseLong(String s) throws OsmTransferException {
-        StringTokenizer t = new StringTokenizer(s);
-        try {
-            return Long.parseLong(t.nextToken());
-        } catch (Exception x) {
-            throw new OsmTransferException(tr("Cannot read numeric value from response"));
-        }
-    }
-
-    /**
      * Returns the base URL for API requests, including the negotiated version number.
      * @return base URL string
@@ -293 +228 @@
     public void createPrimitive(OsmPrimitive osm) throws OsmTransferException {
         initialize();
-        osm.id = parseLong(sendRequest("PUT", which(osm)+"/create", toXml(osm, true)));
-        osm.version = 1;
+        String ret = "";
+        try {
+            ret = sendRequest("PUT", OsmPrimitiveType.from(osm).getAPIName()+"/create", toXml(osm, true));
+            osm.id = Long.parseLong(ret.trim());
+            osm.version = 1;
+        } catch(NumberFormatException e){
+            throw new OsmTransferException(tr("unexpected format of id replied by the server, got ''{0}''", ret));
+        }
     }
 
@@ -309 +250 @@
         if (version.equals("0.5")) {
             // legacy mode does not return the new object version.
-            sendRequest("PUT", which(osm)+"/" + osm.id, toXml(osm, true));
+            sendRequest("PUT", OsmPrimitiveType.from(osm).getAPIName()+"/" + osm.id, toXml(osm, true));
         } else {
+            String ret = null;
             // normal mode (0.6 and up) returns new object version.
-            osm.version = parseInt(sendRequest("PUT", which(osm)+"/" + osm.id, toXml(osm, true)));
+            try {
+                ret = sendRequest("PUT", OsmPrimitiveType.from(osm).getAPIName()+"/" + osm.id, toXml(osm, true));
+                osm.version = Integer.parseInt(ret.trim());
+            } catch(NumberFormatException e) {
+                throw new OsmTransferException(tr("unexpected format of new version of modified primitive ''{0}'', got ''{1}''", osm.id, ret));
+            }
         }
     }
@@ -324 +271 @@
         initialize();
         // legacy mode does not require payload. normal mode (0.6 and up) requires payload for version matching.
-        sendRequest("DELETE", which(osm)+"/" + osm.id, version.equals("0.5") ? null : toXml(osm, false));
+        sendRequest("DELETE", OsmPrimitiveType.from(osm).getAPIName()+"/" + osm.id, version.equals("0.5") ? null : toXml(osm, false));
     }
 
@@ -334 +281 @@
     public void createChangeset(String comment) throws OsmTransferException {
         changeset = new Changeset();
-        Main.pleaseWaitDlg.currentAction.setText(tr("Opening changeset..."));
+        notifyStatusMessage(tr("Opening changeset..."));
         Properties sysProp = System.getProperties();
         Object ua = sysProp.get("http.agent");
@@ -349 +296 @@
     public void stopChangeset() throws OsmTransferException {
         initialize();
-        Main.pleaseWaitDlg.currentAction.setText(tr("Closing changeset..."));
+        notifyStatusMessage(tr("Closing changeset..."));
         sendRequest("PUT", "changeset" + "/" + changeset.id + "/close", null);
         changeset = null;
@@ -372 +319 @@
         CreateOsmChangeVisitor duv = new CreateOsmChangeVisitor(changeset, OsmApi.this);
 
+        notifyStatusMessage(tr("Preparing..."));
         for (OsmPrimitive osm : list) {
-            int progress = Main.pleaseWaitDlg.progress.getValue();
-            Main.pleaseWaitDlg.currentAction.setText(tr("Preparing..."));
             osm.visit(duv);
-            Main.pleaseWaitDlg.progress.setValue(progress+1);
-        }
-
-        Main.pleaseWaitDlg.currentAction.setText(tr("Uploading..."));
+            notifyRelativeProgress(1);
+        }
+        notifyStatusMessage(tr("Uploading..."));
 
         String diff = duv.getDocument();
@@ -517 +462 @@
         }
     }
+
+    /**
+     * notifies any listeners about the current state of this API. Currently just
+     * displays the message in the global progress dialog, see {@see Main#pleaseWaitDlg}
+     * 
+     * @param message a status message.
+     */
+    protected void notifyStatusMessage(String message) {
+        Main.pleaseWaitDlg.currentAction.setText(message);
+    }
+
+    /**
+     * notifies any listeners about the current about a relative progress. Currently just
+     * increments the progress monitor in the in the global progress dialog, see {@see Main#pleaseWaitDlg}
+     * 
+     * @param int the delta
+     */
+    protected void notifyRelativeProgress(int delta) {
+        int current= Main.pleaseWaitDlg.progress.getValue();
+        Main.pleaseWaitDlg.progress.setValue(current + delta);
+    }
 }

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

@@ -22 +22 @@
 
 import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.gui.ExtendedDialog; 
+import org.openstreetmap.josm.gui.ExtendedDialog;
 import org.openstreetmap.josm.tools.Base64;
 import org.openstreetmap.josm.tools.GBC;
@@ -33 +33 @@
  */
 public class OsmConnection {
-
-    public static class OsmParseException extends Exception {
-        public OsmParseException() {super();}
-        public OsmParseException(String message, Throwable cause) {super(message, cause);}
-        public OsmParseException(String message) {super(message);}
-        public OsmParseException(Throwable cause) {super(cause);}
-    }
 
     protected boolean cancel = false;
@@ -77 +70 @@
             if (passwordtried || username.equals("") || password.equals("")) {
                 JPanel p = new JPanel(new GridBagLayout());
-                if (!username.equals("") && !password.equals(""))
+                if (!username.equals("") && !password.equals("")) {
                     p.add(new JLabel(tr("Incorrect password or username.")), GBC.eop());
+                }
                 p.add(new JLabel(tr("Username")), GBC.std().insets(0,0,10,0));
                 JTextField usernameField = new JTextField(username, 20);
@@ -92 +86 @@
                 p.add(savePassword, GBC.eop());
 
-                int choice = new ExtendedDialog(Main.parent, 
-                        tr("Enter Password"), 
+                int choice = new ExtendedDialog(Main.parent,
+                        tr("Enter Password"),
                         p,
-                        new String[] {tr("Login"), tr("Cancel")}, 
-                        new String[] {"ok.png", "cancel.png"}).getValue();  
-                
+                        new String[] {tr("Login"), tr("Cancel")},
+                        new String[] {"ok.png", "cancel.png"}).getValue();
+
                 if (choice != 1) {
                     authCancelled = true;

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);
         }
     }

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);
         }
     }

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

@@ -4 +4 @@
 import static org.openstreetmap.josm.tools.I18n.tr;
 
-import java.io.IOException;
+import java.io.BufferedReader;
 import java.io.InputStream;
+import java.io.InputStreamReader;
 import java.net.HttpURLConnection;
+import java.net.MalformedURLException;
 import java.net.URL;
+import java.util.zip.GZIPInputStream;
 import java.util.zip.Inflater;
 import java.util.zip.InflaterInputStream;
-import java.util.zip.GZIPInputStream;
 
 import javax.swing.JOptionPane;
@@ -17 +19 @@
 import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.gui.PleaseWaitDialog;
-import org.xml.sax.SAXException;
 
 /**
@@ -39 +40 @@
      * @return An reader reading the input stream (servers answer) or <code>null</code>.
      */
-    protected InputStream getInputStream(String urlStr, PleaseWaitDialog pleaseWaitDlg) throws IOException {
-
-        // initialize API. Abort download in case of configuration or network
-        // errors
-        //
-        try {
-            api.initialize();
-        } catch(Exception e) {
-            JOptionPane.showMessageDialog(
-                    null,
-                    tr(   "Failed to initialize communication with the OSM server {0}.\n"
-                            + "Check the server URL in your preferences and your internet connection.",
-                            Main.pref.get("osm-server.url")
-                    ),
-                    tr("Error"),
-                    JOptionPane.ERROR_MESSAGE
-            );
-            e.printStackTrace();
-            return null;
-        }
-
+    protected InputStream getInputStream(String urlStr, PleaseWaitDialog pleaseWaitDlg) throws OsmTransferException  {
+        api.initialize();
         urlStr = api.getBaseUrl() + urlStr;
         return getInputStreamRaw(urlStr, pleaseWaitDlg);
     }
 
-    protected InputStream getInputStreamRaw(String urlStr, PleaseWaitDialog pleaseWaitDlg) throws IOException {
-
-        //        System.out.println("download: "+urlStr);
-        URL url = new URL(urlStr);
-        activeConnection = (HttpURLConnection)url.openConnection();
+    protected InputStream getInputStreamRaw(String urlStr, PleaseWaitDialog pleaseWaitDlg) throws OsmTransferException {
+        URL url = null;
+        try {
+            url = new URL(urlStr);
+        } catch(MalformedURLException e) {
+            throw new OsmTransferException(e);
+        }
+        try {
+            activeConnection = (HttpURLConnection)url.openConnection();
+        } catch(Exception e) {
+            throw new OsmTransferException(tr("Failed to open connection to API {0}", url.toExternalForm()), e);
+        }
         if (cancel) {
             activeConnection.disconnect();
@@ -81 +70 @@
 
         try {
+            System.out.println("GET " + url);
             activeConnection.connect();
+        } catch (Exception e) {
+            throw new OsmTransferException(tr("Couldn't connect to the osm server. Please check your internet connection."), e);
         }
-        catch (Exception e) {
-            throw new IOException(tr("Couldn't connect to the osm server. Please check your internet connection."));
+        try {
+            if (isAuthCancelled() && activeConnection.getResponseCode() == HttpURLConnection.HTTP_UNAUTHORIZED)
+                throw new OsmApiException(HttpURLConnection.HTTP_UNAUTHORIZED,null,null);
+
+            if (activeConnection.getResponseCode() != HttpURLConnection.HTTP_OK) {
+                String errorHeader = activeConnection.getHeaderField("Error");
+                InputStream i = null;
+                i = activeConnection.getErrorStream();
+                StringBuilder errorBody = new StringBuilder();
+                if (i != null) {
+                    BufferedReader in = new BufferedReader(new InputStreamReader(i));
+                    String s;
+                    while((s = in.readLine()) != null) {
+                        errorBody.append(s);
+                        errorBody.append("\n");
+                    }
+                }
+
+                throw new OsmApiException(activeConnection.getResponseCode(), errorHeader, errorBody.toString());
+            }
+
+            String encoding = activeConnection.getContentEncoding();
+            InputStream inputStream = new ProgressInputStream(activeConnection, pleaseWaitDlg);
+            if (encoding != null && encoding.equalsIgnoreCase("gzip")) {
+                inputStream = new GZIPInputStream(inputStream);
+            }
+            else if (encoding != null && encoding.equalsIgnoreCase("deflate")) {
+                inputStream = new InflaterInputStream(inputStream, new Inflater(true));
+            }
+            return inputStream;
+        } catch(Exception e) {
+            if (e instanceof OsmTransferException)
+                throw (OsmTransferException)e;
+            else
+                throw new OsmTransferException(e);
+
         }
-
-        if (isAuthCancelled() && activeConnection.getResponseCode() == 401)
-            return null;
-        if (activeConnection.getResponseCode() == 500)
-            throw new IOException(tr("Server returned internal error. Try a reduced area or retry after waiting some time."));
-
-        String encoding = activeConnection.getContentEncoding();
-        InputStream inputStream = new ProgressInputStream(activeConnection, pleaseWaitDlg);
-        if (encoding != null && encoding.equalsIgnoreCase("gzip")) {
-            inputStream = new GZIPInputStream(inputStream);
-        }
-        else if (encoding != null && encoding.equalsIgnoreCase("deflate")) {
-            inputStream = new InflaterInputStream(inputStream, new Inflater(true));
-        }
-        return inputStream;
     }
 
-    public abstract DataSet parseOsm() throws SAXException, IOException;
+    public abstract DataSet parseOsm() throws OsmTransferException;
 
 }

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

@@ -101 +101 @@
         boolean useChangeset = Main.pref.getBoolean("osm-server.atomic-upload", apiVersion.compareTo("0.6")>=0);
         if (useChangeset && ! canUseChangeset) {
-            System.out.println(tr("WARNING: preference '{0}' or api version {1} of dataset requires to use changesets, but API is not handle them. Ignoring changesets.", "osm-server.atomic-upload", apiVersion));
+            System.out.println(tr("WARNING: preference ''{0}'' or api version ''{1}'' of dataset requires to use changesets, but API is not handle them. Ignoring changesets.", "osm-server.atomic-upload", apiVersion));
             useChangeset = false;
         }

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

@@ -11 +11 @@
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
 import org.openstreetmap.josm.data.osm.Relation;
 import org.openstreetmap.josm.data.osm.RelationMember;
@@ -25 +26 @@
 
     public final String DEFAULT_API_VERSION = "0.6";
-    
+
     /**
      * The counter for newly created objects. Starts at -1 and goes down.
      */
     private long newIdCounter = -1;
- 
+
     /**
      * All newly created ids and their primitive that uses it. This is a back reference
@@ -41 +42 @@
     private String version;
     private Changeset changeset;
-    
+
     public OsmWriter(PrintWriter out, boolean osmConform, String version) {
         super(out);
@@ -47 +48 @@
         this.version = (version == null ? DEFAULT_API_VERSION : version);
     }
-    
+
     public void setWithBody(boolean wb) {
         this.withBody = wb;
@@ -57 +58 @@
         this.version = v;
     }
-    
+
     public void header() {
         out.println("<?xml version='1.0' encoding='UTF-8'?>");
@@ -70 +71 @@
     public void writeContent(DataSet ds) {
         for (Node n : ds.nodes)
-            if (shouldWrite(n))
+            if (shouldWrite(n)) {
                 visit(n);
+            }
         for (Way w : ds.ways)
-            if (shouldWrite(w))
+            if (shouldWrite(w)) {
                 visit(w);
+            }
         for (Relation e : ds.relations)
-            if (shouldWrite(e))
+            if (shouldWrite(e)) {
                 visit(e);
+            }
     }
 
@@ -100 +104 @@
         out.print(" lat='"+n.getCoor().lat()+"' lon='"+n.getCoor().lon()+"'");
         if (!withBody) {
-            out.println("/>");  
+            out.println("/>");
         } else {
             addTags(n, "node", true);
@@ -110 +114 @@
         addCommon(w, "way");
         if (!withBody) {
-            out.println("/>");  
+            out.println("/>");
         } else {
             out.println(">");
-            for (Node n : w.nodes)
+            for (Node n : w.nodes) {
                 out.println("    <nd ref='"+getUsedId(n)+"' />");
+            }
             addTags(w, "way", false);
         }
@@ -123 +128 @@
         addCommon(e, "relation");
         if (!withBody) {
-            out.println("/>");  
+            out.println("/>");
         } else {
             out.println(">");
             for (RelationMember em : e.members) {
                 out.print("    <member type='");
-                out.print(OsmApi.which(em.member));
+                out.print(OsmPrimitiveType.from(em.member).getAPIName());
                 out.println("' ref='"+getUsedId(em.member)+"' role='" +
                         XmlWriter.encode(em.role == null ? "" : em.role) + "' />");
@@ -160 +165 @@
     private void addTags(OsmPrimitive osm, String tagname, boolean tagOpen) {
         if (osm.keys != null) {
-            if (tagOpen)
+            if (tagOpen) {
                 out.println(">");
-            for (Entry<String, String> e : osm.keys.entrySet())
+            }
+            for (Entry<String, String> e : osm.keys.entrySet()) {
                 out.println("    <tag k='"+ XmlWriter.encode(e.getKey()) +
                         "' v='"+XmlWriter.encode(e.getValue())+ "' />");
+            }
             out.println("  </" + tagname + ">");
-        } else if (tagOpen)
+        } else if (tagOpen) {
             out.println(" />");
-        else
+        } else {
             out.println("  </" + tagname + ">");
+        }
     }
 
@@ -180 +188 @@
         out.print("  <"+tagname);
         if (id != 0) {
-             out.print(" id='"+getUsedId(osm)+"'");
+            out.print(" id='"+getUsedId(osm)+"'");
         }
         if (!osmConform) {
             String action = null;
-            if (osm.deleted)
+            if (osm.deleted) {
                 action = "delete";
-            else if (osm.modified)
+            } else if (osm.modified) {
                 action = "modify";
-            if (action != null)
+            }
+            if (action != null) {
                 out.print(" action='"+action+"'");
+            }
         }
         if (!osm.isTimestampEmpty()) {
@@ -199 +209 @@
         }
         out.print(" visible='"+osm.visible+"'");
-        if (osm.version != -1)
+        if (osm.version != -1) {
             out.print(" version='"+osm.version+"'");
-        if (this.changeset != null && this.changeset.id != 0)
+        }
+        if (this.changeset != null && this.changeset.id != 0) {
             out.print(" changeset='"+this.changeset.id+"'" );
-    }
-    
+        }
+    }
+
     public void close() {
         out.close();
     }
-    
+
     public void flush() {
         out.flush();

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

@@ -22 +22 @@
     private PleaseWaitDialog pleaseWaitDlg;
 
-    public class OsmServerException extends IOException {
-        private OsmServerException(String e) {
-            super(e);
-        }
-    }
-
-    public ProgressInputStream(URLConnection con, PleaseWaitDialog pleaseWaitDlg) throws IOException, OsmServerException {
+    public ProgressInputStream(URLConnection con, PleaseWaitDialog pleaseWaitDlg) throws OsmTransferException {
         this.connection = con;
 
@@ -35 +29 @@
         } catch (IOException e) {
             if (con.getHeaderField("Error") != null)
-                throw new OsmServerException(tr(con.getHeaderField("Error")));
-            throw e;
+                throw new OsmTransferException(tr(con.getHeaderField("Error")));
+            throw new OsmTransferException(e);
         }
 
@@ -43 +37 @@
         if (pleaseWaitDlg == null)
             return;
-        if (contentLength > 0)
+        if (contentLength > 0) {
             pleaseWaitDlg.progress.setMaximum(contentLength);
-        else
+        } else {
             pleaseWaitDlg.progress.setMaximum(0);
+        }
         pleaseWaitDlg.progress.setValue(0);
     }
@@ -56 +51 @@
     @Override public int read(byte[] b, int off, int len) throws IOException {
         int read = in.read(b, off, len);
-        if (read != -1)
+        if (read != -1) {
             advanceTicker(read);
+        }
         return read;
     }
@@ -63 +59 @@
     @Override public int read() throws IOException {
         int read = in.read();
-        if (read != -1)
+        if (read != -1) {
             advanceTicker(1);
+        }
         return read;
     }
@@ -76 +73 @@
             return;
 
-        if (pleaseWaitDlg.progress.getMaximum() == 0 && connection.getContentLength() != -1)
+        if (pleaseWaitDlg.progress.getMaximum() == 0 && connection.getContentLength() != -1) {
             pleaseWaitDlg.progress.setMaximum(connection.getContentLength());
+        }
 
         readSoFar += amount;
@@ -89 +87 @@
             String cur = pleaseWaitDlg.currentAction.getText();
             int i = cur.indexOf(' ');
-            if (i != -1)
+            if (i != -1) {
                 cur = cur.substring(0, i) + progStr;
-            else
+            } else {
                 cur += progStr;
+            }
             pleaseWaitDlg.currentAction.setText(cur);
         }