Ticket #6664: xdg-base-dirs.patch

src/org/openstreetmap/josm/tools/PlatformHookUnixoid.java

@@ -367 +367 @@
         });
     }
 
+    private boolean dotPrefDirExists() {
+        return new File(System.getProperty("user.home"), ".josm").exists();
+    }
+
     @Override
     public File getDefaultCacheDirectory() {
-        return new File(Main.pref.getUserDataDirectory(), "cache");
+        if (dotPrefDirExists()) {
+            return new File(System.getProperty("user.home") + File.separator
+                    + ".josm" + File.separator + "cache");
+        } else {
+            String xdgCacheDir = System.getenv("XDG_CACHE_HOME");
+            if (xdgCacheDir != null && !xdgCacheDir.isEmpty()) {
+                return new File(xdgCacheDir, "JOSM");
+            } else {
+                return new File(System.getProperty("user.home") + File.separator +
+                        ".cache" + File.separator + "JOSM");
+            }
+        }
     }
 
     @Override
     public File getDefaultPrefDirectory() {
-        return new File(System.getProperty("user.home"), ".josm");
+        if (dotPrefDirExists()) {
+            return new File(System.getProperty("user.home"), ".josm");
+        } else {
+            String xdgConfigDir = System.getenv("XDG_CONFIG_HOME");
+            if (xdgConfigDir != null && !xdgConfigDir.isEmpty()) {
+                return new File(xdgConfigDir, "JOSM");
+            } else {
+                return new File(System.getProperty("user.home") + File.separator +
+                        ".config" + File.separator + "JOSM");
+            }
+        }
     }
 
     @Override
     public File getDefaultUserDataDirectory() {
-        // Use preferences directory by default
-        return Main.pref.getPreferencesDirectory();
+        if (dotPrefDirExists()) {
+            return new File(System.getProperty("user.home"), ".josm");
+        } else {
+            String xdgDataDir = System.getenv("XDG_DATA_HOME");
+            if (xdgDataDir != null && !xdgDataDir.isEmpty()) {
+                return new File(xdgDataDir, "JOSM");
+            } else {
+                return new File(System.getProperty("user.home") + File.separator +
+                        ".local" + File.separator + "share" + File.separator + "JOSM");
+            }
+        }
     }
 
 }