Changeset 31509 in osm for applications/editors/josm/plugins

Timestamp:

2015-08-18T20:33:19+02:00 (9 years ago)

Author:

niplecrumple

Message:

Patch from simon04: problem with path fixed

Location:

applications/editors/josm/plugins/rasterfilters/src/org/openstreetmap/josm/plugins/rasterfilters

Files:

• RasterFiltersPlugin.java (modified) (1 diff)
• preferences/FiltersDownloader.java (modified) (4 diffs)

applications/editors/josm/plugins/rasterfilters/src/org/openstreetmap/josm/plugins/rasterfilters/RasterFiltersPlugin.java

@@ -43 +43 @@
 
                         // opening file with last user's settings
-                        file = new File(file.getAbsoluteFile() + "\\urls.map");
+                        file = new File(file.getAbsoluteFile(), "urls.map");
                         if (!file.exists()) {
                                 try {

applications/editors/josm/plugins/rasterfilters/src/org/openstreetmap/josm/plugins/rasterfilters/preferences/FiltersDownloader.java

@@ -220 +220 @@
 
         public static void initFilters() {
-                File file = new File(pluginDir + "\\urls.map");
+                File file = new File(pluginDir, "urls.map");
                 Main.debug("EXIST FILE? " + file.exists());
 
@@ -286 +286 @@
         public static void loadBinariesFromMeta(Set<JsonObject> metaList) {
 
-                File file = new File(pluginDir + "\\urls.map");
+                File file = new File(pluginDir, "urls.map");
 
                 FileWriter fileWriter = null;
@@ -338 +338 @@
 
                 String localFile = null;
+                File plugin = new File(pluginDir);
 
                 if (m.find()) {
 
-                        File plugin = new File(pluginDir);
                         if (plugin.exists()) {
 
-                                String plugDir = plugin.getAbsolutePath();
-                                localFile = plugDir + "\\" + fromUrl.substring(m.end());
+                                localFile = fromUrl.substring(m.end());
 
                         }
@@ -353 +352 @@
                         url = new URL(fromUrl);
                         con = url.openConnection();
-                        File file = new File(localFile);
+                        String plugDir = plugin.getAbsolutePath();
+                        File file = new File(plugDir, localFile);
 
                         if (file.exists()) {