Changeset 33798 in osm for applications/editors/josm

Timestamp:

2017-11-07T23:50:14+01:00 (7 years ago)

Author:

donvip

Message:

update to JOSM 13007

Location:

applications/editors/josm/plugins/roadsigns

Files:

• build.xml (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/roadsigns/RoadSignsPlugin.java (modified) (5 diffs)

applications/editors/josm/plugins/roadsigns/build.xml

@@ -4 +4 @@
     <property name="commit.message" value=""/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="12678"/>
+    <property name="plugin.main.version" value="13007"/>
 
     <!--

applications/editors/josm/plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java

@@ -138 +138 @@
             Collection<OsmPrimitive> selPrim = MainApplication.getLayerManager().getEditDataSet().getSelected();
             if (!selPrim.isEmpty()) {
-                Main.pref.put("plugin.roadsigns.addTrafficSignTag", addTrafficSignTag.isSelected());
+                Main.pref.putBoolean("plugin.roadsigns.addTrafficSignTag", addTrafficSignTag.isSelected());
 
                 Command cmd = createCommand(selPrim);

applications/editors/josm/plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignsPlugin.java

@@ -26 +26 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.JosmAction;
-import org.openstreetmap.josm.data.Preferences.pref;
+import org.openstreetmap.josm.data.StructUtils;
+import org.openstreetmap.josm.data.StructUtils.StructEntry;
 import org.openstreetmap.josm.gui.ExtendedDialog;
 import org.openstreetmap.josm.gui.dialogs.properties.PropertiesDialog;
@@ -63 +64 @@
 
     public static File pluginDir() {
-        File dir = new File(plugin.getPluginDir());
+        File dir = plugin.getPluginDirs().getUserDataDirectory(false);
         if (!dir.exists()) {
             dir.mkdirs();
@@ -115 +116 @@
 
     public static class PresetMetaData {
-        @pref public String code;
-        @pref public String display_name;
-        @pref public String preset_path;
-        @pref public String icon_path;
+        @StructEntry public String code;
+        @StructEntry public String display_name;
+        @StructEntry public String preset_path;
+        @StructEntry public String icon_path;
 
         public PresetMetaData() {
@@ -143 +144 @@
     public static List<PresetMetaData> getAvailablePresetsMetaData() {
 
-        List<PresetMetaData> presetsData = Main.pref.getListOfStructs("plugin.roadsigns.presets", DEFAULT_PRESETS, PresetMetaData.class);
+        List<PresetMetaData> presetsData = StructUtils.getListOfStructs(
+                Main.pref, "plugin.roadsigns.presets", DEFAULT_PRESETS, PresetMetaData.class);
 
         String customFile = Main.pref.get("plugin.roadsigns.sources", null);
         if (customFile == null) {
             // for legacy reasons, try both string and collection preference type
-            Collection<String> customFiles = Main.pref.getCollection("plugin.roadsigns.sources", null);
+            List<String> customFiles = Main.pref.getList("plugin.roadsigns.sources", null);
             if (customFiles != null && !customFiles.isEmpty()) {
                 customFile = customFiles.iterator().next();
@@ -164 +166 @@
 
             String customIconDirsStr = Main.pref.get("plugin.roadsigns.icon.sources", null);
-            Collection<String> customIconDirs = null;
+            List<String> customIconDirs = null;
             if (customIconDirsStr != null) {
                 customIconDirs = new ArrayList<>(Arrays.asList(customIconDirsStr.split(",")));
             } else {
-                customIconDirs = Main.pref.getCollection("plugin.roadsigns.icon.sources", null);
+                customIconDirs = Main.pref.getList("plugin.roadsigns.icon.sources", null);
             }
             if (customIconDirs != null) {