From: Ben Soares <b.soares@dundee.ac.uk>
Date: Fri, 28 Jun 2024 11:04:50 +0000 (+0100)
Subject: JAL-3631 Fixed a getdown Exception when launching Jalview in windows
X-Git-Tag: Release_2_11_4_0~24^2~9
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=7a053adc38972f2c3aefa23b22fafe57f158140e;p=jalview.git

JAL-3631 Fixed a getdown Exception when launching Jalview in windows
---

diff --git a/getdown/lib/getdown-core.jar b/getdown/lib/getdown-core.jar
index 9752434..295fe85 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 f148969..94a803b 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 614de25..c50beb1 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/EnvConfig.java b/getdown/src/getdown/core/src/main/java/com/threerings/getdown/data/EnvConfig.java
index 2eef995..0342f70 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
@@ -373,9 +373,6 @@ public final class EnvConfig {
         appDataPath = osAppDataPathMap.get("other");
         append = appdirname.toLowerCase(Locale.ROOT);
       }
-      if (!"/".equals(FS)) {
-        appDataPath = appDataPath.replaceAll("/", FS);
-      }
       String returnString = home + FS + appDataPath + FS + append + FS + "app";
       return returnString;
     }
@@ -417,11 +414,11 @@ public final class EnvConfig {
     private static final Map<String,String> osAppDataPathMap;
     
     static {
-      // paths from user.home with application folder added to end. '/' replaced with file.separator
+      // paths from user.home with application folder added to end.
       osAppDataPathMap = new HashMap<>();
       osAppDataPathMap.put("macos", "Library/Application Support/Jalview-Desktop");
       osAppDataPathMap.put("linux", ".local/share/jalview-desktop");
-      osAppDataPathMap.put("windows", "AppData/Local/Jalview-Desktop");
+      osAppDataPathMap.put("windows", "AppData\\Local\\Jalview-Desktop");
       osAppDataPathMap.put("other", ".jalview-desktop");
     }
 }
diff --git a/j11lib/getdown-core.jar b/j11lib/getdown-core.jar
index 9752434..295fe85 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 9752434..295fe85 100644
Binary files a/j8lib/getdown-core.jar and b/j8lib/getdown-core.jar differ