From: jprocter Date: Sun, 20 Nov 2011 18:46:45 +0000 (+0000) Subject: Merge branch 'patch_JAL-1004' into develop X-Git-Tag: Jalview_2_9~553 X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=c9bcd60e5ed0681116e9bedbd371f7a8b8290126;hp=-c;p=jalview.git Merge branch 'patch_JAL-1004' into develop --- c9bcd60e5ed0681116e9bedbd371f7a8b8290126 diff --combined src/jalview/gui/Desktop.java index 768e130,1da4996..0ab111f --- a/src/jalview/gui/Desktop.java +++ b/src/jalview/gui/Desktop.java @@@ -1,6 -1,6 +1,6 @@@ /* * Jalview - A Sequence Alignment Editor and Viewer (Version 2.7) - * Copyright (C) 2011 J Procter, AM Waterhouse, G Barton, M Clamp, S Searle + * Copyright (C) 2011 J Procter, AM Waterhouse, J Engelhardt, LM Lui, G Barton, M Clamp, S Searle * * This file is part of Jalview. * @@@ -335,7 -335,8 +335,8 @@@ public class Desktop extends jalview.jb } }); - this.addMouseListener(new MouseAdapter() + MouseAdapter ma; + this.addMouseListener(ma=new MouseAdapter() { public void mousePressed(MouseEvent evt) { @@@ -345,6 -346,8 +346,8 @@@ } } }); + desktop.addMouseListener(ma); + this.addFocusListener(new FocusListener() { @@@ -1046,63 -1049,30 +1049,63 @@@ */ public void aboutMenuItem_actionPerformed(ActionEvent e) { - StringBuffer message = new StringBuffer("Jalview version " + StringBuffer message = getAboutMessage(false); + JOptionPane.showInternalMessageDialog(Desktop.desktop, + + message.toString(), "About Jalview", JOptionPane.INFORMATION_MESSAGE); + } + public StringBuffer getAboutMessage(boolean shortv) + { + StringBuffer message=new StringBuffer(); + message.append(""); + if (shortv) + { + message.append("

Jalview " + + jalview.bin.Cache.getProperty("VERSION") + "


"); + message.append("Last Updated: "+jalview.bin.Cache.getDefault("BUILD_DATE", "unknown")+""); + + } else { + + message.append("Jalview version " + jalview.bin.Cache.getProperty("VERSION") + "; last updated: " + jalview.bin.Cache.getDefault("BUILD_DATE", "unknown")); - - if (!jalview.bin.Cache.getProperty("LATEST_VERSION").equals( - jalview.bin.Cache.getProperty("VERSION"))) + } + + if (jalview.bin.Cache.getDefault("LATEST_VERSION", "Checking").equals( + "Checking")) { - 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"); - + message.append("
...Checking latest version...
"); } - // TODO: update this text for each release or centrally store it for lite - // and application - message.append("\nAuthors: Jim Procter, 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); + else if (!jalview.bin.Cache.getDefault("LATEST_VERSION", "Checking") + .equals(jalview.bin.Cache.getProperty("VERSION"))) + { + boolean red=false; + if (jalview.bin.Cache.getProperty("VERSION").toLowerCase() + .indexOf("automated build") == -1) + { + red=true; + // Displayed when code version and jnlp version do not match and code + // version is not a development build + message.append("
"); + } + + message.append("
!! Jalview version " + + jalview.bin.Cache.getDefault("LATEST_VERSION", + "..Checking..") + + " is available for download from "+jalview.bin.Cache.getDefault("www.jalview.org","http://www.jalview.org")+" !!"); + if (red) { + message.append("
"); + } + } + message.append("
Authors: "+jalview.bin.Cache.getDefault("AUTHORNAMES","Jim Procter, Andrew Waterhouse, Jan Engelhardt, Lauren Lui, Michele Clamp, James Cuff, Steve Searle, David Martin & Geoff Barton") + + "
Development managed by The Barton Group, University of Dundee, Scotland, UK.
" + + "
For help, see the FAQ at www.jalview.org and/or join the jalview-discuss@jalview.org mailing list" + + "
If you use Jalview, please cite:" + + "
Waterhouse, A.M., Procter, J.B., Martin, D.M.A, Clamp, M. and Barton, G. J. (2009)" + + "
Jalview Version 2 - a multiple sequence alignment editor and analysis workbench" + + "
Bioinformatics doi: 10.1093/bioinformatics/btp033" + + ""); + return message; } /** @@@ -1611,7 -1581,7 +1614,7 @@@ source.viewport.gatherViewsHere = true; source.viewport.explodedPosition = source.getBounds(); JInternalFrame[] frames = desktop.getAllFrames(); - String viewId = source.viewport.sequenceSetID; + String viewId = source.viewport.getSequenceSetId(); for (int t = 0; t < frames.length; t++) { @@@ -2085,7 -2055,6 +2088,6 @@@ } } } - } /**