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

Timestamp:

02/28/07 11:02:43 (21 months ago)

Author:

TheBrain

Message:

Fixes a number of bugs:

• off by one errors
  
• modal dialog box problems with the login
  

Location:

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

Files:

• FileQueueTable.java (modified) (1 diff)
• ImportDialog.java (modified) (2 diffs)
• ImportHandler.java (modified) (3 diffs)
• ImportLibrary.java (modified) (3 diffs)
• LoginDialog.java (modified) (11 diffs)
• LoginHandler.java (modified) (9 diffs)
• Main.java (modified) (10 diffs)
• ServerDialog.java (modified) (3 diffs)
• SplashWindow.java (modified) (9 diffs)
• Splasher.java (modified) (1 diff)
• StatusBar.java (modified) (1 diff)
• about.txt (modified) (1 diff)
• gfx/icon.png (added)
• util/Actions.java (modified) (1 diff)
• util/GuiCommonElements.java (deleted)

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

@@ -214 +214 @@
     {
         table.setValueAt("archiving", row, 2);
+    }
+    
+    public void setProgressFailed(int index)
+    {
+        table.setValueAt("failed", row, 2);
     }
     

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

@@ -104 +104 @@
     ImportDialog(JFrame owner, String title, boolean modal, OMEROMetadataStore store)
     {
+        super();
         this.store = store;
         
@@ -171 +172 @@
         archiveImage = addCheckBox(this, "Also archive the original image file(s)", c);
         archiveImage.setSelected(false);
-        archiveImage.setVisible(false);
+        archiveImage.setVisible(true);
         
         cancelBtn = addButton(this, "Cancel", c, 1, 1, 1.0f, null);

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

@@ -17 +17 @@
 import java.io.File;
 import java.io.IOException;
+import java.io.PrintWriter;
+import java.io.StringWriter;
 import java.text.SimpleDateFormat;
 import java.util.Date;
@@ -213 +215 @@
         qTable.setProgressInfo(index, count);
         
+        try {
         //viewer.appendToOutput("> Importing plane: ");
         library.importData(pixId, fileName, new ImportLibrary.Step()
@@ -227 +230 @@
         });
 
+        } catch (FormatException e)
+        {
+            StringWriter sw = new StringWriter();
+            PrintWriter pw = new PrintWriter(sw);
+            e.printStackTrace(pw);
+            qTable.setProgressFailed(index);
+            log.info(sw);
+        } catch (IOException e)
+        {
+            StringWriter sw = new StringWriter();
+            PrintWriter pw = new PrintWriter(sw);
+            e.printStackTrace(pw);
+            qTable.setProgressFailed(index);
+            log.info(sw);
+        }
+        
         viewer.appendToOutputLn("> Successfully stored with pixels id \""
                 + pixId + "\".");

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

@@ -27 +27 @@
 import loci.formats.IFormatReader;
 import loci.formats.ReaderWrapper;
-import loci.formats.TiffTools;
 import loci.formats.in.Bits;
 import ome.conditions.ApiUsageException;
@@ -240 +239 @@
      * completed.
      */
-    public void importData(long pixId, String fileName, Step step)
+    public void importData(long pixId, String fileName, Step step) 
+        throws FormatException, IOException
     {
         int i = 1;
-        try {
             int bytesPerPixel = getBytesPerPixel(reader.getPixelType(fileName));
             byte[] buffer = null;
@@ -270 +269 @@
                 }
             }
-        } catch (FormatException e)
-        {
-            StringWriter sw = new StringWriter();
-            PrintWriter pw = new PrintWriter(sw);
-            e.printStackTrace(pw);
-            log.info(sw);
-            return;
-        } catch (IOException e)
-        {
-            StringWriter sw = new StringWriter();
-            PrintWriter pw = new PrintWriter(sw);
-            e.printStackTrace(pw);
-            log.info(sw);
-            return;
-        }
     }
     

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

@@ -16 +16 @@
 import java.awt.Color;
 import java.awt.Dimension;
+import java.awt.Frame;
 import java.awt.Insets;
 import java.util.ArrayList;
