Changeset 1670 in josm for trunk/src/org/openstreetmap/josm/io/OsmConnection.java

Timestamp:

15.06.2009 20:22:46 (3 years ago)

Author:

Gubaer

Message:

fixed: bug in OsmApi.getOsmApi()
cleanup: exception handling in interfacing with OSM API
new: new action for updating individual elements with the their current state on the server (including new menu item in the file menu)
new: improved user feedback in case of conflicts
new: handles 410 Gone conflicts when uploading a changeset
new: undoable command for "purging" a primitive from the current dataset (necessary if the primitive is already deleted on the server and the user wants to remove it from its local dataset)
new: undoable command for "undeleting" an already deleted primitive on the server (kind of "cloning")
new: after a full upload, checks whether there are primitives in the local dataset which might be deleted on the server.
new: data structures for history data
new: history download support in io package

File:

• trunk/src/org/openstreetmap/josm/io/OsmConnection.java (modified) (4 diffs)

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;