Changeset 1299 for branches/3.0-Beta1/components/bioformats-omero

Timestamp:

02/28/07 16:58:06 (21 months ago)

Author:

TheBrain

Message:

Added a few more fixes to login:

• login service now runs in the thread to allow the gui to update with login status
  
• added better feedback to login status within the client
  
• rewrote some login methods to use fired properties when the login isn't modal
  

Location:

branches/3.0-Beta1/components/bioformats-omero/src/ome/formats/importer

Files:

• LoginDialog.java (modified) (2 diffs)
• LoginHandler.java (modified) (3 diffs)
• Main.java (modified) (1 diff)
• StatusBar.java (modified) (1 diff)
• util/GuiCommonElements.java (added)

branches/3.0-Beta1/components/bioformats-omero/src/ome/formats/importer/LoginDialog.java

@@ -25 +25 @@
 import java.awt.event.WindowAdapter;
 import java.awt.event.WindowEvent;
-import java.awt.event.WindowFocusListener;
 import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
@@ -229 +228 @@
         
         // Add an action listener to the uname to move to pswd
-        loginBtn.addActionListener(this);
         configBtn.addActionListener(this);
 

branches/3.0-Beta1/components/bioformats-omero/src/ome/formats/importer/LoginHandler.java

@@ -96 +96 @@
     public void tryLogin()
     {
-        username = dialog.username;
-        password = dialog.password;
-        server = dialog.currentServer;
-        port = dialog.port;
-        dialog.updateServerList(server);
-
-        userPrefs.put("username", username);
-        // userPrefs.put("password", password); // save the password
-        userPrefs.put("server", server);
-        userPrefs.put("port", port);
-        
-        viewer.statusBar.setStatusIcon("gfx/server_trying16.png",
-        "Trying to connect.");
-        try
-        {
-            if (!isValidLogin())
+        new Thread()
+        {
+            public void run()
             {
-                viewer.statusBar.setStatusIcon("gfx/error_msg16.png",
-                        "Incorrect username/password. Server login failed, please try to "
-                        + "log in again.");
-
-                JOptionPane.showMessageDialog(viewer,
-                        "Incorrect username/password. Server login \nfailed, please "
-                        + "try to log in again.");
-                viewer.appendToOutput("> Login failed. Try to relog.\n");
+                SplashWindow.disposeSplash();
+                viewer.setVisible(true);
+
+                username = dialog.username;
+                password = dialog.password;
+                server = dialog.currentServer;
+                port = dialog.port;
+                dialog.updateServerList(server);
+
+                userPrefs.put("username", username);
+                // userPrefs.put("password", password); // save the password
+                userPrefs.put("server", server);
+                userPrefs.put("port", port);
+
+                viewer.statusBar.setStatusIcon("gfx/server_trying16.png",
+                "Trying to connect to " + server);
+                viewer.statusBar.setProgress(true, -1, "");
+                try
+                {
+                    if (!isValidLogin())
+                    {
+                        viewer.statusBar.setProgress(false, 0, "");
+                        viewer.statusBar.setStatusIcon("gfx/error_msg16.png",
+                                "Incorrect username/password. Server login failed, please try to "
+                                + "log in again.");
+
+                        JOptionPane.showMessageDialog(viewer,
+                                "Incorrect username/password. Server login \nfailed, please "
+                                + "try to log in again.");
+                        viewer.appendToOutput("> Login failed. Try to relog.\n");
+                        viewer.enableMenus(true);
+                        viewer.loggedIn = false;
+                        return;
+                    }
+                } catch (Exception e)
+                {
+                    StringWriter sw = new StringWriter();
+                    PrintWriter pw = new PrintWriter(sw);
+                    e.printStackTrace(pw);
+                    log.info(sw);
+
+                    viewer.statusBar.setProgress(false, 0, "");
+                    viewer.statusBar.setStatusIcon("gfx/error_msg16.png",
+                    "Server connection failure. Please try to login again.");
+
+                    JOptionPane
+                    .showMessageDialog(
+                            viewer,
+                            "The application failed to log in. The server " 
+                            + "\nhostname or port may be wrong or the server "
+                            + "\nmay be offline.\n\nPlease try again.");
+                    viewer.appendToOutput("> Login failed. Try to relog.\n");
+                    viewer.enableMenus(true);
+                    viewer.loggedIn = false;
+                    return;
+                }
+
+                viewer.statusBar.setProgress(false, 0, "");
+                viewer.appendToOutput("> Login Successful.\n");
                 viewer.enableMenus(true);
-                viewer.loggedIn = false;
-                return;
+                viewer.setImportEnabled(true);
+                viewer.loggedIn = true;
+                viewer.statusBar.setStatusIcon("gfx/server_connect16.png",
+                "Server connected.");
+
             }
-        } catch (Exception e)
-        {
-            StringWriter sw = new StringWriter();
-            PrintWriter pw = new PrintWriter(sw);
-            e.printStackTrace(pw);
-            log.info(sw);
-
-            viewer.statusBar.setStatusIcon("gfx/error_msg16.png",
-            "Server connection failure. Please try to login again.");
-
-            JOptionPane
-            .showMessageDialog(
-                    viewer,
-                    "The application failed to log in. The server " 
-                    + "\nhostname or port may be wrong or the server "
-                    + "\nmay be offline.\n\nPlease try again.");
-            viewer.appendToOutput("> Login failed. Try to relog.\n");
-            viewer.enableMenus(true);
-            viewer.loggedIn = false;
-            return;
-        }
-
-        SplashWindow.disposeSplash();
-        viewer.setVisible(true);
-        
-        viewer.appendToOutput("> Login Successful.\n");
-        viewer.enableMenus(true);
-        viewer.setImportEnabled(true);
-        viewer.loggedIn = true;
-        viewer.statusBar.setStatusIcon("gfx/server_connect16.png",
-        "Server connected.");
+        }.start();
     }
 
@@ -171 +182 @@
             dialog = new LoginDialog(viewer, viewer, "Login", modal, center);
             dialog.setAlwaysOnTop(true);
+            if (dialog.cancelled == true) return true;
         } else {
             
@@ -196 +208 @@
         }
 
-
-        if (dialog.cancelled == true) return true;
-
         return false;
     }

branches/3.0-Beta1/components/bioformats-omero/src/ome/formats/importer/Main.java

@@ -55 +55 @@
     /** The data of the last release date. */
     public static String        releaseDate      
-         = "2007-02-13 14:51:59 +0000 (Tue, 13 Feb 2007)";
+         = "2007-02-28 11:02:43 +0000 (Wed, 28 Feb 2007";
 
     /** The repository revision. */

branches/3.0-Beta1/components/bioformats-omero/src/ome/formats/importer/StatusBar.java

@@ -110 +110 @@
         else
         {
+            progressBar.setIndeterminate(false);
             progressBar.setFont(getFont().deriveFont(11.0f));
             progressBar.setPreferredSize(new Dimension(220, 20));