From: Ben Soares <b.soares@dundee.ac.uk>
Date: Thu, 31 Oct 2024 17:56:55 +0000 (+0000)
Subject: JAL-4477 Forcing UTF-8 system properties through install4j launch and getdown launch... 
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=cdbb251c7791c9ccb11327bc5149ddd09a0bc2da;p=jalview.git

JAL-4477 Forcing UTF-8 system properties through install4j launch and getdown launch. Works with Java 11 when 'Worldwide language' support is set.
---

diff --git a/getdown/lib/getdown-core.jar b/getdown/lib/getdown-core.jar
index 5d149ac..e52042f 100644
Binary files a/getdown/lib/getdown-core.jar and b/getdown/lib/getdown-core.jar differ
diff --git a/getdown/lib/getdown-launcher-local.jar b/getdown/lib/getdown-launcher-local.jar
index 28781a0..4ae1f62 100644
Binary files a/getdown/lib/getdown-launcher-local.jar and b/getdown/lib/getdown-launcher-local.jar differ
diff --git a/getdown/lib/getdown-launcher.jar b/getdown/lib/getdown-launcher.jar
index fd2b05f..331e5d0 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/com/threerings/getdown/data/Application.java b/getdown/src/getdown/core/src/main/java/com/threerings/getdown/data/Application.java
index 5378f62..7f43b30 100644
--- a/getdown/src/getdown/core/src/main/java/com/threerings/getdown/data/Application.java
+++ b/getdown/src/getdown/core/src/main/java/com/threerings/getdown/data/Application.java
@@ -1099,7 +1099,8 @@ public class Application
         addSystemPropertyIfNotNull(args, "installer.logfile");
         addSystemPropertyIfNotNull(args, "installer.logfile_append");
         addSystemPropertyIfNotNull(args, "installer.extrainfo");
-        addSystemPropertyIfNotNull(args, "sun.jnu.encoding");
+        args.add("-Dsun.jnu.encoding=UTF-8");
+        args.add("-Dfile.encoding=UTF-8");
         
         // backward compatibility (old getdown-launcher.jar)
         args.add("-Dgetdownappdir=" + getAppDir());
@@ -2089,7 +2090,7 @@ public class Application
         FileUtils.mkdirs(userAppDir);
       }
       if (!(applicationAppDir.isDirectory() && userAppDir.isDirectory())) {
-        log.warning("Parameter not a directory", "applicaitonAppDirName", applicationAppDirName, "userAppDirName", userAppDirName);
+        log.warning("Parameter not a directory", "applicationAppDirName", applicationAppDirName, "userAppDirName", userAppDirName);
         return false;
       }
       File configFile = new File(applicationAppDir, CONFIG_FILE);
diff --git a/getdown/src/getdown/core/src/main/java/com/threerings/getdown/data/EnvConfig.java b/getdown/src/getdown/core/src/main/java/com/threerings/getdown/data/EnvConfig.java
index 7c4f669..d1ae75f 100644
--- a/getdown/src/getdown/core/src/main/java/com/threerings/getdown/data/EnvConfig.java
+++ b/getdown/src/getdown/core/src/main/java/com/threerings/getdown/data/EnvConfig.java
@@ -21,6 +21,7 @@ import java.util.jar.Attributes;
 import java.util.jar.JarInputStream;
 import java.util.jar.Manifest;
 
+import com.threerings.getdown.data.Application;
 import com.threerings.getdown.util.Config;
 import com.threerings.getdown.util.LaunchUtil;
 import com.threerings.getdown.util.StringUtil;
@@ -30,7 +31,6 @@ import jalview.util.FileUtils;
 import jalview.util.HttpUtils;
 import jalview.util.LaunchUtils;
 
-import com.threerings.getdown.data.Application;
 
 /** Configuration that comes from our "environment" (command line args, sys props, etc.). */
 public final class EnvConfig {
diff --git a/j11lib/getdown-core.jar b/j11lib/getdown-core.jar
index 5d149ac..e52042f 100644
Binary files a/j11lib/getdown-core.jar and b/j11lib/getdown-core.jar differ
diff --git a/j8lib/getdown-core.jar b/j8lib/getdown-core.jar
index 5d149ac..e52042f 100644
Binary files a/j8lib/getdown-core.jar and b/j8lib/getdown-core.jar differ
diff --git a/utils/install4j/install4j11_template.install4j b/utils/install4j/install4j11_template.install4j
index 312ee1b..705e0ea 100644
--- a/utils/install4j/install4j11_template.install4j
+++ b/utils/install4j/install4j11_template.install4j
@@ -152,7 +152,7 @@
           <versionLine x="85" y="109" text="version ${compiler:sys.version}" />
         </text>
       </splashScreen>
-      <java mainClass="com.threerings.getdown.launcher.GetdownApp" vmParameters="-Dsun.jnu.encoding=UTF-8 -Duserdefaultappdir=true -Dpopulatedefaultappdir=true -Dappid=jalview -Dinstaller.template_version=${compiler:INSTALLER_TEMPLATE_VERSION} -Dinstaller.appdir=&quot;${launcher:sys.launcherDirectory}&quot; -Dinstaller.application_folder=&quot;${compiler:APPLICATION_FOLDER}&quot; -Dchannel.app_name=&quot;${compiler:JALVIEW_APPLICATION_NAME}&quot; -Dinstaller.icon=&quot;${compiler:PNG_ICON_FILE}&quot; -Dinstaller.mac_icons=&quot;${compiler:MAC_ICONS_FILE}&quot; -Dinstaller.logfile=&quot;~/.${compiler:LOG_FILE}&quot; -Dinstaller.logfile_append=true" arguments="&quot;&quot; &quot;&quot;">
+      <java mainClass="com.threerings.getdown.launcher.GetdownApp" vmParameters="-Dsun.jnu.encoding=UTF-8 -Dfile.encoding=UTF-8 -Duserdefaultappdir=true -Dpopulatedefaultappdir=true -Dappid=jalview -Dinstaller.template_version=${compiler:INSTALLER_TEMPLATE_VERSION} -Dinstaller.appdir=&quot;${installer:sys.contentDir}&quot; -Dinstaller.application_folder=&quot;${compiler:APPLICATION_FOLDER}&quot; -Dchannel.app_name=&quot;${compiler:JALVIEW_APPLICATION_NAME}&quot; -Dinstaller.icon=&quot;${compiler:PNG_ICON_FILE}&quot; -Dinstaller.mac_icons=&quot;${compiler:MAC_ICONS_FILE}&quot; -Dinstaller.logfile=&quot;~/.${compiler:LOG_FILE}&quot; -Dinstaller.logfile_append=true" arguments="&quot;&quot; &quot;&quot;">
         <classPath>
           <archive location="getdown-launcher.jar" failOnError="false" />
           <archive location="${compiler:GETDOWN_INSTALL_DIR}/getdown-launcher.jar" failOnError="false" />