Index: /applications/editors/josm/plugins/tageditor/build.xml
===================================================================
--- /applications/editors/josm/plugins/tageditor/build.xml	(revision 33805)
+++ /applications/editors/josm/plugins/tageditor/build.xml	(revision 33806)
@@ -2,5 +2,5 @@
 <project name="tageditor" default="dist" basedir=".">
     <property name="commit.message" value="Tageditor:  help shortcut parser, rebuild"/>
-    <property name="plugin.main.version" value="12678"/>
+    <property name="plugin.main.version" value="12859"/>
     
 	<property name="plugin.author" value="Karl Guggisberg"/>
Index: /applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java
===================================================================
--- /applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java	(revision 33805)
+++ /applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java	(revision 33806)
@@ -28,5 +28,4 @@
 
 import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.Tag;
@@ -283,5 +282,5 @@
         tagEditor.getModel().clearAppliedPresets();
         tagEditor.getModel().initFromJOSMSelection();
-        autocomplete = MainApplication.getLayerManager().getEditLayer().data.getAutoCompletionManager();
+        autocomplete = AutoCompletionManager.of(MainApplication.getLayerManager().getEditLayer().data);
         tagEditor.setAutoCompletionManager(autocomplete);
         getModel().ensureOneTag();
@@ -320,6 +319,4 @@
             setVisible(false);
             tagEditor.getModel().updateJOSMSelection();
-            DataSet ds = MainApplication.getLayerManager().getEditDataSet();
-            ds.fireSelectionChanged();
             Main.parent.repaint(); // repaint all - drawing could have been changed
         }
Index: /applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/ac/AutoCompletionListRenderer.java
===================================================================
--- /applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/ac/AutoCompletionListRenderer.java	(revision 33805)
+++ /applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/ac/AutoCompletionListRenderer.java	(revision 33806)
@@ -15,6 +15,6 @@
 import javax.swing.table.TableCellRenderer;
 
-import org.openstreetmap.josm.gui.tagging.ac.AutoCompletionItemPriority;
-import org.openstreetmap.josm.gui.tagging.ac.AutoCompletionListItem;
+import org.openstreetmap.josm.data.tagging.ac.AutoCompletionItem;
+import org.openstreetmap.josm.data.tagging.ac.AutoCompletionPriority;
 
 /**
@@ -28,10 +28,10 @@
 
     /** the icon used to decorate items of priority
-     *  {@link AutoCompletionItemPriority#IS_IN_STANDARD}
+     *  {@link AutoCompletionPriority#IS_IN_STANDARD}
      */
     private Icon iconStandard;
 
     /** the icon used to decorate items of priority
-     *  {@link AutoCompletionItemPriority#IS_IN_SELECTION}
+     *  {@link AutoCompletionPriority#IS_IN_SELECTION}
      */
     private Icon iconSelection;
@@ -71,10 +71,10 @@
      * @param item the item to be rendered
      */
