Changeset 33887 in osm for applications/editors/josm/plugins/indoorhelper/src/org

Timestamp:

2017-11-25T01:25:40+01:00 (8 years ago)

Author:

donvip

Message:

update to JOSM 12856

File:

• applications/editors/josm/plugins/indoorhelper/src/org/openstreetmap/josm/plugins/indoorhelper/IndoorHelperPlugin.java (modified) (9 diffs)

applications/editors/josm/plugins/indoorhelper/src/org/openstreetmap/josm/plugins/indoorhelper/IndoorHelperPlugin.java

@@ -23 +23 @@
 import java.io.InputStream;
 import java.io.OutputStream;
+
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.gui.MapFrame;
@@ -33 +34 @@
 /**
  * This is the main class for the indoorhelper plug-in.
- * 
+ *
  * @author egru
- * 
+ *
  */
 public class IndoorHelperPlugin extends Plugin {
@@ -46 +47 @@
     /**
      * Constructor for the plug-in.
-     * 
+     *
      * Exports the needed files and adds them to the settings.
-     * 
+     *
      * @param info general information about the plug-in
      */
     public IndoorHelperPlugin(PluginInformation info) throws Exception {
-        super(info);    
+        super(info);
 
         this.exportValidator("/data/indoorhelper.validator.mapcss");
@@ -72 +73 @@
         }
     }
-    
+
     /**
      * Exports the mapcss validator file to the preferences directory.
@@ -92 +93 @@
             byte[] buffer = new byte[4096];
 
-            String valDirPath = Main.pref.getUserDataDirectory() + sep + "validator";
+            String valDirPath = Main.pref.getDirs().getUserDataDirectory(false) + sep + "validator";
             File valDir = new File(valDirPath);
             valDir.mkdirs();
@@ -107 +108 @@
         } finally {
             stream.close();
-        }   
+        }
     }
 
@@ -128 +129 @@
             byte[] buffer = new byte[4096];
 
-            String valDirPath = Main.pref.getUserDataDirectory() + sep + "styles";
+            String valDirPath = Main.pref.getDirs().getUserDataDirectory(false) + sep + "styles";
             File valDir = new File(valDirPath);
             valDir.mkdirs();
@@ -143 +144 @@
         } finally {
             stream.close();
-        }   
+        }
     }
-    
+
     /**
      * Writes the indoor validator file in the user preferences if it isn't there
@@ -179 +180 @@
 //            indoorValidator.put("title", "Indoor");
 //            indoorValidator.put("active", "true");
-//            indoorValidator.put("url", Main.pref.getUserDataDirectory()+ sep +"validator" + 
+//            indoorValidator.put("url", Main.pref.getUserDataDirectory()+ sep +"validator" +
 //                    sep + "indoorhelper.validator.mapcss");
 //
 //            validatorMapsNew.add(indoorValidator);
 //            Main.pref.putListOfStructs
-//            ("validator.org.openstreetmap.josm.data.validation.tests.MapCSSTagChecker.entries", 
+//            ("validator.org.openstreetmap.josm.data.validation.tests.MapCSSTagChecker.entries",
 //                    validatorMapsNew);
 //        }