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

Timestamp:

Mar 29, 2011, 8:24:34 PM (13 years ago)

Author:

mlg

Message:

Adds spring for the dependency injection
Deletion of jdom (not useful just for a class that manipulates a simple XML file)

File:

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

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

@@ -36 +36 @@
 import fr.mael.jiwigo.transverse.util.Messages;
 import fr.mael.jiwigo.transverse.util.preferences.PreferencesManagement;
+import fr.mael.jiwigo.transverse.util.spring.SpringUtils;
 
 /**
@@ -116 +117 @@
      */
     private ProxyPanel proxyPanel;
+
+    private SessionManager sessionManager;
 
     /**
@@ -184 +187 @@
         comboLocales.setModel(model);
         model.setSelectedItem(defautLocale.getDisplayLanguage(Locale.ENGLISH));
+
+        this.sessionManager = SpringUtils.getSessionManager();
+
         this.getContentPane().add(panelInformations, BorderLayout.NORTH);
         this.getContentPane().add(proxyPanel, BorderLayout.CENTER);
@@ -208 +214 @@
             }
             //instanciation of the session manager
-            Main.sessionManager = new SessionManager(loginField.getText(), passwordField.getText(), fieldUrl.getText());
+            sessionManager.setLogin(loginField.getText());
+            sessionManager.setPassword(passwordField.getText());
+            sessionManager.setUrl(fieldUrl.getText() + "/ws.php");
             boolean echecProxy = false;
             if (proxyPanel.getCheckBox().isSelected()) {
@@ -214 +222 @@
                 try {
                     portProxy = Integer.valueOf(proxyPanel.getFieldPort().getText());
-                    Main.sessionManager.setPortProxy(portProxy);
-                    Main.sessionManager.setUrlProxy(proxyPanel.getFieldUrl().getText());
-                    Main.sessionManager.setLoginProxy(proxyPanel.getFieldLogin().getText());
-                    Main.sessionManager.setPassProxy(proxyPanel.getFieldPassword().getText());
-                    Main.sessionManager.setUsesProxy(true);
+                    sessionManager.setPortProxy(portProxy);
+                    sessionManager.setUrlProxy(proxyPanel.getFieldUrl().getText());
+                    sessionManager.setLoginProxy(proxyPanel.getFieldLogin().getText());
+                    sessionManager.setPassProxy(proxyPanel.getFieldPassword().getText());
+                    sessionManager.setUsesProxy(true);
                 } catch (Exception e) {
                     echecProxy = true;
@@ -260 +268 @@
                         JOptionPane.ERROR_MESSAGE);
             } else {
-                int response = Main.sessionManager.processLogin();
+                int response = sessionManager.processLogin();
                 if (response == 0) {
                     Main.showFrame();
@@ -267 +275 @@
                 } else if (response == 1) {
                     //if the login fails, an error is displayed
-                    if (!Main.sessionManager.isProxyError()) {
+                    if (!sessionManager.isProxyError()) {
                         JOptionPane.showMessageDialog(null, Messages.getMessage("connexionDialog_connexionError"),
                                 Messages.getMessage("error"), JOptionPane.ERROR_MESSAGE);