Index: applications/editors/josm/plugins/FixAddresses/build.xml
===================================================================
--- applications/editors/josm/plugins/FixAddresses/build.xml	(revision 29661)
+++ applications/editors/josm/plugins/FixAddresses/build.xml	(revision 29778)
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <project name="FixAddresses" default="dist" basedir=".">
-	<!-- enter the SVN commit message -->
-	<property name="commit.message" value="fix compile error (core changes)"/>
-	<!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="6010"/>
+    <!-- enter the SVN commit message -->
+    <property name="commit.message" value="fix compile error (core changes)"/>
+    <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
+    <property name="plugin.main.version" value="6082"/>
 	
     <!-- Configure these properties (replace "..." accordingly).
Index: applications/editors/josm/plugins/FixAddresses/nbproject/project.xml
===================================================================
--- applications/editors/josm/plugins/FixAddresses/nbproject/project.xml	(revision 29778)
+++ applications/editors/josm/plugins/FixAddresses/nbproject/project.xml	(revision 29778)
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://www.netbeans.org/ns/project/1">
+    <type>org.netbeans.modules.ant.freeform</type>
+    <configuration>
+        <general-data xmlns="http://www.netbeans.org/ns/freeform-project/1">
+            <name>FixAddresses</name>
+        </general-data>
+        <general-data xmlns="http://www.netbeans.org/ns/freeform-project/2">
+            <!-- Не используйте диалоговое окно свойств проекта при редактировании данного файла вручную. -->
+            <name>FixAddresses</name>
+            <properties/>
+            <folders>
+                <source-folder>
+                    <label>src</label>
+                    <type>java</type>
+                    <location>src</location>
+                    <encoding>UTF-8</encoding>
+                </source-folder>
+                <source-folder>
+                    <label>FixAddresses</label>
+                    <location>.</location>
+                    <encoding>UTF-8</encoding>
+                </source-folder>
+            </folders>
+            <ide-actions>
+                <action name="build">
+                    <target>compile</target>
+                </action>
+                <action name="clean">
+                    <target>clean</target>
+                </action>
+                <action name="run">
+                    <target>runjosm</target>
+                </action>
+                <action name="rebuild">
+                    <target>clean</target>
+                    <target>compile</target>
+                </action>
+            </ide-actions>
+            <view>
+                <items>
+                    <source-folder style="packages">
+                        <label>src</label>
+                        <location>src</location>
+                    </source-folder>
+                    <source-file>
+                        <location>build.xml</location>
+                    </source-file>
+                </items>
+                <context-menu>
+                    <ide-action name="build"/>
+                    <ide-action name="rebuild"/>
+                    <ide-action name="clean"/>
+                    <ide-action name="run"/>
+                </context-menu>
+            </view>
+        </general-data>
+        <java-data xmlns="http://www.netbeans.org/ns/freeform-project-java/3">
+            <compilation-unit>
+                <package-root>src</package-root>
+                <classpath mode="compile">../../core/src</classpath>
+                <source-level>1.6</source-level>
+            </compilation-unit>
+        </java-data>
+    </configuration>
+</project>
Index: applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/FixAddressesPlugin.java
===================================================================
--- applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/FixAddressesPlugin.java	(revision 29661)
+++ applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/FixAddressesPlugin.java	(revision 29778)
@@ -14,6 +14,8 @@
 package org.openstreetmap.josm.plugins.fixAddresses;
 
+import javax.swing.JMenu;
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.gui.IconToggleButton;
+import org.openstreetmap.josm.gui.MainMenu;
 import org.openstreetmap.josm.gui.MapFrame;
 import org.openstreetmap.josm.gui.preferences.PreferenceSetting;
@@ -41,7 +43,6 @@
 
 		// ... and add them to the tools menu in main
-		Main.main.menu.toolsMenu.addSeparator();
-		Main.main.menu.toolsMenu.add(action);
-		Main.main.menu.toolsMenu.add(incAddrAction);
+                MainMenu.add(Main.main.menu.dataMenu, action, false, 0);
+		MainMenu.add(Main.main.menu.selectionMenu, incAddrAction);
 
 		// create preferences instance