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];
     }