Changeset 14148 in josm for trunk/src/org/openstreetmap
- Timestamp:
- 2018-08-12T15:37:38+02:00 (7 years ago)
- Location:
- trunk/src/org/openstreetmap/josm
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/data/Preferences.java
r14147 r14148 219 219 * @return the base name of the JOSM directories for preferences, cache and user data 220 220 */ 221 public String getJOSMDirectoryBaseName() { 221 public static String getJOSMDirectoryBaseName() { 222 222 String name = getSystemProperty("josm.dir.name"); 223 223 if (name != null) -
trunk/src/org/openstreetmap/josm/tools/PlatformHookOsx.java
r13647 r14148 30 30 31 31 import org.openstreetmap.josm.Main; 32 import org.openstreetmap.josm.data.Preferences; 32 33 import org.openstreetmap.josm.io.CertificateAmendment.NativeCertAmend; 33 34 … … 423 424 public File getDefaultCacheDirectory() { 424 425 return new File(getSystemProperty("user.home")+"/Library/Caches", 425 Main.pref.getJOSMDirectoryBaseName());426 Preferences.getJOSMDirectoryBaseName()); 426 427 } 427 428 … … 429 430 public File getDefaultPrefDirectory() { 430 431 return new File(getSystemProperty("user.home")+"/Library/Preferences", 431 Main.pref.getJOSMDirectoryBaseName());432 Preferences.getJOSMDirectoryBaseName()); 432 433 } 433 434 … … 435 436 public File getDefaultUserDataDirectory() { 436 437 return new File(getSystemProperty("user.home")+"/Library", 437 Main.pref.getJOSMDirectoryBaseName());438 Preferences.getJOSMDirectoryBaseName()); 438 439 } 439 440 -
trunk/src/org/openstreetmap/josm/tools/PlatformHookUnixoid.java
r14144 r14148 30 30 import java.util.concurrent.ExecutionException; 31 31 32 import org.openstreetmap.josm. Main;32 import org.openstreetmap.josm.data.Preferences; 33 33 import org.openstreetmap.josm.io.CertificateAmendment.NativeCertAmend; 34 34 import org.openstreetmap.josm.spi.preferences.Config; … … 349 349 */ 350 350 private static File getDotDirectory() { 351 String dirName = "." + Main.pref.getJOSMDirectoryBaseName().toLowerCase(Locale.ENGLISH);351 String dirName = "." + Preferences.getJOSMDirectoryBaseName().toLowerCase(Locale.ENGLISH); 352 352 return new File(getSystemProperty("user.home"), dirName); 353 353 } … … 370 370 String xdgCacheDir = getSystemEnv("XDG_CACHE_HOME"); 371 371 if (xdgCacheDir != null && !xdgCacheDir.isEmpty()) { 372 return new File(xdgCacheDir, Main.pref.getJOSMDirectoryBaseName());372 return new File(xdgCacheDir, Preferences.getJOSMDirectoryBaseName()); 373 373 } else { 374 374 return new File(getSystemProperty("user.home") + File.separator + 375 ".cache" + File.separator + Main.pref.getJOSMDirectoryBaseName());375 ".cache" + File.separator + Preferences.getJOSMDirectoryBaseName()); 376 376 } 377 377 } … … 385 385 String xdgConfigDir = getSystemEnv("XDG_CONFIG_HOME"); 386 386 if (xdgConfigDir != null && !xdgConfigDir.isEmpty()) { 387 return new File(xdgConfigDir, Main.pref.getJOSMDirectoryBaseName());387 return new File(xdgConfigDir, Preferences.getJOSMDirectoryBaseName()); 388 388 } else { 389 389 return new File(getSystemProperty("user.home") + File.separator + 390 ".config" + File.separator + Main.pref.getJOSMDirectoryBaseName());390 ".config" + File.separator + Preferences.getJOSMDirectoryBaseName()); 391 391 } 392 392 } … … 400 400 String xdgDataDir = getSystemEnv("XDG_DATA_HOME"); 401 401 if (xdgDataDir != null && !xdgDataDir.isEmpty()) { 402 return new File(xdgDataDir, Main.pref.getJOSMDirectoryBaseName());402 return new File(xdgDataDir, Preferences.getJOSMDirectoryBaseName()); 403 403 } else { 404 404 return new File(getSystemProperty("user.home") + File.separator + 405 ".local" + File.separator + "share" + File.separator + Main.pref.getJOSMDirectoryBaseName());405 ".local" + File.separator + "share" + File.separator + Preferences.getJOSMDirectoryBaseName()); 406 406 } 407 407 } -
trunk/src/org/openstreetmap/josm/tools/PlatformHookWindows.java
r14144 r14148 78 78 79 79 import org.openstreetmap.josm.Main; 80 import org.openstreetmap.josm.data.Preferences; 80 81 import org.openstreetmap.josm.data.StructUtils; 81 82 import org.openstreetmap.josm.data.StructUtils.StructEntry; … … 484 485 p = getSystemEnv("APPDATA"); 485 486 } 486 return new File(new File(p, Main.pref.getJOSMDirectoryBaseName()), "cache");487 return new File(new File(p, Preferences.getJOSMDirectoryBaseName()), "cache"); 487 488 } 488 489 489 490 @Override 490 491 public File getDefaultPrefDirectory() { 491 return new File(getSystemEnv("APPDATA"), Main.pref.getJOSMDirectoryBaseName());492 return new File(getSystemEnv("APPDATA"), Preferences.getJOSMDirectoryBaseName()); 492 493 } 493 494
Note:
See TracChangeset
for help on using the changeset viewer.