Fixed Windows classpath and added default directory (fixes mkpaz#42)

ennerf · Jun 9, 2023 · d9d9a7a · d9d9a7a
1 parent e383e65
commit d9d9a7a
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/sampler/src/main/java/atlantafx/sampler/page/general/SceneBuilderDialog.java b/sampler/src/main/java/atlantafx/sampler/page/general/SceneBuilderDialog.java
@@ -181,6 +181,7 @@ private Pane createStartScreen() {
         browseBtn.setMinWidth(120);
         browseBtn.setOnAction(e -> {
             var dirChooser = new DirectoryChooser();
+            dirChooser.setInitialDirectory(SceneBuilderInstaller.getDefaultConfigDir().toFile());
             File dir = dirChooser.showDialog(getScene().getWindow());
             if (dir != null) {
                 model.setInstallDir(dir.toPath());

diff --git a/sampler/src/main/java/atlantafx/sampler/page/general/SceneBuilderInstaller.java b/sampler/src/main/java/atlantafx/sampler/page/general/SceneBuilderInstaller.java
@@ -28,6 +28,7 @@ final class SceneBuilderInstaller {
 
     private static final String CONFIG_FILE_NAME = "SceneBuilder.cfg";
     private static final String THEME_PACK_FILE_NAME = "atlantafx-scene-builder.zip";
+    private static final char CLASSPATH_SEPARATOR = PlatformUtils.isWindows() ? ';' : ':';
 
     private final Path sceneBuilderDir;
     private Path configDir;
@@ -169,7 +170,7 @@ public void uninstall() {
                 while (it.hasNext()) {
                     var line = it.next();
                     if (line != null && line.startsWith("app.classpath")) {
-                        it.set(line.replace("$APPDIR" + File.separator + THEME_PACK_FILE_NAME + ":", ""));
+                        it.set(line.replace("$APPDIR" + File.separator + THEME_PACK_FILE_NAME + CLASSPATH_SEPARATOR, ""));
                     }
                 }
 
@@ -221,6 +222,18 @@ public static void deleteFile(Path path) {
         }
     }
 
+    public static Path getDefaultConfigDir() {
+        if (PlatformUtils.isWindows()) {
+            return Path.of(System.getProperty("user.home"), "AppData", "Local", "SceneBuilder");
+        } else if (PlatformUtils.isLinux()) {
+            return Path.of("/opt/scenebuilder/");
+        } else if (PlatformUtils.isUnix()) {
+            return Path.of("/Applications/SceneBuilder.app/");
+        } else {
+            return Path.of(".");
+        }
+    }
+
     private Path getConfigDir() {
         if (configDir != null) {
             return configDir;