Changeset 7834 in josm for trunk/src/org/openstreetmap/josm/io

Timestamp:

2014-12-19T15:05:33+01:00 (9 years ago)

Author:

Don-vip

Message:

see #10026 - use recommended user data directory on OSX (distinct from preferences directory). Linux and Windows behaviour is unchanged.

Location:

trunk/src/org/openstreetmap/josm/io

Files:

• CachedFile.java (modified) (3 diffs)
• GpxExporter.java (modified) (3 diffs)
• remotecontrol/RemoteControl.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/io/CachedFile.java

@@ -79 +79 @@
      *  <li>{@code http://...} a URL. It will be cached on disk.</li></ul>
      *  <li>{@code resource://SOME/FILE} file from the classpath (usually in the current *.jar)</li>
-     *  <li>{@code josmdir://SOME/FILE} file inside josm config directory (since r7058)</li></ul>
+     *  <li>{@code josmdir://SOME/FILE} file inside josm user data directory (since r7058)</li></ul>
+     *  <li>{@code josmplugindir://SOME/FILE} file inside josm plugin directory (since r7832)</li></ul>
      */
     public CachedFile(String name) {
@@ -92 +93 @@
      *  <li>{@code http://...} a URL. It will be cached on disk.</li></ul>
      *  <li>{@code resource://SOME/FILE} file from the classpath (usually in the current *.jar)</li>
-     *  <li>{@code josmdir://SOME/FILE} file inside josm config directory (since r7058)</li></ul>
+     *  <li>{@code josmdir://SOME/FILE} file inside josm user data directory (since r7058)</li></ul>
+     *  <li>{@code josmplugindir://SOME/FILE} file inside josm plugin directory (since r7832)</li></ul>
      * @return this object
      */
@@ -206 +208 @@
                 return null;
             } else if (name.startsWith("josmdir://")) {
-                cacheFile = new File(Main.pref.getPreferencesDir(), name.substring("josmdir://".length()));
+                cacheFile = new File(Main.pref.getUserDataDirectory(), name.substring("josmdir://".length()));
+            } else if (name.startsWith("josmplugindir://")) {
+                cacheFile = new File(Main.pref.getPluginsDirectory(), name.substring("josmplugindir://".length()));
             } else {
                 cacheFile = new File(name);

trunk/src/org/openstreetmap/josm/io/GpxExporter.java

@@ -200 +200 @@
 
         if (enable) {
-            if (copyrightYear.getText().length()==0) {
+            if (copyrightYear.getText().isEmpty()) {
                 String sCopyrightYear = data.getString(META_COPYRIGHT_YEAR);
                 if (sCopyrightYear == null) {
@@ -207 +207 @@
                 copyrightYear.setText(sCopyrightYear);
             }
-            if (copyright.getText().length()==0) {
+            if (copyright.getText().isEmpty()) {
                 String sCopyright = data.getString(META_COPYRIGHT_LICENSE);
                 if (sCopyright == null) {
@@ -308 +308 @@
                         break;
                     }
-                    license += license.length()==0 ? urls[i] : ", "+urls[i];
+                    license += license.isEmpty() ? urls[i] : ", "+urls[i];
                 }
                 copyright.setText(license);

trunk/src/org/openstreetmap/josm/io/remotecontrol/RemoteControl.java

@@ -2 +2 @@
 package org.openstreetmap.josm.io.remotecontrol;
 
+import java.io.File;
 import java.net.InetAddress;
 import java.net.UnknownHostException;
@@ -28 +29 @@
      * @since 7335
      */
-    public static final BooleanProperty PROP_REMOTECONTROL_HTTPS_ENABLED = new BooleanProperty("remotecontrol.https.enabled", false);
+    public static final BooleanProperty PROP_REMOTECONTROL_HTTPS_ENABLED = new BooleanProperty(
+            "remotecontrol.https.enabled", false);
 
     /**
@@ -72 +74 @@
      */
     public static String getRemoteControlDir() {
-        return Main.pref.getPreferencesDir() + "remotecontrol/";
+        return new File(Main.pref.getUserDataDirectory(), "remotecontrol").getAbsolutePath();
     }