@@ -24 +25 @@
 import java.awt.event.WindowAdapter;
 import java.awt.event.WindowEvent;
+import java.awt.event.WindowFocusListener;
 import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
@@ -44 +46 @@
 import javax.swing.text.StyleContext;
 
+import ome.formats.importer.util.Actions;
 import ome.formats.importer.util.GuiCommonElements;
 
@@ -52 +55 @@
 {
     boolean debug = false;
+
+    JFrame                  main;
     
     GuiCommonElements       gui;
@@ -98 +103 @@
                                              .userNodeForPackage(LoginDialog.class);
     
-    LoginDialog(JFrame owner, String title, boolean modal, boolean center)
-    {
+    LoginDialog (Frame owner, JFrame main, String title, boolean modal, boolean center)
+    {   
+        super(owner);
+        this.main = main;
+        
         ImageIcon top = getImageIcon(Main.splash);
         String laf = UIManager.getLookAndFeel().toString();
@@ -107 +115 @@
         setModal(modal);
         setResizable(false);
+        toFront();
+        // Nasty cludge to make dialog work with linux
+        //if (System.getProperty("os.name").toUpperCase().indexOf("LINUX") == 1) {
+        //    setAlwaysOnTop(true);
+        //}
         setSize(new Dimension(loginWidth, loginHeight));
-        setLocationRelativeTo(owner);
+        setLocationRelativeTo(main);
         //get the amount to offset the login by
         if (!center)
@@ -118 +131 @@
                 
         // Get the preference file options
-        username = userPrefs.get("username", username).trim();
+        username = userPrefs.get("username", username);
+        if (username != null) username = username.trim();
+        
+        
         // password = userPrefs.get("password", password);
-        
-        currentServer = userPrefs.get("server", currentServer).trim();
+        currentServer = userPrefs.get("server", currentServer);
+        if (currentServer != null) currentServer = currentServer.trim();
+        
         serverList = getServerList();
         
-        port = userPrefs.get("port", port).trim();
-        if (port == null) port = "1099";
+        port = userPrefs.get("port", port);
+        if (port != null) port = port.trim();
+        else port = "1099";
                 
         gui = new GuiCommonElements();
@@ -224 +242 @@
             }
         });
-
+        
         // Add the tab panel to the main panel
         mainPanel.add(topPanel, "0, 0, 3, 0");
@@ -327 +345 @@
             //port = prt.getText();
             cancelled = false;
+            firePropertyChange(Actions.LOGIN, false, true);
             this.dispose();
         }
@@ -332 +351 @@
         {
             cancelled = true;
+            firePropertyChange(Actions.LOGIN_CANCELLED, false, true);
             this.dispose();
         }
@@ -403 +423 @@
         
         JFrame f = new JFrame();   
-        LoginDialog loginDialog = new LoginDialog(f, "", false, true); 
+        LoginDialog loginDialog = new LoginDialog(f, f, "", false, true); 
         f.setVisible(false);
         f.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);

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

@@ -14 +14 @@
 package ome.formats.importer;
 
+import java.awt.event.WindowEvent;
+import java.awt.event.WindowFocusListener;
+import java.beans.PropertyChangeEvent;
+import java.beans.PropertyChangeListener;
 import java.io.PrintWriter;
 import java.io.StringWriter;
@@ -19 +23 @@
 
 import javax.ejb.EJBAccessException;
+import javax.swing.ImageIcon;
+import javax.swing.JFrame;
 import javax.swing.JOptionPane;
 
 import ome.formats.OMEROMetadataStore;
+import ome.formats.importer.util.Actions;
 
 import org.apache.commons.logging.Log;
@@ -37 +44 @@
  * @basedOnCodeFrom Curtis Rueden ctrueden at wisc.edu
  */
