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

Timestamp:

Apr 30, 2011, 12:43:16 PM (13 years ago)

Author:

mlg

Message:

Integrates last jiwigo-ws-api modifications

File:

• extensions/jiwigo/trunk/src/main/java/fr/mael/jiwigo/ui/ConnexionDialog.java (modified) (6 diffs)

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

@@ -33 +33 @@
 import fr.mael.jiwigo.Main;
 import fr.mael.jiwigo.transverse.enumeration.PreferencesEnum;
+import fr.mael.jiwigo.transverse.exception.JiwigoException;
+import fr.mael.jiwigo.transverse.exception.ProxyAuthenticationException;
 import fr.mael.jiwigo.transverse.session.SessionManager;
 import fr.mael.jiwigo.transverse.util.Messages;
@@ -207 +209 @@
         //if one field is empty, an error is displayed
         if (fieldUrl.getText().equals("") || loginField.getText().equals("") || passwordField.getText().equals("")) {
-            JOptionPane.showMessageDialog(null, Messages.getMessage("connexionDialog_emptyField"), Messages
-                    .getMessage("error"), JOptionPane.ERROR_MESSAGE);
+            JOptionPane.showMessageDialog(null, Messages.getMessage("connexionDialog_emptyField"),
+                    Messages.getMessage("error"), JOptionPane.ERROR_MESSAGE);
         } else {
             if (!fieldUrl.getText().startsWith("http://")) {
@@ -245 +247 @@
                         .getText());
                 PreferencesManagement.setValue(PreferencesEnum.PASS_PROXY.getLabel(), proxyPanel.getFieldPassword()
-                        .getText());
-                PreferencesManagement.setValue(PreferencesEnum.USE_PROXY.getLabel(), String.valueOf(proxyPanel
-                        .getCheckBox().isSelected()));
+                        .getSelectedText());
+                PreferencesManagement.setValue(PreferencesEnum.USE_PROXY.getLabel(),
+                        String.valueOf(proxyPanel.getCheckBox().isSelected()));
             }
             //... or not
@@ -261 +263 @@
                         .getText());
                 PreferencesManagement.setValue(PreferencesEnum.PASS_PROXY.getLabel(), proxyPanel.getFieldPassword()
-                        .getText());
+                        .getSelectedText());
                 PreferencesManagement.setValue(PreferencesEnum.USE_PROXY.getLabel(), "false");
             }
@@ -268 +270 @@
                         JOptionPane.ERROR_MESSAGE);
             } else {
-                int response = sessionManager.processLogin();
+                int response = 0;
+                try {
+                    response = sessionManager.processLogin();
+                } catch (JiwigoException e) {
+                    if (e.getCause() != null && ProxyAuthenticationException.class.equals(e.getCause().getClass())) {
+                        response = 2;
+                    } else {
+                        response = 1;
+                    }
+                }
                 if (response == 0) {
                     Main.showFrame();
@@ -275 +286 @@
                 } else if (response == 1) {
                     //if the login fails, an error is displayed
-                    if (!sessionManager.isProxyError()) {
-                        JOptionPane.showMessageDialog(null, Messages.getMessage("connexionDialog_connexionError"),
-                                Messages.getMessage("error"), JOptionPane.ERROR_MESSAGE);
-                    }
+                    JOptionPane.showMessageDialog(null, Messages.getMessage("connexionDialog_connexionError"),
+                            Messages.getMessage("error"), JOptionPane.ERROR_MESSAGE);
                 } else if (response == 2) {
-                    JOptionPane.showMessageDialog(null, Messages.getMessage("connexionDialog_proxyAuthError"), Messages
-                            .getMessage("error"), JOptionPane.ERROR_MESSAGE);
+                    JOptionPane.showMessageDialog(null, Messages.getMessage("connexionDialog_proxyAuthError"),
+                            Messages.getMessage("error"), JOptionPane.ERROR_MESSAGE);
                 }
             }