Index: trunk/src/org/openstreetmap/josm/actions/UploadAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/UploadAction.java (revision 2389)
+++ trunk/src/org/openstreetmap/josm/actions/UploadAction.java (revision 2390)
@@ -2,6 +2,6 @@
package org.openstreetmap.josm.actions;
+import static org.openstreetmap.josm.gui.help.HelpUtil.ht;
import static org.openstreetmap.josm.tools.I18n.tr;
-import static org.openstreetmap.josm.gui.help.HelpUtil.ht;
import java.awt.event.ActionEvent;
@@ -28,5 +28,4 @@
import org.openstreetmap.josm.data.conflict.ConflictCollection;
import org.openstreetmap.josm.data.osm.Changeset;
-import org.openstreetmap.josm.data.osm.DataSet;
import org.openstreetmap.josm.data.osm.OsmPrimitive;
import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
@@ -511,22 +510,4 @@
return;
}
- // any other API exception
- //
- else {
- ex.printStackTrace();
- String msg = tr("Uploading failed."
- + "
"
- + "{0}"
- + "",
- ex.getDisplayMessage()
- );
- JOptionPane.showMessageDialog(
- Main.map,
- msg,
- tr("Upload to OSM API failed"),
- JOptionPane.ERROR_MESSAGE
- );
- return;
- }
}