Changeset 9431 for extensions/jiwigo/trunk/src/main/java/fr/mael/jiwigo/ui/ConnexionDialog.java

Timestamp:

Feb 28, 2011, 7:42:20 PM (13 years ago)

Author:

mlg

Message:

Modifications to use the last version of jiwigo-ws-api which manages proxy errors.

Location:

extensions/jiwigo/trunk

Files:

• . (modified) (1 prop)
• src/main/java/fr/mael/jiwigo/ui/ConnexionDialog.java (modified) (2 diffs)

extensions/jiwigo/trunk

@@ -1 +1 @@
 bin
 target
+temp.xml

@@ -1 +1 @@
 bin
 target
+temp.xml

extensions/jiwigo/trunk/src/main/java/fr/mael/jiwigo/ui/ConnexionDialog.java

@@ -260 +260 @@
                         JOptionPane.ERROR_MESSAGE);
             } else {
-                if (!Main.sessionManager.processLogin()) {
+                int response = Main.sessionManager.processLogin();
+                if (response == 0) {
+                    Main.showFrame();
+                    //hides the dialog
+                    this.dispose();
+                } else if (response == 1) {
                     //if the login fails, an error is displayed
                     if (!Main.sessionManager.isProxyError()) {
@@ -266 +271 @@
                                 Messages.getMessage("error"), JOptionPane.ERROR_MESSAGE);
                     }
-                } else {
-                    //          Locale.setDefault((Locale) comboLocales.getSelectedItem());
-                    Main.showFrame();
-                    //hides the dialog
-                    this.dispose();
+                } else if (response == 2) {
+                    JOptionPane.showMessageDialog(null, Messages.getMessage("connexionDialog_proxyAuthError"), Messages
+                            .getMessage("error"), JOptionPane.ERROR_MESSAGE);
                 }
             }

@@ -1 +1 @@
 bin
 target
+temp.xml