X-Git-Url: http://source.jalview.org/gitweb/?p=jalview.git;a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FDesktop.java;h=f4040fac7d2f12ab20ce14a87a2034c1a3661f3a;hp=0bf029c0c76460ddca451f169bcf4ee1ecb2e216;hb=797df64fa2a0a30773d0f48f5494d4155e5a8be3;hpb=8a91e5ca60b3e9b96854cc753544d60f63a02810 diff --git a/src/jalview/gui/Desktop.java b/src/jalview/gui/Desktop.java old mode 100755 new mode 100644 index 0bf029c..f4040fa --- a/src/jalview/gui/Desktop.java +++ b/src/jalview/gui/Desktop.java @@ -1,6 +1,6 @@ /* - * Jalview - A Sequence Alignment Editor and Viewer (Version 2.5) - * Copyright (C) 2010 J Procter, AM Waterhouse, G Barton, M Clamp, S Searle + * Jalview - A Sequence Alignment Editor and Viewer (Version 2.7) + * Copyright (C) 2011 J Procter, AM Waterhouse, J Engelhardt, LM Lui, G Barton, M Clamp, S Searle * * This file is part of Jalview. * @@ -18,26 +18,68 @@ package jalview.gui; import jalview.bin.Cache; -import jalview.io.*; - -import java.awt.*; -import java.awt.datatransfer.*; -import java.awt.dnd.*; -import java.awt.event.*; +import jalview.io.FileLoader; +import jalview.io.FormatAdapter; +import jalview.io.IdentifyFile; +import jalview.io.JalviewFileChooser; +import jalview.io.JalviewFileView; +import jalview.ws.params.ParamManager; + +import java.awt.BorderLayout; +import java.awt.Color; +import java.awt.Dimension; +import java.awt.FontMetrics; +import java.awt.Graphics; +import java.awt.GridLayout; +import java.awt.Point; +import java.awt.Rectangle; +import java.awt.Toolkit; +import java.awt.datatransfer.Clipboard; +import java.awt.datatransfer.ClipboardOwner; +import java.awt.datatransfer.DataFlavor; +import java.awt.datatransfer.Transferable; +import java.awt.dnd.DnDConstants; +import java.awt.dnd.DropTargetDragEvent; +import java.awt.dnd.DropTargetDropEvent; +import java.awt.dnd.DropTargetEvent; +import java.awt.dnd.DropTargetListener; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.awt.event.FocusEvent; +import java.awt.event.FocusListener; +import java.awt.event.MouseAdapter; +import java.awt.event.MouseEvent; +import java.awt.event.MouseListener; +import java.awt.event.WindowAdapter; +import java.awt.event.WindowEvent; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; +import java.beans.PropertyVetoException; import java.io.BufferedInputStream; -import java.io.BufferedOutputStream; import java.io.File; import java.io.FileOutputStream; -import java.io.InputStream; import java.lang.reflect.Constructor; import java.net.URL; -import java.net.URLConnection; -import java.nio.channels.ReadableByteChannel; -import java.util.*; - -import javax.swing.*; +import java.util.ArrayList; +import java.util.Hashtable; +import java.util.StringTokenizer; +import java.util.Vector; + +import javax.swing.DefaultDesktopManager; +import javax.swing.DesktopManager; +import javax.swing.JButton; +import javax.swing.JComboBox; +import javax.swing.JComponent; +import javax.swing.JDesktopPane; +import javax.swing.JFrame; +import javax.swing.JInternalFrame; +import javax.swing.JLabel; +import javax.swing.JMenuItem; +import javax.swing.JOptionPane; +import javax.swing.JPanel; +import javax.swing.JPopupMenu; +import javax.swing.JProgressBar; +import javax.swing.SwingUtilities; import javax.swing.event.MenuEvent; import javax.swing.event.MenuListener; @@ -46,85 +88,22 @@ import javax.swing.event.MenuListener; * * * @author $author$ - * @version $Revision$ + * @version $Revision: 1.155 $ */ public class Desktop extends jalview.jbgui.GDesktop implements - DropTargetListener, ClipboardOwner, IProgressIndicator + DropTargetListener, ClipboardOwner, IProgressIndicator, jalview.api.StructureSelectionManagerProvider { - private class JalviewChangeSupport implements PropertyChangeListener - { - @Override - public void propertyChange(PropertyChangeEvent evt) - { - // Handle change events - most are simply routed to other sources - changeSupport.firePropertyChange(evt); - } - - /** - * change listeners are notified of changes to resources so they can update - * their state. E.g. - the 'services' property notifies when the available - * set of web service endpoints have changed. - */ - private java.beans.PropertyChangeSupport changeSupport = new java.beans.PropertyChangeSupport( - this); - - /** - * @param propertyName - * @param listener - * @see java.beans.PropertyChangeSupport#addPropertyChangeListener(java.lang.String, - * java.beans.PropertyChangeListener) - */ - public void addJalviewPropertyChangeListener(String propertyName, - PropertyChangeListener listener) - { - changeSupport.addPropertyChangeListener(propertyName, listener); - } - - /** - * @param listener - * @see java.beans.PropertyChangeSupport#addPropertyChangeListener( - * java.beans.PropertyChangeListener) - */ - public void addJalviewPropertyChangeListener( - PropertyChangeListener listener) - { - changeSupport.addPropertyChangeListener(listener); - } - - /* - * @param propertyName - * - * @param oldValue - * - * @param newValue - * - * @see - * java.beans.PropertyChangeSupport#firePropertyChange(java.lang.String, - * java.lang.Object, java.lang.Object) public void firePropertyChange(String - * propertyName, Object oldValue, Object newValue) { - * changeSupport.firePropertyChange(propertyName, oldValue, newValue); } - */ - - /** - * @param propertyName - * @param listener - * @see java.beans.PropertyChangeSupport#removePropertyChangeListener(java.lang.String, - * java.beans.PropertyChangeListener) - */ - public void removeJalviewPropertyChangeListener(String propertyName, - PropertyChangeListener listener) - { - changeSupport.removePropertyChangeListener(propertyName, listener); - } - - } - private JalviewChangeSupport changeSupport = new JalviewChangeSupport(); /** + * news reader - null if it was never started. + */ + private BlogReader jvnews=null; + + /** * @param listener - * @see jalview.gui.Desktop.JalviewChangeSupport#addJalviewPropertyChangeListener(java.beans.PropertyChangeListener) + * @see jalview.gui.JalviewChangeSupport#addJalviewPropertyChangeListener(java.beans.PropertyChangeListener) */ public void addJalviewPropertyChangeListener( PropertyChangeListener listener) @@ -135,7 +114,7 @@ public class Desktop extends jalview.jbgui.GDesktop implements /** * @param propertyName * @param listener - * @see jalview.gui.Desktop.JalviewChangeSupport#addJalviewPropertyChangeListener(java.lang.String, + * @see jalview.gui.JalviewChangeSupport#addJalviewPropertyChangeListener(java.lang.String, * java.beans.PropertyChangeListener) */ public void addJalviewPropertyChangeListener(String propertyName, @@ -147,7 +126,7 @@ public class Desktop extends jalview.jbgui.GDesktop implements /** * @param propertyName * @param listener - * @see jalview.gui.Desktop.JalviewChangeSupport#removeJalviewPropertyChangeListener(java.lang.String, + * @see jalview.gui.JalviewChangeSupport#removeJalviewPropertyChangeListener(java.lang.String, * java.beans.PropertyChangeListener) */ public void removeJalviewPropertyChangeListener(String propertyName, @@ -298,9 +277,13 @@ public class Desktop extends jalview.jbgui.GDesktop implements showMemusage.setSelected(selmemusage); desktop.setBackground(Color.white); getContentPane().setLayout(new BorderLayout()); + // alternate config - have scrollbars - see notes in JAL-153 + //JScrollPane sp = new JScrollPane(); + //sp.getViewport().setView(desktop); + //getContentPane().add(sp, BorderLayout.CENTER); getContentPane().add(desktop, BorderLayout.CENTER); - desktop.setDragMode(JDesktopPane.OUTLINE_DRAG_MODE); - + desktop.setDragMode(JDesktopPane.OUTLINE_DRAG_MODE); + // This line prevents Windows Look&Feel resizing all new windows to maximum // if previous window was maximised desktop.setDesktopManager(new MyDesktopManager( @@ -329,6 +312,21 @@ public class Desktop extends jalview.jbgui.GDesktop implements showConsole(showjconsole); + showNews.setVisible(false); + final Desktop me = this; + // Thread off the news reader, in case there are connection problems. + new Thread( new Runnable() { + @Override + public void run() + { + Cache.log.debug("Starting news thread."); + + jvnews = new BlogReader(me); + showNews.setVisible(true); + Cache.log.debug("Completed news thread."); + } + }).start(); + this.addWindowListener(new WindowAdapter() { public void windowClosing(WindowEvent evt) @@ -347,7 +345,24 @@ public class Desktop extends jalview.jbgui.GDesktop implements } } }); - + this.addFocusListener(new FocusListener() + { + + @Override + public void focusLost(FocusEvent e) + { + // TODO Auto-generated method stub + + } + + @Override + public void focusGained(FocusEvent e) + { + Cache.log.debug("Relaying windows after focus gain"); + // make sure that we sort windows properly after we gain focus + instance.relayerWindows(); + } + }); this.setDropTarget(new java.awt.dnd.DropTarget(desktop, this)); // Spawn a thread that shows the splashscreen SwingUtilities.invokeLater(new Runnable() @@ -374,6 +389,46 @@ public class Desktop extends jalview.jbgui.GDesktop implements Cache.log.debug("Filechooser init thread finished."); } }).start(); + // Add the service change listener + changeSupport.addJalviewPropertyChangeListener("services", + new PropertyChangeListener() + { + + @Override + public void propertyChange(PropertyChangeEvent evt) + { + Cache.log.debug("Firing service changed event for " + + evt.getNewValue()); + JalviewServicesChanged(evt); + } + + }); + } + + protected void showNews_actionPerformed(ActionEvent e) + { + showNews(showNews.isSelected()); + } + void showNews(boolean visible) + { + { + Cache.log.debug((visible?"Showing":"Hiding")+" news."); + showNews.setSelected(visible); + if (visible && !jvnews.isVisible()) + { + new Thread(new Runnable() { + @Override + public void run() + { + long instance=System.currentTimeMillis(); + Desktop.instance.setProgressBar("Refreshing news", instance); + jvnews.refreshNews(); + Desktop.instance.setProgressBar(null, instance); + jvnews.showNews(); + } + }).start(); + } + } } /** @@ -414,6 +469,18 @@ public class Desktop extends jalview.jbgui.GDesktop implements iw = (int) (iw * sw); iy = (int) (iy * sh); ih = (int) (ih * sh); + while (ix >= screenSize.width) + { + jalview.bin.Cache.log + .debug("Window geometry location recall error: shifting horizontal to within screenbounds."); + ix -= screenSize.width; + } + while (iy >= screenSize.height) + { + jalview.bin.Cache.log + .debug("Window geometry location recall error: shifting vertical to within screenbounds."); + iy -= screenSize.height; + } jalview.bin.Cache.log.debug("Got last known dimensions for " + windowName + ": x:" + ix + " y:" + iy + " width:" + iw + " height:" + ih); @@ -576,34 +643,33 @@ public class Desktop extends jalview.jbgui.GDesktop implements } 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(); - } + 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) - { - PaintRefresher.RemoveComponent(frame); - openFrameCount--; - windowMenu.remove(menuItem); - JInternalFrame itf = desktop.getSelectedFrame(); - if (itf != null) - { - itf.requestFocus(); - } - System.gc(); - }; - }); + public void internalFrameClosed( + javax.swing.event.InternalFrameEvent evt) + { + PaintRefresher.RemoveComponent(frame); + openFrameCount--; + windowMenu.remove(menuItem); + JInternalFrame itf = desktop.getSelectedFrame(); + if (itf != null) + { + itf.requestFocus(); + } + System.gc(); + }; + }); menuItem.addActionListener(new ActionListener() { @@ -619,6 +685,47 @@ public class Desktop extends jalview.jbgui.GDesktop implements } } }); + menuItem.addMouseListener(new MouseListener() + { + + @Override + public void mouseReleased(MouseEvent e) + { + } + + @Override + public void mousePressed(MouseEvent e) + { + } + + @Override + public void mouseExited(MouseEvent e) + { + try + { + frame.setSelected(false); + } catch (PropertyVetoException e1) + { + } + } + + @Override + public void mouseEntered(MouseEvent e) + { + try + { + frame.setSelected(true); + } catch (PropertyVetoException e1) + { + } + } + + @Override + public void mouseClicked(MouseEvent e) + { + + } + }); windowMenu.add(menuItem); @@ -631,6 +738,10 @@ public class Desktop extends jalview.jbgui.GDesktop implements } catch (java.beans.PropertyVetoException ve) { } + catch (java.lang.ClassCastException cex) + { + Cache.log.warn("Squashed a possible GUI implementation error. If you can recreate this, please look at http://issues.jalview.org/browse/JAL-869",cex); + } } public void lostOwnership(Clipboard clipboard, Transferable contents) @@ -755,8 +866,8 @@ public class Desktop extends jalview.jbgui.GDesktop implements */ public void inputLocalFileMenuItem_actionPerformed(AlignViewport viewport) { - JalviewFileChooser chooser = new JalviewFileChooser(jalview.bin.Cache - .getProperty("LAST_DIRECTORY"), + JalviewFileChooser chooser = new JalviewFileChooser( + jalview.bin.Cache.getProperty("LAST_DIRECTORY"), jalview.io.AppletFormatAdapter.READABLE_EXTENSIONS, jalview.io.AppletFormatAdapter.READABLE_FNAMES, jalview.bin.Cache.getProperty("DEFAULT_FILE_FORMAT")); @@ -906,6 +1017,12 @@ public class Desktop extends jalview.jbgui.GDesktop implements storeLastKnownDimensions("JAVA_CONSOLE_", jconsole.getBounds()); jconsole.stopConsole(); } + if (jvnews!=null) + { + storeLastKnownDimensions("JALVIEW_RSS_WINDOW_", jvnews.getBounds()); + + } + System.exit(0); } @@ -936,22 +1053,20 @@ public class Desktop extends jalview.jbgui.GDesktop implements if (!jalview.bin.Cache.getProperty("LATEST_VERSION").equals( jalview.bin.Cache.getProperty("VERSION"))) { - message - .append("\n\n!! Jalview version " - + jalview.bin.Cache.getProperty("LATEST_VERSION") - + " is available for download from http://www.jalview.org !!\n"); + message.append("\n\n!! Jalview version " + + jalview.bin.Cache.getProperty("LATEST_VERSION") + + " is available for download from "+jalview.bin.Cache.getDefault("www.jalview.org","http://www.jalview.org")+" !!\n"); } // TODO: update this text for each release or centrally store it for lite // and application - message - .append("\nAuthors: Andrew Waterhouse, Jim Procter, Michele Clamp, James Cuff, Steve Searle,\n David Martin & Geoff Barton." - + "\nDevelopment managed by The Barton Group, University of Dundee, Scotland, UK.\n" - + "\nFor help, see the FAQ at www.jalview.org and/or join the jalview-discuss@jalview.org mailing list\n" - + "\nIf you use Jalview, please cite:" - + "\nWaterhouse, A.M., Procter, J.B., Martin, D.M.A, Clamp, M. and Barton, G. J. (2009)" - + "\nJalview Version 2 - a multiple sequence alignment editor and analysis workbench" - + "\nBioinformatics doi: 10.1093/bioinformatics/btp033"); + message.append("\nAuthors: Jim Procter, Jan Engelhardt, Lauren Lui, Andrew Waterhouse, Michele Clamp, James Cuff, Steve Searle,\n David Martin & Geoff Barton." + + "\nDevelopment managed by The Barton Group, University of Dundee, Scotland, UK.\n" + + "\nFor help, see the FAQ at www.jalview.org and/or join the jalview-discuss@jalview.org mailing list\n" + + "\nIf you use Jalview, please cite:" + + "\nWaterhouse, A.M., Procter, J.B., Martin, D.M.A, Clamp, M. and Barton, G. J. (2009)" + + "\nJalview Version 2 - a multiple sequence alignment editor and analysis workbench" + + "\nBioinformatics doi: 10.1093/bioinformatics/btp033"); JOptionPane.showInternalMessageDialog(Desktop.desktop, message.toString(), "About Jalview", JOptionPane.INFORMATION_MESSAGE); @@ -1164,10 +1279,10 @@ public class Desktop extends jalview.jbgui.GDesktop implements */ public void saveState_actionPerformed(ActionEvent e) { - JalviewFileChooser chooser = new JalviewFileChooser(jalview.bin.Cache - .getProperty("LAST_DIRECTORY"), new String[] - { "jar" }, new String[] - { "Jalview Project" }, "Jalview Project"); + JalviewFileChooser chooser = new JalviewFileChooser( + jalview.bin.Cache.getProperty("LAST_DIRECTORY"), new String[] + { "jar" }, new String[] + { "Jalview Project" }, "Jalview Project"); chooser.setFileView(new JalviewFileView()); chooser.setDialogTitle("Save State"); @@ -1176,14 +1291,37 @@ public class Desktop extends jalview.jbgui.GDesktop implements if (value == JalviewFileChooser.APPROVE_OPTION) { - java.io.File choice = chooser.getSelectedFile(); - JProgressBar progpanel = addProgressPanel("Saving jalview project " - + choice.getName()); + final Desktop me = this; + final java.io.File choice = chooser.getSelectedFile(); + new Thread(new Runnable() + { + public void run() + { + + setProgressBar("Saving jalview project " + choice.getName(), + choice.hashCode()); jalview.bin.Cache.setProperty("LAST_DIRECTORY", choice.getParent()); // TODO catch and handle errors for savestate - new Jalview2XML().SaveState(choice); - removeProgressPanel(progpanel); - + // TODO prevent user from messing with the Desktop whilst we're saving + try + { + new Jalview2XML().SaveState(choice); + } catch (OutOfMemoryError oom) + { + new OOMWarning( + "Whilst saving current state to " + choice.getName(), oom); + } catch (Exception ex) + { + Cache.log + .error("Problems whilst trying to save to " + + choice.getName(), ex); + JOptionPane.showMessageDialog(me, + "Error whilst saving current state to " + choice.getName(), + "Couldn't save project", JOptionPane.WARNING_MESSAGE); + } + setProgressBar(null, choice.hashCode()); + } + }).start(); } } @@ -1195,10 +1333,10 @@ public class Desktop extends jalview.jbgui.GDesktop implements */ public void loadState_actionPerformed(ActionEvent e) { - JalviewFileChooser chooser = new JalviewFileChooser(jalview.bin.Cache - .getProperty("LAST_DIRECTORY"), new String[] - { "jar" }, new String[] - { "Jalview Project" }, "Jalview Project"); + JalviewFileChooser chooser = new JalviewFileChooser( + jalview.bin.Cache.getProperty("LAST_DIRECTORY"), new String[] + { "jar" }, new String[] + { "Jalview Project" }, "Jalview Project"); chooser.setFileView(new JalviewFileView()); chooser.setDialogTitle("Restore state"); @@ -1206,13 +1344,32 @@ public class Desktop extends jalview.jbgui.GDesktop implements if (value == JalviewFileChooser.APPROVE_OPTION) { - String choice = chooser.getSelectedFile().getAbsolutePath(); - setProgressBar("loading jalview project " - + chooser.getSelectedFile().getName(), choice.hashCode()); + final String choice = chooser.getSelectedFile().getAbsolutePath(); jalview.bin.Cache.setProperty("LAST_DIRECTORY", chooser .getSelectedFile().getParent()); - new Jalview2XML().LoadJalviewAlign(choice); - setProgressBar(null, choice.hashCode()); + new Thread(new Runnable() + { + public void run() + { + setProgressBar("loading jalview project " + choice, + choice.hashCode()); + try + { + new Jalview2XML().LoadJalviewAlign(choice); + } catch (OutOfMemoryError oom) + { + new OOMWarning("Whilst loading project from " + choice, oom); + } catch (Exception ex) + { + Cache.log.error("Problems whilst loading project from " + + choice, ex); + JOptionPane.showMessageDialog(Desktop.desktop, + "Error whilst loading project from " + choice, + "Couldn't load project", JOptionPane.WARNING_MESSAGE); + } + setProgressBar(null, choice.hashCode()); + } + }).start(); } } @@ -1222,44 +1379,47 @@ public class Desktop extends jalview.jbgui.GDesktop implements } JPanel progressPanel; - + ArrayList fileLoadingPanels=new ArrayList(); public void startLoading(final String fileName) { if (fileLoadingCount == 0) { - addProgressPanel("Loading File: " + fileName + " "); - + fileLoadingPanels.add(addProgressPanel("Loading File: " + fileName + " ")); } fileLoadingCount++; } - private JProgressBar addProgressPanel(String string) + private JPanel addProgressPanel(String string) { if (progressPanel == null) { - progressPanel = new JPanel(new BorderLayout()); + progressPanel = new JPanel(new GridLayout(1,1)); totalProgressCount = 0; + instance.getContentPane().add(progressPanel, BorderLayout.SOUTH); } + JPanel thisprogress=new JPanel(new BorderLayout(10,5)); JProgressBar progressBar = new JProgressBar(); progressBar.setIndeterminate(true); - progressPanel.add(new JLabel(string), BorderLayout.WEST); + thisprogress.add(new JLabel(string), BorderLayout.WEST); - progressPanel.add(progressBar, BorderLayout.CENTER); - - instance.getContentPane().add(progressPanel, BorderLayout.SOUTH); - totalProgressCount++; - validate(); - return progressBar; + thisprogress.add(progressBar, BorderLayout.CENTER); + progressPanel.add(thisprogress); + ((GridLayout)progressPanel.getLayout()).setRows(((GridLayout)progressPanel.getLayout()).getRows()+1); + ++totalProgressCount; + instance.validate(); + return thisprogress; } int totalProgressCount = 0; - private void removeProgressPanel(JProgressBar progbar) + private void removeProgressPanel(JPanel progbar) { if (progressPanel != null) { progressPanel.remove(progbar); + GridLayout gl = (GridLayout) progressPanel.getLayout(); + gl.setRows(gl.getRows()-1); if (--totalProgressCount < 1) { this.getContentPane().remove(progressPanel); @@ -1274,28 +1434,28 @@ public class Desktop extends jalview.jbgui.GDesktop implements fileLoadingCount--; if (fileLoadingCount < 1) { - if (progressPanel != null) + for (JPanel flp : fileLoadingPanels) { - this.getContentPane().remove(progressPanel); - progressPanel = null; + removeProgressPanel(flp); } + fileLoadingPanels.clear(); fileLoadingCount = 0; } validate(); } - public static int getViewCount(String viewId) + public static int getViewCount(String alignmentId) { - AlignViewport[] aps = getViewports(viewId); + AlignViewport[] aps = getViewports(alignmentId); return (aps == null) ? 0 : aps.length; } /** * - * @param viewId - * @return all AlignmentPanels concerning the viewId sequence set + * @param alignmentId + * @return all AlignmentPanels concerning the alignmentId sequence set */ - public static AlignmentPanel[] getAlignmentPanels(String viewId) + public static AlignmentPanel[] getAlignmentPanels(String alignmentId) { int count = 0; if (Desktop.desktop == null) @@ -1313,7 +1473,7 @@ public class Desktop extends jalview.jbgui.GDesktop implements AlignFrame af = (AlignFrame) frames[t]; for (int a = 0; a < af.alignPanels.size(); a++) { - if (viewId + if (alignmentId .equals(((AlignmentPanel) af.alignPanels.elementAt(a)).av .getSequenceSetId())) { @@ -1455,13 +1615,12 @@ public class Desktop extends jalview.jbgui.GDesktop implements if (v_client == null) { // Load and try to start a session. - JalviewFileChooser chooser = new JalviewFileChooser(jalview.bin.Cache - .getProperty("LAST_DIRECTORY")); + JalviewFileChooser chooser = new JalviewFileChooser( + jalview.bin.Cache.getProperty("LAST_DIRECTORY")); chooser.setFileView(new JalviewFileView()); chooser.setDialogTitle("Open a saved VAMSAS session"); - chooser - .setToolTipText("select a vamsas session to be opened as a new vamsas session."); + chooser.setToolTipText("select a vamsas session to be opened as a new vamsas session."); int value = chooser.showOpenDialog(this); @@ -1516,8 +1675,8 @@ public class Desktop extends jalview.jbgui.GDesktop implements } bis.close(); fos.close(); - v_client = new jalview.gui.VamsasApplication(this, file, url - .toExternalForm()); + v_client = new jalview.gui.VamsasApplication(this, file, + url.toExternalForm()); } catch (Exception ex) { jalview.bin.Cache.log.error( @@ -1546,8 +1705,8 @@ public class Desktop extends jalview.jbgui.GDesktop implements return false; } - setProgressBar("Importing VAMSAS session from " + file.getName(), file - .hashCode()); + setProgressBar("Importing VAMSAS session from " + file.getName(), + file.hashCode()); try { v_client = new jalview.gui.VamsasApplication(this, file, null); @@ -1561,8 +1720,8 @@ public class Desktop extends jalview.jbgui.GDesktop implements } setupVamsasConnectedGui(); v_client.initial_update(); // TODO: thread ? - setProgressBar("Importing VAMSAS session from " + file.getName(), file - .hashCode()); + setProgressBar("Importing VAMSAS session from " + file.getName(), + file.hashCode()); return v_client.inSession(); } @@ -1712,9 +1871,9 @@ public class Desktop extends jalview.jbgui.GDesktop implements { if (v_client != null) { - JalviewFileChooser chooser = new JalviewFileChooser(jalview.bin.Cache - .getProperty("LAST_DIRECTORY"), new String[] - { "vdj" }, // TODO: VAMSAS DOCUMENT EXTENSION is VDJ + JalviewFileChooser chooser = new JalviewFileChooser( + jalview.bin.Cache.getProperty("LAST_DIRECTORY"), new String[] + { "vdj" }, // TODO: VAMSAS DOCUMENT EXTENSION is VDJ new String[] { "Vamsas Document" }, "Vamsas Document"); @@ -1726,7 +1885,7 @@ public class Desktop extends jalview.jbgui.GDesktop implements if (value == JalviewFileChooser.APPROVE_OPTION) { java.io.File choice = chooser.getSelectedFile(); - JProgressBar progpanel = addProgressPanel("Saving VAMSAS Document to " + JPanel progpanel = addProgressPanel("Saving VAMSAS Document to " + choice.getName()); jalview.bin.Cache.setProperty("LAST_DIRECTORY", choice.getParent()); String warnmsg = null; @@ -1760,7 +1919,7 @@ public class Desktop extends jalview.jbgui.GDesktop implements } } - JProgressBar vamUpdate = null; + JPanel vamUpdate = null; /** * hide vamsas user gui bits when a vamsas document event is being handled. @@ -1885,16 +2044,25 @@ public class Desktop extends jalview.jbgui.GDesktop implements FontMetrics fm = g.getFontMetrics(); if (fm != null) { - g.drawString("Total Free Memory: " + df.format(totalFreeMemory) - + "MB; Max Memory: " + df.format(maxMemory) + "MB; " - + df.format(percentUsage) + "%", 10, getHeight() - - fm.getHeight()); + g.drawString( + "Total Free Memory: " + df.format(totalFreeMemory) + + "MB; Max Memory: " + df.format(maxMemory) + + "MB; " + df.format(percentUsage) + "%", 10, + getHeight() - fm.getHeight()); } } } } + /** + * fixes stacking order after a modal dialog to ensure windows that should be on top actually are + */ + public void relayerWindows() + { + + } + protected JMenuItem groovyShell; public void doGroovyCheck() @@ -1954,6 +2122,42 @@ public class Desktop extends jalview.jbgui.GDesktop implements avp.clear(); return afs; } + public AppJmol[] getJmols() + { + JInternalFrame[] frames = Desktop.desktop.getAllFrames(); + + if (frames == null) + { + return null; + } + Vector avp = new Vector(); + try + { + // REVERSE ORDER + for (int i = frames.length - 1; i > -1; i--) + { + if (frames[i] instanceof AppJmol) + { + AppJmol af = (AppJmol) frames[i]; + avp.addElement(af); + } + } + } catch (Exception ex) + { + ex.printStackTrace(); + } + if (avp.size() == 0) + { + return null; + } + AppJmol afs[] = new AppJmol[avp.size()]; + for (int i = 0, j = avp.size(); i < j; i++) + { + afs[i] = (AppJmol) avp.elementAt(i); + } + avp.clear(); + return afs; + } /** * Add Groovy Support to Jalview @@ -1995,7 +2199,8 @@ public class Desktop extends jalview.jbgui.GDesktop implements /** * Progress bars managed by the IProgressIndicator method. */ - private Hashtable progressBars, progressBarHandlers; + private Hashtable progressBars; + private Hashtable progressBarHandlers; /* * (non-Javadoc) @@ -2006,13 +2211,13 @@ public class Desktop extends jalview.jbgui.GDesktop implements { if (progressBars == null) { - progressBars = new Hashtable(); - progressBarHandlers = new Hashtable(); + progressBars = new Hashtable(); + progressBarHandlers = new Hashtable(); } if (progressBars.get(new Long(id)) != null) { - JProgressBar progressPanel = (JProgressBar) progressBars + JPanel progressPanel = progressBars .remove(new Long(id)); if (progressBarHandlers.contains(new Long(id))) { @@ -2052,8 +2257,10 @@ public class Desktop extends jalview.jbgui.GDesktop implements public void actionPerformed(ActionEvent e) { handler.cancelActivity(id); - us.setProgressBar("Cancelled " - + ((JLabel) progressPanel.getComponent(0)).getText(), id); + us.setProgressBar( + "Cancelled " + + ((JLabel) progressPanel.getComponent(0)) + .getText(), id); } }); progressPanel.add(cancel, BorderLayout.EAST); @@ -2089,6 +2296,31 @@ public class Desktop extends jalview.jbgui.GDesktop implements } + /** + * flag set if jalview GUI is being operated programmatically + */ + private boolean inBatchMode = false; + + /** + * check if jalview GUI is being operated programmatically + * + * @return inBatchMode + */ + public boolean isInBatchMode() + { + return inBatchMode; + } + + /** + * set flag if jalview GUI is being operated programmatically + * + * @param inBatchMode + */ + public void setInBatchMode(boolean inBatchMode) + { + this.inBatchMode = inBatchMode; + } + public void startServiceDiscovery() { startServiceDiscovery(false); @@ -2106,7 +2338,8 @@ public class Desktop extends jalview.jbgui.GDesktop implements // register PCS handler for desktop. discoverer.addPropertyChangeListener(changeSupport); } - if (Cache.getDefault("SHOW_JWS1_SERVICES", true)) + // JAL-940 - disabled JWS1 service configuration - always start discoverer until we phase out completely + if (true) { (t0 = new Thread(discoverer)).start(); } @@ -2124,17 +2357,23 @@ public class Desktop extends jalview.jbgui.GDesktop implements } catch (Exception e) { Cache.log - .info( - "Exception when trying to launch Envision2 workflow discovery.", + .info("Exception when trying to launch Envision2 workflow discovery.", e); Cache.log.info(e.getStackTrace()); } if (Cache.getDefault("SHOW_JWS2_SERVICES", true)) { - jalview.ws.jws2.Jws2Discoverer.getDiscoverer() - .addPropertyChangeListener(changeSupport); - (t2 = new Thread(jalview.ws.jws2.Jws2Discoverer.getDiscoverer())) - .start(); + if (jalview.ws.jws2.Jws2Discoverer.getDiscoverer().isRunning()) + { + jalview.ws.jws2.Jws2Discoverer.getDiscoverer().setAborted(true); + } + t2 = jalview.ws.jws2.Jws2Discoverer.getDiscoverer().startDiscoverer( + changeSupport); + + } + Thread t3=null; + { + // TODO: do rest service discovery } if (blocking) { @@ -2148,9 +2387,118 @@ public class Desktop extends jalview.jbgui.GDesktop implements } alive = (t1 != null && t1.isAlive()) || (t2 != null && t2.isAlive()) + || (t3 != null && t3.isAlive()) || (t0 != null && t0.isAlive()); } } } + /** + * called to check if the service discovery process completed successfully. + * + * @param evt + */ + protected void JalviewServicesChanged(PropertyChangeEvent evt) + { + if (evt.getNewValue() == null || evt.getNewValue() instanceof Vector) + { + final String ermsg = jalview.ws.jws2.Jws2Discoverer.getDiscoverer() + .getErrorMessages(); + if (ermsg != null) + { + if (Cache.getDefault("SHOW_WSDISCOVERY_ERRORS", true)) + { + if (serviceChangedDialog == null) + { + // only run if we aren't already displaying one of these. + javax.swing.SwingUtilities + .invokeLater(serviceChangedDialog = new Runnable() + { + public void run() + { + + JOptionPane + .showInternalMessageDialog( + Desktop.desktop, + ermsg + + "It may be that you have invalid JABA URLs\nin your web service preferences.\n\nGo to the Web services tab of the\nTools->Preferences dialog box to change them.\n", + "Preferences Problem", + JOptionPane.WARNING_MESSAGE); + serviceChangedDialog = null; + + } + }); + } + } + else + { + Cache.log + .error("Errors reported by JABA discovery service. Check web services preferences.\n" + + ermsg); + } + } + } + } + + private Runnable serviceChangedDialog = null; + + /** + * start a thread to open a URL in the configured browser. Pops up a warning + * dialog to the user if there is an exception when calling out to the browser + * to open the URL. + * + * @param url + */ + public static void showUrl(final String url) + { + showUrl(url, Desktop.instance); + } + /** + * Like showUrl but allows progress handler to be specified + * @param url + * @param progress (null) or object implementing IProgressIndicator + */ + public static void showUrl(final String url, final IProgressIndicator progress) + { + new Thread(new Runnable() + { + public void run() + { + try + { + if (progress!=null) { + progress.setProgressBar("Opening "+url, this.hashCode()); + } + jalview.util.BrowserLauncher.openURL(url); + } catch (Exception ex) + { + JOptionPane + .showInternalMessageDialog( + Desktop.desktop, + "Unixers: Couldn't find default web browser." + + "\nAdd the full path to your browser in Preferences.", + "Web browser not found", + JOptionPane.WARNING_MESSAGE); + + ex.printStackTrace(); + } + if (progress!=null) { + progress.setProgressBar(null, this.hashCode()); + } + } + }).start(); + } + + public static WsParamSetManager wsparamManager = null; + + public static ParamManager getUserParameterStore() + { + if (wsparamManager == null) + { + wsparamManager = new WsParamSetManager(); + } + return wsparamManager; + } + + }