X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FDesktop.java;h=e239a10652b8cee6bda162d4e53d3b6eb50cb181;hb=588042b69abf8e60bcc950b24c283933c7dd422f;hp=6baa2bb92f28de8ae59bd47ebb54cac29cb62ad0;hpb=c1fad33365988bdf8e335982df0c3ff84dd0bb8b;p=jalview.git

diff --git a/src/jalview/gui/Desktop.java b/src/jalview/gui/Desktop.java
index 6baa2bb..e239a10 100755
--- a/src/jalview/gui/Desktop.java
+++ b/src/jalview/gui/Desktop.java
@@ -1,56 +1,72 @@
-/********************
- * 2004 Jalview Reengineered
- * Barton Group
- * Dundee University
+/*
+ * Jalview - A Sequence Alignment Editor and Viewer
+ * Copyright (C) 2005 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle
  *
- * AM Waterhouse
- *******************/
-
-
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+ */
 package jalview.gui;
 
-import jalview.gui.*;
-import jalview.io.*;
-import jalview.datamodel.*;
-import jalview.schemes.*;
-import javax.swing.*;
 import java.awt.*;
-import java.awt.event.*;
+import java.awt.datatransfer.*;
 import java.awt.dnd.*;
+import java.awt.event.*;
 import javax.swing.*;
-import java.awt.datatransfer.*;
-import java.io.*;
 
+import jalview.datamodel.*;
+import jalview.io.*;
 
