Index: applications/editors/josm/plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/action/AnnotationPresetAction.java
===================================================================
--- applications/editors/josm/plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/action/AnnotationPresetAction.java	(revision 3624)
+++ applications/editors/josm/plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/action/AnnotationPresetAction.java	(revision 3639)
@@ -9,6 +9,6 @@
 
 import org.openstreetmap.josm.data.coor.LatLon;
-import org.openstreetmap.josm.gui.annotation.AnnotationPreset;
-import org.openstreetmap.josm.gui.preferences.AnnotationPresetPreference;
+import org.openstreetmap.josm.gui.tagging.TaggingPreset;
+import org.openstreetmap.josm.gui.preferences.TaggingPresetPreference;
 
 import at.dallermassl.josm.plugin.surveyor.GpsActionEvent;
@@ -21,5 +21,5 @@
 public class AnnotationPresetAction implements SurveyorAction {
     private String presetName;
-    private AnnotationPreset preset;
+    private TaggingPreset preset;
     
 
@@ -58,5 +58,5 @@
         }
         presetName = parameters.get(0);
-        preset = getAnnotationPreset(presetName);
+        preset = getTaggingPreset(presetName);
         if(preset == null) {
             System.err.println("No valid preset '" + parameters.get(0) + "' found - disable action!");
@@ -70,6 +70,6 @@
      * @return  the preset with the given name.
      */
-    protected AnnotationPreset getAnnotationPreset(String name) {
-        for(AnnotationPreset preset : AnnotationPresetPreference.annotationPresets) {
+    protected TaggingPreset getTaggingPreset(String name) {
+        for(TaggingPreset preset : TaggingPresetPreference.taggingPresets) {
             if(name.equals(preset.getValue(Action.NAME))) {
                 return preset;