Index: applications/editors/josm/plugins/imagewaypoint/build.xml
===================================================================
--- applications/editors/josm/plugins/imagewaypoint/build.xml	(revision 19444)
+++ applications/editors/josm/plugins/imagewaypoint/build.xml	(revision 22547)
@@ -33,5 +33,5 @@
 	<property name="commit.message" value="Updated the constructor signature of the plugin main class" />
 	<!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-	<property name="plugin.main.version" value="2830" />
+	<property name="plugin.main.version" value="3408" />
 
 	<property name="josm"                   location="../../core/dist/josm-custom.jar"/>
@@ -91,8 +91,8 @@
 
 	<!--
-	************************** Publishing the plugin *********************************** 
+	************************** Publishing the plugin ***********************************
 	-->
 	<!--
-		** extracts the JOSM release for the JOSM version in ../core and saves it in the 
+		** extracts the JOSM release for the JOSM version in ../core and saves it in the
 		** property ${coreversion.info.entry.revision}
 		**
@@ -143,15 +143,15 @@
 
 	<!--
-		** commits the plugin.jar 
+		** commits the plugin.jar
 		-->
 	<target name="commit-dist">
 		<echo>
 	***** Properties of published ${plugin.jar} *****
-	Commit message    : '${commit.message}'					
+	Commit message    : '${commit.message}'
 	Plugin-Mainversion: ${plugin.main.version}
 	JOSM build version: ${coreversion.info.entry.revision}
 	Plugin-Version    : ${version.entry.commit.revision}
-	***** / Properties of published ${plugin.jar} *****					
-						
+	***** / Properties of published ${plugin.jar} *****
+
 	Now commiting ${plugin.jar} ...
 	</echo>
Index: applications/editors/josm/plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointLayer.java
===================================================================
--- applications/editors/josm/plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointLayer.java	(revision 19444)
+++ applications/editors/josm/plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointLayer.java	(revision 22547)
@@ -3,5 +3,4 @@
 import static org.openstreetmap.josm.tools.I18n.tr;
 
-import java.awt.Component;
 import java.awt.Graphics2D;
 import java.awt.Rectangle;
@@ -10,4 +9,5 @@
 import java.awt.event.MouseListener;
 
+import javax.swing.Action;
 import javax.swing.Icon;
 
@@ -51,12 +51,5 @@
     }
 
-    private static final class ImageChangeListener implements
-    IImageChangeListener {
-        private final ImageWayPointLayer layer;
-
-        public ImageChangeListener(final ImageWayPointLayer layer) {
-            this.layer = layer;
-        }
-
+    private static final class ImageChangeListener implements IImageChangeListener {
         public final void onAvailableImageEntriesChanged(
         final ImageEntries entries) {
@@ -80,5 +73,5 @@
         Main.map.mapView.addMouseListener(this.layerMouseListener);
 
-        this.imageChangeListener = new ImageChangeListener(this);
+        this.imageChangeListener = new ImageChangeListener();
         ImageEntries.getInstance().addListener(this.imageChangeListener);
     }
@@ -95,6 +88,6 @@
 
     @Override
-    public final Component[] getMenuEntries() {
-        return new Component[0];
+    public final Action[] getMenuEntries() {
+        return new Action[0];
     }