Index: applications/editors/josm/plugins/namemanager/src/org/openstreetmap/josm/plugins/namemanager/NameManagerMain.java
===================================================================
--- applications/editors/josm/plugins/namemanager/src/org/openstreetmap/josm/plugins/namemanager/NameManagerMain.java	(revision 27906)
+++ 	(revision )
@@ -1,15 +1,0 @@
-package org.openstreetmap.josm.plugins.namemanager;
-
-/**
- * This is the main class of {@link NameManagerPlugin}
- * 
- * @author Rafal Jachowicz, Harman/Becker Automotive Systems (master's thesis)
- * 
- */
-public class NameManagerMain {
-
-    public static void main(String[] args) {
-    }
-
-}
-
Index: applications/editors/josm/plugins/namemanager/src/org/openstreetmap/josm/plugins/namemanager/NameManagerPlugin.java
===================================================================
--- applications/editors/josm/plugins/namemanager/src/org/openstreetmap/josm/plugins/namemanager/NameManagerPlugin.java	(revision 27906)
+++ applications/editors/josm/plugins/namemanager/src/org/openstreetmap/josm/plugins/namemanager/NameManagerPlugin.java	(revision 29778)
@@ -16,5 +16,5 @@
     public NameManagerPlugin(PluginInformation info) {
         super(info);
-        MainMenu.add(Main.main.menu.toolsMenu, new NameManagerAction());
+        MainMenu.add(Main.main.menu.dataMenu, new NameManagerAction());
     }
 }
Index: applications/editors/josm/plugins/namemanager/src/org/openstreetmap/josm/plugins/namemanager/listeners/NameManagerAction.java
===================================================================
--- applications/editors/josm/plugins/namemanager/src/org/openstreetmap/josm/plugins/namemanager/listeners/NameManagerAction.java	(revision 27906)
+++ applications/editors/josm/plugins/namemanager/src/org/openstreetmap/josm/plugins/namemanager/listeners/NameManagerAction.java	(revision 29778)
@@ -45,4 +45,5 @@
      * @see java.awt.event.ActionListener#actionPerformed(java.awt.event.ActionEvent)
      */
+    @Override
     public void actionPerformed(ActionEvent e) {
         if (!isEnabled()) {
@@ -67,4 +68,5 @@
      * @see org.openstreetmap.josm.data.SelectionChangedListener#selectionChanged(java.util.Collection)
      */
+    @Override
     public void selectionChanged(Collection<? extends OsmPrimitive> newSelection) {
         setEnabled(newSelection != null