-    protected void prepareRendererIcon(AutoCompletionListItem item) {
-        if (item.getPriority().equals(AutoCompletionItemPriority.IS_IN_STANDARD)) {
+    protected void prepareRendererIcon(AutoCompletionItem item) {
+        if (item.getPriority().equals(AutoCompletionPriority.IS_IN_STANDARD)) {
             if (iconStandard != null) {
                 setIcon(iconStandard);
             }
-        } else if (item.getPriority().equals(AutoCompletionItemPriority.IS_IN_SELECTION)) {
+        } else if (item.getPriority().equals(AutoCompletionPriority.IS_IN_SELECTION)) {
             if (iconSelection != null) {
                 setIcon(iconSelection);
@@ -110,6 +110,6 @@
         // set icon and text
         //
-        if (value instanceof AutoCompletionListItem) {
-            AutoCompletionListItem item = (AutoCompletionListItem) value;
+        if (value instanceof AutoCompletionItem) {
+            AutoCompletionItem item = (AutoCompletionItem) value;
             prepareRendererIcon(item);
             setText(item.getValue());
Index: /applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/ac/AutoCompletionListViewer.java
===================================================================
--- /applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/ac/AutoCompletionListViewer.java	(revision 33805)
+++ /applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/ac/AutoCompletionListViewer.java	(revision 33806)
@@ -77,5 +77,5 @@
                         if (e.getClickCount() == 2) {
                             int row = table.getSelectedRow();
-                            String item = autoCompletionList.getFilteredItem(row).getValue();
+                            String item = autoCompletionList.getFilteredItemAt(row).getValue();
                             fireAutoCompletionListItemSelected(item);
                         }
Index: /applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagSpecificationAwareTagCellEditor.java
===================================================================
--- /applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagSpecificationAwareTagCellEditor.java	(revision 33805)
+++ /applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagSpecificationAwareTagCellEditor.java	(revision 33806)
@@ -4,8 +4,8 @@
 import java.util.logging.Logger;
 
+import org.openstreetmap.josm.data.tagging.ac.AutoCompletionItem;
+import org.openstreetmap.josm.data.tagging.ac.AutoCompletionPriority;
 import org.openstreetmap.josm.gui.tagging.TagCellEditor;
 import org.openstreetmap.josm.gui.tagging.TagModel;
-import org.openstreetmap.josm.gui.tagging.ac.AutoCompletionItemPriority;
-import org.openstreetmap.josm.gui.tagging.ac.AutoCompletionListItem;
 import org.openstreetmap.josm.plugins.tageditor.ac.AutoCompletionContext;
 import org.openstreetmap.josm.plugins.tageditor.tagspec.TagSpecifications;
@@ -100,5 +100,5 @@
                 //logger.info("adding ac item " + value + " with priority IN_SELECTION");;
                 autoCompletionList.add(
-                        new AutoCompletionListItem(value, AutoCompletionItemPriority.IS_IN_SELECTION)
+                        new AutoCompletionItem(value, AutoCompletionPriority.IS_IN_SELECTION)
                 );
             }
Index: /applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/TagSpecifications.java
===================================================================
--- /applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/TagSpecifications.java	(revision 33805)
+++ /applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/TagSpecifications.java	(revision 33806)
@@ -14,6 +14,6 @@
 
 import org.openstreetmap.josm.data.osm.Tag;
-import org.openstreetmap.josm.gui.tagging.ac.AutoCompletionItemPriority;
-import org.openstreetmap.josm.gui.tagging.ac.AutoCompletionListItem;
+import org.openstreetmap.josm.data.tagging.ac.AutoCompletionItem;
+import org.openstreetmap.josm.data.tagging.ac.AutoCompletionPriority;
 import org.openstreetmap.josm.plugins.tageditor.ac.AutoCompletionContext;
 import org.xml.sax.Attributes;
@@ -126,20 +126,17 @@
     }
 
-    public List<AutoCompletionListItem> getKeysForAutoCompletion(AutoCompletionContext context) {
-        ArrayList<AutoCompletionListItem> keys = new ArrayList<>();
+    public List<AutoCompletionItem> getKeysForAutoCompletion(AutoCompletionContext context) {
+        ArrayList<AutoCompletionItem> keys = new ArrayList<>();
         for (TagSpecification spec : tagSpecifications) {
             if (!spec.isApplicable(context)) {
                 continue;
             }
-            AutoCompletionListItem item = new AutoCompletionListItem();
-            item.setValue(spec.getKey());
-            item.setPriority(AutoCompletionItemPriority.IS_IN_STANDARD);
-            keys.add(item);
+            keys.add(new AutoCompletionItem(spec.getKey(), AutoCompletionPriority.IS_IN_STANDARD));
         }
         return keys;
     }
 
-    public List<AutoCompletionListItem> getLabelsForAutoCompletion(String forKey, AutoCompletionContext context) {
-        ArrayList<AutoCompletionListItem> items = new ArrayList<>();
+    public List<AutoCompletionItem> getLabelsForAutoCompletion(String forKey, AutoCompletionContext context) {
+        ArrayList<AutoCompletionItem> items = new ArrayList<>();
         for (TagSpecification spec : tagSpecifications) {
             if (spec.getKey().equals(forKey)) {
@@ -149,8 +146,5 @@
                         continue;
                     }
-                    AutoCompletionListItem item = new AutoCompletionListItem();
-                    item.setValue(l.getValue());
-                    item.setPriority(AutoCompletionItemPriority.IS_IN_STANDARD);
-                    items.add(item);
+                    items.add(new AutoCompletionItem(l.getValue(), AutoCompletionPriority.IS_IN_STANDARD));
                 }
             }