Index: /applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/MapillaryImage.java
===================================================================
--- /applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/MapillaryImage.java	(revision 31810)
+++ /applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/MapillaryImage.java	(revision 31811)
@@ -18,5 +18,5 @@
   private String user;
   /** Set of traffic signs in the image. */
-  private List<String> signs;
+  private final List<String> signs = new ArrayList<>();
   /** Where the picture was taken. */
   private String location;
@@ -37,5 +37,4 @@
     super(lat, lon, ca);
     this.key = key;
-    this.signs = new ArrayList<>();
   }
 
Index: /applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/actions/MapillaryExportAction.java
===================================================================
--- /applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/actions/MapillaryExportAction.java	(revision 31810)
+++ /applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/actions/MapillaryExportAction.java	(revision 31811)
@@ -115,5 +115,5 @@
 
   private class OKAction implements ActionListener {
-    private JOptionPane pane;
+    private final JOptionPane pane;
 
     public OKAction(JOptionPane pane) {
@@ -128,5 +128,5 @@
 
   private class CancelAction implements ActionListener {
-    private JOptionPane pane;
+    private final JOptionPane pane;
 
     public CancelAction(JOptionPane pane) {
Index: /applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/actions/MapillaryWalkAction.java
===================================================================
--- /applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/actions/MapillaryWalkAction.java	(revision 31810)
+++ /applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/actions/MapillaryWalkAction.java	(revision 31811)
@@ -27,11 +27,10 @@
  *
  */
-public class MapillaryWalkAction extends JosmAction implements
-    MapillaryDataListener {
+public class MapillaryWalkAction extends JosmAction implements MapillaryDataListener {
 
   private static final long serialVersionUID = 3454223919402245818L;
 
   private WalkThread thread = null;
-  private ArrayList<WalkListener> listeners = new ArrayList<>();
+  private final ArrayList<WalkListener> listeners = new ArrayList<>();
 
   /**
Index: /applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/gui/HyperlinkLabel.java
===================================================================
--- /applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/gui/HyperlinkLabel.java	(revision 31810)
+++ /applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/gui/HyperlinkLabel.java	(revision 31811)
@@ -114,7 +114,7 @@
     private static final long serialVersionUID = 1384054752970921552L;
 
-    private JMenuItem copy;
-    private JMenuItem copyTag;
-    private JMenuItem edit;
+    private final JMenuItem copy;
+    private final JMenuItem copyTag;
+    private final JMenuItem edit;
 
     public LinkPopUp() {
Index: /applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/gui/MapillaryExportDialog.java
===================================================================
--- /applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/gui/MapillaryExportDialog.java	(revision 31810)
+++ /applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/gui/MapillaryExportDialog.java	(revision 31811)
@@ -147,5 +147,5 @@
     private static final long serialVersionUID = -9103251296651015563L;
     private String lastPath;
-    private MapillaryExportDialog dlg;
+    private final MapillaryExportDialog dlg;
 
     /**
Index: /applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/gui/MapillaryHistoryDialog.java
===================================================================
--- /applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/gui/MapillaryHistoryDialog.java	(revision 31810)
+++ /applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/gui/MapillaryHistoryDialog.java	(revision 31811)
@@ -56,6 +56,6 @@
   private static MapillaryHistoryDialog instance;
 
-  private transient UndoRedoSelectionListener undoSelectionListener;
-  private transient UndoRedoSelectionListener redoSelectionListener;
+  private final transient UndoRedoSelectionListener undoSelectionListener;
+  private final transient UndoRedoSelectionListener redoSelectionListener;
 
   private final DefaultTreeModel undoTreeModel = new DefaultTreeModel(
@@ -66,11 +66,11 @@
   private final JTree redoTree = new JTree(this.redoTreeModel);
 
-  private JSeparator separator = new JSeparator();
-  private Component spacer = Box.createRigidArea(new Dimension(0, 3));
-
-  private SideButton undoButton;
-  private SideButton redoButton;
-
-  private ConcurrentHashMap<Object, MapillaryCommand> map;
+  private final JSeparator separator = new JSeparator();
+  private final Component spacer = Box.createRigidArea(new Dimension(0, 3));
+
+  private final SideButton undoButton;
+  private final SideButton redoButton;
+
+  private final ConcurrentHashMap<Object, MapillaryCommand> map;
 
   private MapillaryHistoryDialog() {
Index: /applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/history/MapillaryRecord.java
===================================================================
--- /applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/history/MapillaryRecord.java	(revision 31810)
+++ /applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/history/MapillaryRecord.java	(revision 31811)
@@ -19,5 +19,5 @@
   private static MapillaryRecord instance;
 
-  private ArrayList<MapillaryRecordListener> listeners;
+  private final ArrayList<MapillaryRecordListener> listeners = new ArrayList<>();
 
   /** The set of commands that have taken place or that have been undone. */
@@ -32,5 +32,4 @@
     this.commandList = new ArrayList<>();
     this.position = -1;
-    this.listeners = new ArrayList<>();
   }
 
Index: /applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/history/commands/CommandDelete.java
===================================================================
--- /applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/history/commands/CommandDelete.java	(revision 31810)
+++ /applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/history/commands/CommandDelete.java	(revision 31811)
@@ -18,5 +18,5 @@
 public class CommandDelete extends MapillaryExecutableCommand {
 
-  private HashMap<MapillaryAbstractImage, Integer> changesHash;
+  private final HashMap<MapillaryAbstractImage, Integer> changesHash = new HashMap<>();
 
   /**
@@ -28,5 +28,4 @@
   public CommandDelete(List<MapillaryAbstractImage> images) {
     super(images);
-    this.changesHash = new HashMap<>();
   }
 
Index: /applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/io/download/MapillarySquareDownloadManagerThread.java
===================================================================
--- /applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/io/download/MapillarySquareDownloadManagerThread.java	(revision 31810)
+++ /applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/io/download/MapillarySquareDownloadManagerThread.java	(revision 31811)
@@ -37,9 +37,9 @@
   private final String signQueryString;
 
-  private ThreadPoolExecutor downloadExecutor = new ThreadPoolExecutor(3, 5,
+  private final ThreadPoolExecutor downloadExecutor = new ThreadPoolExecutor(3, 5,
       25, TimeUnit.SECONDS, new ArrayBlockingQueue<Runnable>(5));
-  private ThreadPoolExecutor completeExecutor = new ThreadPoolExecutor(3, 5,
+  private final ThreadPoolExecutor completeExecutor = new ThreadPoolExecutor(3, 5,
       25, TimeUnit.SECONDS, new ArrayBlockingQueue<Runnable>(5));
-  private ThreadPoolExecutor signsExecutor = new ThreadPoolExecutor(3, 5, 25,
+  private final ThreadPoolExecutor signsExecutor = new ThreadPoolExecutor(3, 5, 25,
       TimeUnit.SECONDS, new ArrayBlockingQueue<Runnable>(5));
 
Index: /applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/io/export/MapillaryExportDownloadThread.java
===================================================================
--- /applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/io/export/MapillaryExportDownloadThread.java	(revision 31810)
+++ /applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/io/export/MapillaryExportDownloadThread.java	(revision 31811)
@@ -29,8 +29,8 @@
     ICachedLoaderListener {
 
-  private ArrayBlockingQueue<BufferedImage> queue;
-  private ArrayBlockingQueue<MapillaryAbstractImage> queueImages;
+  private final ArrayBlockingQueue<BufferedImage> queue;
+  private final ArrayBlockingQueue<MapillaryAbstractImage> queueImages;
 
-  private MapillaryImage image;
+  private final MapillaryImage image;
 
   /**
Index: /applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/io/export/MapillaryExportManager.java
===================================================================
--- /applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/io/export/MapillaryExportManager.java	(revision 31810)
+++ /applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/io/export/MapillaryExportManager.java	(revision 31811)
@@ -34,6 +34,6 @@
 public class MapillaryExportManager extends PleaseWaitRunnable {
 
-  private ArrayBlockingQueue<BufferedImage> queue;
-  private ArrayBlockingQueue<MapillaryAbstractImage> queueImages;
+  private final ArrayBlockingQueue<BufferedImage> queue;
+  private final ArrayBlockingQueue<MapillaryAbstractImage> queueImages;
 
   private final int amount;
Index: /applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/mode/SelectMode.java
===================================================================
--- /applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/mode/SelectMode.java	(revision 31810)
+++ /applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/mode/SelectMode.java	(revision 31811)
@@ -36,5 +36,5 @@
   private MapillaryAbstractImage closest;
   private MapillaryAbstractImage lastClicked;
-  private MapillaryRecord record;
+  private final MapillaryRecord record;
   private boolean nothingHighlighted;
   private boolean imageHighlighted = false;
Index: /applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/oauth/OAuthPortListener.java
===================================================================
--- /applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/oauth/OAuthPortListener.java	(revision 31810)
+++ /applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/oauth/OAuthPortListener.java	(revision 31811)
@@ -29,5 +29,5 @@
       I18n.tr("Login successful, return to JOSM.")
   );
-  private MapillaryLoginListener callback;
+  private final MapillaryLoginListener callback;
 
   public OAuthPortListener(MapillaryLoginListener loginCallback) {
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 31810)
+++ /applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/oauth/UploadUtils.java	(revision 31811)
@@ -57,7 +57,7 @@
 
   private static class SequenceUploadThread extends Thread {
-    private List<MapillaryAbstractImage> images;
-    private UUID uuid;
-    private boolean delete;
+    private final List<MapillaryAbstractImage> images;
+    private final UUID uuid;
+    private final boolean delete;
     ThreadPoolExecutor ex;
 
@@ -101,6 +101,6 @@
   private static class SingleUploadThread extends Thread {
 
-    private MapillaryImportedImage image;
-    private UUID uuid;
+    private final MapillaryImportedImage image;
+    private final UUID uuid;
 
     private SingleUploadThread(MapillaryImportedImage image, UUID uuid) {
Index: /applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/traffico/TrafficoSignElement.java
===================================================================
--- /applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/traffico/TrafficoSignElement.java	(revision 31810)
+++ /applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/traffico/TrafficoSignElement.java	(revision 31811)
@@ -6,6 +6,6 @@
 public class TrafficoSignElement {
 
-  private Color color;
-  private char glyph;
+  private final Color color;
+  private final char glyph;
 
   public TrafficoSignElement(char glyph, Color c) {