-public class Desktop extends jalview.jbgui.GDesktop implements DropTargetListener
+public class Desktop
+    extends jalview.jbgui.GDesktop implements DropTargetListener
 {
   public static JDesktopPane desktop;
   static int openFrameCount = 0;
-  static final int xOffset = 30, yOffset = 30;
+  static final int xOffset = 30;
+  static final int yOffset = 30;
 
   public Desktop()
   {
-    Image image =null;
-    try{
+    Image image = null;
+
+    try
+    {
       java.net.URL url = getClass().getResource("/images/logo.gif");
-      if(url!=null)
+
+      if (url != null)
       {
         image = java.awt.Toolkit.getDefaultToolkit().createImage(url);
+
         MediaTracker mt = new MediaTracker(this);
         mt.addImage(image, 0);
         mt.waitForID(0);
         setIconImage(image);
       }
-
-    }catch(Exception ex){}
+    }
+    catch (Exception ex)
+    {
+    }
 
     setTitle("Jalview 2005");
     setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
     desktop = new JDesktopPane();
-    desktop.setBackground(new Color(220,220,230));
+    desktop.setBackground(Color.white);
     setContentPane(desktop);
     desktop.setDragMode(JDesktopPane.OUTLINE_DRAG_MODE);
-    desktop.setDesktopManager( new DefaultDesktopManager() );
+
+    // This line prevents Windows Look&Feel resizing all new windows to maximum
+    // if previous window was maximised
+    desktop.setDesktopManager(new DefaultDesktopManager());
 
     Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize();
     String x = jalview.bin.Cache.getProperty("SCREEN_X");
@@ -58,348 +74,396 @@ public class Desktop extends jalview.jbgui.GDesktop implements DropTargetListene
     String width = jalview.bin.Cache.getProperty("SCREEN_WIDTH");
     String height = jalview.bin.Cache.getProperty("SCREEN_HEIGHT");
 
-    if(x!=null && y!=null && width!=null && height!=null)
+    if ( (x != null) && (y != null) && (width != null) && (height != null))
     {
-      setBounds( Integer.parseInt(x), Integer.parseInt(y),
-                 Integer.parseInt(width), Integer.parseInt(height));
+      setBounds(Integer.parseInt(x), Integer.parseInt(y),
+                Integer.parseInt(width), Integer.parseInt(height));
     }
     else
-      setBounds( (int)(screenSize.width-900)/2,
-           (int)(screenSize.height-650)/2,
-          900 ,
-          650);
-
-this.addWindowListener(new WindowAdapter()
-{
-public void windowClosing(WindowEvent evt)
-{
- jalview.bin.Cache.setProperty("SCREEN_X",
-                               getBounds().x + "");
- jalview.bin.Cache.setProperty("SCREEN_Y",
-                               getBounds().y + "");
- jalview.bin.Cache.setProperty("SCREEN_WIDTH", getWidth() + "");
- jalview.bin.Cache.setProperty("SCREEN_HEIGHT", getHeight() + "");
-}
-});
-setVisible(true);
+    {
+      setBounds( (int) (screenSize.width - 900) / 2,
+                (int) (screenSize.height - 650) / 2, 900, 650);
+    }
 
-this.setDropTarget(new java.awt.dnd.DropTarget(desktop, this));
+    this.addWindowListener(new WindowAdapter()
+    {
+      public void windowClosing(WindowEvent evt)
+      {
+        jalview.bin.Cache.setProperty("SCREEN_X", getBounds().x +
+                                      "");
+        jalview.bin.Cache.setProperty("SCREEN_Y", getBounds().y +
+                                      "");
+        jalview.bin.Cache.setProperty("SCREEN_WIDTH",
+                                      getWidth() + "");
+        jalview.bin.Cache.setProperty("SCREEN_HEIGHT",
+                                      getHeight() + "");
+      }
+    });
+    setVisible(true);
 
+    this.setDropTarget(new java.awt.dnd.DropTarget(desktop, this));
 
-   /////////Add a splashscreen on startup
+    /////////Add a splashscreen on startup
+    /////////Add a splashscreen on startup
     JInternalFrame frame = new JInternalFrame();
 
     SplashScreen splash = new SplashScreen(frame, image);
     frame.setContentPane(splash);
-    desktop.add(frame);
+    frame.setLayer(JLayeredPane.PALETTE_LAYER);
+    addInternalFrame(frame, "", 750, 160, false);
+    frame.setLocation( (int) ( (getWidth() - 750) / 2),
+                      (int) ( (getHeight() - 160) / 2));
+  }
+
+  public static void addInternalFrame(final JInternalFrame frame,
+                                      String title, int w, int h)
+  {
+    addInternalFrame(frame, title, w, h, true);
+  }
 
+  public static void addInternalFrame(final JInternalFrame frame,
+                                      String title, int w, int h,
+                                      boolean resizable)
+  {
+    desktop.add(frame);
     openFrameCount++;
+
     try
     {
       frame.setSelected(true);
     }
     catch (java.beans.PropertyVetoException e)
-    {}
-    frame.setResizable(true);
-    frame.setSize(750, 160);
-    frame.setLocation( (int)((getWidth()-750) /2), (int)((getHeight()-160) /2));
-    frame.setClosable(false);
-    frame.setIconifiable(false);
-    frame.setMaximizable(false);
+    {
+    }
+
+    frame.setTitle(title);
+    frame.setSize(w, h);
+    frame.setClosable(true);
+    frame.setResizable(resizable);
+    frame.setMaximizable(resizable);
+    frame.setIconifiable(resizable);
     frame.setFrameIcon(null);
-    frame.setVisible(true);
+    frame.setLocation(xOffset * openFrameCount, yOffset * openFrameCount);
+    frame.toFront();
 
-  }
+    final JMenuItem menuItem = new JMenuItem(title);
+    frame.addInternalFrameListener(new javax.swing.event.InternalFrameAdapter()
+    {
+      public void internalFrameClosed(
+          javax.swing.event.InternalFrameEvent evt)
+      {
+        openFrameCount--;
+        windowMenu.remove(menuItem);
+      }
+      ;
+    });
 
-  public static void addInternalFrame(final JInternalFrame frame, String title, int w, int h)
-  {
-   desktop.add(frame);
-   openFrameCount++;
-   try {
-       frame.setSelected(true);
-   } catch (java.beans.PropertyVetoException e) {}
-   frame.setTitle(title);
-   frame.setResizable(true);
-   frame.setSize(w,h);
-   frame.setClosable(true);
-   frame.setMaximizable(true);
-   frame.setIconifiable(true);
-   frame.setFrameIcon(null);
-   frame.setLocation(xOffset*openFrameCount, yOffset*openFrameCount);
-   frame.toFront();
-   final JMenuItem menuItem = new JMenuItem(title);
-   frame.addInternalFrameListener(new javax.swing.event.InternalFrameAdapter()
-                                   { public void internalFrameClosed(javax.swing.event.InternalFrameEvent evt)
-                                     {
-                                       openFrameCount--;
-                                       windowMenu.remove(menuItem);
-                                     };
-                                   });
-
-   menuItem.addActionListener(new ActionListener()
+    menuItem.addActionListener(new ActionListener()
     {
       public void actionPerformed(ActionEvent e)
       {
-        try{  frame.setSelected(true);   frame.setIcon(false); }
-        catch(java.beans.PropertyVetoException ex){};
+        try
+        {
+          frame.setSelected(true);
+          frame.setIcon(false);
+        }
+        catch (java.beans.PropertyVetoException ex)
+        {
+        }
+
+        ;
       }
     });
 
-   frame.setVisible(true);
-   windowMenu.add(menuItem);
- }
-
- public void dragEnter(DropTargetDragEvent evt){}
- public void dragExit(DropTargetEvent evt){}
- public void dragOver(DropTargetDragEvent evt){}
- public void dropActionChanged(DropTargetDragEvent evt){}
- public void drop(DropTargetDropEvent evt)
-{
-   Transferable t = evt.getTransferable();
-   if(!t.isDataFlavorSupported(DataFlavor.javaFileListFlavor))
-     return;
-
-   evt.acceptDrop(DnDConstants.ACTION_COPY_OR_MOVE);
-   try{
-     java.util.List files = (java.util.List) t.getTransferData(DataFlavor.javaFileListFlavor);
-
-     for (int i = 0; i < files.size(); i++)
-     {
-       String file = files.get(i).toString();
-       String protocol = "File";
-       String format = jalview.io.IdentifyFile.Identify(file, protocol);
-       LoadFile(file, protocol, format);
-     }
-
-   }catch(Exception ex){ex.printStackTrace();}
+    frame.setVisible(true);
+    windowMenu.add(menuItem);
   }
 
- public void inputLocalFileMenuItem_actionPerformed(ActionEvent e)
- {
-   JalviewFileChooser chooser = new JalviewFileChooser(jalview.bin.Cache.getProperty("LAST_DIRECTORY"),
-       new String[]{"fa", "fasta", "fastq", "blc", "msf", "pfam", "aln", "pir"}, "Alignment files");
-   chooser.setFileView(new JalviewFileView());
-   chooser.setDialogTitle("Open local file");
-   chooser.setToolTipText("Open");
-   int value = chooser.showOpenDialog(this);
-   if(value == JalviewFileChooser.APPROVE_OPTION)
-   {
-     String choice =  chooser.getSelectedFile().getPath();
-     jalview.bin.Cache.setProperty("LAST_DIRECTORY", choice);
-     String format = IdentifyFile.Identify(choice, "File");
-     LoadFile(choice, "File", format);
-   }
- }
-
- public void LoadFile(String file, String protocol,  String format)
- {
-   SequenceI [] sequences = null;
-
-   if (FormatProperties.contains(format))
-       sequences = FormatAdapter.read(file, protocol, format);
-
-   if (sequences != null && sequences.length>0)
-   {
-     AlignFrame af = new AlignFrame(new Alignment(sequences));
-     addInternalFrame(af, file, 700, 500);
-     af.statusBar.setText("Successfully loaded file " + file);
-
-   }
-   else
-     JOptionPane.showInternalMessageDialog(Desktop.desktop,  "Couldn't open file.\n"
-                          + "Formats currently supported are\n"
-                          + "Fasta, MSF, Clustal, BLC, PIR, MSP or PFAM" // JBPNote - message should be generated through FormatAdapter!
-                          ,"Error loading file",
-                                   JOptionPane.WARNING_MESSAGE);
-
- }
-
- public void inputURLMenuItem_actionPerformed(ActionEvent e)
- {
-   String url = JOptionPane.showInternalInputDialog(Desktop.desktop,"Enter url of input file",
-                                            "Input alignment from URL",
-                                            JOptionPane.QUESTION_MESSAGE);
-   if (url == null)
-     return;
-
-   String format = IdentifyFile.Identify(url, "URL");
-
-   if (format.equals("URL NOT FOUND"))
-   {
-     JOptionPane.showInternalMessageDialog(Desktop.desktop,"Couldn't locate " + url,
-                                   "URL not found",
-                                   JOptionPane.WARNING_MESSAGE);
-     return;
-   }
+  public void dragEnter(DropTargetDragEvent evt)
+  {
+  }
 
-    LoadFile(url, "URL", format);
- }
+  public void dragExit(DropTargetEvent evt)
+  {
+  }
 
- public void inputTextboxMenuItem_actionPerformed(ActionEvent e)
- {
-   CutAndPasteTransfer cap = new CutAndPasteTransfer(true);
-   int accept =  JOptionPane.showInternalOptionDialog(Desktop.desktop, cap, "Cut & paste Alignment File",
-                                       JOptionPane.YES_NO_CANCEL_OPTION,
-                                       JOptionPane.PLAIN_MESSAGE,
-                                       null,
-                                       new Object[]{"Accept", "Cancel", }, null);
+  public void dragOver(DropTargetDragEvent evt)
+  {
+  }
 
+  public void dropActionChanged(DropTargetDragEvent evt)
+  {
+  }
 
-  if(accept == JOptionPane.YES_OPTION)
+  public void drop(DropTargetDropEvent evt)
   {
-    String format = IdentifyFile.Identify(cap.getText(), "Paste");
-    SequenceI [] sequences = null;
+    Transferable t = evt.getTransferable();
 
-    if (FormatProperties.contains( format ))
-      sequences = FormatAdapter.read(cap.getText(), "Paste", format);
+    if (!t.isDataFlavorSupported(DataFlavor.javaFileListFlavor))
+    {
+      return;
+    }
 
+    evt.acceptDrop(DnDConstants.ACTION_COPY_OR_MOVE);
 
-      if(sequences!=null)
+    try
+    {
+      java.util.List files = (java.util.List) t.getTransferData(DataFlavor.
+          javaFileListFlavor);
+
+      for (int i = 0; i < files.size(); i++)
       {
-        AlignFrame af = new AlignFrame(new Alignment(sequences));
-        addInternalFrame(af, "Cut & Paste input - "+format, 700, 500);
-        af.statusBar.setText("Successfully pasted alignment file");
+        String file = files.get(i).toString();
+        String protocol = "File";
+
+        if (file.endsWith(".jar"))
+        {
+          Jalview2XML.LoadJalviewAlign(file);
+        }
+        else
+        {
+          String format = jalview.io.IdentifyFile.Identify(file,
+              protocol);
+          LoadFile(file, protocol, format);
+        }
+      }
+    }
+    catch (Exception ex)
+    {
+      ex.printStackTrace();
+    }
+  }
+
+  public void inputLocalFileMenuItem_actionPerformed(ActionEvent e)
+  {
+    JalviewFileChooser chooser = new JalviewFileChooser(jalview.bin.Cache.
+        getProperty(
+            "LAST_DIRECTORY"),
+        new String[]
+        {
+        "fa, fasta, fastq", "aln", "pfam", "msf", "pir", "blc",
+        "jar"
+    },
+        new String[]
+        {
+        "Fasta", "Clustal", "PFAM", "MSF", "PIR", "BLC", "Jalview"
+    }, jalview.bin.Cache.getProperty("DEFAULT_FILE_FORMAT"));
+
+    chooser.setFileView(new JalviewFileView());
+    chooser.setDialogTitle("Open local file");
+    chooser.setToolTipText("Open");
+
+    int value = chooser.showOpenDialog(this);
+
+    if (value == JalviewFileChooser.APPROVE_OPTION)
+    {
+      String choice = chooser.getSelectedFile().getPath();
+      jalview.bin.Cache.setProperty("LAST_DIRECTORY",
+                                    chooser.getSelectedFile().getParent());
+
+      if (chooser.getSelectedFormat().equals("Jalview"))
+      {
+        jalview.bin.Cache.setProperty("DEFAULT_FILE_FORMAT", "Jalivew");
+        Jalview2XML.LoadJalviewAlign(choice);
       }
       else
-        JOptionPane.showInternalMessageDialog(Desktop.desktop, "Couldn't read the pasted text.\n"
-                                      +"Formats currently supported are\n"
-                                      +"Fasta, MSF, Clustal, BLC, PIR, MSP or PFAM",
-                                      "Error parsing text", JOptionPane.WARNING_MESSAGE);
+      {
+        String format = IdentifyFile.Identify(choice, "File");
+        jalview.bin.Cache.setProperty("DEFAULT_FILE_FORMAT", format);
+        LoadFile(choice, "File", format);
+      }
+    }
+  }
 
-   }
- }
+  public void LoadFile(String file, String protocol, String format)
+  {
+    LoadingThread loader = new LoadingThread(file, protocol, format);
+    loader.start();
+  }
 
-/*
-* Exit the program
-*/
- public void quit_actionPerformed(ActionEvent e)
- {
-   if(jalview.bin.Jalview.applet!=null)
-     jalview.bin.Jalview.applet.destroy();
+  public void inputURLMenuItem_actionPerformed(ActionEvent e)
+  {
+    String url = JOptionPane.showInternalInputDialog(Desktop.desktop,
+        "Enter url of input file", "Input alignment from URL",
+        JOptionPane.QUESTION_MESSAGE, null, null, "http://www.")
+        .toString();
+
+    if (url == null)
+    {
+      return;
+    }
+
+    String format = IdentifyFile.Identify(url, "URL");
+
+    if (format.equals("URL NOT FOUND"))
+    {
+      JOptionPane.showInternalMessageDialog(Desktop.desktop,
+                                            "Couldn't locate " + url,
+                                            "URL not found",
+                                            JOptionPane.WARNING_MESSAGE);
+
+      return;
+    }
+
+    LoadFile(url, "URL", format);
+  }
+
+  public void inputTextboxMenuItem_actionPerformed(ActionEvent e)
+  {
+    CutAndPasteTransfer cap = new CutAndPasteTransfer();
+    cap.setForInput();
+    Desktop.addInternalFrame(cap, "Cut & Paste Alignment File", 600, 500);
+  }
+
+  /*
+   * Exit the program
+   */
+  public void quit_actionPerformed(ActionEvent e)
+  {
+    if (jalview.bin.Jalview.applet != null)
+    {
+      jalview.bin.Jalview.applet.destroy();
+    }
     else
+    {
       System.exit(0);
- }
-
-
-
- public void aboutMenuItem_actionPerformed(ActionEvent e)
- {
-   JOptionPane.showInternalMessageDialog(Desktop.desktop,
-                                         "JalView 2005 version " + jalview.bin.Cache.VERSION+"; last updated: "+jalview.bin.Cache.BUILD_DATE
-                                       +"\nAuthors:  Michele Clamp, James Cuff, Steve Searle, Andrew Waterhouse, Jim Procter & Geoff Barton."
-                                       +"\nCurrent development managed by Andrew Waterhouse; Barton Group, University of Dundee."
-                                       +"\nIf  you use JalView, please cite:  Bioinformatics,  2004 12;426-7."
-                                       +"\n\"Clamp, M., Cuff, J., Searle, S. M. and Barton, G. J. (2004), The Jalview Java Alignment Editor\"",
-                                         "About Jalview",
-                                         JOptionPane.INFORMATION_MESSAGE);
- }
-
- public void documentationMenuItem_actionPerformed(ActionEvent e)
- {
-   try
-   {
+    }
+  }
+
+  public void aboutMenuItem_actionPerformed(ActionEvent e)
+  {
+    JOptionPane.showInternalMessageDialog(Desktop.desktop,
+                                          "JalView 2005 version " +
+                                          jalview.bin.Cache.VERSION +
+                                          "; last updated: " +
+                                          jalview.bin.Cache.BUILD_DATE +
+                                          "\nAuthors:  Michele Clamp, James Cuff, Steve Searle, Andrew Waterhouse, Jim Procter & Geoff Barton." +
+                                          "\nCurrent development managed by Andrew Waterhouse; Barton Group, University of Dundee." +
+                                          "\nFor all issues relating to Jalview, email help@jalview.org" +
+                                          "\n\nIf  you use JalView, please cite:" +
+                                          "\n\"Clamp, M., Cuff, J., Searle, S. M. and Barton, G. J. (2004), The Jalview Java Alignment Editor\"" +
+                                          "\nBioinformatics,  2004 12;426-7.",
+                                          "About Jalview",
+                                          JOptionPane.INFORMATION_MESSAGE);
+  }
+
+  public void documentationMenuItem_actionPerformed(ActionEvent e)
+  {
+    try
+    {
       ClassLoader cl = jalview.gui.Desktop.class.getClassLoader();
-      java.net.URL url = javax.help.HelpSet.findHelpSet(cl,"help/help");
-      javax.help.HelpSet hs = new javax.help.HelpSet(cl,url);
+      java.net.URL url = javax.help.HelpSet.findHelpSet(cl, "help/help");
+      javax.help.HelpSet hs = new javax.help.HelpSet(cl, url);
 
       javax.help.HelpBroker hb = hs.createHelpBroker();
       hb.setLocation(new Point(200, 50));
-      hb.setSize(new Dimension(800,700));
+      hb.setSize(new Dimension(800, 700));
       hb.setCurrentID("home");
       hb.setDisplayed(true);
-   }
-   catch (Exception ex)
-   {
-     ex.printStackTrace();
-   }
- }
-
- static JInternalFrame conservationSlider;
- static JInternalFrame PIDSlider;
- public static int setConservationSliderSource(AlignmentPanel ap, ColourSchemeI cs, String source)
- {
-   SliderPanel sp = null;
-   ConservationColourScheme ccs = (ConservationColourScheme)cs;
-   int value = ccs.inc;
-
-   if(conservationSlider == null)
-   {
-     sp = new SliderPanel(ap, value, true, cs);
-     conservationSlider = new JInternalFrame();
-     conservationSlider.setContentPane(sp);
-     addInternalFrame(conservationSlider, "Conservation Colour Increment  ("+source+")", 420, 90);
-     conservationSlider.setResizable(false);
-     conservationSlider.setMaximizable(false);
-     conservationSlider.addInternalFrameListener(new javax.swing.event.InternalFrameAdapter()
-                  {
-                    public void internalFrameClosed(javax.swing.event.InternalFrameEvent e)
-                    {
-                      conservationSlider = null;
-                    }
-                  });
-   }
-   else
-   {
-
-       conservationSlider.setTitle("Conservation Colour Increment  ("+source+")");
-       sp = (SliderPanel)conservationSlider.getContentPane();
-       sp.cs = cs;
-       sp.setValue(value);
-   }
-
-   if(ap.av.alignment.getGroups()!=null)
-     sp.setAllGroupsCheckEnabled( true );
-   else
-     sp.setAllGroupsCheckEnabled( false);
-
-   return sp.getValue();
-
- }
-
- public static void hideConservationSlider()
- {
-  try{
-    conservationSlider.setClosed(true);
-    conservationSlider = null;
-  }catch(Exception ex){}
-}
+    }
+    catch (Exception ex)
+    {
+      ex.printStackTrace();
+    }
+  }
+
+  protected void preferences_actionPerformed(ActionEvent e)
+  {
+    Preferences pref = new Preferences();
+  }
+
+  public void saveState_actionPerformed(ActionEvent e)
+  {
+    JalviewFileChooser chooser = new JalviewFileChooser(jalview.bin.Cache.
+        getProperty(
+            "LAST_DIRECTORY"), new String[]
+        {"jar"},
+        new String[]
+        {"Jalview Project"}, "Jalview Project");
+
+    chooser.setFileView(new JalviewFileView());
+    chooser.setDialogTitle("Save State");
+
+    int value = chooser.showSaveDialog(this);
+
+    if (value == JalviewFileChooser.APPROVE_OPTION)
+    {
+      java.io.File choice = chooser.getSelectedFile();
+      jalview.bin.Cache.setProperty("LAST_DIRECTORY", choice.getParent());
+      Jalview2XML.SaveState(choice);
+    }
+  }
+
+  public void loadState_actionPerformed(ActionEvent e)
+  {
+    JalviewFileChooser chooser = new JalviewFileChooser(jalview.bin.Cache.
+        getProperty(
+            "LAST_DIRECTORY"), new String[]
+        {"jar"},
+        new String[]
+        {"Jalview Project"}, "Jalview Project");
+    chooser.setFileView(new JalviewFileView());
+    chooser.setDialogTitle("Restore state");
+
+    int value = chooser.showOpenDialog(this);
+
+    if (value == JalviewFileChooser.APPROVE_OPTION)
+    {
+      String choice = chooser.getSelectedFile().getAbsolutePath();
+      jalview.bin.Cache.setProperty("LAST_DIRECTORY",
+                                    chooser.getSelectedFile().getParent());
+      Jalview2XML.LoadJalviewAlign(choice);
+    }
+  }
+
+  class LoadingThread
+      extends Thread
+  {
+    String file;
+    String protocol;
+    String format;
 
+    public LoadingThread(String file, String protocol, String format)
+    {
+      this.file = file;
+      this.protocol = protocol;
+      this.format = format;
+    }
 
- public static void hidePIDSlider()
- {
-   try{
-     PIDSlider.setClosed(true);
-     PIDSlider = null;
-   }catch(Exception ex){}
- }
-
- public static int setPIDSliderSource(AlignmentPanel ap, ColourSchemeI cs, String source)
- {
-   SliderPanel pid = null;
-   if(PIDSlider == null)
-   {
-     pid = new SliderPanel(ap, 50, false, cs);
-     PIDSlider = new JInternalFrame();
-     PIDSlider.setContentPane(pid);
-     addInternalFrame(PIDSlider, "Percentage Identity Threshold ("+source+")", 420, 90);
-     PIDSlider.setResizable(false);
-     PIDSlider.setMaximizable(false);
-   }
-   else
-   {
-       PIDSlider.setTitle("Percentage Identity Threshold ("+source+")");
-       pid = (SliderPanel)PIDSlider.getContentPane();
-       pid.cs = cs;
-   }
-
-   if (ap.av.alignment.getGroups() != null)
-     pid.setAllGroupsCheckEnabled(true);
-   else
-     pid.setAllGroupsCheckEnabled(false);
-
-
-   return pid.getValue();
-
- }
+    public void run()
+    {
+      SequenceI[] sequences = null;
 
+      if (FormatAdapter.formats.contains(format))
+      {
+        sequences = FormatAdapter.readFile(file, protocol, format);
+      }
+
+      if ( (sequences != null) && (sequences.length > 0))
+      {
+        AlignFrame af = new AlignFrame(new Alignment(sequences));
+        addInternalFrame(af, file, AlignFrame.NEW_WINDOW_WIDTH,
+                         AlignFrame.NEW_WINDOW_HEIGHT);
+        af.currentFileFormat = format;
+        af.statusBar.setText("Successfully loaded file " + file);
+
+        try
+        {
+          af.setMaximum(Preferences.showFullscreen);
+        }
+        catch (Exception ex)
+        {
+        }
+      }
+      else
+      {
+        JOptionPane.showInternalMessageDialog(Desktop.desktop,
+                                              "Couldn't open file.\n" +
+                                              "Formats currently supported are\n" +
+                                              "Fasta, MSF, Clustal, BLC, PIR, MSP, and PFAM" // JBPNote - message should be generated through FormatAdapter!
+                                              , "Error loading file",
+                                              JOptionPane.WARNING_MESSAGE);
+      }
+    }
+  }
 }