Recently loaded files, urls, append sequences to Alignment

[jalview.git] / src / jalview / gui / Desktop.java

diff --git a/src/jalview/gui/Desktop.java b/src/jalview/gui/Desktop.java
index ab686ff..fdb19d5 100755 (executable)
--- a/src/jalview/gui/Desktop.java
+++ b/src/jalview/gui/Desktop.java
@@ -24,6 +24,7 @@ import java.awt.*;
 import java.awt.datatransfer.*;\r
 import java.awt.dnd.*;\r
 import java.awt.event.*;\r
+import java.util.*;\r
 \r
 import javax.swing.*;\r
 \r
@@ -322,7 +323,10 @@ public class Desktop extends jalview.jbgui.GDesktop
                 format = new IdentifyFile().Identify(file,\r
                                                           protocol);\r
               }\r
-              LoadFile(file, protocol, format);\r
+\r
+\r
+              new FileLoader().LoadFile(file, protocol, format);\r
+\r
             }\r
           }\r
           catch (Exception ex)\r
@@ -337,7 +341,7 @@ public class Desktop extends jalview.jbgui.GDesktop
      *\r
      * @param e DOCUMENT ME!\r
      */\r
-    public void inputLocalFileMenuItem_actionPerformed(ActionEvent e)\r
+    public void inputLocalFileMenuItem_actionPerformed(jalview.datamodel.AlignmentI alignment)\r
     {\r
         JalviewFileChooser chooser = new JalviewFileChooser(jalview.bin.Cache.getProperty(\r
                     "LAST_DIRECTORY"),\r
@@ -366,46 +370,53 @@ public class Desktop extends jalview.jbgui.GDesktop
             String format = null;\r
             if (chooser.getSelectedFormat().equals("Jalview"))\r
             {\r
-              format = "Jalview";\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
+            if (alignment != null)\r
+              new FileLoader().LoadFile(alignment, choice, FormatAdapter.FILE, format);\r
+            else\r
+              new FileLoader().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
     /**\r
      * DOCUMENT ME!\r
      *\r
      * @param e DOCUMENT ME!\r
      */\r
-    public void inputURLMenuItem_actionPerformed(ActionEvent e)\r
+    public void inputURLMenuItem_actionPerformed(jalview.datamodel.AlignmentI alignment)\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
+      final JComboBox history = new JComboBox();\r
       JPanel panel = new JPanel(new BorderLayout());\r
       panel.add(label, BorderLayout.NORTH);\r
-      panel.add(textinput, BorderLayout.SOUTH);\r
+      panel.add(history, BorderLayout.CENTER);\r
+      history.setPreferredSize(new Dimension(400,20));\r
+      history.setEditable(true);\r
+      history.addItem("http://www.");\r
+\r
+      String historyItems = jalview.bin.Cache.getProperty("RECENT_URL");\r
+\r
+      StringTokenizer st;\r
+\r
+      if (historyItems != null)\r
+      {\r
+        st = new StringTokenizer(historyItems, "\t");\r
 \r
+        while (st.hasMoreTokens())\r
+        {\r
+          history.addItem(st.nextElement());\r
+        }\r
+      }\r
 \r
        int reply = JOptionPane.showInternalConfirmDialog(desktop,\r
           panel, "Input Alignment From URL",\r
@@ -417,16 +428,17 @@ public class Desktop extends jalview.jbgui.GDesktop
             return;\r
         }\r
 \r
-        String url = textinput.getText();\r
+        String url = history.getSelectedItem().toString();\r
 \r
         if (url.toLowerCase().endsWith(".jar"))\r
         {\r
-               jalview.bin.Cache.setProperty("DEFAULT_FILE_FORMAT", "Jalview");\r
-               new Jalview2XML().LoadJalviewAlign(url);\r
+          if (alignment != null)\r
+            new FileLoader().LoadFile(alignment, url, FormatAdapter.URL, "Jalview");\r
+          else\r
+            new FileLoader().LoadFile(url, FormatAdapter.URL, "Jalview");\r
         }\r
         else\r
         {\r
-\r
           String format = new IdentifyFile().Identify(url, FormatAdapter.URL);\r
 \r
           if (format.equals("URL NOT FOUND"))\r
@@ -439,7 +451,10 @@ public class Desktop extends jalview.jbgui.GDesktop
             return;\r
           }\r
 \r
-          LoadFile(url, FormatAdapter.URL, format);\r
+          if (alignment != null)\r
+            new FileLoader().LoadFile(alignment, url, FormatAdapter.URL, format);\r
+          else\r
+            new FileLoader().LoadFile(url, FormatAdapter.URL, format);\r
         }\r
     }\r
 \r
@@ -448,10 +463,10 @@ public class Desktop extends jalview.jbgui.GDesktop
      *\r
      * @param e DOCUMENT ME!\r
      */\r
-    public void inputTextboxMenuItem_actionPerformed(ActionEvent e)\r
+    public void inputTextboxMenuItem_actionPerformed(jalview.datamodel.AlignmentI alignment)\r
     {\r
         CutAndPasteTransfer cap = new CutAndPasteTransfer();\r
-        cap.setForInput();\r
+        cap.setForInput(alignment);\r
         Desktop.addInternalFrame(cap, "Cut & Paste Alignment File", 600, 500);\r
     }\r
 \r