From 7553b1d4e5aeb837c94d1281ed91e6635edc37b3 Mon Sep 17 00:00:00 2001 From: James Procter Date: Thu, 2 Nov 2023 23:00:03 +0000 Subject: [PATCH] JAL-4169 fix up urls to faq and documentation --- help/help/html/index.html | 2 +- help/help/html/logging.html | 2 +- src/jalview/gui/Desktop.java | 50 ++++++++++++++++++++++++++---------------- 3 files changed, 33 insertions(+), 21 deletions(-) diff --git a/help/help/html/index.html b/help/help/html/index.html index a6bb1b6..14cf630 100755 --- a/help/help/html/index.html +++ b/help/help/html/index.html @@ -45,7 +45,7 @@

For more information, you might also want to take a look at the documentation section of the Jalview website (https://www.jalview.org/about/documentation). + href="https://www.jalview.org/help">https://www.jalview.org/help).

If you are using the Jalview Desktop application and are looking for diff --git a/help/help/html/logging.html b/help/help/html/logging.html index a7da021..547fff2 100644 --- a/help/help/html/logging.html +++ b/help/help/html/logging.html @@ -163,7 +163,7 @@

If you come across a problem in Jalview where something is not working as described, or how you think it should, you should first - check the Jalview FAQ to + check the Jalview FAQ to see if this is a known problem and if there is a suggested workaround.

diff --git a/src/jalview/gui/Desktop.java b/src/jalview/gui/Desktop.java index 070e67d..a2a344c 100644 --- a/src/jalview/gui/Desktop.java +++ b/src/jalview/gui/Desktop.java @@ -184,7 +184,7 @@ public class Desktop extends jalview.jbgui.GDesktop : " \"University"); sb.append( - "

For help, see www.jalview.org/faq and join discourse.jalview.org"); + "

For help, see www.jalview.org/faq and join discourse.jalview.org"); sb.append("

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" @@ -1478,16 +1478,21 @@ public class Desktop extends jalview.jbgui.GDesktop } /** - * close everything, stash window geometries, and shut down all associated threads/workers - * @param dispose - sets the dispose on close flag - JVM may terminate when set - * @param terminateJvm - quit with prejudice - stops the JVM. + * close everything, stash window geometries, and shut down all associated + * threads/workers + * + * @param dispose + * - sets the dispose on close flag - JVM may terminate when set + * @param terminateJvm + * - quit with prejudice - stops the JVM. */ - public void quitTheDesktop(boolean dispose, boolean terminateJvm) { + public void quitTheDesktop(boolean dispose, boolean terminateJvm) + { Dimension screen = Toolkit.getDefaultToolkit().getScreenSize(); Cache.setProperty("SCREENGEOMETRY_WIDTH", screen.width + ""); Cache.setProperty("SCREENGEOMETRY_HEIGHT", screen.height + ""); - storeLastKnownDimensions("", new Rectangle(getBounds().x, - getBounds().y, getWidth(), getHeight())); + storeLastKnownDimensions("", new Rectangle(getBounds().x, getBounds().y, + getWidth(), getHeight())); if (jconsole != null) { @@ -1530,19 +1535,22 @@ public class Desktop extends jalview.jbgui.GDesktop // instance.dispose(); } } + public QuitHandler.QResponse desktopQuit(boolean ui, boolean disposeFlag) { final Runnable doDesktopQuit = () -> { - // FIRST !! check for aborted quit + // FIRST !! check for aborted quit if (QuitHandler.quitCancelled()) { - jalview.bin.Console.debug("Quit was cancelled - Desktop aborting quit"); + jalview.bin.Console + .debug("Quit was cancelled - Desktop aborting quit"); return; } - + // Proceed with quitting - quitTheDesktop(disposeFlag, QuitHandler.gotQuitResponse() == QResponse.FORCE_QUIT); + quitTheDesktop(disposeFlag, + QuitHandler.gotQuitResponse() == QResponse.FORCE_QUIT); // and exit the JVM instance.quit(); }; @@ -1552,13 +1560,13 @@ public class Desktop extends jalview.jbgui.GDesktop } /** - * Exits the program and the JVM. + * Exits the program and the JVM. * * Don't call this directly * * - use desktopQuit() above to tidy up first. * - * - use closeDesktop() to shutdown Jalview without shutting down the JVM + * - use closeDesktop() to shutdown Jalview without shutting down the JVM * */ @Override @@ -3067,13 +3075,16 @@ public class Desktop extends jalview.jbgui.GDesktop */ public static void showUrl(final String url) { - if (url!=null && !url.trim().equals("")) { - jalview.bin.Console.info("Opening URL: "+url); + if (url != null && !url.trim().equals("")) + { + jalview.bin.Console.info("Opening URL: " + url); showUrl(url, Desktop.instance); - } else { + } + else + { jalview.bin.Console.warn("Ignoring attempt to show an empty URL."); } - + } /** @@ -3724,8 +3735,9 @@ public class Desktop extends jalview.jbgui.GDesktop } /** - * closes the current instance window, but leaves the JVM running. - * Bypasses any shutdown prompts, but does not set window dispose on close in case JVM terminates. + * closes the current instance window, but leaves the JVM running. Bypasses + * any shutdown prompts, but does not set window dispose on close in case JVM + * terminates. */ public static void closeDesktop() { -- 1.7.10.2