header updated

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

diff --git a/src/jalview/gui/Desktop.java b/src/jalview/gui/Desktop.java
index 83fc065..9d58c7b 100755 (executable)
--- a/src/jalview/gui/Desktop.java
+++ b/src/jalview/gui/Desktop.java
@@ -1,6 +1,6 @@
 /*\r
  * Jalview - A Sequence Alignment Editor and Viewer\r
- * Copyright (C) 2005 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle\r
+ * Copyright (C) 2006 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
@@ -48,6 +48,7 @@ public class Desktop extends jalview.jbgui.GDesktop
 \r
     public static Object [] jalviewClipboard;\r
 \r
+    static int fileLoadingCount= 0;\r
 \r
     /**\r
      * Creates a new Desktop object.\r
@@ -80,7 +81,8 @@ public class Desktop extends jalview.jbgui.GDesktop
         setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);\r
         desktop = new JDesktopPane();\r
         desktop.setBackground(Color.white);\r
-        setContentPane(desktop);\r
+        getContentPane().setLayout(new BorderLayout());\r
+        getContentPane().add(desktop, BorderLayout.CENTER);\r
         desktop.setDragMode(JDesktopPane.OUTLINE_DRAG_MODE);\r
 \r
         // This line prevents Windows Look&Feel resizing all new windows to maximum\r
@@ -341,7 +343,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 +379,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,7 +393,7 @@ 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
@@ -433,8 +435,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
@@ -452,8 +454,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
@@ -464,10 +466,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
@@ -511,7 +513,7 @@ public class Desktop extends jalview.jbgui.GDesktop
             "\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
+            "\nBioinformatics,  2004 20;426-7.");\r
 \r
         JOptionPane.showInternalMessageDialog(Desktop.desktop,\r
 \r
@@ -624,7 +626,44 @@ public class Desktop extends jalview.jbgui.GDesktop
 \r
     public void inputSequence_actionPerformed(ActionEvent e)\r
     {\r
-      SequenceFetcher sf = new SequenceFetcher(null);\r
+      new SequenceFetcher(null);\r
     }\r
+\r
+    JPanel progressPanel;\r
+\r
+    public void startLoading(final String fileName)\r
+    {\r
+      if (fileLoadingCount == 0)\r
+      {\r
+        progressPanel = new JPanel(new BorderLayout());\r
+        JProgressBar progressBar = new JProgressBar();\r
+        progressBar.setIndeterminate(true);\r
+\r
+        progressPanel.add(new JLabel("Loading File: " + fileName + "   "),\r
+                          BorderLayout.WEST);\r
+\r
+        progressPanel.add(progressBar, BorderLayout.CENTER);\r
+\r
+        instance.getContentPane().add(progressPanel, BorderLayout.SOUTH);\r
+      }\r
+      fileLoadingCount++;\r
+      validate();\r
+    }\r
+\r
+    public void stopLoading()\r
+    {\r
+      fileLoadingCount--;\r
+      if (fileLoadingCount < 1)\r
+      {\r
+        if(progressPanel!=null)\r
+        {\r
+          this.getContentPane().remove(progressPanel);\r
+          progressPanel = null;\r
+        }\r
+        fileLoadingCount = 0;\r
+      }\r
+      validate();\r
+    }\r
+\r
 }\r
 \r