Index: /applications/editors/josm/plugins/ImportImagePlugin/nbproject/project.xml
===================================================================
--- /applications/editors/josm/plugins/ImportImagePlugin/nbproject/project.xml	(revision 29803)
+++ /applications/editors/josm/plugins/ImportImagePlugin/nbproject/project.xml	(revision 29803)
@@ -0,0 +1,67 @@
+<?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>ImportImagePlugin</name>
+        </general-data>
+        <general-data xmlns="http://www.netbeans.org/ns/freeform-project/2">
+            <!-- Не используйте диалоговое окно свойств проекта при редактировании данного файла вручную. -->
+            <name>ImportImagePlugin</name>
+            <properties/>
+            <folders>
+                <source-folder>
+                    <label>ImportImagePlugin</label>
+                    <location>.</location>
+                    <encoding>UTF-8</encoding>
+                </source-folder>
+                <source-folder>
+                    <label>src</label>
+                    <type>java</type>
+                    <location>src</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>
+            <subprojects/>
+        </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;../jts/lib/jts-1.13.jar;../log4j/lib/log4j-1.2.17.jar;../geotools/lib/commons-beanutils-1.7.0.jar;../geotools/lib/commons-pool-1.5.4.jar;../geotools/lib/gt-api-9.3.jar;../geotools/lib/gt-coverage-9.3.jar;../geotools/lib/gt-data-9.3.jar;../geotools/lib/gt-epsg-extension-9.3.jar;../geotools/lib/gt-epsg-hsql-9.3.jar;../geotools/lib/gt-geotiff-9.3.jar;../geotools/lib/gt-main-9.3.jar;../geotools/lib/gt-metadata-9.3.jar;../geotools/lib/gt-opengis-9.3.jar;../geotools/lib/gt-referencing-9.3.jar;../geotools/lib/gt-shapefile-9.3.jar;../geotools/lib/hsqldb-1.8.0.7.jar;../geotools/lib/imageio-ext-tiff-1.1.7.jar;../geotools/lib/imageio-ext-utilities-1.1.7.jar;../geotools/lib/jai_codec-1.1.3.jar;../geotools/lib/jai_core-1.1.3.jar;../geotools/lib/jai_imageio-1.1.jar;../geotools/lib/jdom-1.0.jar;../geotools/lib/jsr-275-1.0-beta-2.jar;../geotools/lib/jt-contour-1.3.0.jar;../geotools/lib/jt-rangelookup-1.3.0.jar;../geotools/lib/jt-utils-1.3.0.jar;../geotools/lib/jt-vectorbinarize-1.3.0.jar;../geotools/lib/jt-vectorize-1.3.0.jar;../geotools/lib/jt-zonalstats-1.3.0.jar;../geotools/lib/vecmath-1.3.2.jar</classpath>
+                <source-level>1.6</source-level>
+            </compilation-unit>
+        </java-data>
+    </configuration>
+</project>
Index: /applications/editors/josm/plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImportImagePlugin.java
===================================================================
--- /applications/editors/josm/plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImportImagePlugin.java	(revision 29802)
+++ /applications/editors/josm/plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImportImagePlugin.java	(revision 29803)
@@ -14,4 +14,5 @@
 import org.apache.log4j.PropertyConfigurator;
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.actions.ExtensionFileFilter;
 import org.openstreetmap.josm.actions.JosmAction;
 import org.openstreetmap.josm.plugins.Plugin;
@@ -91,6 +92,9 @@
 
             // add menu entries
