Index: /trunk/src/org/openstreetmap/josm/actions/ChangesetManagerToggleAction.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/actions/ChangesetManagerToggleAction.java	(revision 9066)
+++ /trunk/src/org/openstreetmap/josm/actions/ChangesetManagerToggleAction.java	(revision 9067)
@@ -19,5 +19,5 @@
  */
 public class ChangesetManagerToggleAction extends ToggleAction {
-    private transient WindowListener changesetCacheManagerClosedHandler;
+    private final transient WindowListener changesetCacheManagerClosedHandler;
 
     /**
Index: /trunk/src/org/openstreetmap/josm/actions/CombineWayAction.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/actions/CombineWayAction.java	(revision 9066)
+++ /trunk/src/org/openstreetmap/josm/actions/CombineWayAction.java	(revision 9067)
@@ -463,5 +463,5 @@
         }
 
-        private Set<NodePair> edges;
+        private final Set<NodePair> edges;
         private int numUndirectedEges;
         private Map<Node, List<NodePair>> successors;
Index: /trunk/src/org/openstreetmap/josm/actions/CreateCircleAction.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/actions/CreateCircleAction.java	(revision 9066)
+++ /trunk/src/org/openstreetmap/josm/actions/CreateCircleAction.java	(revision 9067)
@@ -102,6 +102,6 @@
      */
     private static class PolarNode {
-        private double a;
-        private Node node;
+        private final double a;
+        private final Node node;
 
         PolarNode(EastNorth center, Node n) {
Index: /trunk/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java	(revision 9066)
+++ /trunk/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java	(revision 9067)
@@ -28,5 +28,5 @@
  */
 public class FullscreenToggleAction extends ToggleAction {
-    private transient GraphicsDevice gd;
+    private final transient GraphicsDevice gd;
     private Rectangle prevBounds;
 
Index: /trunk/src/org/openstreetmap/josm/actions/JoinAreasAction.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/actions/JoinAreasAction.java	(revision 9066)
+++ /trunk/src/org/openstreetmap/josm/actions/JoinAreasAction.java	(revision 9067)
@@ -190,5 +190,5 @@
 
         /** Set of {@link WayInPolygon} to be joined by walk algorithm */
-        private Set<WayInPolygon> availableWays;
+        private final Set<WayInPolygon> availableWays;
         /** Current state of walk algorithm */
         private WayInPolygon lastWay;
Index: /trunk/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java	(revision 9066)
+++ /trunk/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java	(revision 9067)
@@ -181,5 +181,5 @@
 
         private final EastNorth refPoint;
-        private EastNorth refPoint2;
+        private final EastNorth refPoint2;
         private final boolean projectToSegment;
 
Index: /trunk/src/org/openstreetmap/josm/actions/MoveAction.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/actions/MoveAction.java	(revision 9066)
+++ /trunk/src/org/openstreetmap/josm/actions/MoveAction.java	(revision 9067)
@@ -29,5 +29,5 @@
     public enum Direction { UP, LEFT, RIGHT, DOWN }
 
-    private Direction myDirection;
+    private final Direction myDirection;
 
     // any better idea?
Index: /trunk/src/org/openstreetmap/josm/actions/RenameLayerAction.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/actions/RenameLayerAction.java	(revision 9066)
+++ /trunk/src/org/openstreetmap/josm/actions/RenameLayerAction.java	(revision 9067)
@@ -28,6 +28,6 @@
 public class RenameLayerAction extends AbstractAction {
 
-    private File file;
-    private transient Layer layer;
+    private final File file;
+    private final transient Layer layer;
 
     /**
Index: /trunk/src/org/openstreetmap/josm/actions/ReverseWayAction.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/actions/ReverseWayAction.java	(revision 9066)
+++ /trunk/src/org/openstreetmap/josm/actions/ReverseWayAction.java	(revision 9067)
@@ -32,7 +32,7 @@
 
     public static class ReverseWayResult {
-        private Way newWay;
-        private Collection<Command> tagCorrectionCommands;
-        private Command reverseCommand;
+        private final Way newWay;
+        private final Collection<Command> tagCorrectionCommands;
+        private final Command reverseCommand;
 
         public ReverseWayResult(Way newWay, Collection<Command> tagCorrectionCommands, Command reverseCommand) {
Index: /trunk/src/org/openstreetmap/josm/actions/ToggleUploadDiscouragedLayerAction.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/actions/ToggleUploadDiscouragedLayerAction.java	(revision 9066)
+++ /trunk/src/org/openstreetmap/josm/actions/ToggleUploadDiscouragedLayerAction.java	(revision 9067)
@@ -11,5 +11,5 @@
 public class ToggleUploadDiscouragedLayerAction extends JosmAction {
 
-    private transient OsmDataLayer layer;
+    private final transient OsmDataLayer layer;
 
     public ToggleUploadDiscouragedLayerAction(OsmDataLayer layer) {
Index: /trunk/src/org/openstreetmap/josm/actions/UploadSelectionAction.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/actions/UploadSelectionAction.java	(revision 9066)
+++ /trunk/src/org/openstreetmap/josm/actions/UploadSelectionAction.java	(revision 9067)
@@ -259,6 +259,6 @@
         private boolean canceled;
         private Exception lastException;
-        private Collection<OsmPrimitive> toUpload;
-        private OsmDataLayer layer;
+        private final Collection<OsmPrimitive> toUpload;
+        private final OsmDataLayer layer;
         private OsmServerBackreferenceReader reader;
 
Index: /trunk/src/org/openstreetmap/josm/actions/ValidateAction.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/actions/ValidateAction.java	(revision 9066)
+++ /trunk/src/org/openstreetmap/josm/actions/ValidateAction.java	(revision 9067)
@@ -112,6 +112,6 @@
     static class ValidationTask extends PleaseWaitRunnable {
         private Collection<Test> tests;
-        private Collection<OsmPrimitive> validatedPrimitives;
-        private Collection<OsmPrimitive> formerValidatedPrimitives;
+        private final Collection<OsmPrimitive> validatedPrimitives;
+        private final Collection<OsmPrimitive> formerValidatedPrimitives;
         private boolean canceled;
         private List<TestError> errors;
Index: /trunk/src/org/openstreetmap/josm/actions/downloadtasks/AbstractDownloadTask.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/actions/downloadtasks/AbstractDownloadTask.java	(revision 9066)
+++ /trunk/src/org/openstreetmap/josm/actions/downloadtasks/AbstractDownloadTask.java	(revision 9067)
@@ -13,5 +13,5 @@
  */
 public abstract class AbstractDownloadTask<T> implements DownloadTask {
-    private List<Object> errorMessages;
+    private final List<Object> errorMessages;
     private boolean canceled;
     private boolean failed;
Index: /trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java	(revision 9066)
+++ /trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java	(revision 9067)
@@ -98,5 +98,5 @@
 
     class DownloadTask extends PleaseWaitRunnable {
-        private OsmServerReader reader;
+        private final OsmServerReader reader;
         private GpxData rawData;
         private final boolean newLayer;
Index: /trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadTaskList.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadTaskList.java	(revision 9066)
+++ /trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadTaskList.java	(revision 9067)
@@ -44,6 +44,6 @@
  */
 public class DownloadTaskList {
-    private List<DownloadTask> tasks = new LinkedList<>();
-    private List<Future<?>> taskFutures = new LinkedList<>();
+    private final List<DownloadTask> tasks = new LinkedList<>();
+    private final List<Future<?>> taskFutures = new LinkedList<>();
     private ProgressMonitor progressMonitor;
 
Index: /trunk/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java	(revision 9066)
+++ /trunk/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java	(revision 9067)
@@ -21,6 +21,6 @@
 
 public class PostDownloadHandler implements Runnable {
-    private DownloadTask task;
-    private List<Future<?>> futures;
+    private final DownloadTask task;
+    private final List<Future<?>> futures;
 
     /**
Index: /trunk/src/org/openstreetmap/josm/actions/mapmode/AddNoteAction.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/actions/mapmode/AddNoteAction.java	(revision 9066)
+++ /trunk/src/org/openstreetmap/josm/actions/mapmode/AddNoteAction.java	(revision 9067)
@@ -27,5 +27,5 @@
 public class AddNoteAction extends MapMode implements KeyPressReleaseListener {
 
-    private transient NoteData noteData;
+    private final transient NoteData noteData;
 
     /**
Index: /trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java	(revision 9066)
+++ /trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java	(revision 9067)
@@ -1408,5 +1408,5 @@
         private JCheckBoxMenuItem checkBox;
 
-        private MouseListener anglePopupListener = new PopupMenuLauncher(new AnglePopupMenu()) {
+        private final MouseListener anglePopupListener = new PopupMenuLauncher(new AnglePopupMenu()) {
             @Override
             public void mouseClicked(MouseEvent e) {
Index: /trunk/src/org/openstreetmap/josm/actions/mapmode/PlayHeadDragMode.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/actions/mapmode/PlayHeadDragMode.java	(revision 9066)
+++ /trunk/src/org/openstreetmap/josm/actions/mapmode/PlayHeadDragMode.java	(revision 9067)
@@ -23,5 +23,5 @@
     private Point mousePos;
     private Point mouseStart;
-    private transient PlayHeadMarker playHeadMarker;
+    private final transient PlayHeadMarker playHeadMarker;
 
     /**
Index: /trunk/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java	(revision 9066)
+++ /trunk/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java	(revision 9067)
@@ -1020,6 +1020,6 @@
     }
 
-    private transient CycleManager cycleManager = new CycleManager();
-    private transient VirtualManager virtualManager = new VirtualManager();
+    private final transient CycleManager cycleManager = new CycleManager();
+    private final transient VirtualManager virtualManager = new VirtualManager();
 
     private class CycleManager {
Index: /trunk/src/org/openstreetmap/josm/actions/search/SearchCompiler.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/actions/search/SearchCompiler.java	(revision 9066)
+++ /trunk/src/org/openstreetmap/josm/actions/search/SearchCompiler.java	(revision 9067)
@@ -65,9 +65,9 @@
 public class SearchCompiler {
 
-    private boolean caseSensitive;
-    private boolean regexSearch;
+    private final boolean caseSensitive;
+    private final boolean regexSearch;
     private static String  rxErrorMsg = marktr("The regex \"{0}\" had a parse error at offset {1}, full error:\n\n{2}");
     private static String  rxErrorMsgNoPos = marktr("The regex \"{0}\" had a parse error, full error:\n\n{1}");
-    private PushbackTokenizer tokenizer;
+    private final PushbackTokenizer tokenizer;
     private static Map<String, SimpleMatchFactory> simpleMatchFactoryMap = new HashMap<>();
     private static Map<String, UnaryMatchFactory> unaryMatchFactoryMap = new HashMap<>();
@@ -109,5 +109,5 @@
 
     public class CoreSimpleMatchFactory implements SimpleMatchFactory {
-        private Collection<String> keywords = Arrays.asList("id", "version", "type", "user", "role",
+        private final Collection<String> keywords = Arrays.asList("id", "version", "type", "user", "role",
                 "changeset", "nodes", "ways", "tags", "areasize", "waylength", "modified", "selected",
                 "incomplete", "untagged", "closed", "new", "indownloadedarea",
Index: /trunk/src/org/openstreetmap/josm/actions/upload/FixDataHook.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/actions/upload/FixDataHook.java	(revision 9066)
+++ /trunk/src/org/openstreetmap/josm/actions/upload/FixDataHook.java	(revision 9067)
@@ -30,5 +30,5 @@
      * List of checks to run on data
      */
-    private List<FixData> deprecated = new LinkedList<>();
+    private final List<FixData> deprecated = new LinkedList<>();
 
     /**
@@ -107,7 +107,7 @@
     public static class FixDataKey implements FixData {
         /** key of wrong data */
-        private String oldKey;
+        private final String oldKey;
         /** key of correct data */
-        private String newKey;
+        private final String newKey;
 
         /**
@@ -141,11 +141,11 @@
     public static class FixDataTag implements FixData {
         /** key of wrong data */
-        private String oldKey;
+        private final String oldKey;
         /** value of wrong data */
-        private String oldValue;
+        private final String oldValue;
         /** key of correct data */
-        private String newKey;
+        private final String newKey;
         /** value of correct data */
-        private String newValue;
+        private final String newValue;
 
         /**
Index: /trunk/src/org/openstreetmap/josm/actions/upload/UploadNotesTask.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/actions/upload/UploadNotesTask.java	(revision 9066)
+++ /trunk/src/org/openstreetmap/josm/actions/upload/UploadNotesTask.java	(revision 9067)
@@ -40,6 +40,6 @@
 
         private boolean isCanceled;
-        private Map<Note, Note> updatedNotes = new HashMap<>();
-        private Map<Note, Exception> failedNotes = new HashMap<>();
+        private final Map<Note, Note> updatedNotes = new HashMap<>();
+        private final Map<Note, Exception> failedNotes = new HashMap<>();
 
         /**
Index: /trunk/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java	(revision 9066)
+++ /trunk/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java	(revision 9067)
@@ -25,5 +25,5 @@
     private final Relation relation;
     // Position of the member
-    private int position = -1;
+    private final int position;
     // The new role
     private final String newRole;
Index: /trunk/src/org/openstreetmap/josm/command/MoveCommand.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/command/MoveCommand.java	(revision 9066)
+++ /trunk/src/org/openstreetmap/josm/command/MoveCommand.java	(revision 9067)
@@ -51,5 +51,5 @@
      * List of all old states of the objects.
      */
-    private List<OldNodeState> oldState = new LinkedList<>();
+    private final List<OldNodeState> oldState = new LinkedList<>();
 
     /**
Index: /trunk/src/org/openstreetmap/josm/command/RotateCommand.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/command/RotateCommand.java	(revision 9066)
+++ /trunk/src/org/openstreetmap/josm/command/RotateCommand.java	(revision 9067)
@@ -20,10 +20,10 @@
      * Pivot point
      */
-    private EastNorth pivot;
+    private final EastNorth pivot;
 
     /**
      * angle of rotation starting click to pivot
      */
-    private double startAngle;
+    private final double startAngle;
 
     /**
Index: /trunk/src/org/openstreetmap/josm/command/ScaleCommand.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/command/ScaleCommand.java	(revision 9066)
+++ /trunk/src/org/openstreetmap/josm/command/ScaleCommand.java	(revision 9067)
@@ -14,5 +14,5 @@
      * Pivot point
      */
-    private EastNorth pivot;
+    private final EastNorth pivot;
 
     /**
@@ -24,5 +24,5 @@
      * World position of the mouse when the user started the command.
      */
-    private EastNorth startEN;
+    private final EastNorth startEN;
 
     /**
Index: /trunk/src/org/openstreetmap/josm/corrector/CorrectionTableModel.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/corrector/CorrectionTableModel.java	(revision 9066)
+++ /trunk/src/org/openstreetmap/josm/corrector/CorrectionTableModel.java	(revision 9067)
@@ -11,7 +11,7 @@
 public abstract class CorrectionTableModel<C extends Correction> extends AbstractTableModel {
 
-    private transient List<C> corrections;
+    private final transient List<C> corrections;
     private boolean[] apply;
-    private int applyColumn;
+    private final int applyColumn;
 
     public CorrectionTableModel(List<C> corrections) {
Index: /trunk/src/org/openstreetmap/josm/corrector/TagCorrector.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/corrector/TagCorrector.java	(revision 9066)
+++ /trunk/src/org/openstreetmap/josm/corrector/TagCorrector.java	(revision 9067)
@@ -46,5 +46,5 @@
     public abstract Collection<Command> execute(P oldprimitive, P primitive) throws UserCancelException;
 
-    private String[] applicationOptions = new String[] {
+    private final String[] applicationOptions = new String[] {
             tr("Apply selected changes"),
             tr("Do not apply changes"),
Index: /trunk/src/org/openstreetmap/josm/data/APIDataSet.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/APIDataSet.java	(revision 9066)
+++ /trunk/src/org/openstreetmap/josm/data/APIDataSet.java	(revision 9067)
@@ -270,5 +270,5 @@
      */
     private static class RelationUploadDependencyGraph {
-        private Map<Relation, Set<Relation>> children = new HashMap<>();
+        private final Map<Relation, Set<Relation>> children = new HashMap<>();
         private Collection<Relation> relations;
         private Set<Relation> visited = new HashSet<>();
Index: /trunk/src/org/openstreetmap/josm/data/CustomConfigurator.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/CustomConfigurator.java	(revision 9066)
+++ /trunk/src/org/openstreetmap/josm/data/CustomConfigurator.java	(revision 9067)
@@ -423,5 +423,5 @@
 
         private Preferences mainPrefs;
-        private Map<String, Element> tasksMap = new HashMap<>();
+        private final Map<String, Element> tasksMap = new HashMap<>();
 
         private boolean lastV; // last If condition result
Index: /trunk/src/org/openstreetmap/josm/data/Preferences.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/Preferences.java	(revision 9066)
+++ /trunk/src/org/openstreetmap/josm/data/Preferences.java	(revision 9067)
@@ -1727,6 +1727,6 @@
 
     private class SettingToXml implements SettingVisitor {
-        private StringBuilder b;
-        private boolean noPassword;
+        private final StringBuilder b;
+        private final boolean noPassword;
         private String key;
 
Index: /trunk/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java	(revision 9066)
+++ /trunk/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java	(revision 9067)
@@ -40,5 +40,5 @@
 public class ConflictCollection implements Iterable<Conflict<? extends OsmPrimitive>> {
     private final List<Conflict<? extends OsmPrimitive>> conflicts;
-    private CopyOnWriteArrayList<IConflictListener> listeners;
+    private final CopyOnWriteArrayList<IConflictListener> listeners;
 
     private static class FilterPredicate implements Predicate<Conflict<? extends OsmPrimitive>> {
Index: /trunk/src/org/openstreetmap/josm/data/imagery/CachedTileLoaderFactory.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/imagery/CachedTileLoaderFactory.java	(revision 9066)
+++ /trunk/src/org/openstreetmap/josm/data/imagery/CachedTileLoaderFactory.java	(revision 9067)
@@ -27,5 +27,5 @@
      */
     public static final StringProperty PROP_TILECACHE_DIR = getTileCacheDir();
-    private ICacheAccess<String, BufferedImageCacheEntry> cache;
+    private final ICacheAccess<String, BufferedImageCacheEntry> cache;
     private Constructor<? extends TileLoader> tileLoaderConstructor;
 
Index: /trunk/src/org/openstreetmap/josm/data/imagery/TMSCachedTileLoaderJob.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/imagery/TMSCachedTileLoaderJob.java	(revision 9066)
+++ /trunk/src/org/openstreetmap/josm/data/imagery/TMSCachedTileLoaderJob.java	(revision 9067)
@@ -42,5 +42,5 @@
     private static final long MAXIMUM_EXPIRES = 30 /*days*/ * 24 /*hours*/ * 60 /*minutes*/ * 60 /*seconds*/ *1000L /*milliseconds*/;
     private static final long MINIMUM_EXPIRES = 1 /*hour*/ * 60 /*minutes*/ * 60 /*seconds*/ *1000L /*milliseconds*/;
-    private Tile tile;
+    private final Tile tile;
     private volatile URL url;
 
Index: /trunk/src/org/openstreetmap/josm/data/notes/NoteComment.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/notes/NoteComment.java	(revision 9066)
+++ /trunk/src/org/openstreetmap/josm/data/notes/NoteComment.java	(revision 9067)
@@ -12,8 +12,8 @@
 public class NoteComment {
 
-    private String text;
-    private User user;
-    private Date commentTimestamp;
-    private Action action;
+    private final String text;
+    private final User user;
+    private final Date commentTimestamp;
+    private final Action action;
 
     //not currently used. I'm planning on using this to keep track of new actions that need to be uploaded
Index: /trunk/src/org/openstreetmap/josm/data/oauth/OAuthToken.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/oauth/OAuthToken.java	(revision 9066)
+++ /trunk/src/org/openstreetmap/josm/data/oauth/OAuthToken.java	(revision 9067)
@@ -2,7 +2,7 @@
 package org.openstreetmap.josm.data.oauth;
 
+import org.openstreetmap.josm.tools.CheckParameterUtil;
+
 import oauth.signpost.OAuthConsumer;
-
-import org.openstreetmap.josm.tools.CheckParameterUtil;
 
 public class OAuthToken {
@@ -18,6 +18,6 @@
     }
 
-    private String key;
-    private String secret;
+    private final String key;
+    private final String secret;
 
     /**
Index: /trunk/src/org/openstreetmap/josm/data/osm/ChangesetDataSet.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/osm/ChangesetDataSet.java	(revision 9066)
+++ /trunk/src/org/openstreetmap/josm/data/osm/ChangesetDataSet.java	(revision 9067)
@@ -153,6 +153,6 @@
 
     private static class DefaultChangesetDataSetEntry implements ChangesetDataSetEntry {
-        private ChangesetModificationType modificationType;
-        private HistoryOsmPrimitive primitive;
+        private final ChangesetModificationType modificationType;
+        private final HistoryOsmPrimitive primitive;
 
         DefaultChangesetDataSetEntry(ChangesetModificationType modificationType, HistoryOsmPrimitive primitive) {
@@ -173,5 +173,5 @@
 
     private class DefaultIterator implements Iterator<ChangesetDataSetEntry> {
-        private Iterator<Entry<PrimitiveId, ChangesetModificationType>> typeIterator;
+        private final Iterator<Entry<PrimitiveId, ChangesetModificationType>> typeIterator;
 
         DefaultIterator() {
Index: /trunk/src/org/openstreetmap/josm/data/osm/DataSet.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/osm/DataSet.java	(revision 9066)
+++ /trunk/src/org/openstreetmap/josm/data/osm/DataSet.java	(revision 9067)
@@ -233,8 +233,8 @@
     }
 
-    /*
+    /**
      * Holding bin for changeset tag information, to be applied when or if this is ever uploaded.
      */
-    private Map<String, String> changeSetTags = new HashMap<>();
+    private final Map<String, String> changeSetTags = new HashMap<>();
 
     /**
Index: /trunk/src/org/openstreetmap/josm/data/osm/RelationToChildReference.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/osm/RelationToChildReference.java	(revision 9066)
+++ /trunk/src/org/openstreetmap/josm/data/osm/RelationToChildReference.java	(revision 9067)
@@ -42,8 +42,8 @@
     }
 
-    private Relation parent;
-    private int position;
-    private String role;
-    private OsmPrimitive child;
+    private final Relation parent;
+    private final int position;
+    private final String role;
+    private final OsmPrimitive child;
 
     public RelationToChildReference(Relation parent, int position, String role, OsmPrimitive child) {
Index: /trunk/src/org/openstreetmap/josm/data/osm/Storage.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/osm/Storage.java	(revision 9066)
+++ /trunk/src/org/openstreetmap/josm/data/osm/Storage.java	(revision 9067)
@@ -90,5 +90,5 @@
     private int size;
     private volatile int modCount;
-    private double loadFactor = 0.6d;
+    private final double loadFactor = 0.6d;
     private static final int DEFAULT_CAPACITY = 16;
     private final boolean safeIterator;
@@ -363,5 +363,5 @@
 
     private final class FMap<K> implements Map<K, T> {
-        private Hash<K, ? super T> fHash;
+        private final Hash<K, ? super T> fHash;
 
         private FMap(Hash<K, ? super T> h) {
Index: /trunk/src/org/openstreetmap/josm/data/osm/history/History.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/osm/history/History.java	(revision 9066)
+++ /trunk/src/org/openstreetmap/josm/data/osm/history/History.java	(revision 9067)
@@ -36,5 +36,5 @@
 
     /** the list of object snapshots */
-    private List<HistoryOsmPrimitive> versions;
+    private final List<HistoryOsmPrimitive> versions;
     /** the object id */
     private final long id;
Index: /trunk/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java	(revision 9066)
+++ /trunk/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java	(revision 9067)
@@ -45,7 +45,7 @@
 
     /** the history data */
-    private Map<PrimitiveId, ArrayList<HistoryOsmPrimitive>> data;
-    private CopyOnWriteArrayList<HistoryDataSetListener> listeners;
-    private Map<Long, Changeset> changesets;
+    private final Map<PrimitiveId, ArrayList<HistoryOsmPrimitive>> data;
+    private final CopyOnWriteArrayList<HistoryDataSetListener> listeners;
+    private final Map<Long, Changeset> changesets;
 
     /**
Index: /trunk/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java	(revision 9066)
+++ /trunk/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java	(revision 9067)
@@ -21,5 +21,5 @@
 public class HistoryRelation extends HistoryOsmPrimitive {
 
-    private List<RelationMemberData> members = new ArrayList<>();
+    private final List<RelationMemberData> members = new ArrayList<>();
 
     /**
Index: /trunk/src/org/openstreetmap/josm/data/osm/history/HistoryWay.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/osm/history/HistoryWay.java	(revision 9066)
+++ /trunk/src/org/openstreetmap/josm/data/osm/history/HistoryWay.java	(revision 9067)
@@ -21,5 +21,5 @@
 public class HistoryWay extends HistoryOsmPrimitive {
 
-    private List<Long> nodeIds = new ArrayList<>();
+    private final List<Long> nodeIds = new ArrayList<>();
 
     /**
Index: /trunk/src/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitor.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitor.java	(revision 9066)
+++ /trunk/src/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitor.java	(revision 9067)
@@ -32,7 +32,7 @@
  */
 public class MergeSourceBuildingVisitor extends AbstractVisitor {
-    private DataSet selectionBase;
-    private DataSet hull;
-    private Map<OsmPrimitive, PrimitiveData> mappedPrimitives;
+    private final DataSet selectionBase;
+    private final DataSet hull;
+    private final Map<OsmPrimitive, PrimitiveData> mappedPrimitives;
 
     /**
Index: /trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/MapRendererFactory.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/MapRendererFactory.java	(revision 9066)
+++ /trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/MapRendererFactory.java	(revision 9067)
@@ -60,7 +60,7 @@
 
     public static class Descriptor {
-        private Class<? extends AbstractMapRenderer> renderer;
-        private String displayName;
-        private String description;
+        private final Class<? extends AbstractMapRenderer> renderer;
+        private final String displayName;
+        private final String description;
 
         public Descriptor(Class<? extends AbstractMapRenderer> renderer, String displayName, String description) {
Index: /trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/WireframeMapRenderer.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/WireframeMapRenderer.java	(revision 9066)
+++ /trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/WireframeMapRenderer.java	(revision 9067)
@@ -90,5 +90,5 @@
 
     /** Helper variable for {@link #visit(Relation)} */
-    private Stroke relatedWayStroke = new BasicStroke(
+    private final Stroke relatedWayStroke = new BasicStroke(
             4, BasicStroke.CAP_SQUARE, BasicStroke.JOIN_BEVEL);
 
Index: /trunk/src/org/openstreetmap/josm/data/projection/datum/NTV2GridShiftFileWrapper.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/projection/datum/NTV2GridShiftFileWrapper.java	(revision 9066)
+++ /trunk/src/org/openstreetmap/josm/data/projection/datum/NTV2GridShiftFileWrapper.java	(revision 9067)
@@ -35,5 +35,5 @@
 
     private NTV2GridShiftFile instance;
-    private String gridFileName;
+    private final String gridFileName;
 
     /**
Index: /trunk/src/org/openstreetmap/josm/data/projection/datum/NTV2SubGrid.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/projection/datum/NTV2SubGrid.java	(revision 9066)
+++ /trunk/src/org/openstreetmap/josm/data/projection/datum/NTV2SubGrid.java	(revision 9067)
@@ -41,20 +41,20 @@
     private static final long serialVersionUID = 1L;
 
-    private String subGridName;
-    private String parentSubGridName;
-    private String created;
-    private String updated;
-    private double minLat;
-    private double maxLat;
-    private double minLon;
-    private double maxLon;
-    private double latInterval;
-    private double lonInterval;
-    private int nodeCount;
-
-    private int lonColumnCount;
-    private int latRowCount;
-    private float[] latShift;
-    private float[] lonShift;
+    private final String subGridName;
+    private final String parentSubGridName;
+    private final String created;
+    private final String updated;
+    private final double minLat;
+    private final double maxLat;
+    private final double minLon;
+    private final double maxLon;
+    private final double latInterval;
+    private final double lonInterval;
+    private final int nodeCount;
+
+    private final int lonColumnCount;
+    private final int latRowCount;
+    private final float[] latShift;
+    private final float[] lonShift;
     private float[] latAccuracy;
     private float[] lonAccuracy;
Index: /trunk/src/org/openstreetmap/josm/data/projection/proj/ClassProjFactory.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/projection/proj/ClassProjFactory.java	(revision 9066)
+++ /trunk/src/org/openstreetmap/josm/data/projection/proj/ClassProjFactory.java	(revision 9067)
@@ -7,5 +7,5 @@
 public class ClassProjFactory implements ProjFactory {
 
-    private Class<? extends Proj> projClass;
+    private final Class<? extends Proj> projClass;
 
     public ClassProjFactory(Class<? extends Proj> projClass) {
Index: /trunk/src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java	(revision 9066)
+++ /trunk/src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java	(revision 9067)
@@ -44,5 +44,5 @@
     private static class NodeHash implements Hash<Object, Object> {
 
-        private double precision = Main.pref.getDouble("validator.duplicatenodes.precision", 0.);
+        private final double precision = Main.pref.getDouble("validator.duplicatenodes.precision", 0.);
 
         private LatLon roundCoord(LatLon coor) {
Index: /trunk/src/org/openstreetmap/josm/data/validation/tests/DuplicateRelation.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/validation/tests/DuplicateRelation.java	(revision 9066)
+++ /trunk/src/org/openstreetmap/josm/data/validation/tests/DuplicateRelation.java	(revision 9067)
@@ -39,8 +39,8 @@
     public static class RelMember {
         /** Role of the relation member */
-        private String role;
+        private final String role;
 
         /** Type of the relation member */
-        private OsmPrimitiveType type;
+        private final OsmPrimitiveType type;
 
         /** Tags of the relation member */
@@ -103,5 +103,5 @@
     private static class RelationMembers {
         /** List of member objects of the relation */
-        private List<RelMember> members;
+        private final List<RelMember> members;
 
         /** Store relation information
@@ -133,7 +133,7 @@
     private static class RelationPair {
         /** Member objects of the relation */
-        private RelationMembers members;
+        private final RelationMembers members;
         /** Tags of the relation */
-        private Map<String, String> keys;
+        private final Map<String, String> keys;
 
         /** Store relation information
Index: /trunk/src/org/openstreetmap/josm/data/validation/tests/SimilarNamedWays.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/validation/tests/SimilarNamedWays.java	(revision 9066)
+++ /trunk/src/org/openstreetmap/josm/data/validation/tests/SimilarNamedWays.java	(revision 9067)
@@ -41,5 +41,5 @@
     private MultiMap<Way, Way> errorWays;
 
-    private List<NormalizeRule> rules = new ArrayList<NormalizeRule>();
+    private final List<NormalizeRule> rules = new ArrayList<NormalizeRule>();
 
     /**