-public class LoginHandler
+public class LoginHandler implements PropertyChangeListener
 {
+    
+    public JFrame              f;
+    
     private boolean            center;
+    
+    private boolean            modal;
     
     private String             username;
@@ -58 +70 @@
 
     private OMEROMetadataStore store;
-
-    LoginHandler(Main viewer, boolean center)
-    {
+    
+    public LoginDialog          dialog;
+
+    LoginHandler(Main viewer, boolean modal, boolean center)
+    {
+        this.viewer = viewer;
+        this.modal = modal;
         this.center = center;
-        tryLogin(viewer);
-        viewer.setVisible(true);
-    }
-
-    public void tryLogin(Main v)
-    {
-        this.viewer = v;
+        
         viewer.enableMenus(false);
-
-        // Display the initial login dialog
-        boolean cancelled = displayLoginDialog(viewer);
-        if (cancelled == true) 
-            {
-                viewer.loggedIn = false;
-                viewer.enableMenus(true);
-                return;
-            }
-                
+        boolean cancelled = displayLoginDialog(viewer, modal);
+        
+        if (modal == true && cancelled == true)
+        {
+            loginCancelled();
+        }
+        
+        if (modal == true && cancelled == false)
+        {
+            tryLogin();
+        }
+        
+    }
+
+    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.");
@@ -88 +115 @@
                 viewer.statusBar.setStatusIcon("gfx/error_msg16.png",
                         "Incorrect username/password. Server login failed, please try to "
-                                + "log in again.");
+                        + "log in again.");
 
                 JOptionPane.showMessageDialog(viewer,
                         "Incorrect username/password. Server login \nfailed, please "
-                                + "try to log in again.");
+                        + "try to log in again.");
                 viewer.appendToOutput("> Login failed. Try to relog.\n");
                 viewer.enableMenus(true);
@@ -106 +133 @@
 
             viewer.statusBar.setStatusIcon("gfx/error_msg16.png",
-                    "Server connection failure. Please try to login again.");
+            "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.");
+            .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);
@@ -120 +147 @@
         }
 
+        SplashWindow.disposeSplash();
+        viewer.setVisible(true);
+        
         viewer.appendToOutput("> Login Successful.\n");
         viewer.enableMenus(true);
@@ -125 +155 @@
         viewer.loggedIn = true;
         viewer.statusBar.setStatusIcon("gfx/server_connect16.png",
-                "Server connected.");
-
-    }
-
-    private boolean displayLoginDialog(Main viewer)
-    {
-        LoginDialog dialog = new LoginDialog(viewer, "Login", true, center);
+        "Server connected.");
+    }
+
+    void loginCancelled() {
+        viewer.loggedIn = false;
+        viewer.enableMenus(true);
+        SplashWindow.disposeSplash();
+        viewer.setVisible(true);
+    }
+    
+    private boolean displayLoginDialog(Main viewer, boolean modal)
+    {
+        if (modal == true)
+        {
+            dialog = new LoginDialog(viewer, viewer, "Login", modal, center);
+            dialog.setAlwaysOnTop(true);
+        } else {
+            
+            f = new JFrame();
+            f.setTitle("Login");
+            f.setIconImage(getImageIcon(Main.ICON).getImage());
+            f.setUndecorated(true);
+            f.setSize(0,0);
+            f.setVisible(true);
+            
+            dialog = new LoginDialog(f, viewer, "Login", modal, center);
+            dialog.addPropertyChangeListener(this);            
+
+            f.addWindowFocusListener(new WindowFocusListener() {
+                public void windowGainedFocus(WindowEvent e)
+                {
+                    try {
+                        dialog.toFront();
+                    } catch (NullPointerException ex) {} 
+                }
+
+                public void windowLostFocus(WindowEvent e) {}
+            });
+
+        }
+
+
         if (dialog.cancelled == true) return 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);
-        
         return false;
     }
@@ -167 +221 @@
         return store;
     }
+    
+    private ImageIcon getImageIcon(String path)
+    {
+        java.net.URL imgURL = Main.class.getResource(path);
+        if (imgURL != null) { return new ImageIcon(imgURL); } 
+        else { System.err.println("Couldn't find icon: " + imgURL); }
+        return null;
+    }
+
+    public void propertyChange(PropertyChangeEvent ev)
+    {
+        String prop = ev.getPropertyName();
+        if (prop.equals(Actions.LOGIN))
+        {
+            tryLogin();
+            f.dispose();
+        }
+        if (prop.equals(Actions.LOGIN_CANCELLED))
+        {
+            loginCancelled();
+            f.dispose();
+        }
+    }
+    
 }

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

