X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FDesktop.java;h=fdb19d59b47f40eb262db50cf9a79852409be71b;hb=5874ca652d08909c74d422552eb03a996112316d;hp=ab686ff9109f85209bf995a67fac70ea18486f21;hpb=65bf5e3d27d9df076e3c1af6bbf5178b06fb0479;p=jalview.git

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