Index: /applications/editors/josm/plugins/ImportImagePlugin/build.xml
===================================================================
--- /applications/editors/josm/plugins/ImportImagePlugin/build.xml	(revision 32286)
+++ /applications/editors/josm/plugins/ImportImagePlugin/build.xml	(revision 32287)
@@ -5,5 +5,5 @@
     <property name="commit.message" value="use consistent plugin name (don't mix up the words)" />
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="7817" />
+    <property name="plugin.main.version" value="10407" />
 
     <property name="plugin.author" value="Christoph Beekmans, Fabian Kowitz, Anna Robaszkiewicz, Oliver Kuhn, Martin Ulitzny"/>
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 32286)
+++ /applications/editors/josm/plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImportImagePlugin.java	(revision 32287)
@@ -56,6 +56,7 @@
      *
      * @param info
-     */
-    public ImportImagePlugin(PluginInformation info){
+     * @throws IOException if any I/O error occurs
+     */
+    public ImportImagePlugin(PluginInformation info) throws IOException{
         super(info);
 
@@ -86,19 +87,11 @@
             if (Main.main != null) {
                 MainMenu.add(Main.main.menu.imagerySubMenu, loadFileAction);
-    
-                // add menu entries
-                //Main.main.menu.fileMenu.insert(loadFileAction, 8);
-                //Main.main.menu.fileMenu.insertSeparator(9);
-            }
-
-            ExtensionFileFilter.importers.add(new ImportImageFileImporter());
-
-        } catch (Exception e) {
+            }
+
+            ExtensionFileFilter.addImporter(new ImportImageFileImporter());
+
+        } catch (IOException e) {
             logger.fatal("Error while loading plugin", e);
-            try {
-                throw e;
-            } catch (Exception e1) {
-                e1.printStackTrace();
-            }
+            throw e;
         }
 
Index: /applications/editors/josm/plugins/dataimport/build.xml
===================================================================
--- /applications/editors/josm/plugins/dataimport/build.xml	(revision 32286)
+++ /applications/editors/josm/plugins/dataimport/build.xml	(revision 32287)
@@ -4,5 +4,5 @@
     <property name="commit.message" value="Changed constructor signature, updated build.xml"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="7001"/>
+    <property name="plugin.main.version" value="10407"/>
     <!--
       ************************************************
Index: /applications/editors/josm/plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/DataImportPlugin.java
===================================================================
--- /applications/editors/josm/plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/DataImportPlugin.java	(revision 32286)
+++ /applications/editors/josm/plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/DataImportPlugin.java	(revision 32287)
@@ -7,19 +7,23 @@
 
 import org.openstreetmap.josm.actions.ExtensionFileFilter;
+import org.openstreetmap.josm.plugins.Plugin;
+import org.openstreetmap.josm.plugins.PluginInformation;
 import org.openstreetmap.josm.plugins.dataimport.io.TangoGPS;
 import org.openstreetmap.josm.plugins.dataimport.io.Tcx;
-import org.openstreetmap.josm.plugins.Plugin;
-import org.openstreetmap.josm.plugins.PluginInformation;
 
+/**
+ * Data import plugin.
+ */
 public class DataImportPlugin extends Plugin {
 
     /**
      * Add new File import filter into open dialog
+     * @param info plugin information
      */
     public DataImportPlugin(PluginInformation info) throws IOException{
         super(info);
 
-        ExtensionFileFilter.importers.add(new TangoGPS());
-        ExtensionFileFilter.importers.add(new Tcx());
+        ExtensionFileFilter.addImporter(new TangoGPS());
+        ExtensionFileFilter.addImporter(new Tcx());
     }
 }
Index: /applications/editors/josm/plugins/imagery-xml-bounds/build.xml
===================================================================
--- /applications/editors/josm/plugins/imagery-xml-bounds/build.xml	(revision 32286)
+++ /applications/editors/josm/plugins/imagery-xml-bounds/build.xml	(revision 32287)
@@ -4,5 +4,5 @@
     <property name="commit.message" value="Commit message"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="8526"/>
+    <property name="plugin.main.version" value="10407"/>
     
     <!-- Configure these properties (replace "..." accordingly).