@@ -25 +25 @@
 import java.awt.event.WindowEvent;
 import java.awt.event.WindowListener;
-import java.lang.reflect.InvocationTargetException;
-
+
+import javax.swing.ImageIcon;
 import javax.swing.JFrame;
 import javax.swing.JMenu;
@@ -36 +36 @@
 import javax.swing.JTabbedPane;
 import javax.swing.JTextPane;
-import javax.swing.SwingUtilities;
 import javax.swing.UIManager;
 import javax.swing.text.BadLocationException;
@@ -56 +55 @@
     /** The data of the last release date. */
     public static String        releaseDate      
-         = "2006-12-20 11:36:25 +0000 (Wed, 20 Dec 2006)";
+         = "2007-02-13 14:51:59 +0000 (Tue, 13 Feb 2007)";
 
     /** The repository revision. */
@@ -73 +72 @@
     // -- Constants --
 
-    private final static String TITLE            = "OMERO Importer";
+    public final static String TITLE            = "OMERO.importer";
     public final static String splash           = "gfx/importer_splash.png";
     private final static boolean useSplashScreenAbout   = false;
@@ -79 +78 @@
     private final static int width = 980;
     private final static int height = 580;
+
+    public static final String ICON = "gfx/icon.png";
     
     public LoginHandler        loginHandler;
@@ -122 +123 @@
         setLocationRelativeTo(null);
         addWindowListener(this);
+        
+        setTitle(TITLE);
+        setIconImage(getImageIcon(Main.ICON).getImage());
 
         // menu bar
@@ -235 +239 @@
         appendToOutputLn("> Release date: " + releaseDate);
         
-        loginHandler = new LoginHandler(this, false);
+        loginHandler = new LoginHandler(this, false, false);
     }
 
@@ -305 +309 @@
             } else 
             {                
-                loginHandler = new LoginHandler(this, true);
+                loginHandler = new LoginHandler(this, true, true);
                 //store = loginHandler.getMetadataStore();
                 //loginHandler.tryLogin(this);
@@ -431 +435 @@
     public void windowOpened(WindowEvent e) {}
 
+    
+    private ImageIcon getImageIcon(String path)
+    {
+        java.net.URL imgURL = Main.class.getResource(path);
+        if (imgURL != null) { return new ImageIcon(imgURL); } 
+        else { System.err.println("Couldn't find icon: " + imgURL); }
+        return null;
+    }
+    
     /**
      * @param args Start up the application, display the main window and the
@@ -459 +472 @@
                 UIManager.setLookAndFeel(laf);
             } catch (Exception e) 
-            { System.err.println(laf + " not supported."); }
-        }
-        
-        try {
-            SwingUtilities.invokeAndWait(new Runnable() {
-                public void run() {
-                    new Main();
-                }
-            });
-        } catch (InterruptedException e) {
-            // Ignore: If this exception occurs, we return too early, which
-            // makes the splash window go away too early.
-            // Nothing to worry about. Maybe we should write a log message.
-        } catch (InvocationTargetException e) {
-            // Error: Startup has failed badly. 
-            // We can not continue running our application.
-            InternalError error = new InternalError();
-            error.initCause(e);
-            throw error;
-        }
+           { System.err.println(laf + " not supported."); }
+        }
+        new Main();
+    }
+
+    public static Main returnMain(String[] args)
+    {  
+
+        String laf = UIManager.getSystemLookAndFeelClassName() ;
+
+        //laf = "ch.randelshofer.quaqua.QuaquaLookAndFeel";
+        //laf = "com.sun.java.swing.plaf.windows.WindowsLookAndFeel";
+        //laf = "com.sun.java.swing.plaf.gtk.GTKLookAndFeel";
+        //laf = "com.sun.java.swing.plaf.motif.MotifLookAndFeel";
+        //laf = "javax.swing.plaf.metal.MetalLookAndFeel";
+
+        if (laf.equals("apple.laf.AquaLookAndFeel"))
+        {