Changeset 33887 in osm for applications/editors/josm/plugins/indoorhelper/src/controller/IndoorHelperController.java

Timestamp:

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

Author:

donvip

Message:

update to JOSM 12856

File:

• applications/editors/josm/plugins/indoorhelper/src/controller/IndoorHelperController.java (modified) (8 diffs)

applications/editors/josm/plugins/indoorhelper/src/controller/IndoorHelperController.java

@@ -37 +37 @@
 import org.openstreetmap.josm.data.validation.OsmValidator;
 import org.openstreetmap.josm.data.validation.tests.MapCSSTagChecker;
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.dialogs.FilterDialog;
 import org.openstreetmap.josm.gui.dialogs.FilterTableModel;
@@ -77 +78 @@
 
         addToolboxListeners();
-        Main.map.addToggleDialog(toolboxView);
+        MainApplication.getMap().addToggleDialog(toolboxView);
     }
 
@@ -142 +143 @@
 
                 // Delete the indoor filters
-                FilterDialog filterDialog = Main.map.getToggleDialog(FilterDialog.class);
+                FilterDialog filterDialog = MainApplication.getMap().getToggleDialog(FilterDialog.class);
 
                 if (filterDialog != null) {
@@ -394 +395 @@
      */
     private void setPluginPreferences(boolean enabled) {
-        Collection<Map<String, String>> validatorMaps = 
-                Main.pref.getListOfStructs("validator.org.openstreetmap.josm.data.validation.tests.MapCSSTagChecker.entries",
+        Collection<Map<String, String>> validatorMaps =
+                Main.pref.getListOfMaps("validator.org.openstreetmap.josm.data.validation.tests.MapCSSTagChecker.entries",
                 new ArrayList<>());
-        Collection<Map<String, String>> styleMaps = 
-                Main.pref.getListOfStructs("mappaint.style.entries", new ArrayList<>());
+        Collection<Map<String, String>> styleMaps =
+                Main.pref.getListOfMaps("mappaint.style.entries", new ArrayList<>());
 
         if (enabled) {
@@ -418 +419 @@
             indoorValidator.put("title", "Indoor");
             indoorValidator.put("active", "true");
-            indoorValidator.put("url", Main.pref.getUserDataDirectory()+ sep +"validator" +
+            indoorValidator.put("url", Main.pref.getDirs().getUserDataDirectory(false)+ sep +"validator" +
                     sep + "indoorhelper.validator.mapcss");
 
             validatorMapsNew.add(indoorValidator);
-            Main.pref.putListOfStructs("validator.org.openstreetmap.josm.data.validation.tests.MapCSSTagChecker.entries",
+            Main.pref.putListOfMaps("validator.org.openstreetmap.josm.data.validation.tests.MapCSSTagChecker.entries",
                     validatorMapsNew);
 
@@ -441 +442 @@
             indoorMapPaint.put("title", "Indoor");
             indoorMapPaint.put("active", "true");
-            indoorMapPaint.put("url", Main.pref.getUserDataDirectory() + sep + "styles"
+            indoorMapPaint.put("url", Main.pref.getDirs().getUserDataDirectory(false) + sep + "styles"
                     + sep + "indoor.mapcss");
             styleMapsNew.add(indoorMapPaint);
-            Main.pref.putListOfStructs("mappaint.style.entries", styleMapsNew);
+            Main.pref.putListOfMaps("mappaint.style.entries", styleMapsNew);
 
             updateSettings();
@@ -465 +466 @@
             indoorValidator.put("title", "Indoor");
             indoorValidator.put("active", "false");
-            indoorValidator.put("url", Main.pref.getUserDataDirectory()+ sep +"validator" +
+            indoorValidator.put("url", Main.pref.getDirs().getUserDataDirectory(false)+ sep +"validator" +
                     sep + "indoorhelper.validator.mapcss");
 
             validatorMapsNew.add(indoorValidator);
-            Main.pref.putListOfStructs("validator.org.openstreetmap.josm.data.validation.tests.MapCSSTagChecker.entries",
+            Main.pref.putListOfMaps("validator.org.openstreetmap.josm.data.validation.tests.MapCSSTagChecker.entries",
                     validatorMapsNew);
 
@@ -489 +490 @@
             indoorMapPaint.put("title", "Indoor");
             indoorMapPaint.put("active", "false");
-            indoorMapPaint.put("url", Main.pref.getUserDataDirectory() + sep + "styles"
+            indoorMapPaint.put("url", Main.pref.getDirs().getUserDataDirectory(false) + sep + "styles"
                     + sep + "indoor.mapcss");
             styleMapsNew.add(indoorMapPaint);
-            Main.pref.putListOfStructs("mappaint.style.entries", styleMapsNew);
+            Main.pref.putListOfMaps("mappaint.style.entries", styleMapsNew);
 
             updateSettings();