From e9aa1cee679000405c5549829ee08e1c08b2ffd5 Mon Sep 17 00:00:00 2001 From: jprocter Date: Mon, 14 May 2012 17:53:51 +0100 Subject: [PATCH] formatting --- src/jalview/gui/Desktop.java | 54 ++++++++++++++++++++++++++---------------- 1 file changed, 34 insertions(+), 20 deletions(-) diff --git a/src/jalview/gui/Desktop.java b/src/jalview/gui/Desktop.java index b8c224d..300fcc2 100644 --- a/src/jalview/gui/Desktop.java +++ b/src/jalview/gui/Desktop.java @@ -1065,23 +1065,30 @@ public class Desktop extends jalview.jbgui.GDesktop implements message.toString(), "About Jalview", JOptionPane.INFORMATION_MESSAGE); } + public StringBuffer getAboutMessage(boolean shortv) { - StringBuffer message=new StringBuffer(); + 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")); + + 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.getDefault("LATEST_VERSION", "Checking").equals( "Checking")) { @@ -1090,25 +1097,32 @@ public class Desktop extends jalview.jbgui.GDesktop implements else if (!jalview.bin.Cache.getDefault("LATEST_VERSION", "Checking") .equals(jalview.bin.Cache.getProperty("VERSION"))) { - boolean red=false; + boolean red = false; if (jalview.bin.Cache.getProperty("VERSION").toLowerCase() .indexOf("automated build") == -1) { - red=true; + 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) { + + 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") + } + 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:" -- 1.7.10.2