X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FDesktop.java;h=163e297c9475ff21bf323cc8670b13f31c43bcc5;hb=7be3a744db5213f49e70178ade126d1cc797c762;hp=e7355262e8ed136c20c667578e2f392d6d6dc7ee;hpb=b76544bc71a9751607064ec68b26e7cacc502024;p=jalview.git

diff --git a/src/jalview/gui/Desktop.java b/src/jalview/gui/Desktop.java
index e735526..163e297 100755
--- a/src/jalview/gui/Desktop.java
+++ b/src/jalview/gui/Desktop.java
@@ -1,6 +1,6 @@
 /*
  * Jalview - A Sequence Alignment Editor and Viewer
- * Copyright (C) 2005 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle
+ * Copyright (C) 2006 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
@@ -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.*;
 
@@ -35,9 +36,10 @@ import javax.swing.*;
  * @version $Revision$
  */
 public class Desktop extends jalview.jbgui.GDesktop
-    implements DropTargetListener
+    implements DropTargetListener, ClipboardOwner
 {
     /** DOCUMENT ME!! */
+    public static Desktop instance;
     public static JDesktopPane desktop;
     static int openFrameCount = 0;
     static final int xOffset = 30;
@@ -46,14 +48,16 @@ public class Desktop extends jalview.jbgui.GDesktop
 
     public static Object [] jalviewClipboard;
 
+    static int fileLoadingCount= 0;
 
     /**
      * Creates a new Desktop object.
      */
     public Desktop()
     {
-        Image image = null;
+        instance = this;
 
+        Image image = null;
 
         try
         {
@@ -77,7 +81,8 @@ public class Desktop extends jalview.jbgui.GDesktop
         setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
         desktop = new JDesktopPane();
         desktop.setBackground(Color.white);
-        setContentPane(desktop);
+        getContentPane().setLayout(new BorderLayout());
+        getContentPane().add(desktop, BorderLayout.CENTER);
         desktop.setDragMode(JDesktopPane.OUTLINE_DRAG_MODE);
 
         // This line prevents Windows Look&Feel resizing all new windows to maximum
@@ -235,6 +240,11 @@ public class Desktop extends jalview.jbgui.GDesktop
         {}
     }
 
+    public void lostOwnership(Clipboard clipboard, Transferable contents)
+    {
+      Desktop.jalviewClipboard = null;
+    }
+
     public void dragEnter(DropTargetDragEvent evt)
     {}
 
@@ -315,7 +325,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)
@@ -330,7 +343,7 @@ public class Desktop extends jalview.jbgui.GDesktop
      *
      * @param e DOCUMENT ME!
      */
-    public void inputLocalFileMenuItem_actionPerformed(ActionEvent e)
+    public void inputLocalFileMenuItem_actionPerformed(AlignViewport viewport)
     {
         JalviewFileChooser chooser = new JalviewFileChooser(jalview.bin.Cache.getProperty(
                     "LAST_DIRECTORY"),
@@ -359,46 +372,54 @@ 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 (viewport != null)
+              new FileLoader().LoadFile(viewport, 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(AlignViewport viewport)
     {
       // 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);
+      final JComboBox history = new JComboBox();
+
+      JPanel panel = new JPanel(new GridLayout(2,1));
+      panel.add(label);
+      panel.add(history);
+      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",
@@ -410,16 +431,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 (viewport != null)
+            new FileLoader().LoadFile(viewport, 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"))
@@ -432,7 +454,10 @@ public class Desktop extends jalview.jbgui.GDesktop
             return;
           }
 
-          LoadFile(url, FormatAdapter.URL, format);
+          if (viewport != null)
+            new FileLoader().LoadFile(viewport, url, FormatAdapter.URL, format);
+          else
+            new FileLoader().LoadFile(url, FormatAdapter.URL, format);
         }
     }
 
@@ -441,10 +466,10 @@ public class Desktop extends jalview.jbgui.GDesktop
      *
      * @param e DOCUMENT ME!
      */
-    public void inputTextboxMenuItem_actionPerformed(ActionEvent e)
+    public void inputTextboxMenuItem_actionPerformed(AlignViewport viewport)
     {
         CutAndPasteTransfer cap = new CutAndPasteTransfer();
-        cap.setForInput();
+        cap.setForInput(viewport);
         Desktop.addInternalFrame(cap, "Cut & Paste Alignment File", 600, 500);
     }
 
@@ -488,7 +513,7 @@ public class Desktop extends jalview.jbgui.GDesktop
             "\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.");
+            "\nBioinformatics,  2004 20;426-7.");
 
         JOptionPane.showInternalMessageDialog(Desktop.desktop,
 
@@ -601,7 +626,127 @@ public class Desktop extends jalview.jbgui.GDesktop
 
     public void inputSequence_actionPerformed(ActionEvent e)
     {
-      SequenceFetcher sf = new SequenceFetcher(null);
+      new SequenceFetcher(null);
+    }
+
+    JPanel progressPanel;
+
+    public void startLoading(final String fileName)
+    {
+      if (fileLoadingCount == 0)
+      {
+        progressPanel = new JPanel(new BorderLayout());
+        JProgressBar progressBar = new JProgressBar();
+        progressBar.setIndeterminate(true);
+
+        progressPanel.add(new JLabel("Loading File: " + fileName + "   "),
+                          BorderLayout.WEST);
+
+        progressPanel.add(progressBar, BorderLayout.CENTER);
+
+        instance.getContentPane().add(progressPanel, BorderLayout.SOUTH);
+      }
+      fileLoadingCount++;
+      validate();
     }
+
+    public void stopLoading()
+    {
+      fileLoadingCount--;
+      if (fileLoadingCount < 1)
+      {
+        if(progressPanel!=null)
+        {
+          this.getContentPane().remove(progressPanel);
+          progressPanel = null;
+        }
+        fileLoadingCount = 0;
+      }
+      validate();
+    }
+
+    public static int getViewCount(String viewId)
+    {
+      int count = 0;
+      JInternalFrame[] frames = Desktop.desktop.getAllFrames();
+      for (int t = 0; t < frames.length; t++)
+      {
+        if (frames[t] instanceof AlignFrame)
+        {
+          AlignFrame af = (AlignFrame) frames[t];
+          for(int a=0; a<af.alignPanels.size(); a++)
+          {
+            if(viewId.equals(
+                ((AlignmentPanel)af.alignPanels.elementAt(a)).av.getSequenceSetId() )
+                )
+            count ++;
+          }
+        }
+      }
+
+      return count;
+    }
+
+    public void explodeViews(AlignFrame af)
+    {
+      int size = af.alignPanels.size();
+      if(size<2)
+        return;
+      af.closeMenuItem_actionPerformed(null);
+
+      for(int i=0; i<size; i++)
+      {
+        AlignmentPanel ap = (AlignmentPanel)af.alignPanels.elementAt(i);
+        AlignFrame newaf = new AlignFrame(ap);
+        if(ap.av.explodedPosition!=null)
+          newaf.setBounds(ap.av.explodedPosition);
+
+        ap.av.gatherViewsHere = false;
+
+        PaintRefresher.Register(ap.seqPanel.seqCanvas, ap.av.getSequenceSetId());
+        PaintRefresher.Register(ap.idPanel.idCanvas, ap.av.getSequenceSetId());
+        PaintRefresher.Register(ap, ap.av.getSequenceSetId());
+
+
+        newaf.viewport = ap.av;
+        addInternalFrame(newaf, af.getTitle(),
+                         AlignFrame.DEFAULT_WIDTH,
+                         AlignFrame.DEFAULT_HEIGHT);
+      }
+
+    }
+
+    public void gatherViews(AlignFrame source)
+    {
+      source.viewport.gatherViewsHere = true;
+      source.viewport.explodedPosition = source.getBounds();
+      JInternalFrame[] frames = Desktop.desktop.getAllFrames();
+      String viewId = source.viewport.sequenceSetID;
+
+      for (int t = 0; t < frames.length; t++)
+      {
+        if (frames[t] instanceof AlignFrame && frames[t] != source)
+        {
+          AlignFrame af = (AlignFrame) frames[t];
+          boolean gatherThis = false;
+          for (int a = 0; a < af.alignPanels.size(); a++)
+          {
+            AlignmentPanel ap = (AlignmentPanel) af.alignPanels.elementAt(a);
+            if (viewId.equals(ap.av.getSequenceSetId()))
+            {
+              gatherThis = true;
+              ap.av.gatherViewsHere = false;
+              ap.av.explodedPosition = af.getBounds();
+              source.addAlignmentPanel(ap);
+            }
+          }
+          if (gatherThis)
+            af.closeMenuItem_actionPerformed(null);
+        }
+      }
+
+    }
+
+
 }