- Timestamp:
- Apr 30, 2011, 12:43:16 PM (13 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
extensions/jiwigo/trunk/src/main/java/fr/mael/jiwigo/ui/ConnexionDialog.java
r9921 r10697 33 33 import fr.mael.jiwigo.Main; 34 34 import fr.mael.jiwigo.transverse.enumeration.PreferencesEnum; 35 import fr.mael.jiwigo.transverse.exception.JiwigoException; 36 import fr.mael.jiwigo.transverse.exception.ProxyAuthenticationException; 35 37 import fr.mael.jiwigo.transverse.session.SessionManager; 36 38 import fr.mael.jiwigo.transverse.util.Messages; … … 207 209 //if one field is empty, an error is displayed 208 210 if (fieldUrl.getText().equals("") || loginField.getText().equals("") || passwordField.getText().equals("")) { 209 JOptionPane.showMessageDialog(null, Messages.getMessage("connexionDialog_emptyField"), Messages210 .getMessage("error"), JOptionPane.ERROR_MESSAGE);211 JOptionPane.showMessageDialog(null, Messages.getMessage("connexionDialog_emptyField"), 212 Messages.getMessage("error"), JOptionPane.ERROR_MESSAGE); 211 213 } else { 212 214 if (!fieldUrl.getText().startsWith("http://")) { … … 245 247 .getText()); 246 248 PreferencesManagement.setValue(PreferencesEnum.PASS_PROXY.getLabel(), proxyPanel.getFieldPassword() 247 .get Text());248 PreferencesManagement.setValue(PreferencesEnum.USE_PROXY.getLabel(), String.valueOf(proxyPanel249 .getCheckBox().isSelected()));249 .getSelectedText()); 250 PreferencesManagement.setValue(PreferencesEnum.USE_PROXY.getLabel(), 251 String.valueOf(proxyPanel.getCheckBox().isSelected())); 250 252 } 251 253 //... or not … … 261 263 .getText()); 262 264 PreferencesManagement.setValue(PreferencesEnum.PASS_PROXY.getLabel(), proxyPanel.getFieldPassword() 263 .get Text());265 .getSelectedText()); 264 266 PreferencesManagement.setValue(PreferencesEnum.USE_PROXY.getLabel(), "false"); 265 267 } … … 268 270 JOptionPane.ERROR_MESSAGE); 269 271 } else { 270 int response = sessionManager.processLogin(); 272 int response = 0; 273 try { 274 response = sessionManager.processLogin(); 275 } catch (JiwigoException e) { 276 if (e.getCause() != null && ProxyAuthenticationException.class.equals(e.getCause().getClass())) { 277 response = 2; 278 } else { 279 response = 1; 280 } 281 } 271 282 if (response == 0) { 272 283 Main.showFrame(); … … 275 286 } else if (response == 1) { 276 287 //if the login fails, an error is displayed 277 if (!sessionManager.isProxyError()) { 278 JOptionPane.showMessageDialog(null, Messages.getMessage("connexionDialog_connexionError"), 279 Messages.getMessage("error"), JOptionPane.ERROR_MESSAGE); 280 } 288 JOptionPane.showMessageDialog(null, Messages.getMessage("connexionDialog_connexionError"), 289 Messages.getMessage("error"), JOptionPane.ERROR_MESSAGE); 281 290 } else if (response == 2) { 282 JOptionPane.showMessageDialog(null, Messages.getMessage("connexionDialog_proxyAuthError"), Messages283 .getMessage("error"), JOptionPane.ERROR_MESSAGE);291 JOptionPane.showMessageDialog(null, Messages.getMessage("connexionDialog_proxyAuthError"), 292 Messages.getMessage("error"), JOptionPane.ERROR_MESSAGE); 284 293 } 285 294 }
Note: See TracChangeset
for help on using the changeset viewer.