Index: /applications/editors/josm/plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageChangeListener.java
===================================================================
--- /applications/editors/josm/plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageChangeListener.java	(revision 33228)
+++ /applications/editors/josm/plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageChangeListener.java	(revision 33229)
@@ -14,5 +14,5 @@
         final ImageEntries entries) {
         this.dialog.imageDisplay.setImage(entries.getCurrentImage());
-        this.dialog.updateUI();
+        this.dialog.updateGUI();
     }
 
@@ -20,5 +20,5 @@
     public void onSelectedImageEntryChanged(final ImageEntries entries) {
         this.dialog.imageDisplay.setImage(entries.getCurrentImage());
-        this.dialog.updateUI();
+        this.dialog.updateGUI();
     }
 }
Index: /applications/editors/josm/plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java
===================================================================
--- /applications/editors/josm/plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java	(revision 33228)
+++ /applications/editors/josm/plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java	(revision 33229)
@@ -19,7 +19,5 @@
 import org.openstreetmap.josm.tools.Shortcut;
 
-public final class ImageWayPointDialog {
-    private static final ImageWayPointDialog INSTANCE = new ImageWayPointDialog();
-    private final ToggleDialog dialog;
+public final class ImageWayPointDialog extends ToggleDialog {
     final ImageComponent imageDisplay;
     private final Action previousAction;
@@ -30,11 +28,8 @@
     private final IImageChangeListener listener;
 
-    private ImageWayPointDialog() {
-        this.dialog = new ToggleDialog(tr("WayPoint Image"),
-            "imagewaypoint",
-            tr("Display non-geotagged photos"),
+    public ImageWayPointDialog() {
+        super(tr("WayPoint Image"), "imagewaypoint", tr("Display non-geotagged photos"),
             Shortcut.registerShortcut("subwindow:imagewaypoint", tr("Toggle: {0}", tr("WayPoint Image")),
-            KeyEvent.VK_Y, Shortcut.ALT_SHIFT),
-            200);
+            KeyEvent.VK_Y, Shortcut.ALT_SHIFT), 200);
 
         this.previousAction = new PreviousAction();
@@ -65,15 +60,13 @@
         ImageEntries.getInstance().addListener(this.listener);
 
-        this.updateUI();
-        dialog.add(mainPanel);
+        this.updateGUI();
+        add(mainPanel);
     }
 
-    void updateUI() {
+    void updateGUI() {
         this.previousAction.setEnabled(ImageEntries.getInstance().hasPrevious());
         this.nextAction.setEnabled(ImageEntries.getInstance().hasNext());
-        this.rotateLeftAction.setEnabled(null != ImageEntries.getInstance()
-            .getCurrentImageEntry());
-        this.rotateRightAction.setEnabled(null != ImageEntries.getInstance()
-            .getCurrentImageEntry());
+        this.rotateLeftAction.setEnabled(null != ImageEntries.getInstance().getCurrentImageEntry());
+        this.rotateRightAction.setEnabled(null != ImageEntries.getInstance().getCurrentImageEntry());
 
         if (null != Main.map) {
@@ -81,11 +74,3 @@
         }
     }
-
-    public static ImageWayPointDialog getInstance() {
-        return ImageWayPointDialog.INSTANCE;
-    }
-
-    public ToggleDialog getDisplayComponent() {
-        return this.dialog;
-    }
 }
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 33228)
+++ /applications/editors/josm/plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointPlugin.java	(revision 33229)
@@ -8,4 +8,5 @@
 import java.util.Iterator;
 import java.util.List;
+import java.util.Locale;
 
 import org.openstreetmap.josm.Main;
@@ -57,10 +58,5 @@
                 }
                 if (!foundImageWayPointLayer) {
-                    GuiHelper.runInEDT(new Runnable() {
-                        @Override
-                        public void run() {
-                            new ImageWayPointLayer();
-                        }
-                    });
+                    GuiHelper.runInEDT(ImageWayPointLayer::new);
                 }
             }
@@ -79,6 +75,5 @@
     public void mapFrameInitialized(final MapFrame oldFrame, final MapFrame newFrame) {
         if (newFrame != null) {
-            newFrame.addToggleDialog(ImageWayPointDialog.getInstance()
-            .getDisplayComponent());
+            newFrame.addToggleDialog(new ImageWayPointDialog());
         } else {
             ImageEntries.getInstance().setCurrentImageEntry(null);
@@ -90,7 +85,7 @@
             final File selectedFile = selectedFiles[index];
             if (selectedFile.isDirectory())
-              this.addFiles(allFiles, selectedFile.listFiles());
-            else if (selectedFile.getName().toLowerCase().endsWith(".jpg"))
-              allFiles.add(selectedFile);
+                this.addFiles(allFiles, selectedFile.listFiles());
+            else if (selectedFile.getName().toLowerCase(Locale.ENGLISH).endsWith(".jpg"))
+                allFiles.add(selectedFile);
         }
     }