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 20043)
+++ /applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java	(revision 20044)
@@ -32,6 +32,6 @@
 import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
-import org.openstreetmap.josm.plugins.tageditor.ac.AutoCompletionCache;
-import org.openstreetmap.josm.plugins.tageditor.ac.AutoCompletionList;
+import org.openstreetmap.josm.gui.tagging.ac.AutoCompletionCache;
+import org.openstreetmap.josm.gui.tagging.ac.AutoCompletionList;
 import org.openstreetmap.josm.plugins.tageditor.ac.AutoCompletionListViewer;
 import org.openstreetmap.josm.plugins.tageditor.editor.TagEditor;
@@ -306,5 +306,5 @@
 		model.clearAppliedPresets();
 		model.initFromJOSMSelection();
-		acCache.initFromJOSMDataset();
+		//acCache.initFromJOSMDataset();
 		getModel().ensureOneTag();
 	}
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 20043)
+++ /applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/ac/AutoCompletionListViewer.java	(revision 20044)
@@ -19,11 +19,6 @@
 import javax.swing.ListSelectionModel;
 import javax.swing.table.DefaultTableModel;
+import org.openstreetmap.josm.gui.tagging.ac.AutoCompletionList;
 
-/**
- * 
- * 
- *
- */
-@SuppressWarnings("serial")
 public class AutoCompletionListViewer extends JPanel {
 	
Index: /applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TableCellEditor.java
===================================================================
--- /applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TableCellEditor.java	(revision 20043)
+++ /applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TableCellEditor.java	(revision 20044)
@@ -40,5 +40,4 @@
 	private AutoCompletionList autoCompletionList = null;
 
-
 	/**
 	 * constructor
@@ -77,6 +76,4 @@
 			logger.log(Level.WARNING, "failed to initialize auto completion list with standard keys.", e);
 		}
-
-
 
 		// add the list of keys in the current data set
@@ -246,4 +243,3 @@
 		this.tagEditorModel = tagEditorModel;
 	}
-
 }
Index: /applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditor.java
===================================================================
--- /applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditor.java	(revision 20043)
+++ /applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditor.java	(revision 20044)
@@ -2,7 +2,4 @@
 
 import java.awt.BorderLayout;
-import java.awt.Dimension;
-import java.awt.event.ComponentAdapter;
-import java.awt.event.ComponentEvent;
 import java.util.logging.Logger;
 
@@ -11,6 +8,8 @@
 import javax.swing.ScrollPaneConstants;
 
-import org.openstreetmap.josm.plugins.tageditor.ac.AutoCompletionCache;
-import org.openstreetmap.josm.plugins.tageditor.ac.AutoCompletionList;
+import org.openstreetmap.josm.gui.dialogs.relation.RunnableAction;
+import org.openstreetmap.josm.gui.tagging.TagTable;
+import org.openstreetmap.josm.gui.tagging.ac.AutoCompletionCache;
+import org.openstreetmap.josm.gui.tagging.ac.AutoCompletionList;
 import org.openstreetmap.josm.plugins.tageditor.ac.IAutoCompletionListListener;
 
@@ -78,13 +77,13 @@
 		// getPreferredViewportSize() in JTable, but did not work.
 		//
-		scrollPane.addComponentListener(
-				new ComponentAdapter() {
-					@Override public void componentResized(ComponentEvent e) {
-						super.componentResized(e);
-						Dimension d = scrollPane.getViewport().getExtentSize();
-						tblTagEditor.adjustColumnWidth(d.width);
-					}
-				}
-		);
+//		scrollPane.addComponentListener(
+//				new ComponentAdapter() {
+//					@Override public void componentResized(ComponentEvent e) {
+//						super.componentResized(e);
+//						Dimension d = scrollPane.getViewport().getExtentSize();
+//						tblTagEditor.adjustColumnWidth(d.width);
+//					}
+//				}
+//		);
 
 		// build the preset manager which shows a list of applied presets
@@ -140,11 +139,7 @@
 	}
 
-
-
 	public void clearSelection() {
 		tblTagEditor.getSelectionModel().clearSelection();
 	}
-
-
 
 	public void stopEditing() {
@@ -155,7 +150,7 @@
 	}
 
-
 	public AutoCompletionList getAutoCompletionList() {
-		return ((org.openstreetmap.josm.plugins.tageditor.editor.TableCellEditor)tblTagEditor.getCellEditor()).getAutoCompletionList();
+		return null;
+		//return ((org.openstreetmap.josm.gui.tagging.TagCellEditor)tblTagEditor.getCellEditor()).getAutoCompletionList();
 	}
 
@@ -167,5 +162,4 @@
 		tblTagEditor.setAutoCompletionCache(acCache);
 	}
-
 
 	public void autoCompletionItemSelected(String item) {
@@ -179,9 +173,3 @@
 		tblTagEditor.requestFocusInCell(0,0);
 	}
-
-
-
-
-
-
 }
Index: /applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java
===================================================================
--- /applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java	(revision 20043)
+++ /applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java	(revision 20044)
@@ -32,23 +32,14 @@
 import org.openstreetmap.josm.plugins.tageditor.ac.AutoCompletionList;
 
-
 /**
  * This is the tabular editor component for OSM tags.
  * 
- * 
- * @author Gubaer
- *
  */
 @SuppressWarnings("serial")
 public class TagTable extends JTable  {
-
 	private static Logger logger = Logger.getLogger(TagTable.class.getName());
-
-
 
 	/** the table cell editor used by this table */
 	private TableCellEditor editor = null;
-
-
 
 	/**
@@ -65,5 +56,4 @@
 			TableColumn col = null;
 			TableCellRenderer renderer = new TableCellRenderer();
-
 
 			// column 0 - tag key
@@ -83,5 +73,4 @@
 		}
 	}
-
 
 	/**
@@ -217,6 +206,4 @@
 			getColumnModel().getSelectionModel().addListSelectionListener(this);
 		}
-
-
 
 		@Override
@@ -233,5 +220,5 @@
 					// should not happen
 					//
-					throw new IllegalStateException("unexpected selected clolumn: getSelectedColumn() is " + getSelectedColumn());
+					throw new IllegalStateException("unexpected selected column: getSelectedColumn() is " + getSelectedColumn());
 			} else if (getSelectedColumnCount() == 2) {
 				deleteTags();
@@ -257,5 +244,4 @@
 				setEnabled(false);
 			}
-
 		}
 	}
@@ -300,16 +286,11 @@
 	}
 
-
 	/**
 	 * initialize the table
 	 */
 	protected void init() {
-
-
 		setAutoResizeMode(JTable.AUTO_RESIZE_OFF);
 		setCellSelectionEnabled(true);
 		setSelectionMode(ListSelectionModel.SINGLE_INTERVAL_SELECTION);
-
-
 
 		// make ENTER behave like TAB
@@ -335,5 +316,4 @@
 		getActionMap().put("addTag", addAction);
 
-
 		// create the table cell editor and set it to key and value columns
 		//
@@ -342,5 +322,6 @@
 		getColumnModel().getColumn(0).setCellEditor(editor);
 		getColumnModel().getColumn(1).setCellEditor(editor);
-
+		
+		
 	}
 
@@ -355,6 +336,4 @@
 		init();
 	}
-
-
 
 	/**
@@ -378,5 +357,4 @@
 	}
 
-
 	@Override protected boolean processKeyBinding(KeyStroke ks, KeyEvent e,
 			int condition, boolean pressed) {
@@ -389,5 +367,4 @@
 		return super.processKeyBinding(ks, e, condition, pressed);
 	}
-
 
 	/**
@@ -464,7 +441,4 @@
 			return;
 		}
-
-	}
-
-
+	}
 }