Index: applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/MapillaryAbstractImage.java
===================================================================
--- applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/MapillaryAbstractImage.java	(revision 32592)
+++ applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/MapillaryAbstractImage.java	(revision 32593)
@@ -130,11 +130,11 @@
 
   /**
- * Returns the direction towards the image has been taken.
- *
- * @return The direction of the image (0 means north and goes clockwise).
- */
-public double getMovingCa() {
-  return this.movingCa;
-}
+   * Returns the direction towards the image has been taken.
+   *
+   * @return The direction of the image (0 means north and goes clockwise).
+   */
+  public double getMovingCa() {
+    return this.movingCa;
+  }
 
   /**
Index: applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/MapillaryLocationChangeset.java
===================================================================
--- applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/MapillaryLocationChangeset.java	(revision 32592)
+++ applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/MapillaryLocationChangeset.java	(revision 32593)
@@ -1,2 +1,3 @@
+// License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.plugins.mapillary;
 
@@ -7,4 +8,5 @@
 
 public class MapillaryLocationChangeset extends HashSet<MapillaryImage> {
+  private static final long serialVersionUID = 2461033584553885626L;
   private final Set<MapillaryChangesetListener> listeners = new HashSet<>();
 
Index: applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/MapillaryPlugin.java
===================================================================
--- applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/MapillaryPlugin.java	(revision 32592)
+++ applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/MapillaryPlugin.java	(revision 32593)
@@ -255,5 +255,5 @@
     }
     if (!SwingUtilities.isEventDispatchThread()) {
-      SwingUtilities.invokeLater( new Runnable() {
+      SwingUtilities.invokeLater(new Runnable() {
         @Override
         public void run() {
Index: applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/actions/MapillaryImportIntoSequenceAction.java
===================================================================
--- applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/actions/MapillaryImportIntoSequenceAction.java	(revision 32592)
+++ applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/actions/MapillaryImportIntoSequenceAction.java	(revision 32593)
@@ -102,5 +102,5 @@
    *
    */
