pass viewport to fileloader, as we need to firepropertychange once sequences are...

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

diff --git a/src/jalview/gui/Desktop.java b/src/jalview/gui/Desktop.java
index fdb19d5..09f4b3a 100755 (executable)
--- a/src/jalview/gui/Desktop.java
+++ b/src/jalview/gui/Desktop.java
@@ -341,7 +341,7 @@ public class Desktop extends jalview.jbgui.GDesktop
      *\r
      * @param e DOCUMENT ME!\r
      */\r
-    public void inputLocalFileMenuItem_actionPerformed(jalview.datamodel.AlignmentI alignment)\r
+    public void inputLocalFileMenuItem_actionPerformed(AlignViewport viewport)\r
     {\r
         JalviewFileChooser chooser = new JalviewFileChooser(jalview.bin.Cache.getProperty(\r
                     "LAST_DIRECTORY"),\r
@@ -377,8 +377,8 @@ public class Desktop extends jalview.jbgui.GDesktop
                 format = new IdentifyFile().Identify(choice, FormatAdapter.FILE);\r
             }\r
 \r
-            if (alignment != null)\r
-              new FileLoader().LoadFile(alignment, choice, FormatAdapter.FILE, format);\r
+            if (viewport != null)\r
+              new FileLoader().LoadFile(viewport, choice, FormatAdapter.FILE, format);\r
             else\r
               new FileLoader().LoadFile(choice, FormatAdapter.FILE, format);\r
         }\r
@@ -391,15 +391,16 @@ public class Desktop extends jalview.jbgui.GDesktop
      *\r
      * @param e DOCUMENT ME!\r
      */\r
-    public void inputURLMenuItem_actionPerformed(jalview.datamodel.AlignmentI alignment)\r
+    public void inputURLMenuItem_actionPerformed(AlignViewport viewport)\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
       final JComboBox history = new JComboBox();\r
-      JPanel panel = new JPanel(new BorderLayout());\r
-      panel.add(label, BorderLayout.NORTH);\r
-      panel.add(history, BorderLayout.CENTER);\r
+\r
+      JPanel panel = new JPanel(new GridLayout(2,1));\r
+      panel.add(label);\r
+      panel.add(history);\r
       history.setPreferredSize(new Dimension(400,20));\r
       history.setEditable(true);\r
       history.addItem("http://www.");\r
@@ -432,8 +433,8 @@ public class Desktop extends jalview.jbgui.GDesktop
 \r
         if (url.toLowerCase().endsWith(".jar"))\r
         {\r
-          if (alignment != null)\r
-            new FileLoader().LoadFile(alignment, url, FormatAdapter.URL, "Jalview");\r
+          if (viewport != null)\r
+            new FileLoader().LoadFile(viewport, url, FormatAdapter.URL, "Jalview");\r
           else\r
             new FileLoader().LoadFile(url, FormatAdapter.URL, "Jalview");\r
         }\r
@@ -451,8 +452,8 @@ public class Desktop extends jalview.jbgui.GDesktop
             return;\r
           }\r
 \r
-          if (alignment != null)\r
-            new FileLoader().LoadFile(alignment, url, FormatAdapter.URL, format);\r
+          if (viewport != null)\r
+            new FileLoader().LoadFile(viewport, url, FormatAdapter.URL, format);\r
           else\r
             new FileLoader().LoadFile(url, FormatAdapter.URL, format);\r
         }\r
@@ -463,10 +464,10 @@ public class Desktop extends jalview.jbgui.GDesktop
      *\r
      * @param e DOCUMENT ME!\r
      */\r
-    public void inputTextboxMenuItem_actionPerformed(jalview.datamodel.AlignmentI alignment)\r
+    public void inputTextboxMenuItem_actionPerformed(AlignViewport viewport)\r
     {\r
         CutAndPasteTransfer cap = new CutAndPasteTransfer();\r
-        cap.setForInput(alignment);\r
+        cap.setForInput(viewport);\r
         Desktop.addInternalFrame(cap, "Cut & Paste Alignment File", 600, 500);\r
     }\r
 \r