X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FDesktop.java;h=7031e992a59df6342faf52acb971853987e8fb0d;hb=b69e028fe41a867e72cda2a6d69182ff0c6bd90e;hp=6295801bc057bea83344c9ffadb352a02ec3eeae;hpb=26c3004aa398c51cdeee79945d0e0bb8a877f47d;p=jalview.git diff --git a/src/jalview/gui/Desktop.java b/src/jalview/gui/Desktop.java index 6295801..7031e99 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,15 +48,17 @@ public class Desktop extends jalview.jbgui.GDesktop public static Object [] jalviewClipboard; + static int fileLoadingCount= 0; /** * Creates a new Desktop object. */ public Desktop() { + instance = this; + doVamsasClientCheck(); Image image = null; - try { java.net.URL url = getClass().getResource("/images/logo.gif"); @@ -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 @@ -124,6 +129,13 @@ public class Desktop extends jalview.jbgui.GDesktop addInternalFrame(frame, "", 750, 160, false); discoverer=new jalview.ws.Discoverer(); // Only gets started if gui is displayed. + } + + private void doVamsasClientCheck() { + if (jalview.bin.Cache.vamsasJarsPresent()) { + VamsasMenu.setVisible(true); + vamsasLoad.setVisible(true); + } } @@ -196,9 +208,11 @@ public class Desktop extends jalview.jbgui.GDesktop } + public void internalFrameClosed( javax.swing.event.InternalFrameEvent evt) { + PaintRefresher.RemoveComponent(frame); openFrameCount--; windowMenu.remove(menuItem); JInternalFrame itf = desktop.getSelectedFrame(); @@ -232,7 +246,12 @@ public class Desktop extends jalview.jbgui.GDesktop frame.setSelected(true); frame.requestFocus(); }catch(java.beans.PropertyVetoException ve) - {} + { } + } + + public void lostOwnership(Clipboard clipboard, Transferable contents) + { + Desktop.jalviewClipboard = null; } public void dragEnter(DropTargetDragEvent evt) @@ -291,9 +310,7 @@ public class Desktop extends jalview.jbgui.GDesktop } } catch (Exception e) - { - e.printStackTrace(); - } + { } if (files != null) { @@ -302,7 +319,7 @@ public class Desktop extends jalview.jbgui.GDesktop for (int i = 0; i < files.size(); i++) { String file = files.get(i).toString(); - String protocol = "File"; + String protocol = FormatAdapter.FILE; String format = null; if (file.endsWith(".jar")) @@ -312,16 +329,17 @@ public class Desktop extends jalview.jbgui.GDesktop } else { - format = jalview.io.IdentifyFile.Identify(file, + format = new IdentifyFile().Identify(file, protocol); } - LoadFile(file, protocol, format); + + + new FileLoader().LoadFile(file, protocol, format); + } } catch (Exception ex) - { - ex.printStackTrace(); - } + { } } } @@ -330,7 +348,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,58 +377,77 @@ public class Desktop extends jalview.jbgui.GDesktop String format = null; if (chooser.getSelectedFormat().equals("Jalview")) { - format = "Jalview"; + format = "Jalview"; } 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); + 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) { - Object reply = JOptionPane.showInternalInputDialog(Desktop.desktop, - "Enter url of input file", "Input alignment from URL", - JOptionPane.QUESTION_MESSAGE, null, null, "http://www."); + // This construct allows us to have a wider textfield + // for viewing + JLabel label = new JLabel("Enter URL of Input File"); + 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 (reply == null) + 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", + JOptionPane.OK_CANCEL_OPTION ); + + + if (reply != JOptionPane.OK_OPTION ) { return; } - String url = reply.toString().trim(); + String url = history.getSelectedItem().toString(); if (url.toLowerCase().endsWith(".jar")) { - jalview.bin.Cache.setProperty("DEFAULT_FILE_FORMAT", "Jalview"); - 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 = IdentifyFile.Identify(url, "URL"); + String format = new IdentifyFile().Identify(url, FormatAdapter.URL); if (format.equals("URL NOT FOUND")) { @@ -422,7 +459,10 @@ public class Desktop extends jalview.jbgui.GDesktop return; } - LoadFile(url, "URL", format); + if (viewport != null) + new FileLoader().LoadFile(viewport, url, FormatAdapter.URL, format); + else + new FileLoader().LoadFile(url, FormatAdapter.URL, format); } } @@ -431,10 +471,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); } @@ -478,7 +518,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, @@ -504,11 +544,93 @@ public class Desktop extends jalview.jbgui.GDesktop hb.setDisplayed(true); } catch (Exception ex) + { } + } + + public void closeAll_actionPerformed(ActionEvent e) + { + JInternalFrame [] frames = desktop.getAllFrames(); + for(int i=0; i