From: Ben Soares Date: Mon, 17 Jun 2019 19:15:00 +0000 (+0100) Subject: JAL-3310 JAL-3300 two getdown fixes merged X-Git-Tag: Release_2_11_0~6^2^2~6 X-Git-Url: http://source.jalview.org/gitweb/?p=jalview.git;a=commitdiff_plain;h=ebe6d6c49b13eceb339f0a83c3f2f58ea70d02b4;hp=e1961abdd45299594a8c01a049da9242bf98094e JAL-3310 JAL-3300 two getdown fixes merged --- diff --git a/build.gradle b/build.gradle index f851c7d..9aedd2f 100644 --- a/build.gradle +++ b/build.gradle @@ -432,9 +432,9 @@ cleanTest { delete cloverInstrDir } +// format is a string like date.format("dd MMMM yyyy") def getDate(format) { def date = new Date() - //return date.format("dd MMMM yyyy") return date.format(format) } @@ -466,9 +466,9 @@ task createBuildProperties(type: WriteProperties) { inputs.dir("$jalviewDir/$resourceDir") outputFile "$classes/$buildPropertiesFile" // taking time specific comment out to allow better incremental builds - //comment "--Jalview Build Details--\n"+getDate("yyyy-MM-dd HH:mm:ss") - comment "--Jalview Build Details--\n"+getDate("yyyy-MM-dd") - property "BUILD_DATE", getDate("dd MMMM yyyy") + comment "--Jalview Build Details--\n"+getDate("yyyy-MM-dd HH:mm:ss") + //comment "--Jalview Build Details--\n"+getDate("yyyy-MM-dd") + property "BUILD_DATE", getDate("HH:mm:ss dd MMMM yyyy") property "VERSION", JALVIEW_VERSION property "INSTALLATION", INSTALLATION+" git-commit:"+project.ext.gitHash+" ["+project.ext.gitBranch+"]" outputs.file(outputFile) diff --git a/getdown/lib/getdown-core-1.8.3-SNAPSHOT.jar b/getdown/lib/getdown-core-1.8.3-SNAPSHOT.jar index 2949778..bbeb351 100644 Binary files a/getdown/lib/getdown-core-1.8.3-SNAPSHOT.jar and b/getdown/lib/getdown-core-1.8.3-SNAPSHOT.jar differ diff --git a/getdown/lib/getdown-launcher.jar b/getdown/lib/getdown-launcher.jar index e57d4e8..6323dc9 100644 Binary files a/getdown/lib/getdown-launcher.jar and b/getdown/lib/getdown-launcher.jar differ diff --git a/getdown/src/getdown/core/src/main/java/jalview/bin/MemorySetting.java b/getdown/src/getdown/core/src/main/java/jalview/bin/MemorySetting.java index b3bae2d..8af09da 100644 --- a/getdown/src/getdown/core/src/main/java/jalview/bin/MemorySetting.java +++ b/getdown/src/getdown/core/src/main/java/jalview/bin/MemorySetting.java @@ -24,7 +24,7 @@ public class MemorySetting } catch (NoClassDefFoundError e) { // com.sun.management.OperatingSystemMXBean doesn't exist in this JVM - System.out.println("No com.sun.management.OperatingSystemMXBean"); + System.err.println("No com.sun.management.OperatingSystemMXBean"); } // We didn't get a com.sun.management.OperatingSystemMXBean. diff --git a/getdown/src/getdown/launcher/src/main/java/com/threerings/getdown/launcher/GetdownApp.java b/getdown/src/getdown/launcher/src/main/java/com/threerings/getdown/launcher/GetdownApp.java index 367db7c..2d19089 100644 --- a/getdown/src/getdown/launcher/src/main/java/com/threerings/getdown/launcher/GetdownApp.java +++ b/getdown/src/getdown/launcher/src/main/java/com/threerings/getdown/launcher/GetdownApp.java @@ -27,7 +27,6 @@ import javax.swing.JFrame; import javax.swing.KeyStroke; import javax.swing.WindowConstants; -import com.install4j.api.launcher.StartupNotification; import com.samskivert.swing.util.SwingUtil; import com.threerings.getdown.data.Application; import com.threerings.getdown.data.EnvConfig; @@ -35,6 +34,7 @@ import com.threerings.getdown.data.SysProps; import com.threerings.getdown.util.LaunchUtil; import com.threerings.getdown.util.StringUtil; import static com.threerings.getdown.Log.log; +import jalview.bin.StartupNotificationListener; /** * The main application entry point for Getdown. @@ -94,18 +94,16 @@ public class GetdownApp try { - StartupNotification.registerStartupListener( - new StartupNotification.Listener() { - @Override - public void startupPerformed(String parameters) - { - log.warning("StartupNotification.Listener.startupPerformed: '"+parameters+"'"); - setStartupFilesParameterString(parameters); - } - }); + jalview.bin.StartupNotificationListener.setListener(); } catch (Exception e) { e.printStackTrace(); + } catch (NoClassDefFoundError e) + { + log.warning("Starting without install4j classes"); + } catch (Throwable t) + { + t.printStackTrace(); } // record a few things for posterity diff --git a/getdown/src/getdown/launcher/src/main/java/jalview/bin/StartupNotificationListener.java b/getdown/src/getdown/launcher/src/main/java/jalview/bin/StartupNotificationListener.java new file mode 100644 index 0000000..5c6c7c3 --- /dev/null +++ b/getdown/src/getdown/launcher/src/main/java/jalview/bin/StartupNotificationListener.java @@ -0,0 +1,29 @@ +package jalview.bin; + +import com.threerings.getdown.launcher.GetdownApp; +import static com.threerings.getdown.Log.log; + +public class StartupNotificationListener { + + public static void setListener() { + + + try { + com.install4j.api.launcher.StartupNotification.registerStartupListener( + new com.install4j.api.launcher.StartupNotification.Listener() { + @Override + public void startupPerformed(String parameters) { + log.info("StartupNotification.Listener.startupPerformed: '"+parameters+"'"); + GetdownApp.setStartupFilesParameterString(parameters); + } + } + ); + } catch (Exception e) { + e.printStackTrace(); + } catch (NoClassDefFoundError t) { + log.warning("Starting without install4j classes"); + } + + } + +} diff --git a/getdown/src/getdown/pom.xml b/getdown/src/getdown/pom.xml index f19fa54..78d67b0 100644 --- a/getdown/src/getdown/pom.xml +++ b/getdown/src/getdown/pom.xml @@ -65,7 +65,7 @@ com.install4j install4j-runtime 7.0.11 - + provided diff --git a/help/help/html/releases.html b/help/help/html/releases.html index e7b2f47..8cebf4f 100755 --- a/help/help/html/releases.html +++ b/help/help/html/releases.html @@ -58,93 +58,169 @@ li:before { 2.11
- tbc/06/2019 + 20/06/2019 +
  • Enhanced visualisation and analysis of Sequence Features + +
    • +
  • + Backup files created when saving Jalview project + or alignment files +
    • +
  • Principal Components Analysis Viewer + +
    • +
  • + New 'Colour by Sequence ID' option +
    • +
  • Speed and Efficiency + +
  • User Interface +
    • +
  • Java 11 Support +
    • + Deprecations - Release Processes + Development and Release Processes