Index: applications/editors/josm/plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageEntries.java
===================================================================
--- applications/editors/josm/plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageEntries.java	(revision 32499)
+++ applications/editors/josm/plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageEntries.java	(revision 32915)
@@ -22,4 +22,5 @@
         }
 
+        @Override
         public final void onImageReady(final ImageEntry imageEntry,
             final Image image) {
Index: applications/editors/josm/plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageEntry.java
===================================================================
--- applications/editors/josm/plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageEntry.java	(revision 32499)
+++ applications/editors/josm/plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageEntry.java	(revision 32915)
@@ -23,30 +23,31 @@
 public final class ImageEntry implements Comparable<ImageEntry> {
     public interface IImageReadyListener {
-    void onImageReady(ImageEntry imageEntry, Image image);
+        void onImageReady(ImageEntry imageEntry, Image image);
     }
 
     private static final class Observer implements ImageObserver {
-    private final ImageEntry imageEntry;
-
-    public Observer(final ImageEntry imageEntry) {
-        this.imageEntry = imageEntry;
-    }
-
-    /**
-     * @see java.awt.image.ImageObserver#imageUpdate(java.awt.Image, int,
-     *      int, int, int, int)
-     * @return true if this ImageObserver still wants to be updates about
-     *         image loading progress
-     */
-    public final boolean imageUpdate(final Image image,
-        final int infoflags, final int x, final int y, final int width,
-        final int height) {
-        final boolean complete = ImageObserver.ALLBITS == (infoflags | ImageObserver.ALLBITS);
-        if (complete) {
-        this.imageEntry.imageLoaded(image);
-        }
-
-        return !complete;
-    }
+        private final ImageEntry imageEntry;
+
+        public Observer(final ImageEntry imageEntry) {
+            this.imageEntry = imageEntry;
+        }
+
+        /**
+         * @see java.awt.image.ImageObserver#imageUpdate(java.awt.Image, int,
+         *      int, int, int, int)
+         * @return true if this ImageObserver still wants to be updates about
+         *         image loading progress
+         */
+        @Override
+        public final boolean imageUpdate(final Image image,
+            final int infoflags, final int x, final int y, final int width,
+            final int height) {
+            final boolean complete = ImageObserver.ALLBITS == (infoflags | ImageObserver.ALLBITS);
+            if (complete) {
+                this.imageEntry.imageLoaded(image);
+            }
+
+            return !complete;
+        }
     }
 
@@ -119,4 +120,5 @@
     }
 
+    @Override
     public final int compareTo(final ImageEntry image) {
     return this.fileName.compareTo(image.fileName);
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 32499)
+++ applications/editors/josm/plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java	(revision 32915)
@@ -22,77 +22,79 @@
 public final class ImageWayPointDialog {
     private static final class ImageComponent extends JComponent {
-    private static final long serialVersionUID = -5207198660736375133L;
-
-    private Image image;
-
-    public ImageComponent() {
-        this.image = null;
-    }
-
-    @Override
-    public final void paint(final Graphics g) {
-        if (null == this.image || 0 >= this.image.getWidth(null)
-            || 0 >= this.image.getHeight(null)) {
-        g.setColor(Color.white);
-        g.fillRect(0, 0, this.getSize().width, this.getSize().height);
-        } else {
-        final int maxWidth = this.getSize().width;
-        final int maxHeight = this.getSize().height;
-        final int imageWidth = this.image.getWidth(null);
-        final int imageHeight = this.image.getHeight(null);
-
-        final double aspect = 1.0 * imageWidth / imageHeight;
-
-        // what's the width if the height is 100%?
-        final int widthIfHeightIsMax = (int) (aspect * maxHeight);
-
-        // now find the real width and height
-        final int resizedWidth;
-        final int resizedHeight;
-        if (widthIfHeightIsMax > maxWidth) {
-            // oops - burst the width - so width should be the max, and
-            // work out the resulting height
-            resizedWidth = maxWidth;
-            resizedHeight = (int) (resizedWidth / aspect);
-        } else {
-            // that'll do...
-            resizedWidth = widthIfHeightIsMax;
-            resizedHeight = maxHeight;
-        }
-
-        g.drawImage(this.image,
-            (maxWidth - resizedWidth) / 2,
-            (maxHeight - resizedHeight) / 2,
-            resizedWidth,
-            resizedHeight,
-            Color.black,
-            null);
-        }
-    }
-
-    public final void setImage(final Image image) {
-        this.image = image;
-        this.repaint();
-    }
+        private static final long serialVersionUID = -5207198660736375133L;
+
+        private Image image;
+
+        public ImageComponent() {
+            this.image = null;
+        }
+
+        @Override
+        public final void paint(final Graphics g) {
+            if (null == this.image || 0 >= this.image.getWidth(null)
+                || 0 >= this.image.getHeight(null)) {
+            g.setColor(Color.white);
+            g.fillRect(0, 0, this.getSize().width, this.getSize().height);
+            } else {
+            final int maxWidth = this.getSize().width;
+            final int maxHeight = this.getSize().height;
+            final int imageWidth = this.image.getWidth(null);
+            final int imageHeight = this.image.getHeight(null);
+
+            final double aspect = 1.0 * imageWidth / imageHeight;
+
+            // what's the width if the height is 100%?
+            final int widthIfHeightIsMax = (int) (aspect * maxHeight);
+
+            // now find the real width and height
+            final int resizedWidth;
+            final int resizedHeight;
+            if (widthIfHeightIsMax > maxWidth) {
+                // oops - burst the width - so width should be the max, and
+                // work out the resulting height
+                resizedWidth = maxWidth;
+                resizedHeight = (int) (resizedWidth / aspect);
+            } else {
+                // that'll do...
+                resizedWidth = widthIfHeightIsMax;
+                resizedHeight = maxHeight;
+            }
+
+            g.drawImage(this.image,
+                (maxWidth - resizedWidth) / 2,
+                (maxHeight - resizedHeight) / 2,
+                resizedWidth,
+                resizedHeight,
+                Color.black,
+                null);
+            }
+        }
+
+        public final void setImage(final Image image) {
+            this.image = image;
+            this.repaint();
+        }
     }
 
     private static final class ImageChangeListener implements
         IImageChangeListener {
-    private final ImageWayPointDialog dialog;
-
-    public ImageChangeListener(final ImageWayPointDialog dialog) {
-        this.dialog = dialog;
-    }
-
-    public final void onAvailableImageEntriesChanged(
-        final ImageEntries entries) {
-        this.dialog.imageDisplay.setImage(entries.getCurrentImage());
-        this.dialog.updateUI();
-    }
-
-    public final void onSelectedImageEntryChanged(final ImageEntries entries) {
-        this.dialog.imageDisplay.setImage(entries.getCurrentImage());
-        this.dialog.updateUI();
-    }
+        private final ImageWayPointDialog dialog;
+
+        public ImageChangeListener(final ImageWayPointDialog dialog) {
+            this.dialog = dialog;
+        }
+
+        @Override
+        public final void onAvailableImageEntriesChanged(
+            final ImageEntries entries) {
+            this.dialog.imageDisplay.setImage(entries.getCurrentImage());
+            this.dialog.updateUI();
+        }
+
+        @Override
+        public final void onSelectedImageEntryChanged(final ImageEntries entries) {
+            this.dialog.imageDisplay.setImage(entries.getCurrentImage());
+            this.dialog.updateUI();
+        }
     }
 
@@ -107,4 +109,5 @@
     }
 
+    @Override
     public final void actionPerformed(final ActionEvent actionEvent) {
         if (ImageEntries.getInstance().hasPrevious()) {
@@ -120,4 +123,5 @@
     }
 
+    @Override
     public final void actionPerformed(final ActionEvent actionEvent) {
         if (ImageEntries.getInstance().hasNext()) {
@@ -137,4 +141,5 @@
     }
 
+    @Override
     public final void actionPerformed(final ActionEvent actionEvent) {
         ImageEntries.getInstance().rotateCurrentImageLeft();
@@ -152,4 +157,5 @@
     }
 
+    @Override
     public final void actionPerformed(final ActionEvent actionEvent) {
         ImageEntries.getInstance().rotateCurrentImageRight();
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 32499)
+++ applications/editors/josm/plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointLayer.java	(revision 32915)
@@ -52,4 +52,5 @@
 
     private static final class ImageChangeListener implements IImageChangeListener {
+        @Override
         public final void onAvailableImageEntriesChanged(
         final ImageEntries entries) {
@@ -57,4 +58,5 @@
         }
 
+        @Override
         public final void onSelectedImageEntryChanged(final ImageEntries entries) {
             Main.map.repaint();