IdentifyFile should not be static
authoramwaterhouse <Andrew Waterhouse>
Wed, 8 Mar 2006 16:58:51 +0000 (16:58 +0000)
committeramwaterhouse <Andrew Waterhouse>
Wed, 8 Mar 2006 16:58:51 +0000 (16:58 +0000)
src/jalview/bin/Jalview.java
src/jalview/bin/JalviewLite.java
src/jalview/gui/AlignFrame.java
src/jalview/gui/Desktop.java
src/jalview/gui/SequenceFetcher.java
src/jalview/ws/JPredClient.java

index 0272751..a734054 100755 (executable)
@@ -163,7 +163,7 @@ public class Jalview
             if (file.endsWith(".jar"))\r
               format = "Jalview";\r
             else\r
-              format = jalview.io.IdentifyFile.Identify(file, protocol);\r
+              format = new jalview.io.IdentifyFile().Identify(file, protocol);\r
 \r
             System.out.println("Opening: " + format + " file " + file);\r
 \r
@@ -238,7 +238,7 @@ public class Jalview
             }\r
             else\r
             {\r
-              format = jalview.io.IdentifyFile.Identify(file, protocol);\r
+              format = new jalview.io.IdentifyFile().Identify(file, protocol);\r
               desktop.LoadFile(file, protocol, format);\r
             }\r
           }\r
index c4e17fb..858c391 100755 (executable)
@@ -45,7 +45,13 @@ public class JalviewLite extends Applet
     String file = "No file";\r
     Button launcher = new Button("Start Jalview");\r
 \r
+    //The currentAlignFrame is static, it will change\r
+    //if and when the user selects a new window\r
     static AlignFrame currentAlignFrame;\r
+\r
+    //This is the first frame to be displayed, and does not change\r
+    AlignFrame initialAlignFrame;\r
+\r
     boolean embedded = false;\r
 \r
 \r
@@ -82,8 +88,6 @@ public class JalviewLite extends Applet
         this.setBackground(new Color(r, g, b));\r
 \r
         file = getParameter("file");\r
-        if(file.indexOf("://")==-1)\r
-               file = getCodeBase() + file;\r
 \r
         final JalviewLite applet = this;\r
         if(getParameter("embedded")!=null\r
@@ -91,7 +95,7 @@ public class JalviewLite extends Applet
         {\r
           embedded = true;\r
           LoadingThread loader = new LoadingThread(file,\r
-                            "URL",\r
+                            AppletFormatAdapter.URL,\r
                             applet);\r
           loader.start();\r
         }\r
@@ -104,7 +108,7 @@ public class JalviewLite extends Applet
                     public void actionPerformed(ActionEvent e)\r
                     {\r
                         LoadingThread loader = new LoadingThread(file,\r
-                            "URL",\r
+                            AppletFormatAdapter.URL,\r
                             applet);\r
                         loader.start();\r
                       }\r
@@ -126,10 +130,11 @@ public class JalviewLite extends Applet
         System.exit(1);\r
       }\r
 \r
-      String format = jalview.io.IdentifyFile.Identify(args[0],"File");\r
+      String format = new jalview.io.IdentifyFile().Identify(args[0],AppletFormatAdapter.FILE);\r
+\r
       SequenceI[] sequences = null;\r
      try{\r
-       sequences = new AppletFormatAdapter().readFile(args[0], "File", format);\r
+       sequences = new AppletFormatAdapter().readFile(args[0], AppletFormatAdapter.FILE, format);\r
      }catch(java.io.IOException ex)\r
      {\r
        ex.printStackTrace();\r
@@ -167,7 +172,7 @@ public class JalviewLite extends Applet
                       currentAlignFrame = null;\r
                     }\r
                     lastFrameX -=40;\r
-                    lastFrameY-=40;\r
+                    lastFrameY -=40;\r
                     frame.setMenuBar(null);\r
                     frame.dispose();\r
                 }\r
@@ -181,6 +186,23 @@ public class JalviewLite extends Applet
         frame.setVisible(true);\r
     }\r
 \r
