X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FDesktop.java;h=9d58c7badef5f205da54936e314b68d820a49115;hb=174230b4233d9ce80f94527768d2cd2f76da11ab;hp=ab686ff9109f85209bf995a67fac70ea18486f21;hpb=1377b376ecba2e996a17b3dec54a4bd7823aa9e1;p=jalview.git diff --git a/src/jalview/gui/Desktop.java b/src/jalview/gui/Desktop.java index ab686ff..9d58c7b 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.*; @@ -47,6 +48,7 @@ public class Desktop extends jalview.jbgui.GDesktop public static Object [] jalviewClipboard; + static int fileLoadingCount= 0; /** * Creates a new Desktop object. @@ -79,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 @@ -322,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) @@ -337,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"), @@ -366,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", @@ -417,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")) @@ -439,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); } } @@ -448,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); } @@ -495,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, @@ -608,7 +626,44 @@ 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(); + } + }