X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FDesktop.java;h=e7355262e8ed136c20c667578e2f392d6d6dc7ee;hb=b2319fcc38be5c500ed7cafc014cf9da96a4ce98;hp=020a420bc72e2b24f0f73b9e4fc804bdd1d0642a;hpb=258c0056231d8a97c1d40dd665260e7814d11206;p=jalview.git diff --git a/src/jalview/gui/Desktop.java b/src/jalview/gui/Desktop.java index 020a420..e735526 100755 --- a/src/jalview/gui/Desktop.java +++ b/src/jalview/gui/Desktop.java @@ -42,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. @@ -50,6 +54,7 @@ public class Desktop extends jalview.jbgui.GDesktop { Image image = null; + try { java.net.URL url = getClass().getResource("/images/logo.gif"); @@ -68,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); @@ -113,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. + } /** @@ -126,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); @@ -141,13 +150,15 @@ 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) { frame.setTitle(title); - frame.setSize(w, h); - + 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 @@ -159,33 +170,40 @@ public class Desktop extends jalview.jbgui.GDesktop } - desktop.add(frame); openFrameCount++; - try - { - frame.setSelected(true); - } - catch (java.beans.PropertyVetoException e) - { - } - + 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(); } ; }); @@ -201,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! @@ -255,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; + 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; + } + + java.net.URI uri = new java.net.URI(s); + java.io.File file = new java.io.File(uri); + files.add(file); + } + } } - - evt.acceptDrop(DnDConstants.ACTION_COPY_OR_MOVE); - - try + 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; - - if (file.endsWith(".jar")) - { - format = "Jalview"; - - } - else - { - format = jalview.io.IdentifyFile.Identify(file, - protocol); - } - LoadFile(file, protocol, format); + String file = files.get(i).toString(); + String protocol = FormatAdapter.FILE; + String format = null; + + if (file.endsWith(".jar")) + { + format = "Jalview"; + + } + else + { + format = new IdentifyFile().Identify(file, + protocol); + } + LoadFile(file, protocol, format); } - } - catch (Exception ex) - { + } + catch (Exception ex) + { ex.printStackTrace(); + } } } @@ -330,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); } } @@ -358,25 +391,36 @@ 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); + - if (url == null) + int reply = JOptionPane.showInternalConfirmDialog(desktop, + panel, "Input Alignment From URL", + JOptionPane.OK_CANCEL_OPTION ); + + + 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); + new Jalview2XML().LoadJalviewAlign(url); } else { - String format = IdentifyFile.Identify(url, "URL"); + String format = new IdentifyFile().Identify(url, FormatAdapter.URL); if (format.equals("URL NOT FOUND")) { @@ -388,7 +432,7 @@ public class Desktop extends jalview.jbgui.GDesktop return; } - LoadFile(url, "URL", format); + LoadFile(url, FormatAdapter.URL, format); } } @@ -423,7 +467,7 @@ 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: " + @@ -466,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); } @@ -507,7 +549,7 @@ public class Desktop extends jalview.jbgui.GDesktop { java.io.File choice = chooser.getSelectedFile(); jalview.bin.Cache.setProperty("LAST_DIRECTORY", choice.getParent()); - Jalview2XML.SaveState(choice); + new Jalview2XML().SaveState(choice); } } @@ -531,8 +573,35 @@ public class Desktop extends jalview.jbgui.GDesktop String choice = chooser.getSelectedFile().getAbsolutePath(); jalview.bin.Cache.setProperty("LAST_DIRECTORY", chooser.getSelectedFile().getParent()); - Jalview2XML.LoadJalviewAlign(choice); + new Jalview2XML().LoadJalviewAlign(choice); } } + /* public void vamsasLoad_actionPerformed(ActionEvent e) + { + JalviewFileChooser chooser = new JalviewFileChooser(jalview.bin.Cache. + getProperty("LAST_DIRECTORY")); + + chooser.setFileView(new JalviewFileView()); + chooser.setDialogTitle("Load Vamsas file"); + chooser.setToolTipText("Import"); + + int value = chooser.showOpenDialog(this); + + if (value == JalviewFileChooser.APPROVE_OPTION) + { + jalview.io.VamsasDatastore vs = new jalview.io.VamsasDatastore(null); + vs.load( + chooser.getSelectedFile().getAbsolutePath() + ); + } + + }*/ + + + public void inputSequence_actionPerformed(ActionEvent e) + { + SequenceFetcher sf = new SequenceFetcher(null); + } } +