+    public String getSelectedSequences()\r
+    {\r
+      StringBuffer result = new StringBuffer("");\r
+\r
+      if(initialAlignFrame.viewport.getSelectionGroup()!=null)\r
+      {\r
+        SequenceI[] seqs = initialAlignFrame.viewport.getSelectionGroup().\r
+            getSequencesInOrder(\r
+                initialAlignFrame.viewport.getAlignment());\r
+\r
+        for (int i = 0; i < seqs.length; i++)\r
+          result.append(seqs[i].getName() + "¬");\r
+      }\r
+\r
+      return result.toString();\r
+    }\r
+\r
     public String getAlignment(String format)\r
     {\r
       return getAlignment(format, "true");\r
@@ -239,14 +261,18 @@ public class JalviewLite extends Applet
         String format;\r
         JalviewLite applet;\r
 \r
-        public LoadingThread(String file,\r
-                             String protocol,\r
-                             JalviewLite applet)\r
+        public LoadingThread(String _file,\r
+                             String _protocol,\r
+                             JalviewLite _applet)\r
         {\r
-            this.file = file;\r
-            this.protocol = protocol;\r
-            format = jalview.io.IdentifyFile.Identify(file, "URL");\r
-            this.applet = applet;\r
+            file = _file;\r
+            if(inArchive(file))\r
+              protocol = AppletFormatAdapter.CLASSLOADER;\r
+            else\r
+              protocol = _protocol;\r
+\r
+            format = new jalview.io.IdentifyFile().Identify(file, protocol);\r
+            applet = _applet;\r
         }\r
 \r
         public void run()\r
@@ -263,6 +289,9 @@ public class JalviewLite extends Applet
             {\r
               currentAlignFrame = new AlignFrame(new Alignment(sequences),\r
                                                  applet, file);\r
+\r
+              initialAlignFrame = currentAlignFrame;\r
+\r
               if (embedded)\r
                 currentAlignFrame.setEmbedded();\r
 \r
@@ -272,12 +301,18 @@ public class JalviewLite extends Applet
                 String treeFile = applet.getParameter("treeFile");\r
                 if (treeFile != null)\r
                 {\r
-                  if (treeFile.indexOf("://") == -1)\r
-                    treeFile = getCodeBase() + treeFile;\r
-\r
                   try\r
                   {\r
-                    jalview.io.NewickFile fin = new jalview.io.NewickFile(treeFile, "URL");\r
+                    if(inArchive(treeFile))\r
+                      protocol = AppletFormatAdapter.CLASSLOADER;\r
+                    else\r
+                    {\r
+                      protocol = AppletFormatAdapter.URL;\r
+                      treeFile = addProtocol(treeFile);\r
+                    }\r
+\r
+                    jalview.io.NewickFile fin = new jalview.io.NewickFile(treeFile, protocol);\r
+\r
                     fin.parse();\r
 \r
                     if (fin.getTree() != null)\r
@@ -299,8 +334,8 @@ public class JalviewLite extends Applet
               String param = getParameter("features");\r
               if (param != null)\r
               {\r
-                if (param.indexOf("://") == -1)\r
-                  param = getCodeBase() + param;\r
+                if( !inArchive(param) )\r
+                  param = addProtocol( param );\r
 \r
                 currentAlignFrame.parseFeaturesFile(param);\r
               }\r
@@ -308,8 +343,8 @@ public class JalviewLite extends Applet
              param = getParameter("annotations");\r
              if (param != null)\r
              {\r
-               if (param.indexOf("://") == -1)\r
-                 param = getCodeBase() + param;\r
+               if( !inArchive(param) )\r
+                  param = addProtocol( param );\r
 \r
                new AnnotationReader().readAnnotationFile(\r
                    currentAlignFrame.viewport.getAlignment(),\r
@@ -322,14 +357,19 @@ public class JalviewLite extends Applet
                 String pdbfile = applet.getParameter("PDBFILE");\r
                 if(pdbfile!=null)\r
                 {\r
-                  if(pdbfile.indexOf("://")==-1)\r
-                       pdbfile = getCodeBase() + pdbfile;\r
+                  if( inArchive(pdbfile) )\r
+                    protocol = AppletFormatAdapter.CLASSLOADER;\r
+                  else\r
+                  {\r
+                    protocol = AppletFormatAdapter.URL;\r
+                    pdbfile = addProtocol(pdbfile);\r
+                  }\r
 \r
                   String sequence = applet.getParameter("PDBSEQ");\r
 \r
                   if(sequence!=null)\r
                   {\r
-                    new MCview.AppletPDBViewer(pdbfile, "URL",\r
+                    new MCview.AppletPDBViewer(pdbfile, protocol,\r
                                                (Sequence)currentAlignFrame.getAlignViewport().getAlignment().findName(sequence),\r
                                                currentAlignFrame.getSeqcanvas());\r
                   }\r
@@ -343,5 +383,24 @@ public class JalviewLite extends Applet
                 repaint();\r
             }\r
         }\r
+\r
+        /**\r
+         * Discovers whether the given file is in the Applet Archive\r
+         * @param file String\r
+         * @return boolean\r
+         */\r
+        boolean inArchive(String file)\r
+        {\r
+          return ( getClass().getResourceAsStream("/" + file) != null );\r
+        }\r
+\r
+        String addProtocol(String file)\r
+        {\r
+          if (file.indexOf("://") == -1)\r
+             file = getCodeBase() + file;\r
+\r
+          return file;\r
+        }\r
+\r
     }\r
 }\r
index e500422..b714aea 100755 (executable)
@@ -691,7 +691,7 @@ public class AlignFrame
       if(str.length()<1)\r
         return;\r
 \r
-      String format = IdentifyFile.Identify(str, "Paste");\r
+      String format = new IdentifyFile().Identify(str, "Paste");\r
       SequenceI[] sequences;\r
 \r
      if(Desktop.jalviewClipboard!=null)\r
@@ -926,7 +926,6 @@ public class AlignFrame
     viewport.setSelectionGroup(null);\r
     alignPanel.seqPanel.seqCanvas.highlightSearchResults(null);\r
     alignPanel.idPanel.idCanvas.searchResults = null;\r
-    alignPanel.annotationPanel.activeRes = null;\r
     PaintRefresher.Refresh(null, viewport.alignment);\r
   }\r
 \r
@@ -2735,7 +2734,7 @@ public void drop(DropTargetDropEvent evt)
             if (!isGroupsFile)\r
             {\r
               String protocol = "File";\r
-              String format = jalview.io.IdentifyFile.Identify(file, protocol);\r
+              String format = new IdentifyFile().Identify(file, protocol);\r
               SequenceI[] sequences = new FormatAdapter().readFile(file, protocol, format);\r
 \r
               FastaFile ff = new FastaFile();\r
index a60d4e7..9085b1e 100755 (executable)
-/*
- * Jalview - A Sequence Alignment Editor and Viewer
- * Copyright (C) 2005 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle
- *
- * 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.io.*;
-
-import java.awt.*;
-import java.awt.datatransfer.*;
-import java.awt.dnd.*;
-import java.awt.event.*;
-
-import javax.swing.*;
-
-
-/**
- * DOCUMENT ME!
- *
- * @author $author$
- * @version $Revision$
- */
-public class Desktop extends jalview.jbgui.GDesktop
-    implements DropTargetListener
-{
-    /** DOCUMENT ME!! */
-    public static JDesktopPane desktop;
-    static int openFrameCount = 0;
-    static final int xOffset = 30;
-    static final int yOffset = 30;
-    public static jalview.ws.Discoverer discoverer;
-
-    public static Object [] jalviewClipboard;
-
-
-    /**
-     * Creates a new Desktop object.
-     */
-    public Desktop()
-    {
-        Image image = null;
-
-
-        try
-        {
-            java.net.URL url = getClass().getResource("/images/logo.gif");
-
-            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)
-        {
-        }
-
-        setTitle("Jalview "+jalview.bin.Cache.getProperty("VERSION"));
-        setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
-        desktop = new JDesktopPane();
-        desktop.setBackground(Color.white);
-        setContentPane(desktop);
-        desktop.setDragMode(JDesktopPane.OUTLINE_DRAG_MODE);
-
-        // 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");
-        String y = jalview.bin.Cache.getProperty("SCREEN_Y");
-        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))
-        {
-            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)
-                {
-                    quit();
-                }
-            });
-
-        this.setDropTarget(new java.awt.dnd.DropTarget(desktop, this));
-
-        /////////Add a splashscreen on startup
-        /////////Add a splashscreen on startup
-        JInternalFrame frame = new JInternalFrame();
-
-        SplashScreen splash = new SplashScreen(frame, image);
-        frame.setContentPane(splash);
-        frame.setLayer(JLayeredPane.PALETTE_LAYER);
-        frame.setLocation((int) ((getWidth() - 750) / 2),
-            (int) ((getHeight() - 160) / 2));
-
-        addInternalFrame(frame, "", 750, 160, false);
-
-        discoverer=new jalview.ws.Discoverer(); // Only gets started if gui is displayed.
-
-    }
-
-    /**
-     * DOCUMENT ME!
-     *
-     * @param frame DOCUMENT ME!
-     * @param title DOCUMENT ME!
-     * @param w DOCUMENT ME!
-     * @param h DOCUMENT ME!
-     */
-    public static synchronized void addInternalFrame(final JInternalFrame frame,
-        String title, int w, int h)
-    {
-        addInternalFrame(frame, title, w, h, true);
-    }
-
-    /**
-     * DOCUMENT ME!
-     *
-     * @param frame DOCUMENT ME!
-     * @param title DOCUMENT ME!
-     * @param w DOCUMENT ME!
-     * @param h DOCUMENT ME!
-     * @param resizable DOCUMENT ME!
-     */
-    public static synchronized void addInternalFrame(final JInternalFrame frame,
-        String title, int w, int h, boolean resizable)
-    {
-
-      frame.setTitle(title);
-      if(frame.getWidth()<1 || frame.getHeight()<1)
-      {
-        frame.setSize(w, h);
-      }
-      // THIS IS A PUBLIC STATIC METHOD, SO IT MAY BE CALLED EVEN IN
-      // A HEADLESS STATE WHEN NO DESKTOP EXISTS. MUST RETURN
-      // IF JALVIEW IS RUNNING HEADLESS
-      /////////////////////////////////////////////////
-      if (System.getProperty("java.awt.headless") != null
-          && System.getProperty("java.awt.headless").equals("true"))
-      {
-        return;
-      }
-
-
-        openFrameCount++;
-
-        frame.setVisible(true);
-        frame.setClosable(true);
-        frame.setResizable(resizable);
-        frame.setMaximizable(resizable);
-        frame.setIconifiable(resizable);
-        frame.setFrameIcon(null);
-
-        if (frame.getX()<1 && frame.getY()<1)
-       {
-         frame.setLocation(xOffset * openFrameCount, yOffset * ((openFrameCount-1)%10)+yOffset);
-       }
-
-        final JMenuItem menuItem = new JMenuItem(title);
-        frame.addInternalFrameListener(new javax.swing.event.InternalFrameAdapter()
-            {
-              public void internalFrameActivated(javax.swing.event.
-                                                 InternalFrameEvent evt)
-              {
-                JInternalFrame itf = desktop.getSelectedFrame();
-                if (itf != null)
-                  itf.requestFocus();
-
-              }
-
-                public void internalFrameClosed(
-                    javax.swing.event.InternalFrameEvent evt)
-                {
-                    openFrameCount--;
-                    windowMenu.remove(menuItem);
-                    JInternalFrame itf = desktop.getSelectedFrame();
-                       if (itf != null)
-                        itf.requestFocus();
-                }
-                ;
-            });
-
-        menuItem.addActionListener(new ActionListener()
-            {
-                public void actionPerformed(ActionEvent e)
-                {
-                    try
-                    {
-                        frame.setSelected(true);
-                        frame.setIcon(false);
-                    }
-                    catch (java.beans.PropertyVetoException ex)
-                    {
-
-                    }
-                }
-            });
-
-        windowMenu.add(menuItem);
-
-        desktop.add(frame);
-        frame.toFront();
-        try{
-          frame.setSelected(true);
-          frame.requestFocus();
-        }catch(java.beans.PropertyVetoException ve)
-        {}
-    }
-
-    public void dragEnter(DropTargetDragEvent evt)
-    {}
-
-    public void dragExit(DropTargetEvent evt)
-    {}
-
-    public void dragOver(DropTargetDragEvent evt)
-    {}
-
-    public void dropActionChanged(DropTargetDragEvent evt)
-    {}
-
-    /**
-     * DOCUMENT ME!
-     *
-     * @param evt DOCUMENT ME!
-     */
-    public void drop(DropTargetDropEvent evt)
-    {
-        Transferable t = evt.getTransferable();
-        java.util.List files = null;
-
-        try
-        {
-          DataFlavor uriListFlavor = new DataFlavor("text/uri-list;class=java.lang.String");
-          if (t.isDataFlavorSupported(DataFlavor.javaFileListFlavor))
-          {
-            //Works on Windows and MacOSX
-            evt.acceptDrop(DnDConstants.ACTION_COPY_OR_MOVE);
-            files = (java.util.List) t.getTransferData(DataFlavor.javaFileListFlavor);
-          }
-          else if (t.isDataFlavorSupported(uriListFlavor))
-          {
-            // This is used by Unix drag system
-            evt.acceptDrop(DnDConstants.ACTION_COPY_OR_MOVE);
-            String data = (String) t.getTransferData(uriListFlavor);
-            files = new java.util.ArrayList(1);
-            for (java.util.StringTokenizer st = new java.util.StringTokenizer(
-                data,
-                "\r\n");
-                 st.hasMoreTokens(); )
-            {
-              String s = st.nextToken();
-              if (s.startsWith("#"))
-              {
-                // the line is a comment (as per the RFC 2483)
-                continue;
-              }
-
-              java.net.URI uri = new java.net.URI(s);
-              java.io.File file = new java.io.File(uri);
-              files.add(file);
-            }
-          }
-        }
-        catch (Exception e)
-        {
-          e.printStackTrace();
-        }
-
-        if (files != null)
-        {
-          try
-          {
-            for (int i = 0; i < files.size(); i++)
-            {
-              String file = files.get(i).toString();
-              String protocol = "File";
-              String format = null;
-
-              if (file.endsWith(".jar"))
-              {
-                format = "Jalview";
-
-              }
-              else
-              {
-                format = jalview.io.IdentifyFile.Identify(file,
-                                                          protocol);
-              }
-              LoadFile(file, protocol, format);
-            }
-          }
-          catch (Exception ex)
-          {
-            ex.printStackTrace();
-          }
-        }
-    }
-
-    /**
-     * DOCUMENT ME!
-     *
-     * @param e DOCUMENT ME!
-     */
-    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());
-
-            String format = null;
-            if (chooser.getSelectedFormat().equals("Jalview"))
-            {
-              format = "Jalview";
-            }
-            else
-            {
-                format = IdentifyFile.Identify(choice, "File");
-            }
-
-            jalview.bin.Cache.setProperty("DEFAULT_FILE_FORMAT", format);
-            LoadFile(choice, "File", format);
-        }
-    }
-
-    /**
-     * DOCUMENT ME!
-     *
-     * @param file DOCUMENT ME!
-     * @param protocol DOCUMENT ME!
-     * @param format DOCUMENT ME!
-     */
-    public void LoadFile(String file, String protocol, String format)
-    {
-      FileLoader fileLoader = new FileLoader();
-      fileLoader.LoadFile(file, protocol, format);
-    }
-
-    /**
-     * DOCUMENT ME!
-     *
-     * @param e DOCUMENT ME!
-     */
-    public void inputURLMenuItem_actionPerformed(ActionEvent e)
-    {
-      // This construct allows us to have a wider textfield
-      // for viewing
-      JLabel label = new JLabel("Enter URL of Input File");
-      JTextField textinput = new JTextField("http://www.", 40);
-      JPanel panel = new JPanel(new BorderLayout());
-      panel.add(label, BorderLayout.NORTH);
-      panel.add(textinput, BorderLayout.SOUTH);
-
-
-       int reply = JOptionPane.showInternalConfirmDialog(desktop,
-          panel, "Input Alignment From URL",
-          JOptionPane.OK_CANCEL_OPTION );
-
-
-        if (reply != JOptionPane.OK_OPTION )
-        {
-            return;
-        }
-
-        String url = textinput.getText();
-
-        if (url.toLowerCase().endsWith(".jar"))
-        {
-               jalview.bin.Cache.setProperty("DEFAULT_FILE_FORMAT", "Jalview");
-               Jalview2XML.LoadJalviewAlign(url);
-        }
-        else
-        {
-
-          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);
-        }
-    }
-
-    /**
-     * DOCUMENT ME!
-     *
-     * @param e DOCUMENT ME!
-     */
-    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()
-    {
-        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() + "");
-        System.exit(0);
-    }
-
-    /**
-     * DOCUMENT ME!
-     *
-     * @param e DOCUMENT ME!
-     */
-    public void aboutMenuItem_actionPerformed(ActionEvent e)
-    {
-      StringBuffer message = new StringBuffer("JalView version " +
-                                              jalview.bin.Cache.getProperty(
-          "VERSION") +
-                                              "; last updated: " +
-                                              jalview.bin.
-                                              Cache.getDefault("BUILD_DATE", "unknown"));
-
-      if (!jalview.bin.Cache.getProperty("LATEST_VERSION").equals(
-          jalview.bin.Cache.getProperty("VERSION")))
-      {
-        message.append("\n\n!! Jalview version "
-                       + jalview.bin.Cache.getProperty("LATEST_VERSION")
-                       + " is available for download from http://www.jalview.org !!\n");
-
-      }
-
-      message.append( "\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.");
-
-        JOptionPane.showInternalMessageDialog(Desktop.desktop,
-
-           message.toString(), "About Jalview",
-            JOptionPane.INFORMATION_MESSAGE);
-    }
-
-    /**
-     * DOCUMENT ME!
-     *
-     * @param e DOCUMENT ME!
-     */
-    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);
-
-            javax.help.HelpBroker hb = hs.createHelpBroker();
-            hb.setCurrentID("home");
-            hb.setDisplayed(true);
-        }
-        catch (Exception ex)
-        {
-            ex.printStackTrace();
-        }
-    }
-
-    /**
-     * DOCUMENT ME!
-     *
-     * @param e DOCUMENT ME!
-     */
-    protected void preferences_actionPerformed(ActionEvent e)
-    {
-        new Preferences();
-    }
-
-    /**
-     * DOCUMENT ME!
-     *
-     * @param e DOCUMENT ME!
-     */
-    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);
-        }
-    }
-
-    /**
-     * DOCUMENT ME!
-     *
-     * @param e DOCUMENT ME!
-     */
-    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);
-        }
-    }
-
-  /*  public void vamsasLoad_actionPerformed(ActionEvent e)
-    {
-      JalviewFileChooser chooser = new JalviewFileChooser(jalview.bin.Cache.
-          getProperty("LAST_DIRECTORY"));
-
-      chooser.setFileView(new JalviewFileView());
-      chooser.setDialogTitle("Load Vamsas file");
-      chooser.setToolTipText("Import");
-
-      int value = chooser.showOpenDialog(this);
-
-      if (value == JalviewFileChooser.APPROVE_OPTION)
-      {
-        jalview.io.VamsasDatastore vs = new jalview.io.VamsasDatastore(null);
-        vs.load(
-            chooser.getSelectedFile().getAbsolutePath()
-            );
-      }
-
-    }*/
-
-
-    public void inputSequence_actionPerformed(ActionEvent e)
-    {
-      SequenceFetcher sf = new SequenceFetcher(null);
-    }
-}
-
+/*\r
+ * Jalview - A Sequence Alignment Editor and Viewer\r
+ * Copyright (C) 2005 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle\r
+ *\r
+ * This program is free software; you can redistribute it and/or\r
+ * modify it under the terms of the GNU General Public License\r
+ * as published by the Free Software Foundation; either version 2\r
+ * of the License, or (at your option) any later version.\r
+ *\r
+ * This program is distributed in the hope that it will be useful,\r
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of\r
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
+ * GNU General Public License for more details.\r
+ *\r
+ * You should have received a copy of the GNU General Public License\r
+ * along with this program; if not, write to the Free Software\r
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA\r
+ */\r
+package jalview.gui;\r
+\r
+import jalview.io.*;\r
+\r
+import java.awt.*;\r
+import java.awt.datatransfer.*;\r
+import java.awt.dnd.*;\r
+import java.awt.event.*;\r
+\r
+import javax.swing.*;\r
+\r
+\r
+/**\r
+ * DOCUMENT ME!\r
+ *\r
+ * @author $author$\r
+ * @version $Revision$\r
+ */\r
+public class Desktop extends jalview.jbgui.GDesktop\r
+    implements DropTargetListener\r
+{\r
+    /** DOCUMENT ME!! */\r
+    public static JDesktopPane desktop;\r
+    static int openFrameCount = 0;\r
+    static final int xOffset = 30;\r
+    static final int yOffset = 30;\r
+    public static jalview.ws.Discoverer discoverer;\r
+\r
+    public static Object [] jalviewClipboard;\r
+\r
+\r
+    /**\r
+     * Creates a new Desktop object.\r
+     */\r
+    public Desktop()\r
+    {\r
+        Image image = null;\r
+\r
+\r
+        try\r
+        {\r
+            java.net.URL url = getClass().getResource("/images/logo.gif");\r
+\r
+            if (url != null)\r
+            {\r
+                image = java.awt.Toolkit.getDefaultToolkit().createImage(url);\r
+\r
+                MediaTracker mt = new MediaTracker(this);\r
+                mt.addImage(image, 0);\r
+                mt.waitForID(0);\r
+                setIconImage(image);\r
+            }\r
+        }\r
+        catch (Exception ex)\r
+        {\r
+        }\r
+\r
+        setTitle("Jalview "+jalview.bin.Cache.getProperty("VERSION"));\r
+        setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);\r
+        desktop = new JDesktopPane();\r
+        desktop.setBackground(Color.white);\r
+        setContentPane(desktop);\r
+        desktop.setDragMode(JDesktopPane.OUTLINE_DRAG_MODE);\r
+\r
+        // This line prevents Windows Look&Feel resizing all new windows to maximum\r
+        // if previous window was maximised\r
+        desktop.setDesktopManager(new DefaultDesktopManager());\r
+\r
+        Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize();\r
+        String x = jalview.bin.Cache.getProperty("SCREEN_X");\r
+        String y = jalview.bin.Cache.getProperty("SCREEN_Y");\r
+        String width = jalview.bin.Cache.getProperty("SCREEN_WIDTH");\r
+        String height = jalview.bin.Cache.getProperty("SCREEN_HEIGHT");\r
+\r
+        if ((x != null) && (y != null) && (width != null) && (height != null))\r
+        {\r
+            setBounds(Integer.parseInt(x), Integer.parseInt(y),\r
+                Integer.parseInt(width), Integer.parseInt(height));\r
+        }\r
+        else\r
+        {\r
+            setBounds((int) (screenSize.width - 900) / 2,\r
+                (int) (screenSize.height - 650) / 2, 900, 650);\r
+        }\r
+\r
+        this.addWindowListener(new WindowAdapter()\r
+            {\r
+                public void windowClosing(WindowEvent evt)\r
+                {\r
+                    quit();\r
+                }\r
+            });\r
+\r
+        this.setDropTarget(new java.awt.dnd.DropTarget(desktop, this));\r
+\r
+        /////////Add a splashscreen on startup\r
+        /////////Add a splashscreen on startup\r
+        JInternalFrame frame = new JInternalFrame();\r
+\r
+        SplashScreen splash = new SplashScreen(frame, image);\r
+        frame.setContentPane(splash);\r
+        frame.setLayer(JLayeredPane.PALETTE_LAYER);\r
+        frame.setLocation((int) ((getWidth() - 750) / 2),\r
+            (int) ((getHeight() - 160) / 2));\r
+\r
+        addInternalFrame(frame, "", 750, 160, false);\r
+\r
+        discoverer=new jalview.ws.Discoverer(); // Only gets started if gui is displayed.\r
+\r
+    }\r
+\r
+    /**\r
+     * DOCUMENT ME!\r
+     *\r
+     * @param frame DOCUMENT ME!\r
+     * @param title DOCUMENT ME!\r
+     * @param w DOCUMENT ME!\r
+     * @param h DOCUMENT ME!\r
+     */\r
+    public static synchronized void addInternalFrame(final JInternalFrame frame,\r
+        String title, int w, int h)\r
+    {\r
+        addInternalFrame(frame, title, w, h, true);\r
+    }\r
+\r
+    /**\r
+     * DOCUMENT ME!\r
+     *\r
+     * @param frame DOCUMENT ME!\r
+     * @param title DOCUMENT ME!\r
+     * @param w DOCUMENT ME!\r
+     * @param h DOCUMENT ME!\r
+     * @param resizable DOCUMENT ME!\r
+     */\r
+    public static synchronized void addInternalFrame(final JInternalFrame frame,\r
+        String title, int w, int h, boolean resizable)\r
+    {\r
+\r
+      frame.setTitle(title);\r
+      if(frame.getWidth()<1 || frame.getHeight()<1)\r
+      {\r
+        frame.setSize(w, h);\r
+      }\r
+      // THIS IS A PUBLIC STATIC METHOD, SO IT MAY BE CALLED EVEN IN\r
+      // A HEADLESS STATE WHEN NO DESKTOP EXISTS. MUST RETURN\r
+      // IF JALVIEW IS RUNNING HEADLESS\r
+      /////////////////////////////////////////////////\r
+      if (System.getProperty("java.awt.headless") != null\r
+          && System.getProperty("java.awt.headless").equals("true"))\r
+      {\r
+        return;\r
+      }\r
+\r
+\r
+        openFrameCount++;\r
+\r
+        frame.setVisible(true);\r
+        frame.setClosable(true);\r
+        frame.setResizable(resizable);\r
+        frame.setMaximizable(resizable);\r
+        frame.setIconifiable(resizable);\r
+        frame.setFrameIcon(null);\r
+\r
+        if (frame.getX()<1 && frame.getY()<1)\r
+       {\r
+         frame.setLocation(xOffset * openFrameCount, yOffset * ((openFrameCount-1)%10)+yOffset);\r
+       }\r
+\r
+        final JMenuItem menuItem = new JMenuItem(title);\r
+        frame.addInternalFrameListener(new javax.swing.event.InternalFrameAdapter()\r
+            {\r
+              public void internalFrameActivated(javax.swing.event.\r
+                                                 InternalFrameEvent evt)\r
+              {\r
+                JInternalFrame itf = desktop.getSelectedFrame();\r
+                if (itf != null)\r
+                  itf.requestFocus();\r
+\r
+              }\r
+\r
+                public void internalFrameClosed(\r
+                    javax.swing.event.InternalFrameEvent evt)\r
+                {\r
+                    openFrameCount--;\r
+                    windowMenu.remove(menuItem);\r
+                    JInternalFrame itf = desktop.getSelectedFrame();\r
+                       if (itf != null)\r
+                        itf.requestFocus();\r
+                }\r
+                ;\r
+            });\r
+\r
+        menuItem.addActionListener(new ActionListener()\r
+            {\r
+                public void actionPerformed(ActionEvent e)\r
+                {\r
+                    try\r
+                    {\r
+                        frame.setSelected(true);\r
+                        frame.setIcon(false);\r
+                    }\r
+                    catch (java.beans.PropertyVetoException ex)\r
+                    {\r
+\r
+                    }\r
+                }\r
+            });\r
+\r
+        windowMenu.add(menuItem);\r
+\r
+        desktop.add(frame);\r
+        frame.toFront();\r
+        try{\r
+          frame.setSelected(true);\r
+          frame.requestFocus();\r
+        }catch(java.beans.PropertyVetoException ve)\r
+        {}\r
+    }\r
+\r
+    public void dragEnter(DropTargetDragEvent evt)\r
+    {}\r
+\r
+    public void dragExit(DropTargetEvent evt)\r
+    {}\r
+\r
+    public void dragOver(DropTargetDragEvent evt)\r
+    {}\r
+\r
+    public void dropActionChanged(DropTargetDragEvent evt)\r
+    {}\r
+\r
+    /**\r
+     * DOCUMENT ME!\r
+     *\r
+     * @param evt DOCUMENT ME!\r
+     */\r
+    public void drop(DropTargetDropEvent evt)\r
+    {\r
+        Transferable t = evt.getTransferable();\r
+        java.util.List files = null;\r
+\r
+        try\r
+        {\r
+          DataFlavor uriListFlavor = new DataFlavor("text/uri-list;class=java.lang.String");\r
+          if (t.isDataFlavorSupported(DataFlavor.javaFileListFlavor))\r
+          {\r
+            //Works on Windows and MacOSX\r
+            evt.acceptDrop(DnDConstants.ACTION_COPY_OR_MOVE);\r
+            files = (java.util.List) t.getTransferData(DataFlavor.javaFileListFlavor);\r
+          }\r
+          else if (t.isDataFlavorSupported(uriListFlavor))\r
+          {\r
+            // This is used by Unix drag system\r
+            evt.acceptDrop(DnDConstants.ACTION_COPY_OR_MOVE);\r
+            String data = (String) t.getTransferData(uriListFlavor);\r
+            files = new java.util.ArrayList(1);\r
+            for (java.util.StringTokenizer st = new java.util.StringTokenizer(\r
+                data,\r
+                "\r\n");\r
+                 st.hasMoreTokens(); )\r
+            {\r
+              String s = st.nextToken();\r
+              if (s.startsWith("#"))\r
+              {\r
+                // the line is a comment (as per the RFC 2483)\r
+                continue;\r
+              }\r
+\r
+              java.net.URI uri = new java.net.URI(s);\r
+              java.io.File file = new java.io.File(uri);\r
+              files.add(file);\r
+            }\r
+          }\r
+        }\r
+        catch (Exception e)\r
+        {\r
+          e.printStackTrace();\r
+        }\r
+\r
+        if (files != null)\r
+        {\r
+          try\r
+          {\r
+            for (int i = 0; i < files.size(); i++)\r
+            {\r
+              String file = files.get(i).toString();\r
+              String protocol = FormatAdapter.FILE;\r
+              String format = null;\r
+\r
+              if (file.endsWith(".jar"))\r
+              {\r
+                format = "Jalview";\r
+\r
+              }\r
+              else\r
+              {\r
+                format = new IdentifyFile().Identify(file,\r
+                                                          protocol);\r
+              }\r
+              LoadFile(file, protocol, format);\r
+            }\r
+          }\r
+          catch (Exception ex)\r
+          {\r
+            ex.printStackTrace();\r
+          }\r
+        }\r
+    }\r
+\r
+    /**\r
+     * DOCUMENT ME!\r
+     *\r
+     * @param e DOCUMENT ME!\r
+     */\r
+    public void inputLocalFileMenuItem_actionPerformed(ActionEvent e)\r
+    {\r
+        JalviewFileChooser chooser = new JalviewFileChooser(jalview.bin.Cache.getProperty(\r
+                    "LAST_DIRECTORY"),\r
+                new String[]\r
+                {\r
+                    "fa, fasta, fastq", "aln", "pfam", "msf", "pir", "blc",\r
+                    "jar"\r
+                },\r
+                new String[]\r
+                {\r
+                    "Fasta", "Clustal", "PFAM", "MSF", "PIR", "BLC", "Jalview"\r
+                }, jalview.bin.Cache.getProperty("DEFAULT_FILE_FORMAT"));\r
+\r
+        chooser.setFileView(new JalviewFileView());\r
+        chooser.setDialogTitle("Open local file");\r
+        chooser.setToolTipText("Open");\r
+\r
+        int value = chooser.showOpenDialog(this);\r
+\r
+        if (value == JalviewFileChooser.APPROVE_OPTION)\r
+        {\r
+            String choice = chooser.getSelectedFile().getPath();\r
+            jalview.bin.Cache.setProperty("LAST_DIRECTORY",\r
+                chooser.getSelectedFile().getParent());\r
+\r
+            String format = null;\r
+            if (chooser.getSelectedFormat().equals("Jalview"))\r
+            {\r
+              format = "Jalview";\r
+            }\r
+            else\r
+            {\r
+                format = new IdentifyFile().Identify(choice, FormatAdapter.FILE);\r
+            }\r
+\r
+            jalview.bin.Cache.setProperty("DEFAULT_FILE_FORMAT", format);\r
+            LoadFile(choice, FormatAdapter.FILE, format);\r
+        }\r
+    }\r
+\r
+    /**\r
+     * DOCUMENT ME!\r
+     *\r
+     * @param file DOCUMENT ME!\r
+     * @param protocol DOCUMENT ME!\r
+     * @param format DOCUMENT ME!\r
+     */\r
+    public void LoadFile(String file, String protocol, String format)\r
+    {\r
+      FileLoader fileLoader = new FileLoader();\r
+      fileLoader.LoadFile(file, protocol, format);\r
+    }\r
+\r
+    /**\r
+     * DOCUMENT ME!\r
+     *\r
+     * @param e DOCUMENT ME!\r
+     */\r
+    public void inputURLMenuItem_actionPerformed(ActionEvent e)\r
+    {\r
+      // This construct allows us to have a wider textfield\r
+      // for viewing\r
+      JLabel label = new JLabel("Enter URL of Input File");\r
+      JTextField textinput = new JTextField("http://www.", 40);\r
+      JPanel panel = new JPanel(new BorderLayout());\r
+      panel.add(label, BorderLayout.NORTH);\r
+      panel.add(textinput, BorderLayout.SOUTH);\r
+\r
+\r
+       int reply = JOptionPane.showInternalConfirmDialog(desktop,\r
+          panel, "Input Alignment From URL",\r
+          JOptionPane.OK_CANCEL_OPTION );\r
+\r
+\r
+        if (reply != JOptionPane.OK_OPTION )\r
+        {\r
+            return;\r
+        }\r
+\r
+        String url = textinput.getText();\r
+\r
+        if (url.toLowerCase().endsWith(".jar"))\r
+        {\r
+               jalview.bin.Cache.setProperty("DEFAULT_FILE_FORMAT", "Jalview");\r
+               Jalview2XML.LoadJalviewAlign(url);\r
+        }\r
+        else\r
+        {\r
+\r
+          String format = new IdentifyFile().Identify(url, FormatAdapter.URL);\r
+\r
+          if (format.equals("URL NOT FOUND"))\r
+          {\r
+            JOptionPane.showInternalMessageDialog(Desktop.desktop,\r
+                                                  "Couldn't locate " + url,\r
+                                                  "URL not found",\r
+                                                  JOptionPane.WARNING_MESSAGE);\r
+\r
+            return;\r
+          }\r
+\r
+          LoadFile(url, FormatAdapter.URL, format);\r
+        }\r
+    }\r
+\r
+    /**\r
+     * DOCUMENT ME!\r
+     *\r
+     * @param e DOCUMENT ME!\r
+     */\r
+    public void inputTextboxMenuItem_actionPerformed(ActionEvent e)\r
+    {\r
+        CutAndPasteTransfer cap = new CutAndPasteTransfer();\r
+        cap.setForInput();\r
+        Desktop.addInternalFrame(cap, "Cut & Paste Alignment File", 600, 500);\r
+    }\r
+\r
+    /*\r
+     * Exit the program\r
+     */\r
+    public void quit()\r
+    {\r
+        jalview.bin.Cache.setProperty("SCREEN_X", getBounds().x + "");\r
+        jalview.bin.Cache.setProperty("SCREEN_Y", getBounds().y + "");\r
+        jalview.bin.Cache.setProperty("SCREEN_WIDTH", getWidth() + "");\r
+        jalview.bin.Cache.setProperty("SCREEN_HEIGHT", getHeight() + "");\r
+        System.exit(0);\r
+    }\r
+\r
+    /**\r
+     * DOCUMENT ME!\r
+     *\r
+     * @param e DOCUMENT ME!\r
+     */\r
+    public void aboutMenuItem_actionPerformed(ActionEvent e)\r
+    {\r
+      StringBuffer message = new StringBuffer("JalView version " +\r
+                                              jalview.bin.Cache.getProperty(\r
+          "VERSION") +\r
+                                              "; last updated: " +\r
+                                              jalview.bin.\r
+                                              Cache.getDefault("BUILD_DATE", "unknown"));\r
+\r
+      if (!jalview.bin.Cache.getProperty("LATEST_VERSION").equals(\r
+          jalview.bin.Cache.getProperty("VERSION")))\r
+      {\r
+        message.append("\n\n!! Jalview version "\r
+                       + jalview.bin.Cache.getProperty("LATEST_VERSION")\r
+                       + " is available for download from http://www.jalview.org !!\n");\r
+\r
+      }\r
+\r
+      message.append( "\nAuthors:  Michele Clamp, James Cuff, Steve Searle, Andrew Waterhouse, Jim Procter & Geoff Barton." +\r
+            "\nCurrent development managed by Andrew Waterhouse; Barton Group, University of Dundee." +\r
+            "\nFor all issues relating to Jalview, email help@jalview.org" +\r
+            "\n\nIf  you use JalView, please cite:" +\r
+            "\n\"Clamp, M., Cuff, J., Searle, S. M. and Barton, G. J. (2004), The Jalview Java Alignment Editor\"" +\r
+            "\nBioinformatics,  2004 12;426-7.");\r
+\r
+        JOptionPane.showInternalMessageDialog(Desktop.desktop,\r
+\r
+           message.toString(), "About Jalview",\r
+            JOptionPane.INFORMATION_MESSAGE);\r
+    }\r
+\r
+    /**\r
+     * DOCUMENT ME!\r
+     *\r
+     * @param e DOCUMENT ME!\r
+     */\r
+    public void documentationMenuItem_actionPerformed(ActionEvent e)\r
+    {\r
+        try\r
+        {\r
+            ClassLoader cl = jalview.gui.Desktop.class.getClassLoader();\r
+            java.net.URL url = javax.help.HelpSet.findHelpSet(cl, "help/help");\r
+            javax.help.HelpSet hs = new javax.help.HelpSet(cl, url);\r
+\r
+            javax.help.HelpBroker hb = hs.createHelpBroker();\r
+            hb.setCurrentID("home");\r
+            hb.setDisplayed(true);\r
+        }\r
+        catch (Exception ex)\r
+        {\r
+            ex.printStackTrace();\r
+        }\r
+    }\r
+\r
+    /**\r
+     * DOCUMENT ME!\r
+     *\r
+     * @param e DOCUMENT ME!\r
+     */\r
+    protected void preferences_actionPerformed(ActionEvent e)\r
+    {\r
+        new Preferences();\r
+    }\r
+\r
+    /**\r
+     * DOCUMENT ME!\r
+     *\r
+     * @param e DOCUMENT ME!\r
+     */\r
+    public void saveState_actionPerformed(ActionEvent e)\r
+    {\r
+        JalviewFileChooser chooser = new JalviewFileChooser(jalview.bin.Cache.getProperty(\r
+                    "LAST_DIRECTORY"), new String[] { "jar" },\r
+                new String[] { "Jalview Project" }, "Jalview Project");\r
+\r
+        chooser.setFileView(new JalviewFileView());\r
+        chooser.setDialogTitle("Save State");\r
+\r
+        int value = chooser.showSaveDialog(this);\r
+\r
+        if (value == JalviewFileChooser.APPROVE_OPTION)\r
+        {\r
+            java.io.File choice = chooser.getSelectedFile();\r
+            jalview.bin.Cache.setProperty("LAST_DIRECTORY", choice.getParent());\r
+            Jalview2XML.SaveState(choice);\r
+        }\r
+    }\r
+\r
+    /**\r
+     * DOCUMENT ME!\r
+     *\r
+     * @param e DOCUMENT ME!\r
+     */\r
+    public void loadState_actionPerformed(ActionEvent e)\r
+    {\r
+        JalviewFileChooser chooser = new JalviewFileChooser(jalview.bin.Cache.getProperty(\r
+                    "LAST_DIRECTORY"), new String[] { "jar" },\r
+                new String[] { "Jalview Project" }, "Jalview Project");\r
+        chooser.setFileView(new JalviewFileView());\r
+        chooser.setDialogTitle("Restore state");\r
+\r
+        int value = chooser.showOpenDialog(this);\r
+\r
+        if (value == JalviewFileChooser.APPROVE_OPTION)\r
+        {\r
+            String choice = chooser.getSelectedFile().getAbsolutePath();\r
+            jalview.bin.Cache.setProperty("LAST_DIRECTORY",\r
+                chooser.getSelectedFile().getParent());\r
+            Jalview2XML.LoadJalviewAlign(choice);\r
+        }\r
+    }\r
+\r
+  /*  public void vamsasLoad_actionPerformed(ActionEvent e)\r
+    {\r
+      JalviewFileChooser chooser = new JalviewFileChooser(jalview.bin.Cache.\r
+          getProperty("LAST_DIRECTORY"));\r
+\r
+      chooser.setFileView(new JalviewFileView());\r
+      chooser.setDialogTitle("Load Vamsas file");\r
+      chooser.setToolTipText("Import");\r
+\r
+      int value = chooser.showOpenDialog(this);\r
+\r
+      if (value == JalviewFileChooser.APPROVE_OPTION)\r
+      {\r
+        jalview.io.VamsasDatastore vs = new jalview.io.VamsasDatastore(null);\r
+        vs.load(\r
+            chooser.getSelectedFile().getAbsolutePath()\r
+            );\r
+      }\r
+\r
+    }*/\r
+\r
+\r
+    public void inputSequence_actionPerformed(ActionEvent e)\r
+    {\r
+      SequenceFetcher sf = new SequenceFetcher(null);\r
+    }\r
+}\r
+\r
index e3282d8..2e2456b 100755 (executable)
@@ -341,7 +341,7 @@ public class SequenceFetcher
 \r
   SequenceI[] parseResult(String result, String title)\r
   {\r
-    String format = IdentifyFile.Identify(result, "Paste");\r
+    String format = new IdentifyFile().Identify(result, "Paste");\r
     SequenceI[] sequences = null;\r
 \r
     if (FormatAdapter.formats.contains(format))\r
index 6fd0a4a..d353b51 100755 (executable)
@@ -399,7 +399,7 @@ public class JPredClient
         {\r
           jalview.bin.Cache.log.debug("Getting associated alignment.");\r
           // we ignore the returned alignment if we only predicted on a single sequence\r
-          String format = jalview.io.IdentifyFile.Identify(result.getAligfile(),\r
+          String format = new jalview.io.IdentifyFile().Identify(result.getAligfile(),\r
               "Paste");\r
 \r
           if (jalview.io.FormatAdapter.formats.contains(format))\r