Index: /applications/editors/josm/plugins/imagery-xml-bounds/src/org/openstreetmap/josm/plugins/imageryxmlbounds/ImageryXmlBoundsPlugin.java
===================================================================
--- /applications/editors/josm/plugins/imagery-xml-bounds/src/org/openstreetmap/josm/plugins/imageryxmlbounds/ImageryXmlBoundsPlugin.java	(revision 32286)
+++ /applications/editors/josm/plugins/imagery-xml-bounds/src/org/openstreetmap/josm/plugins/imageryxmlbounds/ImageryXmlBoundsPlugin.java	(revision 32287)
@@ -28,13 +28,13 @@
 
     /**
-     * Action showing bounds of the selected closed ways in Selection dialog 
+     * Action showing bounds of the selected closed ways in Selection dialog
      */
     private final ShowBoundsAction selectionListAction = new ShowBoundsAction();
 
     /**
-     * Action showing bounds of the selected multipolygons in Properties dialog 
+     * Action showing bounds of the selected multipolygons in Properties dialog
      */
     private final ShowBoundsAction propertiesListAction = new ShowBoundsAction();
-    
+
     /**
      * Action showing bounds of the selected multipolygons in Relations dialog
@@ -46,10 +46,10 @@
      */
     private final ShowBoundsSelectionAction selectionAction = new ShowBoundsSelectionAction();
-    
+
     /**
      * Class modifying the Imagery preferences panel
      */
     private final XmlBoundsPreferenceSetting preferenceSetting = new XmlBoundsPreferenceSetting();
