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

Timestamp:

2009-02-14T12:25:54+01:00 (15 years ago)

Author:

stoecker

Message:

apply patches from xeen for #1977.

File:

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

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

@@ -17 +17 @@
 import javax.swing.JCheckBox;
 import javax.swing.JLabel;
-import javax.swing.JOptionPane;
 import javax.swing.JPanel;
 import javax.swing.JPasswordField;
@@ -23 +22 @@
 
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.gui.ExtendedDialog; 
 import org.openstreetmap.josm.tools.Base64;
 import org.openstreetmap.josm.tools.GBC;
@@ -90 +90 @@
                 p.add(savePassword, GBC.eop());
 
-                int choice = JOptionPane.showConfirmDialog(Main.parent, p, tr("Enter Password"), JOptionPane.OK_CANCEL_OPTION);
-                if (choice == JOptionPane.CANCEL_OPTION) {
+                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) {
                     authCancelled = true;
                     return null;