X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FDesktop.java;h=9085b1e0f7a0ff21e82c106eee0d973a5b156135;hb=c77ccc33971183dba9cb66b40886a6b61fe8eaa0;hp=ee9eb274277cdfee1091d90f0199c235880595b6;hpb=631729455dcde5766a5d307f2c15d553bc32cb3e;p=jalview.git

diff --git a/src/jalview/gui/Desktop.java b/src/jalview/gui/Desktop.java
index ee9eb27..9085b1e 100755
--- a/src/jalview/gui/Desktop.java
+++ b/src/jalview/gui/Desktop.java
@@ -18,8 +18,6 @@
  */
 package jalview.gui;
 
-import jalview.datamodel.*;
-
 import jalview.io.*;
 
 import java.awt.*;
@@ -44,6 +42,10 @@ public class Desktop extends jalview.jbgui.GDesktop
     static int openFrameCount = 0;
     static final int xOffset = 30;
     static final int yOffset = 30;
+    public static jalview.ws.Discoverer discoverer;
+
+    public static Object [] jalviewClipboard;
+
 
     /**
      * Creates a new Desktop object.
@@ -52,6 +54,7 @@ public class Desktop extends jalview.jbgui.GDesktop
     {
         Image image = null;
 
+
         try
         {
             java.net.URL url = getClass().getResource("/images/logo.gif");
@@ -70,7 +73,7 @@ public class Desktop extends jalview.jbgui.GDesktop
         {
         }
 
-        setTitle("Jalview 2005");
+        setTitle("Jalview "+jalview.bin.Cache.getProperty("VERSION"));
         setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
         desktop = new JDesktopPane();
         desktop.setBackground(Color.white);
@@ -115,9 +118,13 @@ public class Desktop extends jalview.jbgui.GDesktop
         SplashScreen splash = new SplashScreen(frame, image);
         frame.setContentPane(splash);
         frame.setLayer(JLayeredPane.PALETTE_LAYER);
-        addInternalFrame(frame, "", 750, 160, false);
         frame.setLocation((int) ((getWidth() - 750) / 2),
             (int) ((getHeight() - 160) / 2));
+
+        addInternalFrame(frame, "", 750, 160, false);
+
+        discoverer=new jalview.ws.Discoverer(); // Only gets started if gui is displayed.
+
     }
 
     /**
@@ -128,7 +135,7 @@ public class Desktop extends jalview.jbgui.GDesktop
      * @param w DOCUMENT ME!
      * @param h DOCUMENT ME!
      */
-    public static void addInternalFrame(final JInternalFrame frame,
+    public static synchronized void addInternalFrame(final JInternalFrame frame,
         String title, int w, int h)
     {
         addInternalFrame(frame, title, w, h, true);
@@ -143,38 +150,60 @@ public class Desktop extends jalview.jbgui.GDesktop
      * @param h DOCUMENT ME!
      * @param resizable DOCUMENT ME!
      */
-    public static void addInternalFrame(final JInternalFrame frame,
+    public static synchronized void addInternalFrame(final JInternalFrame frame,
         String title, int w, int h, boolean resizable)
     {
-        desktop.add(frame);
-        openFrameCount++;
 
-        try
-        {
-            frame.setSelected(true);
-        }
-        catch (java.beans.PropertyVetoException e)
-        {
-        }
-
-        frame.setTitle(title);
+      frame.setTitle(title);
+      if(frame.getWidth()<1 || frame.getHeight()<1)
+      {
         frame.setSize(w, h);
+      }
+      // THIS IS A PUBLIC STATIC METHOD, SO IT MAY BE CALLED EVEN IN
+      // A HEADLESS STATE WHEN NO DESKTOP EXISTS. MUST RETURN
+      // IF JALVIEW IS RUNNING HEADLESS
+      /////////////////////////////////////////////////
+      if (System.getProperty("java.awt.headless") != null
+          && System.getProperty("java.awt.headless").equals("true"))
+      {
+        return;
+      }
+
+
+        openFrameCount++;
+
+        frame.setVisible(true);
         frame.setClosable(true);
         frame.setResizable(resizable);
         frame.setMaximizable(resizable);
         frame.setIconifiable(resizable);
         frame.setFrameIcon(null);
-        frame.setLocation(xOffset * openFrameCount, yOffset * openFrameCount);
-        frame.toFront();
+
+        if (frame.getX()<1 && frame.getY()<1)
+       {
+         frame.setLocation(xOffset * openFrameCount, yOffset * ((openFrameCount-1)%10)+yOffset);
+       }
 
         final JMenuItem menuItem = new JMenuItem(title);
         frame.addInternalFrameListener(new javax.swing.event.InternalFrameAdapter()
             {
+              public void internalFrameActivated(javax.swing.event.
+                                                 InternalFrameEvent evt)
+              {
+                JInternalFrame itf = desktop.getSelectedFrame();
+                if (itf != null)
+                  itf.requestFocus();
+
+              }
+
                 public void internalFrameClosed(
                     javax.swing.event.InternalFrameEvent evt)
                 {
                     openFrameCount--;
                     windowMenu.remove(menuItem);
+                    JInternalFrame itf = desktop.getSelectedFrame();
+                       if (itf != null)
+                        itf.requestFocus();
                 }
                 ;
             });
@@ -190,51 +219,33 @@ public class Desktop extends jalview.jbgui.GDesktop
                     }
                     catch (java.beans.PropertyVetoException ex)
                     {
-                    }
 
-                    ;
+                    }
                 }
             });
 