-    
+
     /**
      * Initializes the plugin.
@@ -59,7 +59,7 @@
         super(info);
         // Allow JOSM to import *.imagery.xml files
-        ExtensionFileFilter.importers.add(0, new XmlBoundsImporter());
+        ExtensionFileFilter.addImporterFirst(new XmlBoundsImporter());
         // Allow JOSM to export *.imagery.xml files
-        ExtensionFileFilter.exporters.add(0, new XmlBoundsExporter());
+        ExtensionFileFilter.addExporterFirst(new XmlBoundsExporter());
         // Initialize the selection action
         DataSet.addSelectionListener(selectionAction);
@@ -68,5 +68,5 @@
         Main.main.menu.openLocation.addDownloadTaskClass(DownloadXmlBoundsTask.class);
     }
-    
+
     @Override
     public PreferenceSetting getPreferenceSetting() {
@@ -77,5 +77,5 @@
     public void mapFrameInitialized(MapFrame oldFrame, MapFrame newFrame) {
         if (newFrame != null) {
-            // Initialize dialogs actions only after the main frame is created 
+            // Initialize dialogs actions only after the main frame is created
             newFrame.selectionListDialog.getPopupMenuHandler().addSeparator();
             newFrame.selectionListDialog.getPopupMenuHandler().addAction(selectionListAction);
Index: /applications/editors/josm/plugins/imagewaypoint/build.xml
===================================================================
--- /applications/editors/josm/plugins/imagewaypoint/build.xml	(revision 32286)
+++ /applications/editors/josm/plugins/imagewaypoint/build.xml	(revision 32287)
@@ -4,5 +4,5 @@
     <property name="commit.message" value="[josm/ImageWayPoint] move opening to File/Open"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="7001"/>
+    <property name="plugin.main.version" value="10407"/>
     
     <!-- Configure these properties (replace "..." accordingly).
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 32286)
+++ /applications/editors/josm/plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointPlugin.java	(revision 32287)
@@ -95,5 +95,5 @@
     public ImageWayPointPlugin(PluginInformation info) {
         super(info);
-	ExtensionFileFilter.importers.add(new ImageWaypointImporter());
+	ExtensionFileFilter.addImporter(new ImageWaypointImporter());
     }
 
Index: /applications/editors/josm/plugins/importvec/build.xml
===================================================================
--- /applications/editors/josm/plugins/importvec/build.xml	(revision 32286)
+++ /applications/editors/josm/plugins/importvec/build.xml	(revision 32287)
@@ -4,5 +4,5 @@
     <property name="commit.message" value="Remove the action, add importing SVG to File/Open"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="7001"/>
+    <property name="plugin.main.version" value="10407"/>
 
     <property name="plugin.author" value="Upliner"/>
Index: /applications/editors/josm/plugins/importvec/src/org/openstreetmap/josm/plugins/importvec/ImportVecPlugin.java
===================================================================
--- /applications/editors/josm/plugins/importvec/src/org/openstreetmap/josm/plugins/importvec/ImportVecPlugin.java	(revision 32286)
+++ /applications/editors/josm/plugins/importvec/src/org/openstreetmap/josm/plugins/importvec/ImportVecPlugin.java	(revision 32287)
@@ -9,6 +9,5 @@
     public ImportVecPlugin(PluginInformation info) {
         super(info);
-	ExtensionFileFilter.importers.add(new SvgImporter());
+	ExtensionFileFilter.addImporter(new SvgImporter());
     }
-
 }
Index: /applications/editors/josm/plugins/opendata/build.xml
===================================================================
--- /applications/editors/josm/plugins/opendata/build.xml	(revision 32286)
+++ /applications/editors/josm/plugins/opendata/build.xml	(revision 32287)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <project name="opendata" default="dist" basedir=".">
-    <property name="plugin.main.version" value="9705"/>
+    <property name="plugin.main.version" value="10407"/>
     <property name="plugin.author" value="Don-vip"/>
     <property name="plugin.class" value="org.openstreetmap.josm.plugins.opendata.OdPlugin"/>
Index: /applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/OdPlugin.java
===================================================================
--- /applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/OdPlugin.java	(revision 32286)
+++ /applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/OdPlugin.java	(revision 32287)
@@ -72,5 +72,5 @@
                 xmlImporter // Generic importer for XML files (currently used for Neptune files)
         })) {
-            ExtensionFileFilter.importers.add(0, importer);
+            ExtensionFileFilter.addImporterFirst(importer);
         }
 
Index: /applications/editors/josm/plugins/poly/build.xml
===================================================================
--- /applications/editors/josm/plugins/poly/build.xml	(revision 32286)
+++ /applications/editors/josm/plugins/poly/build.xml	(revision 32287)
@@ -5,5 +5,5 @@
     <property name="commit.message" value="Commit message"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="7248"/>
+    <property name="plugin.main.version" value="10407"/>
 
     <!-- Configure these properties (replace "..." accordingly).
Index: /applications/editors/josm/plugins/poly/src/poly/PolyPlugin.java
===================================================================
--- /applications/editors/josm/plugins/poly/src/poly/PolyPlugin.java	(revision 32286)
+++ /applications/editors/josm/plugins/poly/src/poly/PolyPlugin.java	(revision 32287)
@@ -13,8 +13,12 @@
 public class PolyPlugin extends Plugin {
 
+    /**
+     * Constructs a new {@code PolyPlugin}.
+     * @param info plugin information
+     */
     public PolyPlugin(PluginInformation info) {
         super(info);
-        ExtensionFileFilter.importers.add(new PolyImporter());
-        ExtensionFileFilter.exporters.add(new PolyExporter());
+        ExtensionFileFilter.addImporter(new PolyImporter());
+        ExtensionFileFilter.addExporter(new PolyExporter());
         Main.main.menu.openLocation.addDownloadTaskClass(DownloadPolyTask.class);
     }
Index: /applications/editors/josm/plugins/trustosm/build.xml
===================================================================
--- /applications/editors/josm/plugins/trustosm/build.xml	(revision 32286)
+++ /applications/editors/josm/plugins/trustosm/build.xml	(revision 32287)
@@ -5,5 +5,5 @@
     <property name="commit.message" value="New plugin for digital signing osm data"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="9241" />
+    <property name="plugin.main.version" value="10407" />
     <property name="plugin.author" value="Christoph Wagner" />
     <property name="plugin.class" value="org.openstreetmap.josm.plugins.trustosm.TrustOSMplugin" />
Index: /applications/editors/josm/plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/TrustOSMplugin.java
===================================================================
--- /applications/editors/josm/plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/TrustOSMplugin.java	(revision 32286)
+++ /applications/editors/josm/plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/TrustOSMplugin.java	(revision 32287)
@@ -72,6 +72,6 @@
         checkForUnrestrictedPolicyFiles();
         // register new SigImporter and SigExporter
-        ExtensionFileFilter.importers.add(new SigImporter());
-        ExtensionFileFilter.exporters.add(new SigExporter());
+        ExtensionFileFilter.addImporter(new SigImporter());
+        ExtensionFileFilter.addExporter(new SigExporter());
 
         gpg = new TrustGPG();