Changeset 12855 in josm for trunk/src/org/openstreetmap/josm/tools/ImageProvider.java

Timestamp:

2017-09-14T14:39:53+02:00 (7 years ago)

Author:

bastiK

Message:

see #15229 - add separate interface IBaseDirectories to look up pref, user data and cache dir

File:

• trunk/src/org/openstreetmap/josm/tools/ImageProvider.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/tools/ImageProvider.java

@@ -927 +927 @@
      */
     private static ImageResource getIfAvailableHttp(String url, ImageType type) {
-        try (CachedFile cf = new CachedFile(url).setDestDir(new File(Main.pref.getCacheDirectory(), "images").getPath());
+        try (CachedFile cf = new CachedFile(url).setDestDir(
+                new File(Config.getDirs().getCacheDirectory(), "images").getPath());
              InputStream is = cf.getInputStream()) {
             switch (type) {
@@ -1172 +1173 @@
         }
         // Try user-data directory
-        if (Main.pref != null) {
-            String dir = new File(Main.pref.getUserDataDirectory(), "images").getAbsolutePath();
+        if (Config.getDirs() != null) {
+            String dir = new File(Config.getDirs().getUserDataDirectory(), "images").getAbsolutePath();
             try {
                 u = getImageUrl(dir, imageName, additionalClassLoaders);
@@ -1246 +1247 @@
             parser.setEntityResolver((publicId, systemId) -> new InputSource(new ByteArrayInputStream(new byte[0])));
 
-            try (CachedFile cf = new CachedFile(base + fn).setDestDir(new File(Main.pref.getUserDataDirectory(), "images").getPath());
+            try (CachedFile cf = new CachedFile(base + fn).setDestDir(
+                        new File(Config.getDirs().getUserDataDirectory(), "images").getPath());
                  InputStream is = cf.getInputStream()) {
                 parser.parse(new InputSource(is));