-        frame.setVisible(true);
         windowMenu.add(menuItem);
+
+        desktop.add(frame);
+        frame.toFront();
+        try{
+          frame.setSelected(true);
+          frame.requestFocus();
+        }catch(java.beans.PropertyVetoException ve)
+        {}
     }
 
-    /**
-     * DOCUMENT ME!
-     *
-     * @param evt DOCUMENT ME!
-     */
     public void dragEnter(DropTargetDragEvent evt)
-    {
-    }
+    {}
 
-    /**
-     * DOCUMENT ME!
-     *
-     * @param evt DOCUMENT ME!
-     */
     public void dragExit(DropTargetEvent evt)
-    {
-    }
+    {}
 
-    /**
-     * DOCUMENT ME!
-     *
-     * @param evt DOCUMENT ME!
-     */
     public void dragOver(DropTargetDragEvent evt)
-    {
-    }
+    {}
 
-    /**
-     * DOCUMENT ME!
-     *
-     * @param evt DOCUMENT ME!
-     */
     public void dropActionChanged(DropTargetDragEvent evt)
-    {
-    }
+    {}
 
     /**
      * DOCUMENT ME!
@@ -244,40 +255,73 @@ public class Desktop extends jalview.jbgui.GDesktop
     public void drop(DropTargetDropEvent evt)
     {
         Transferable t = evt.getTransferable();
+        java.util.List files = null;
 
-        if (!t.isDataFlavorSupported(DataFlavor.javaFileListFlavor))
+        try
         {
-            return;
-        }
-
-        evt.acceptDrop(DnDConstants.ACTION_COPY_OR_MOVE);
+          DataFlavor uriListFlavor = new DataFlavor("text/uri-list;class=java.lang.String");
+          if (t.isDataFlavorSupported(DataFlavor.javaFileListFlavor))
+          {
+            //Works on Windows and MacOSX
+            evt.acceptDrop(DnDConstants.ACTION_COPY_OR_MOVE);
+            files = (java.util.List) t.getTransferData(DataFlavor.javaFileListFlavor);
+          }
+          else if (t.isDataFlavorSupported(uriListFlavor))
+          {
+            // This is used by Unix drag system
+            evt.acceptDrop(DnDConstants.ACTION_COPY_OR_MOVE);
+            String data = (String) t.getTransferData(uriListFlavor);
+            files = new java.util.ArrayList(1);
+            for (java.util.StringTokenizer st = new java.util.StringTokenizer(
+                data,
+                "\r\n");
+                 st.hasMoreTokens(); )
+            {
+              String s = st.nextToken();
+              if (s.startsWith("#"))
+              {
+                // the line is a comment (as per the RFC 2483)
+                continue;
+              }
 
-        try
+              java.net.URI uri = new java.net.URI(s);
+              java.io.File file = new java.io.File(uri);
+              files.add(file);
+            }
+          }
+        }
+        catch (Exception e)
         {
-            java.util.List files = (java.util.List) t.getTransferData(DataFlavor.javaFileListFlavor);
+          e.printStackTrace();
+        }
 
+        if (files != null)
+        {
+          try
+          {
             for (int i = 0; i < files.size(); i++)
             {
-                String file = files.get(i).toString();
-                String protocol = "File";
-                String format = null;
+              String file = files.get(i).toString();
+              String protocol = FormatAdapter.FILE;
+              String format = null;
 
-                if (file.endsWith(".jar"))
-                {
-                  format = "Jalview";
+              if (file.endsWith(".jar"))
+              {
+                format = "Jalview";
 
-                }
-                else
-                {
-                    format = jalview.io.IdentifyFile.Identify(file,
-                            protocol);
-                }
-                LoadFile(file, protocol, format);
+              }
+              else
+              {
+                format = new IdentifyFile().Identify(file,
+                                                          protocol);
+              }
+              LoadFile(file, protocol, format);
             }
-        }
-        catch (Exception ex)
-        {
+          }
+          catch (Exception ex)
+          {
             ex.printStackTrace();
+          }
         }
     }
 
@@ -319,11 +363,11 @@ public class Desktop extends jalview.jbgui.GDesktop
             }
             else
             {
-                format = IdentifyFile.Identify(choice, "File");
+                format = new IdentifyFile().Identify(choice, FormatAdapter.FILE);
             }
 
             jalview.bin.Cache.setProperty("DEFAULT_FILE_FORMAT", format);
-            LoadFile(choice, "File", format);
+            LoadFile(choice, FormatAdapter.FILE, format);
         }
     }
 
@@ -336,32 +380,8 @@ public class Desktop extends jalview.jbgui.GDesktop
      */
     public void LoadFile(String file, String protocol, String format)
     {
-        LoadingThread loader = new LoadingThread(file, protocol, format);
-        loader.start();
-    }
-    /**
-     * DOCUMENT ME!
-     *
-     * @param file DOCUMENT ME!
-     * @param protocol DOCUMENT ME!
-     * @param format DOCUMENT ME!
-     */
-    public AlignFrame LoadFileWaitTillLoaded(String file, String protocol, String format)
-    {
-        LoadingThread loader = new LoadingThread(file, protocol, format);
-        loader.start();
-
-        while (loader.isAlive())
-        {
-          try
-          {
-            Thread.sleep(50);
-          }
-          catch (Exception ex)
-          {}
-        }
-
-      return loader.af;
+      FileLoader fileLoader = new FileLoader();
+      fileLoader.LoadFile(file, protocol, format);
     }
 
     /**
@@ -371,17 +391,28 @@ public class Desktop extends jalview.jbgui.GDesktop
      */
     public void inputURLMenuItem_actionPerformed(ActionEvent e)
     {
-        String url = JOptionPane.showInternalInputDialog(Desktop.desktop,
-                "Enter url of input file", "Input alignment from URL",
-                JOptionPane.QUESTION_MESSAGE, null, null, "http://www.")
-                                .toString();
+      // 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);
+
+
+       int reply = JOptionPane.showInternalConfirmDialog(desktop,
+          panel, "Input Alignment From URL",
+          JOptionPane.OK_CANCEL_OPTION );
 
-        if (url == null)
+
+        if (reply != JOptionPane.OK_OPTION )
         {
             return;
         }
 
-        if (url.trim().toLowerCase().endsWith(".jar"))
+        String url = textinput.getText();
+
+        if (url.toLowerCase().endsWith(".jar"))
         {
                jalview.bin.Cache.setProperty("DEFAULT_FILE_FORMAT", "Jalview");
                Jalview2XML.LoadJalviewAlign(url);
@@ -389,7 +420,7 @@ public class Desktop extends jalview.jbgui.GDesktop
         else
         {
 
-          String format = IdentifyFile.Identify(url, "URL");
+          String format = new IdentifyFile().Identify(url, FormatAdapter.URL);
 
           if (format.equals("URL NOT FOUND"))
           {
@@ -401,7 +432,7 @@ public class Desktop extends jalview.jbgui.GDesktop
             return;
           }
 
-          LoadFile(url, "URL", format);
+          LoadFile(url, FormatAdapter.URL, format);
         }
     }
 
@@ -436,18 +467,18 @@ public class Desktop extends jalview.jbgui.GDesktop
      */
     public void aboutMenuItem_actionPerformed(ActionEvent e)
     {
-      StringBuffer message = new StringBuffer("JalView 2005 version " +
+      StringBuffer message = new StringBuffer("JalView version " +
                                               jalview.bin.Cache.getProperty(
           "VERSION") +
                                               "; last updated: " +
                                               jalview.bin.
-                                              Cache.getProperty("BUILD_DATE"));
+                                              Cache.getDefault("BUILD_DATE", "unknown"));
 
-      if (!jalview.bin.Cache.getProperty("jalview.version").equals(
+      if (!jalview.bin.Cache.getProperty("LATEST_VERSION").equals(
           jalview.bin.Cache.getProperty("VERSION")))
       {
         message.append("\n\n!! Jalview version "
-                       + jalview.bin.Cache.getProperty("jalview.version")
+                       + jalview.bin.Cache.getProperty("LATEST_VERSION")
                        + " is available for download from http://www.jalview.org !!\n");
 
       }
@@ -479,8 +510,6 @@ public class Desktop extends jalview.jbgui.GDesktop
             javax.help.HelpSet hs = new javax.help.HelpSet(cl, url);
 
             javax.help.HelpBroker hb = hs.createHelpBroker();
-            hb.setLocation(new Point(200, 50));
-            hb.setSize(new Dimension(800, 700));
             hb.setCurrentID("home");
             hb.setDisplayed(true);
         }
@@ -548,60 +577,31 @@ public class Desktop extends jalview.jbgui.GDesktop
         }
     }
 
-    class LoadingThread extends Thread
+  /*  public void vamsasLoad_actionPerformed(ActionEvent e)
     {
-        String file;
-        String protocol;
-        String format;
-        AlignFrame af;
+      JalviewFileChooser chooser = new JalviewFileChooser(jalview.bin.Cache.
+          getProperty("LAST_DIRECTORY"));
 
-        public LoadingThread(String file, String protocol, String format)
-        {
-            this.file = file;
-            this.protocol = protocol;
-            this.format = format;
-        }
+      chooser.setFileView(new JalviewFileView());
+      chooser.setDialogTitle("Load Vamsas file");
+      chooser.setToolTipText("Import");
 
-        public void run()
-        {
-            SequenceI[] sequences = null;
+      int value = chooser.showOpenDialog(this);
 
-            if(format.equalsIgnoreCase("Jalview"))
-            {
-              Jalview2XML.LoadJalviewAlign(file);
-            }
-            else
-            {
-              if (FormatAdapter.formats.contains(format))
-              {
-                sequences = FormatAdapter.readFile(file, protocol, format);
-              }
+      if (value == JalviewFileChooser.APPROVE_OPTION)
+      {
+        jalview.io.VamsasDatastore vs = new jalview.io.VamsasDatastore(null);
+        vs.load(
+            chooser.getSelectedFile().getAbsolutePath()
+            );
+      }
 
-              if ( (sequences != null) && (sequences.length > 0))
-              {
-                af = new AlignFrame(new Alignment(sequences));
-                addInternalFrame(af, file, AlignFrame.NEW_WINDOW_WIDTH,
-                                 AlignFrame.NEW_WINDOW_HEIGHT);
-                af.currentFileFormat = format;
-                af.statusBar.setText("Successfully loaded file " + file);
+    }*/
 
-                try
-                {
-                  af.setMaximum(Preferences.showFullscreen);
-                }
-                catch (Exception ex)
-                {
-                }
-              }
-              else
-              {
-                JOptionPane.showInternalMessageDialog(Desktop.desktop,
-                    "Couldn't open file.\n" +
-                    "Formats currently supported are\n" +
-                    "Fasta, MSF, Clustal, BLC, PIR, MSP, and PFAM" // JBPNote - message should be generated through FormatAdapter!
-                    , "Error loading file", JOptionPane.WARNING_MESSAGE);
-              }
-            }
-        }
+
+    public void inputSequence_actionPerformed(ActionEvent e)
+    {
+      SequenceFetcher sf = new SequenceFetcher(null);
     }
 }
+