Index: applications/editors/josm/plugins/HouseNumberTaggingTool/src/org/openstreetmap/josm/plugins/housenumbertool/LaunchAction.java
===================================================================
--- applications/editors/josm/plugins/HouseNumberTaggingTool/src/org/openstreetmap/josm/plugins/housenumbertool/LaunchAction.java	(revision 34516)
+++ applications/editors/josm/plugins/HouseNumberTaggingTool/src/org/openstreetmap/josm/plugins/housenumbertool/LaunchAction.java	(revision 34517)
@@ -5,13 +5,13 @@
 import java.awt.event.KeyEvent;
 import java.io.File;
-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 {
 
     private OsmPrimitive selection = null;
@@ -31,5 +31,5 @@
 
         this.pluginDir = pluginDir;
-        DataSet.addSelectionListener(this);
+        SelectionEventManager.getInstance().addSelectionListener(this);
         setEnabled(false);
     }
@@ -53,5 +53,6 @@
 
     @Override
-    public void selectionChanged(Collection<? extends OsmPrimitive> newSelection) {
+    public void selectionChanged(SelectionChangeEvent event) {
+        Set<OsmPrimitive> newSelection = event.getSelection();
         if (newSelection != null && newSelection.size() == 1) {
             setEnabled(true);
Index: applications/editors/josm/plugins/HouseNumberTaggingTool/src/org/openstreetmap/josm/plugins/housenumbertool/TagDialog.java
===================================================================
--- applications/editors/josm/plugins/HouseNumberTaggingTool/src/org/openstreetmap/josm/plugins/housenumbertool/TagDialog.java	(revision 34516)
+++ applications/editors/josm/plugins/HouseNumberTaggingTool/src/org/openstreetmap/josm/plugins/housenumbertool/TagDialog.java	(revision 34517)
@@ -37,8 +37,8 @@
 import javax.swing.SwingUtilities;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.command.ChangePropertyCommand;
 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.tagging.ac.AutoCompletionItem;
@@ -106,5 +106,5 @@
      */
     public TagDialog(File pluginDir, OsmPrimitive selection) {
-        super(Main.parent, tr("House Number Editor"), new String[] { tr("OK"), tr("Cancel") }, true);
+        super(MainApplication.getMainFrame(), tr("House Number Editor"), new String[] { tr("OK"), tr("Cancel") }, true);
         this.pluginDir = pluginDir;
         this.selection = selection;
@@ -521,5 +521,5 @@
 
             // executes the commands and adds them to the undo/redo chains
-            Main.main.undoRedo.add(sequenceCommand);
+            UndoRedoHandler.getInstance().add(sequenceCommand);
         }
     }