Index: /applications/editors/josm/plugins/tageditor/build.xml
===================================================================
--- /applications/editors/josm/plugins/tageditor/build.xml	(revision 34559)
+++ /applications/editors/josm/plugins/tageditor/build.xml	(revision 34560)
@@ -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="12859"/>
+    <property name="plugin.main.version" value="14153"/>
     
 	<property name="plugin.author" value="Karl Guggisberg"/>
Index: /applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java
===================================================================
--- /applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java	(revision 34559)
+++ /applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java	(revision 34560)
@@ -6,13 +6,13 @@
 import java.awt.event.ActionEvent;
 import java.awt.event.KeyEvent;
-import java.util.Collection;
+import java.util.Set;
 
 import org.openstreetmap.josm.actions.JosmAction;
-import org.openstreetmap.josm.data.SelectionChangedListener;
-import org.openstreetmap.josm.data.osm.DataSet;
+import org.openstreetmap.josm.data.osm.DataSelectionListener;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.data.osm.event.SelectionEventManager;
 import org.openstreetmap.josm.tools.Shortcut;
 
-public class LaunchAction extends JosmAction implements SelectionChangedListener {
+public class LaunchAction extends JosmAction implements DataSelectionListener {
 
     public LaunchAction() {
@@ -25,5 +25,5 @@
                 true, "tageditor/launch", true);
 
-        DataSet.addSelectionListener(this);
+        SelectionEventManager.getInstance().addSelectionListener(this);
         setEnabled(false);
     }
@@ -46,5 +46,6 @@
 
     @Override
-    public void selectionChanged(Collection<? extends OsmPrimitive> newSelection) {
+    public void selectionChanged(SelectionChangeEvent event) {
+        Set<OsmPrimitive> newSelection = event.getSelection();
         setEnabled(newSelection != null && newSelection.size() > 0);
     }
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 34559)
+++ /applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java	(revision 34560)
@@ -27,5 +27,4 @@
 import javax.swing.SwingUtilities;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.Tag;
@@ -264,5 +263,5 @@
                     getClass().getName() + ".geometry",
                     WindowGeometry.centerInWindow(
-                            Main.parent,
+                            MainApplication.getMainFrame(),
                             PREFERRED_SIZE
                     )
@@ -319,5 +318,5 @@
             setVisible(false);
             tagEditor.getModel().updateJOSMSelection();
-            Main.parent.repaint(); // repaint all - drawing could have been changed
+            MainApplication.getMainFrame().repaint(); // repaint all - drawing could have been changed
         }
 
Index: /applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java
===================================================================
--- /applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java	(revision 34559)
+++ /applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java	(revision 34560)
@@ -12,4 +12,5 @@
 import org.openstreetmap.josm.command.Command;
 import org.openstreetmap.josm.command.SequenceCommand;
+import org.openstreetmap.josm.data.UndoRedoHandler;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.Tag;
@@ -167,5 +168,5 @@
 
         // executes the commands and adds them to the undo/redo chains
-        MainApplication.undoRedo.add(command);
+        UndoRedoHandler.getInstance().add(command);
     }
 
Index: /applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/PresetsTableColumnModel.java
===================================================================
--- /applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/PresetsTableColumnModel.java	(revision 34559)
+++ /applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/PresetsTableColumnModel.java	(revision 34560)
@@ -1,9 +1,10 @@
 // License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.plugins.tageditor.preset.ui;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
 
 import javax.swing.table.DefaultTableColumnModel;
 import javax.swing.table.TableCellRenderer;
 import javax.swing.table.TableColumn;
-import static org.openstreetmap.josm.tools.I18n.tr;
 
 public class PresetsTableColumnModel extends DefaultTableColumnModel {