-  public class MapillaryEpochComparator implements
+  public static class MapillaryEpochComparator implements
       Comparator<MapillaryAbstractImage> {
 
Index: applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/actions/WalkThread.java
===================================================================
--- applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/actions/WalkThread.java	(revision 32592)
+++ applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/actions/WalkThread.java	(revision 32593)
@@ -71,10 +71,8 @@
             final BufferedImage displayImage = MapillaryMainDialog.getInstance().mapillaryImageDisplay.getImage();
             if (this.waitForFullQuality && image instanceof MapillaryImage) {
-              while ( displayImage == this.lastImage || displayImage == null || displayImage.getWidth() < 2048) {
+              while (displayImage == this.lastImage || displayImage == null || displayImage.getWidth() < 2048) {
                 wait(100);
               }
-            }
-            // Waits for thumbnail.
-            else {
+            } else { // Waits for thumbnail.
               while (displayImage == this.lastImage || displayImage == null || displayImage.getWidth() < 320) {
                 wait(100);
@@ -114,5 +112,5 @@
    * @param type the quality of the image (full or thumbnail)
    */
-  private void preDownloadImages(MapillaryImage startImage, int n, CacheUtils.PICTURE type) {
+  private static void preDownloadImages(MapillaryImage startImage, int n, CacheUtils.PICTURE type) {
     if (n >= 1 && startImage != null) {
       CacheUtils.downloadPicture(startImage, type);
Index: applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/gui/FinishedUploadDialog.java
===================================================================
--- applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/gui/FinishedUploadDialog.java	(revision 32592)
+++ applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/gui/FinishedUploadDialog.java	(revision 32593)
@@ -38,4 +38,5 @@
     this.add(text);
     JButton web = new JButton(tr("Approve upload on the website"));
+    text.setLabelFor(web);
     web.addActionListener(new WebAction());
     web.setAlignmentX(Component.CENTER_ALIGNMENT);
Index: applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/oauth/UploadUtils.java
===================================================================
--- applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/oauth/UploadUtils.java	(revision 32592)
+++ applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/oauth/UploadUtils.java	(revision 32593)
@@ -55,5 +55,5 @@
  * @author nokutu
  */
-public class UploadUtils {
+public final class UploadUtils {
   /**
    * Required keys for POST
@@ -75,5 +75,5 @@
   }
 
-  private static class SequenceUploadThread extends Thread {
+  private static final class SequenceUploadThread extends Thread {
     private final Set<MapillaryAbstractImage> images;
     private final UUID uuid;
@@ -117,5 +117,5 @@
   }
 
-  private static class SingleUploadThread extends Thread {
+  private static final class SingleUploadThread extends Thread {
 
     private final MapillaryImportedImage image;
@@ -215,7 +215,12 @@
    */
   public static void upload(MapillaryImportedImage image, UUID uuid) {
-    String key = MapillaryUser.getUsername() + "/" + uuid.toString() + "/"
-            + image.getMovingLatLon().lat() + "_" + image.getMovingLatLon().lon() + "_"
-            + image.getMovingCa() + "_" + image.getCapturedAt() + ".jpg";
+    String key = new StringBuilder(MapillaryUser.getUsername())
+      .append('/').append(uuid)
+      .append('/').append(image.getMovingLatLon().lat()) // TODO: Make sure, that the double values are not appended as something like "10e-4", "Infinity" or "NaN" (all possible values of Double.toString(double))
+      .append('_').append(image.getMovingLatLon().lon())
+      .append('_').append(image.getMovingCa())
+      .append('_').append(image.getCapturedAt())
+      .append(".jpg")
+      .toString();
 
     String policy;
Index: applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/utils/MapillaryColorScheme.java
===================================================================
--- applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/utils/MapillaryColorScheme.java	(revision 32592)
+++ applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/utils/MapillaryColorScheme.java	(revision 32593)
@@ -12,5 +12,5 @@
 import javax.swing.JComponent;
 
-public class MapillaryColorScheme {
+public final class MapillaryColorScheme {
   public static final Color MAPILLARY_GREEN = new Color(0x35af6d);
   public static final Color TOOLBAR_DARK_GREY = new Color(0x242528);
@@ -33,11 +33,13 @@
   }
 
-  public final static class MapillaryButton extends JButton {
+  public static final class MapillaryButton extends JButton {
+    private static final long serialVersionUID = 3824559897922944415L;
     public MapillaryButton(final String text, final Action action) {
       super(action);
       setText(text);
       setForeground(Color.WHITE);
-      setBorder(BorderFactory.createEmptyBorder(7,10,7,10));
+      setBorder(BorderFactory.createEmptyBorder(7, 10, 7, 10));
     }
+
     @Override
     protected void paintComponent(final Graphics g) {
@@ -53,4 +55,5 @@
       super.paintComponent(g);
     }
+
     @Override
     public boolean isContentAreaFilled() {
Index: applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/utils/MapillaryUtils.java
===================================================================
--- applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/utils/MapillaryUtils.java	(revision 32592)
+++ applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/utils/MapillaryUtils.java	(revision 32593)
@@ -203,10 +203,10 @@
   public static void showPictures(final Set<MapillaryAbstractImage> images, final boolean select) {
     if (!SwingUtilities.isEventDispatchThread()) {
-      SwingUtilities.invokeLater( new Runnable() {
+      SwingUtilities.invokeLater(new Runnable() {
         @Override
         public void run() {
           showPictures(images, select);
         }
-      } );
+      });
     } else {
       Bounds zoomBounds;
Index: applications/editors/josm/plugins/mapillary/test/unit/org/openstreetmap/josm/plugins/mapillary/utils/ImageUtilsTest.java
===================================================================
--- applications/editors/josm/plugins/mapillary/test/unit/org/openstreetmap/josm/plugins/mapillary/utils/ImageUtilsTest.java	(revision 32592)
+++ applications/editors/josm/plugins/mapillary/test/unit/org/openstreetmap/josm/plugins/mapillary/utils/ImageUtilsTest.java	(revision 32593)
@@ -1,2 +1,3 @@
+// License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.plugins.mapillary.utils;
 
Index: applications/editors/josm/plugins/mapillary/test/unit/org/openstreetmap/josm/plugins/mapillary/utils/MapillaryURLTest.java
===================================================================
--- applications/editors/josm/plugins/mapillary/test/unit/org/openstreetmap/josm/plugins/mapillary/utils/MapillaryURLTest.java	(revision 32592)
+++ applications/editors/josm/plugins/mapillary/test/unit/org/openstreetmap/josm/plugins/mapillary/utils/MapillaryURLTest.java	(revision 32593)
@@ -1,2 +1,3 @@
+// License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.plugins.mapillary.utils;
 
@@ -26,20 +27,20 @@
   }
 
-  @Test(expected=IllegalArgumentException.class)
+  @Test(expected = IllegalArgumentException.class)
   public void testIllegalBrowseEditURL() {
     MapillaryURL.browseEditURL(null);
   }
 
-  @Test(expected=IllegalArgumentException.class)
+  @Test(expected = IllegalArgumentException.class)
   public void testIllegalBrowseEditURL2() {
     MapillaryURL.browseEditURL("123456789012345678901");
   }
 
-  @Test(expected=IllegalArgumentException.class)
+  @Test(expected = IllegalArgumentException.class)
   public void testIllegalBrowseEditURL3() {
     MapillaryURL.browseEditURL("12345678901234567890123");
   }
 
-  @Test(expected=IllegalArgumentException.class)
+  @Test(expected = IllegalArgumentException.class)
   public void testIllegalBrowseEditURL4() {
     MapillaryURL.browseEditURL("123456789012345678901+");
@@ -54,20 +55,20 @@
   }
 
-  @Test(expected=IllegalArgumentException.class)
+  @Test(expected = IllegalArgumentException.class)
   public void testIllegalBrowseImageURL() {
     MapillaryURL.browseImageURL(null);
   }
 
-  @Test(expected=IllegalArgumentException.class)
+  @Test(expected = IllegalArgumentException.class)
   public void testIllegalBrowseImageURL2() {
     MapillaryURL.browseImageURL("123456789012345678901");
   }
 
-  @Test(expected=IllegalArgumentException.class)
+  @Test(expected = IllegalArgumentException.class)
   public void testIllegalBrowseImageURL3() {
     MapillaryURL.browseImageURL("12345678901234567890123");
   }
 
-  @Test(expected=IllegalArgumentException.class)
+  @Test(expected = IllegalArgumentException.class)
   public void testIllegalBrowseImageURL4() {
     MapillaryURL.browseImageURL("123456789012345678901+");
@@ -212,5 +213,5 @@
       }
       assertTrue(
-          expectedParams[exIndex] + " was expected in the query string of " + actualUrl.toString() + " but wasn't there." ,
+          expectedParams[exIndex] + " was expected in the query string of " + actualUrl.toString() + " but wasn't there.",
           parameterIsPresent
       );
Index: applications/editors/josm/plugins/mapillary/test/unit/org/openstreetmap/josm/plugins/mapillary/utils/MapillaryUtilsTest.java
===================================================================
--- applications/editors/josm/plugins/mapillary/test/unit/org/openstreetmap/josm/plugins/mapillary/utils/MapillaryUtilsTest.java	(revision 32592)
+++ applications/editors/josm/plugins/mapillary/test/unit/org/openstreetmap/josm/plugins/mapillary/utils/MapillaryUtilsTest.java	(revision 32593)
@@ -1,2 +1,3 @@
+// License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.plugins.mapillary.utils;
 
Index: applications/editors/josm/plugins/mapillary/test/unit/org/openstreetmap/josm/plugins/mapillary/utils/PluginStateTest.java
===================================================================
--- applications/editors/josm/plugins/mapillary/test/unit/org/openstreetmap/josm/plugins/mapillary/utils/PluginStateTest.java	(revision 32592)
+++ applications/editors/josm/plugins/mapillary/test/unit/org/openstreetmap/josm/plugins/mapillary/utils/PluginStateTest.java	(revision 32593)
@@ -1,2 +1,3 @@
+// License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.plugins.mapillary.utils;
 
Index: applications/editors/josm/plugins/mapillary/test/unit/org/openstreetmap/josm/plugins/mapillary/utils/TestUtil.java
===================================================================
--- applications/editors/josm/plugins/mapillary/test/unit/org/openstreetmap/josm/plugins/mapillary/utils/TestUtil.java	(revision 32592)
+++ applications/editors/josm/plugins/mapillary/test/unit/org/openstreetmap/josm/plugins/mapillary/utils/TestUtil.java	(revision 32593)
@@ -1,2 +1,3 @@
+// License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.plugins.mapillary.utils;