-            Main.main.menu.fileMenu.insert(loadFileAction, 8);
-            Main.main.menu.fileMenu.insertSeparator(9);
+            //Main.main.menu.fileMenu.insert(loadFileAction, 8);
+            
+            //Main.main.menu.fileMenu.insertSeparator(9);
+            
+            ExtensionFileFilter.importers.add(new ImportImageFileImporter());
 
         } catch (Exception e) {
Index: /applications/editors/josm/plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java
===================================================================
--- /applications/editors/josm/plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java	(revision 29802)
+++ /applications/editors/josm/plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java	(revision 29803)
@@ -29,5 +29,5 @@
      */
     public LoadImageAction() {
-        super(tr("Import image"), (String)null, tr("Import georeferenced image"), null, false, "importimage/loadimage", true);
+        super(tr("Import image"), (String)null, tr("Import georeferenced image"), null, true, "importimage/loadimage", true);
     }
 
Index: /applications/editors/josm/plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointPlugin.java
===================================================================
--- /applications/editors/josm/plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointPlugin.java	(revision 29802)
+++ /applications/editors/josm/plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointPlugin.java	(revision 29803)
@@ -3,5 +3,4 @@
 import static org.openstreetmap.josm.tools.I18n.tr;
 
-import java.awt.event.ActionEvent;
 import java.io.File;
 import java.io.IOException;
@@ -11,11 +10,8 @@
 import java.util.List;
 
-import javax.swing.JFileChooser;
 import javax.swing.filechooser.FileFilter;
 
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.ExtensionFileFilter;
-import org.openstreetmap.josm.actions.JosmAction;
-import org.openstreetmap.josm.gui.MainMenu;
 import org.openstreetmap.josm.gui.MapFrame;
 import org.openstreetmap.josm.gui.layer.Layer;
Index: /applications/editors/josm/plugins/importvec/nbproject/project.xml
===================================================================
--- /applications/editors/josm/plugins/importvec/nbproject/project.xml	(revision 29803)
+++ /applications/editors/josm/plugins/importvec/nbproject/project.xml	(revision 29803)
@@ -0,0 +1,67 @@
+<?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>importvec</name>
+        </general-data>
+        <general-data xmlns="http://www.netbeans.org/ns/freeform-project/2">
+            <!-- Не используйте диалоговое окно свойств проекта при редактировании данного файла вручную. -->
+            <name>importvec</name>
+            <properties/>
+            <folders>
+                <source-folder>
+                    <label>importvec</label>
+                    <location>.</location>
+                    <encoding>UTF-8</encoding>
+                </source-folder>
+                <source-folder>
+                    <label>src</label>
+                    <type>java</type>
+                    <location>src</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>
+            <subprojects/>
+        </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/pdfimport/build.xml
===================================================================
--- /applications/editors/josm/plugins/pdfimport/build.xml	(revision 29802)
+++ /applications/editors/josm/plugins/pdfimport/build.xml	(revision 29803)
@@ -4,5 +4,5 @@
     <property name="commit.message" value="Initial pdfimport version"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="5236"/>
+    <property name="plugin.main.version" value="6088"/>
     
     <!-- Configure these properties (replace "..." accordingly).
Index: /applications/editors/josm/plugins/pdfimport/src/pdfimport/LoadPdfDialog.java
===================================================================
--- /applications/editors/josm/plugins/pdfimport/src/pdfimport/LoadPdfDialog.java	(revision 29802)
+++ /applications/editors/josm/plugins/pdfimport/src/pdfimport/LoadPdfDialog.java	(revision 29803)
@@ -65,5 +65,5 @@
 public class LoadPdfDialog extends JFrame{
 
-	class LoadProgressRenderer implements ProgressRenderer{
+    	class LoadProgressRenderer implements ProgressRenderer{
 		private final JProgressBar pBar;
 		private String title = "";
@@ -167,6 +167,6 @@
 		this.removeLayer();
 	}
-
-	private void addListeners() {
+        
+ 	private void addListeners() {
 
 		this.projectionCombo.addActionListener(new ActionListener() {
Index: /applications/editors/josm/plugins/pdfimport/src/pdfimport/PdfImportPlugin.java
===================================================================
--- /applications/editors/josm/plugins/pdfimport/src/pdfimport/PdfImportPlugin.java	(revision 29802)
+++ /applications/editors/josm/plugins/pdfimport/src/pdfimport/PdfImportPlugin.java	(revision 29803)
@@ -3,8 +3,6 @@
 import static org.openstreetmap.josm.tools.I18n.tr;
 
-import javax.swing.JMenu;
-import javax.swing.JMenuItem;
-
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.gui.MainMenu;
 import org.openstreetmap.josm.plugins.Plugin;
 import org.openstreetmap.josm.plugins.PluginInformation;
@@ -20,21 +18,5 @@
 		super(info);
 		name = tr("Import PDf file");
-		JMenu toolsMenu = null;
-		for (int i = 0; i < Main.main.menu.getMenuCount() && toolsMenu == null; i++) {
-			JMenu menu = Main.main.menu.getMenu(i);
-			String name = menu.getText();
-			if (name != null && name.equals(tr("Tools"))) {
-				toolsMenu = menu;
-			}
-		}
-
-		if (toolsMenu == null) {
-			toolsMenu = new JMenu(name);
-			toolsMenu.add(new JMenuItem(new PdfImportAction()));
-			Main.main.menu.add(toolsMenu, 2);
-		} else {
-			toolsMenu.addSeparator();
-			toolsMenu.add(new JMenuItem(new PdfImportAction()));
-		}
+		MainMenu.add(Main.main.menu.dataMenu, new PdfImportAction());
 	}
 }