Changeset 30440 in osm for applications

Timestamp:

2014-05-11T01:03:31+02:00 (11 years ago)

Author:

donvip

Message:

[josm_surveyor] update to JOSM 7100

Location:

applications/editors/josm/plugins/surveyor

Files:

• build.xml (modified) (1 diff)
• src/at/dallermassl/josm/plugin/surveyor/action/TaggingPresetAction.java (modified) (6 diffs)

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

@@ -7 +7 @@
     <property name="commit.message" value="Changed the constructor signature of the plugin main class"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="7001"/>
+    <property name="plugin.main.version" value="7100"/>
     <property name="livegpsplugin.jar" value="${plugin.dist.dir}/livegps.jar"/>
 

applications/editors/josm/plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/action/TaggingPresetAction.java

@@ -10 +10 @@
 
 import org.openstreetmap.josm.data.coor.LatLon;
-import org.openstreetmap.josm.gui.preferences.map.TaggingPresetPreference;
 import org.openstreetmap.josm.gui.tagging.TaggingPreset;
+import org.openstreetmap.josm.gui.tagging.TaggingPresets;
 
 import at.dallermassl.josm.plugin.surveyor.GpsActionEvent;
@@ -24 +24 @@
     private TaggingPreset preset;
 
-
-    /* (non-Javadoc)
-     * @see at.dallermassl.josm.plugin.surveyor.SurveyorAction#actionPerformed(at.dallermassl.josm.plugin.surveyor.GpsActionEvent)
-     */
-    //@Override
+    @Override
     public void actionPerformed(GpsActionEvent event) {
         if(preset == null) {
@@ -49 +45 @@
     }
 
-
-    /* (non-Javadoc)
-     * @see at.dallermassl.josm.plugin.surveyor.SurveyorAction#setParameters(java.util.List)
-     */
-    //@Override
+    @Override
     public void setParameters(List<String> parameters) {
         if(parameters.size() == 0) {
@@ -60 +52 @@
         presetName = parameters.get(0);
         preset = getAnnotationPreset(presetName);
-        if(preset == null) {
+        if (preset == null) {
             System.err.println("No valid preset '" + parameters.get(0) + "' found - disable action!");
             return;
@@ -72 +64 @@
      */
     protected TaggingPreset getAnnotationPreset(String name) {
-        for(TaggingPreset preset : TaggingPresetPreference.taggingPresets) {
-            if(name.equals(preset.getValue(Action.NAME))) {
+        for (TaggingPreset preset : TaggingPresets.getTaggingPresets()) {
+            if (name.equals(preset.getValue(Action.NAME))) {
                 return preset;
             }
@@ -79 +71 @@
         return null;
     }
-
-
 }