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

Timestamp:

2018-08-18T18:12:13+02:00 (6 years ago)

Author:

donvip

Message:

update to JOSM 14153

File:

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

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

@@ -26 +26 @@
 import java.io.OutputStream;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.MapFrame;
@@ -38 +37 @@
 import org.openstreetmap.josm.plugins.Plugin;
 import org.openstreetmap.josm.plugins.PluginInformation;
+import org.openstreetmap.josm.spi.preferences.Config;
 
 import controller.IndoorHelperController;
@@ -97 +97 @@
             byte[] buffer = new byte[4096];
 
-            String valDirPath = Main.pref.getDirs().getUserDataDirectory(true) + sep + "validator";
+            String valDirPath = Config.getDirs().getUserDataDirectory(true) + sep + "validator";
             File valDir = new File(valDirPath);
             valDir.mkdirs();
@@ -126 +126 @@
             byte[] buffer = new byte[4096];
 
-            String valDirPath = Main.pref.getDirs().getUserDataDirectory(true) + sep + "styles";
+            String valDirPath = Config.getDirs().getUserDataDirectory(true) + sep + "styles";
             File valDir = new File(valDirPath);
             valDir.mkdirs();
@@ -172 +172 @@
 //    private void setIndoorValidator() {
 //        //get the current validator settings
-//        Map<String, Setting<?>> settings =  Main.pref.getAllSettings();
+//        Map<String, Setting<?>> settings =  Config.getPref().getAllSettings();
 //        MapListSetting mapListSetting = (MapListSetting) settings.
 //                get("validator.org.openstreetmap.josm.data.validation.tests.MapCSSTagChecker.entries");
@@ -199 +199 @@
 //            indoorValidator.put("title", "Indoor");
 //            indoorValidator.put("active", "true");
-//            indoorValidator.put("url", Main.pref.getUserDataDirectory()+ sep +"validator" +
+//            indoorValidator.put("url", Config.getPref().getUserDataDirectory()+ sep +"validator" +
 //                    sep + "indoorhelper.validator.mapcss");
 //
 //            validatorMapsNew.add(indoorValidator);
-//            Main.pref.putListOfStructs
+//            Config.getPref().putListOfStructs
 //            ("validator.org.openstreetmap.josm.data.validation.tests.MapCSSTagChecker.entries",
 //                    validatorMapsNew);