Index: /applications/editors/josm/plugins/surveyor/build.xml
===================================================================
--- /applications/editors/josm/plugins/surveyor/build.xml	(revision 30439)
+++ /applications/editors/josm/plugins/surveyor/build.xml	(revision 30440)
@@ -7,5 +7,5 @@
     <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"/>
 
Index: /applications/editors/josm/plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/action/TaggingPresetAction.java
===================================================================
--- /applications/editors/josm/plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/action/TaggingPresetAction.java	(revision 30439)
+++ /applications/editors/josm/plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/action/TaggingPresetAction.java	(revision 30440)
@@ -10,6 +10,6 @@
 
 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,9 +24,5 @@
     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,9 +45,5 @@
     }
 
-
-    /* (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,5 +52,5 @@
         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,6 +64,6 @@
      */
     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,5 +71,3 @@
         return null;
     }
-
-
 }