Changeset 2037 in josm for trunk/src/org/openstreetmap/josm/io

Timestamp:

2009-09-03T14:13:22+02:00 (16 years ago)

Author:

Gubaer

Message:

Improved cancellation of upload tasks
Refactored upload dialog
fixed #2597: Size of upload dialog - now restores dialog size from preferences
fixed #2913: Upload dialog enters scrolling-mode when JOSM isn't maximized - no scroling anymore in ExtendeDialog for UploadDialog
fixed #2518: focus & select comment editing field

Location:

trunk/src/org/openstreetmap/josm/io

Files:

• OsmApi.java (modified) (1 diff)
• OsmConnection.java (modified) (7 diffs)
• OsmServerWriter.java (modified) (2 diffs)

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

@@ -160 +160 @@
         if (initialized)
             return;
+        cancel = false;
         initAuthentication();
         try {

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

@@ -23 +23 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.gui.ExtendedDialog;
+import org.openstreetmap.josm.gui.progress.ProgressMonitor;
 import org.openstreetmap.josm.tools.Base64;
 import org.openstreetmap.josm.tools.GBC;
@@ -94 +95 @@
 
     public void cancel() {
-        //TODO
-        //Main.pleaseWaitDlg.currentAction.setText(tr("Aborting..."));
         cancel = true;
         if (activeConnection != null) {
@@ -112 +111 @@
         try {
             synchronized (credentialsManager) {
-                auth = credentialsManager.lookup(CredentialsManager.Key.USERNAME) + ":" + 
-                    credentialsManager.lookup(CredentialsManager.Key.PASSWORD);
+                auth = credentialsManager.lookup(CredentialsManager.Key.USERNAME) + ":" +
+                credentialsManager.lookup(CredentialsManager.Key.PASSWORD);
             }
         } catch (CredentialsManager.CMException e) {
@@ -139 +138 @@
             String secret = Main.pref.get("osm-server." + key.toString(), null);
             if (secret == null) throw new CredentialsManager.NoContentException();
-            return secret;            
+            return secret;
         }
         public void store(CredentialsManager.Key key, String secret) {
@@ -171 +170 @@
                 p.add(warning, GBC.eop());
 
-                JCheckBox savePassword = new JCheckBox(tr("Save user and password (unencrypted)"), 
-                                                       !username.equals("") && !password.equals(""));
+                JCheckBox savePassword = new JCheckBox(tr("Save user and password (unencrypted)"),
+                        !username.equals("") && !password.equals(""));
                 p.add(savePassword, GBC.eop());
 
-                int choice = new ExtendedDialog(
-                    Main.parent,
-                    tr("Enter Password"),
-                    p,
-                    new String[] {tr("Login"), tr("Cancel")},
-                    new String[] {"ok.png", "cancel.png"}).getValue();
-
-                if (choice != 1) {
+                ExtendedDialog dialog = new ExtendedDialog(
+                        Main.parent,
+                        tr("Enter Password"),
+                        new String[] {tr("Login"), tr("Cancel")}
+                );
+                dialog.setContent(p);
+                dialog.setButtonIcons( new String[] {"ok.png", "cancel.png"});
+                dialog.showDialog();
+
+                if (dialog.getValue() != 1) {
                     caller.authCancelled = true;
                     return null;
@@ -223 +224 @@
                         oldServerURL = "";
                     }
-                    if (oldServerURL.equals("")) oldServerURL = "http://api.openstreetmap.org/api";
+                    if (oldServerURL.equals("")) {
+                        oldServerURL = "http://api.openstreetmap.org/api";
+                    }
                     try {
                         oldUsername = lookup(Key.USERNAME);
@@ -258 +261 @@
                     String newPassword = String.valueOf(osmDataPassword.getPassword());
                     if (!oldServerURL.equals(newServerURL)) {
-                        store(Key.OSM_SERVER_URL, newServerURL); 
+                        store(Key.OSM_SERVER_URL, newServerURL);
                     }
                     if (!oldUsername.equals(newUsername)) {

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

@@ -12 +12 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.UploadAction;
-import org.openstreetmap.josm.data.osm.Changeset;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
@@ -203 +202 @@
     }
 
-    public void disconnectActiveConnection() {
-        if (api != null && api.activeConnection != null) {
-            api.activeConnection.disconnect();
+    public void cancel() {
+        if (api != null) {
+            api.cancel();
         }
     }