From: Ben Soares <b.soares@dundee.ac.uk>
Date: Tue, 7 Jul 2020 19:39:04 +0000 (+0100)
Subject: Merge branch 'bug/JAL-3628_Unable_to_save_update_to_existing_file_in_Windows' into... 
X-Git-Tag: Release_2_11_1_1~13^2~26^2~6
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=c65c736a21956464c8e0a01e7c3188f8340c4c5f;hp=-c;p=jalview.git

Merge branch 'bug/JAL-3628_Unable_to_save_update_to_existing_file_in_Windows' into task/JAL-3608_property_set_laf_and_tests_from_Release_2_11_1_Branch
---

c65c736a21956464c8e0a01e7c3188f8340c4c5f
diff --combined src/jalview/bin/Cache.java
index 751461f,bb3ea76..dbe85fe
--- a/src/jalview/bin/Cache.java
+++ b/src/jalview/bin/Cache.java
@@@ -27,6 -27,8 +27,8 @@@ import java.io.FileInputStream
  import java.io.FileOutputStream;
  import java.io.InputStream;
  import java.io.InputStreamReader;
+ import java.io.PrintWriter;
+ import java.io.StringWriter;
  import java.text.DateFormat;
  import java.text.SimpleDateFormat;
  import java.util.Collections;
@@@ -36,10 -38,6 +38,10 @@@ import java.util.Locale
  import java.util.Properties;
  import java.util.StringTokenizer;
  import java.util.TreeSet;
 +import java.util.regex.Pattern;
 +
 +import javax.swing.LookAndFeel;
 +import javax.swing.UIManager;
  
  import org.apache.log4j.ConsoleAppender;
  import org.apache.log4j.Level;
@@@ -440,8 -438,7 +442,7 @@@ public class Cach
      String jnlpVersion = System.getProperty("jalview.version");
  
      // jnlpVersion will be null if a latest version check for the channel needs
-     // to
-     // be done
+     // to be done
      // Dont do this check if running in headless mode
  
      if (jnlpVersion == null && getDefault("VERSION_CHECK", true)
@@@ -1125,12 -1122,9 +1126,16 @@@
              System.getProperty("installer_template_version"), "\n", null);
      appendIfNotNull(sb, "Launcher version: ",
              System.getProperty("launcher_version"), "\n", null);
 -    if (jalview.bin.Cache.getDefault("VERSION", "TEST")
 -            .equals("DEVELOPMENT"))
 +    LookAndFeel laf = UIManager.getLookAndFeel();
-     String lafName = laf == null?"Not obtained":laf.getName();
-     String lafClass = laf == null?"unknown":laf.getClass().getName();
-     appendIfNotNull(sb, "LookAndFeel: ", lafName+" ("+lafClass+")", "\n", null);
-     // Not displayed in release version ( determined by possible version number regex 9[9.]*9[.-_a9]* )
-     if (Pattern.matches("^\\d[\\d\\.]*\\d[\\.\\-\\w]*$", jalview.bin.Cache.getDefault("VERSION", "TEST"))) {
++    String lafName = laf == null ? "Not obtained" : laf.getName();
++    String lafClass = laf == null ? "unknown" : laf.getClass().getName();
++    appendIfNotNull(sb, "LookAndFeel: ", lafName + " (" + lafClass + ")",
++            "\n", null);
++    // Not displayed in release version ( determined by possible version number
++    // regex 9[9.]*9[.-_a9]* )
++    if (Pattern.matches("^\\d[\\d\\.]*\\d[\\.\\-\\w]*$",
++            jalview.bin.Cache.getDefault("VERSION", "TEST")))
+     {
        appendIfNotNull(sb, "Getdown appdir: ",
                System.getProperty("getdownappdir"), "\n", null);
        appendIfNotNull(sb, "Java home: ", System.getProperty("java.home"),
@@@ -1149,4 -1143,12 +1154,12 @@@
      // eg 'built from Source' or update channel
      return jalview.bin.Cache.getDefault("INSTALLATION", "unknown");
    }
+ 
+   public static String getStackTraceString(Throwable t)
+   {
+     StringWriter sw = new StringWriter();
+     PrintWriter pw = new PrintWriter(sw);
+     t.printStackTrace(pw);
+     return sw.toString();
+   }
  }