Index: /trunk/src/org/openstreetmap/josm/Main.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/Main.java	(revision 8839)
+++ /trunk/src/org/openstreetmap/josm/Main.java	(revision 8840)
@@ -528,5 +528,5 @@
     }
 
-    private static volatile InitStatusListener initListener = null;
+    private static volatile InitStatusListener initListener;
 
     public interface InitStatusListener {
Index: /trunk/src/org/openstreetmap/josm/actions/AlignInCircleAction.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/actions/AlignInCircleAction.java	(revision 8839)
+++ /trunk/src/org/openstreetmap/josm/actions/AlignInCircleAction.java	(revision 8840)
@@ -62,5 +62,5 @@
         private double angle;
         private EastNorth origin = new EastNorth(0, 0);
-        private double azimuth = 0;
+        private double azimuth;
 
         PolarCoor(double radius, double angle) {
Index: /trunk/src/org/openstreetmap/josm/actions/CombineWayAction.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/actions/CombineWayAction.java	(revision 8839)
+++ /trunk/src/org/openstreetmap/josm/actions/CombineWayAction.java	(revision 8840)
@@ -464,5 +464,5 @@
 
         private Set<NodePair> edges;
-        private int numUndirectedEges = 0;
+        private int numUndirectedEges;
         private Map<Node, List<NodePair>> successors;
         private Map<Node, List<NodePair>> predecessors;
Index: /trunk/src/org/openstreetmap/josm/actions/JoinAreasAction.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/actions/JoinAreasAction.java	(revision 8839)
+++ /trunk/src/org/openstreetmap/josm/actions/JoinAreasAction.java	(revision 8840)
@@ -55,5 +55,5 @@
     // This will be used to commit commands and unite them into one large command sequence at the end
     private final LinkedList<Command> cmds = new LinkedList<>();
-    private int cmdsCount = 0;
+    private int cmdsCount;
     private final transient List<Relation> addedRelations = new LinkedList<>();
 
Index: /trunk/src/org/openstreetmap/josm/actions/OpenFileAction.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/actions/OpenFileAction.java	(revision 8839)
+++ /trunk/src/org/openstreetmap/josm/actions/OpenFileAction.java	(revision 8840)
@@ -101,5 +101,5 @@
         private final FileFilter fileFilter;
         private boolean canceled;
-        private boolean recordHistory = false;
+        private boolean recordHistory;
 
         public OpenFileTask(final List<File> files, final FileFilter fileFilter, final String title) {
Index: /trunk/src/org/openstreetmap/josm/actions/downloadtasks/AbstractDownloadTask.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/actions/downloadtasks/AbstractDownloadTask.java	(revision 8839)
+++ /trunk/src/org/openstreetmap/josm/actions/downloadtasks/AbstractDownloadTask.java	(revision 8840)
@@ -13,6 +13,6 @@
 public abstract class AbstractDownloadTask implements DownloadTask {
     private List<Object> errorMessages;
-    private boolean canceled = false;
-    private boolean failed = false;
+    private boolean canceled;
+    private boolean failed;
 
     public AbstractDownloadTask() {
Index: /trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java	(revision 8839)
+++ /trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java	(revision 8840)
@@ -44,5 +44,5 @@
     private static final String PATTERN_EXTERNAL_GPX_FILE = "https?://.*/(.*\\.gpx)";
 
-    protected String newLayerName = null;
+    protected String newLayerName;
 
     @Override
Index: /trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java	(revision 8839)
+++ /trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java	(revision 8840)
@@ -47,5 +47,5 @@
     protected DownloadTask downloadTask;
 
-    protected String newLayerName = null;
+    protected String newLayerName;
 
     @Override
Index: /trunk/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java	(revision 8839)
+++ /trunk/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java	(revision 8840)
@@ -47,5 +47,5 @@
 public class DeleteAction extends MapMode implements ModifierListener {
     // Cache previous mouse event (needed when only the modifier keys are pressed but the mouse isn't moved)
-    private MouseEvent oldEvent = null;
+    private MouseEvent oldEvent;
 
     /**
@@ -54,5 +54,5 @@
      * set would have to be checked.
      */
-    private transient WaySegment oldHighlightedWaySegment = null;
+    private transient WaySegment oldHighlightedWaySegment;
 
     private static final HighlightHelper highlightHelper = new HighlightHelper();
Index: /trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java	(revision 8839)
+++ /trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java	(revision 8840)
@@ -80,5 +80,5 @@
     private final Cursor cursorJoinWay;
 
-    private transient Node lastUsedNode = null;
+    private transient Node lastUsedNode;
     private double toleranceMultiplier;
 
@@ -94,5 +94,5 @@
     private transient Set<OsmPrimitive> newHighlights = new HashSet<>();
     private boolean drawHelperLine;
-    private boolean wayIsFinished = false;
+    private boolean wayIsFinished;
     private boolean drawTargetHighlight;
     private Point mousePos;
Index: /trunk/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java	(revision 8839)
+++ /trunk/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java	(revision 8840)
@@ -69,10 +69,10 @@
      * If {@code true}, when extruding create new node(s) even if segments are parallel.
      */
-    private boolean alwaysCreateNodes = false;
+    private boolean alwaysCreateNodes;
     private boolean nodeDragWithoutCtrl;
 
-    private long mouseDownTime = 0;
-    private transient WaySegment selectedSegment = null;
-    private transient Node selectedNode = null;
+    private long mouseDownTime;
+    private transient WaySegment selectedSegment;
+    private transient Node selectedNode;
     private Color mainColor;
     private transient Stroke mainStroke;
@@ -180,5 +180,5 @@
     private transient ReferenceSegment dualAlignSegment1, dualAlignSegment2;
     /** {@code true}, if new segment was collapsed */
-    private boolean dualAlignSegmentCollapsed = false;
+    private boolean dualAlignSegmentCollapsed;
     // Dual alignment UI stuff
     private final DualAlignChangeAction dualAlignChangeAction;
Index: /trunk/src/org/openstreetmap/josm/actions/mapmode/ImproveWayAccuracyAction.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/actions/mapmode/ImproveWayAccuracyAction.java	(revision 8839)
+++ /trunk/src/org/openstreetmap/josm/actions/mapmode/ImproveWayAccuracyAction.java	(revision 8840)
@@ -65,9 +65,9 @@
 
     private transient Way targetWay;
-    private transient Node candidateNode = null;
-    private transient WaySegment candidateSegment = null;
-
-    private Point mousePos = null;
-    private boolean dragging = false;
+    private transient Node candidateNode;
+    private transient WaySegment candidateSegment;
+
+    private Point mousePos;
+    private boolean dragging;
 
     private final Cursor cursorSelect;
@@ -86,5 +86,5 @@
     private int dotSize;
 
-    private boolean selectionChangedBlocked = false;
+    private boolean selectionChangedBlocked;
 
     protected String oldModeHelpText;
Index: /trunk/src/org/openstreetmap/josm/actions/mapmode/PlayHeadDragMode.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/actions/mapmode/PlayHeadDragMode.java	(revision 8839)
+++ /trunk/src/org/openstreetmap/josm/actions/mapmode/PlayHeadDragMode.java	(revision 8840)
@@ -20,8 +20,8 @@
 public class PlayHeadDragMode extends MapMode {
 
-    private boolean dragging = false;
-    private Point mousePos = null;
-    private Point mouseStart = null;
-    private transient PlayHeadMarker playHeadMarker = null;
+    private boolean dragging;
+    private Point mousePos;
+    private Point mouseStart;
+    private transient PlayHeadMarker playHeadMarker;
 
     /**
Index: /trunk/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java	(revision 8839)
+++ /trunk/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java	(revision 8840)
@@ -116,16 +116,16 @@
     }
 
-    private boolean lassoMode = false;
+    private boolean lassoMode;
     public boolean repeatedKeySwitchLassoOption;
 
     // Cache previous mouse event (needed when only the modifier keys are
     // pressed but the mouse isn't moved)
-    private MouseEvent oldEvent = null;
-
-    private Mode mode = null;
+    private MouseEvent oldEvent;
+
+    private Mode mode;
     private final transient SelectionManager selectionManager;
-    private boolean cancelDrawMode = false;
+    private boolean cancelDrawMode;
     private boolean drawTargetHighlight;
-    private boolean didMouseDrag = false;
+    private boolean didMouseDrag;
     /**
      * The component this SelectAction is associated with.
@@ -147,13 +147,13 @@
      * The time of the user mouse down event.
      */
-    private long mouseDownTime = 0;
+    private long mouseDownTime;
     /**
      * The pressed button of the user mouse down event.
      */
-    private int mouseDownButton = 0;
+    private int mouseDownButton;
     /**
      * The time of the user mouse down event.
      */
-    private long mouseReleaseTime = 0;
+    private long mouseReleaseTime;
     /**
      * The time which needs to pass between click and release before something
@@ -166,5 +166,5 @@
      */
     private int initialMoveThreshold;
-    private boolean initialMoveThresholdExceeded = false;
+    private boolean initialMoveThresholdExceeded;
 
     /**
@@ -991,6 +991,6 @@
 
         private Collection<OsmPrimitive> cycleList = Collections.emptyList();
-        private boolean cyclePrims = false;
-        private OsmPrimitive cycleStart = null;
+        private boolean cyclePrims;
+        private OsmPrimitive cycleStart;
         private boolean waitForMouseUpParameter;
         private boolean multipleMatchesParameter;
@@ -1130,5 +1130,5 @@
     private class VirtualManager {
 
-        private Node virtualNode = null;
+        private Node virtualNode;
         private Collection<WaySegment> virtualWays = new LinkedList<>();
         private int nodeVirtualSize;
Index: /trunk/src/org/openstreetmap/josm/actions/search/SearchAction.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/actions/search/SearchAction.java	(revision 8839)
+++ /trunk/src/org/openstreetmap/josm/actions/search/SearchAction.java	(revision 8840)
@@ -125,5 +125,5 @@
     }
 
-    private static volatile SearchSetting lastSearch = null;
+    private static volatile SearchSetting lastSearch;
 
     /**
Index: /trunk/src/org/openstreetmap/josm/actions/search/SearchCompiler.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/actions/search/SearchCompiler.java	(revision 8839)
+++ /trunk/src/org/openstreetmap/josm/actions/search/SearchCompiler.java	(revision 8840)
@@ -62,6 +62,6 @@
 public class SearchCompiler {
 
-    private boolean caseSensitive = false;
-    private boolean regexSearch = false;
+    private boolean caseSensitive;
+    private 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}");
Index: /trunk/src/org/openstreetmap/josm/actions/upload/UploadNotesTask.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/actions/upload/UploadNotesTask.java	(revision 8839)
+++ /trunk/src/org/openstreetmap/josm/actions/upload/UploadNotesTask.java	(revision 8840)
@@ -39,5 +39,5 @@
     private class UploadTask extends PleaseWaitRunnable {
 
-        private boolean isCanceled = false;
+        private boolean isCanceled;
         private Map<Note, Note> updatedNotes = new HashMap<>();
         private Map<Note, Exception> failedNotes = new HashMap<>();
Index: /trunk/src/org/openstreetmap/josm/command/AddPrimitivesCommand.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/command/AddPrimitivesCommand.java	(revision 8839)
+++ /trunk/src/org/openstreetmap/josm/command/AddPrimitivesCommand.java	(revision 8840)
@@ -29,6 +29,6 @@
 
     // only filled on undo
-    private List<OsmPrimitive> createdPrimitives = null;
-    private Collection<OsmPrimitive> createdPrimitivesToSelect = null;
+    private List<OsmPrimitive> createdPrimitives;
+    private Collection<OsmPrimitive> createdPrimitivesToSelect;
 
     /**
Index: /trunk/src/org/openstreetmap/josm/command/RotateCommand.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/command/RotateCommand.java	(revision 8839)
+++ /trunk/src/org/openstreetmap/josm/command/RotateCommand.java	(revision 8840)
@@ -25,10 +25,10 @@
      * angle of rotation starting click to pivot
      */
-    private double startAngle = 0.0;
+    private double startAngle;
 
     /**
      * computed rotation angle between starting click and current mouse pos
      */
-    private double rotationAngle = 0.0;
+    private double rotationAngle;
 
     /**
Index: /trunk/src/org/openstreetmap/josm/command/ScaleCommand.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/command/ScaleCommand.java	(revision 8839)
+++ /trunk/src/org/openstreetmap/josm/command/ScaleCommand.java	(revision 8840)
@@ -24,5 +24,5 @@
      * World position of the mouse when the user started the command.
      */
-    private EastNorth startEN = null;
+    private EastNorth startEN;
 
     /**
Index: /trunk/src/org/openstreetmap/josm/command/SequenceCommand.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/command/SequenceCommand.java	(revision 8839)
+++ /trunk/src/org/openstreetmap/josm/command/SequenceCommand.java	(revision 8840)
@@ -27,5 +27,5 @@
     private final String name;
     /** Determines if the sequence execution should continue after one of its commands fails. */
-    public boolean continueOnError = false;
+    public boolean continueOnError;
 
     /**
Index: /trunk/src/org/openstreetmap/josm/corrector/CorrectionTable.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/corrector/CorrectionTable.java	(revision 8839)
+++ /trunk/src/org/openstreetmap/josm/corrector/CorrectionTable.java	(revision 8840)
@@ -32,5 +32,5 @@
     }
 
-    private static volatile BoldRenderer boldRenderer = null;
+    private static volatile BoldRenderer boldRenderer;
 
     protected CorrectionTable(T correctionTableModel) {
Index: /trunk/src/org/openstreetmap/josm/data/CustomConfigurator.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/CustomConfigurator.java	(revision 8839)
+++ /trunk/src/org/openstreetmap/josm/data/CustomConfigurator.java	(revision 8840)
@@ -321,5 +321,5 @@
     }
 
-    private static boolean busy = false;
+    private static boolean busy;
 
     public static void pluginOperation(String install, String uninstall, String delete)  {
Index: /trunk/src/org/openstreetmap/josm/data/Preferences.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/Preferences.java	(revision 8839)
+++ /trunk/src/org/openstreetmap/josm/data/Preferences.java	(revision 8840)
@@ -101,15 +101,15 @@
      * @see #getPreferencesDirectory()
      */
-    private File preferencesDir = null;
+    private File preferencesDir;
 
     /**
      * Internal storage for the cache directory.
      */
-    private File cacheDir = null;
+    private File cacheDir;
 
     /**
      * Internal storage for the user data directory.
      */
-    private File userdataDir = null;
+    private File userdataDir;
 
     /**
Index: /trunk/src/org/openstreetmap/josm/data/cache/BufferedImageCacheEntry.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/cache/BufferedImageCacheEntry.java	(revision 8839)
+++ /trunk/src/org/openstreetmap/josm/data/cache/BufferedImageCacheEntry.java	(revision 8840)
@@ -17,9 +17,9 @@
     private static final long serialVersionUID = 1L; //version
     // transient to avoid serialization, volatile to avoid synchronization of whole getImage() method
-    private transient volatile BufferedImage img = null;
-    private transient volatile boolean writtenToDisk = false;
+    private transient volatile BufferedImage img;
+    private transient volatile boolean writtenToDisk;
     // we need to have separate control variable, to know, if we already tried to load the image, as img might be null
     // after we loaded image, as for example, when image file is malformed (eg. HTML file)
-    private transient volatile boolean imageLoaded = false;
+    private transient volatile boolean imageLoaded;
 
     /**
Index: /trunk/src/org/openstreetmap/josm/data/cache/JCSCacheManager.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/cache/JCSCacheManager.java	(revision 8839)
+++ /trunk/src/org/openstreetmap/josm/data/cache/JCSCacheManager.java	(revision 8840)
@@ -38,9 +38,9 @@
     private static final Logger LOG = FeatureAdapter.getLogger(JCSCacheManager.class.getCanonicalName());
 
-    private static volatile CompositeCacheManager cacheManager = null;
+    private static volatile CompositeCacheManager cacheManager;
     private static long maxObjectTTL        = -1;
     private static final String PREFERENCE_PREFIX = "jcs.cache";
     private static final AuxiliaryCacheFactory diskCacheFactory = new IndexedDiskCacheFactory();
-    private static FileLock cacheDirLock = null;
+    private static FileLock cacheDirLock;
 
     /**
Index: /trunk/src/org/openstreetmap/josm/data/cache/JCSCachedTileLoaderJob.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/cache/JCSCachedTileLoaderJob.java	(revision 8839)
+++ /trunk/src/org/openstreetmap/josm/data/cache/JCSCachedTileLoaderJob.java	(revision 8840)
@@ -89,6 +89,6 @@
     private ICacheAccess<K, V> cache;
     private ICacheElement<K, V> cacheElement;
-    protected V cacheData = null;
-    protected CacheEntryAttributes attributes = null;
+    protected V cacheData;
+    protected CacheEntryAttributes attributes;
 
     // HTTP connection parameters
@@ -98,5 +98,5 @@
     private ThreadPoolExecutor downloadJobExecutor;
     private Runnable finishTask;
-    private boolean force = false;
+    private boolean force;
 
     /**
Index: /trunk/src/org/openstreetmap/josm/data/imagery/ImageryInfo.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/imagery/ImageryInfo.java	(revision 8839)
+++ /trunk/src/org/openstreetmap/josm/data/imagery/ImageryInfo.java	(revision 8840)
@@ -164,18 +164,18 @@
     private String langName;
     /** whether this is a entry activated by default or not */
-    private boolean defaultEntry = false;
+    private boolean defaultEntry;
     /** The data part of HTTP cookies header in case the service requires cookies to work */
-    private String cookies = null;
+    private String cookies;
     /** Whether this service requires a explicit EULA acceptance before it can be activated */
-    private String eulaAcceptanceRequired = null;
+    private String eulaAcceptanceRequired;
     /** type of the imagery servics - WMS, TMS, ... */
     private ImageryType imageryType = ImageryType.WMS;
-    private double pixelPerDegree = 0.0;
+    private double pixelPerDegree;
     /** maximum zoom level for TMS imagery */
-    private int defaultMaxZoom = 0;
+    private int defaultMaxZoom;
     /** minimum zoom level for TMS imagery */
-    private int defaultMinZoom = 0;
+    private int defaultMinZoom;
     /** display bounds of imagery, displayed in prefs and used for automatic imagery selection */
-    private ImageryBounds bounds = null;
+    private ImageryBounds bounds;
     /** projections supported by WMS servers */
     private List<String> serverProjections;
Index: /trunk/src/org/openstreetmap/josm/data/osm/AbstractPrimitive.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/osm/AbstractPrimitive.java	(revision 8839)
+++ /trunk/src/org/openstreetmap/josm/data/osm/AbstractPrimitive.java	(revision 8840)
@@ -94,5 +94,5 @@
      * know what id it will get.
      */
-    protected long id = 0;
+    protected long id;
 
     /**
@@ -100,5 +100,5 @@
      * Never changed by JOSM.
      */
-    protected User user = null;
+    protected User user;
 
     /**
@@ -106,5 +106,5 @@
      * ensure update consistency
      */
-    protected int version = 0;
+    protected int version;
 
     /**
Index: /trunk/src/org/openstreetmap/josm/data/osm/Changeset.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/osm/Changeset.java	(revision 8839)
+++ /trunk/src/org/openstreetmap/josm/data/osm/Changeset.java	(revision 8840)
@@ -46,7 +46,7 @@
     private boolean incomplete;
     /** the changeset content */
-    private ChangesetDataSet content = null;
+    private ChangesetDataSet content;
     /** the changeset discussion */
-    private List<ChangesetDiscussionComment> discussion = null;
+    private List<ChangesetDiscussionComment> discussion;
 
     /**
Index: /trunk/src/org/openstreetmap/josm/data/osm/DataSet.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/osm/DataSet.java	(revision 8839)
+++ /trunk/src/org/openstreetmap/josm/data/osm/DataSet.java	(revision 8840)
@@ -121,5 +121,5 @@
     private int highlightUpdateCount;
 
-    private boolean uploadDiscouraged = false;
+    private boolean uploadDiscouraged;
 
     private final ReadWriteLock lock = new ReentrantReadWriteLock();
Index: /trunk/src/org/openstreetmap/josm/data/osm/Filter.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/osm/Filter.java	(revision 8839)
+++ /trunk/src/org/openstreetmap/josm/data/osm/Filter.java	(revision 8840)
@@ -15,6 +15,6 @@
 
     public boolean enable = true;
-    public boolean hiding = false;
-    public boolean inverted = false;
+    public boolean hiding;
+    public boolean inverted;
 
     /**
@@ -48,12 +48,12 @@
     public static class FilterPreferenceEntry {
         @pref @writeExplicitly public String version = "1";
-        @pref public String text = null;
+        @pref public String text;
         @pref @writeExplicitly public String mode = "add";
-        @pref public boolean case_sensitive = false;
-        @pref public boolean regex_search = false;
-        @pref public boolean mapCSS_search = false;
+        @pref public boolean case_sensitive;
+        @pref public boolean regex_search;
+        @pref public boolean mapCSS_search;
         @pref @writeExplicitly public boolean enable = true;
-        @pref @writeExplicitly public boolean hiding = false;
-        @pref @writeExplicitly public boolean inverted = false;
+        @pref @writeExplicitly public boolean hiding;
+        @pref @writeExplicitly public boolean inverted;
     }
 
Index: /trunk/src/org/openstreetmap/josm/data/osm/NoteData.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/osm/NoteData.java	(revision 8839)
+++ /trunk/src/org/openstreetmap/josm/data/osm/NoteData.java	(revision 8840)
@@ -27,5 +27,5 @@
 
     private final Storage<Note> noteList;
-    private Note selectedNote = null;
+    private Note selectedNote;
     private Comparator<Note> comparator = DEFAULT_COMPARATOR;
 
Index: /trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java	(revision 8839)
+++ /trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java	(revision 8840)
@@ -291,5 +291,5 @@
      * MAPPAINT
      *--------*/
-    public StyleCache mappaintStyle = null;
+    public StyleCache mappaintStyle;
     public int mappaintCacheIdx;
 
@@ -653,7 +653,7 @@
      *--------------------------------------------------*/
 
-    private static volatile Collection<String> workinprogress = null;
-    private static volatile Collection<String> uninteresting = null;
-    private static volatile Collection<String> discardable = null;
+    private static volatile Collection<String> workinprogress;
+    private static volatile Collection<String> uninteresting;
+    private static volatile Collection<String> discardable;
 
     /**
@@ -777,6 +777,6 @@
     }
 
-    private static volatile Match directionKeys = null;
-    private static volatile Match reversedDirectionKeys = null;
+    private static volatile Match directionKeys;
+    private static volatile Match reversedDirectionKeys;
 
     /**
Index: /trunk/src/org/openstreetmap/josm/data/osm/Storage.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/osm/Storage.java	(revision 8839)
+++ /trunk/src/org/openstreetmap/josm/data/osm/Storage.java	(revision 8840)
@@ -89,5 +89,5 @@
     private int mask;
     private int size;
-    private volatile int modCount = 0;
+    private volatile int modCount;
     private double loadFactor = 0.6d;
     private static final int DEFAULT_CAPACITY = 16;
@@ -459,5 +459,5 @@
     private final class SafeReadonlyIter implements Iterator<T> {
         private final T[] data;
-        private int slot = 0;
+        private int slot;
 
         SafeReadonlyIter(T[] data) {
@@ -491,5 +491,5 @@
     private final class Iter implements Iterator<T> {
         private final int mods;
-        private int slot = 0;
+        private int slot;
         private int removeSlot = -1;
 
Index: /trunk/src/org/openstreetmap/josm/data/osm/User.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/osm/User.java	(revision 8839)
+++ /trunk/src/org/openstreetmap/josm/data/osm/User.java	(revision 8840)
@@ -24,5 +24,5 @@
 public final class User {
 
-    private static long uidCounter = 0;
+    private static long uidCounter;
 
     /**
@@ -59,5 +59,5 @@
     }
 
-    private static User lastUser = null;
+    private static User lastUser;
 
     /**
Index: /trunk/src/org/openstreetmap/josm/data/osm/visitor/BoundingXYVisitor.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/osm/visitor/BoundingXYVisitor.java	(revision 8839)
+++ /trunk/src/org/openstreetmap/josm/data/osm/visitor/BoundingXYVisitor.java	(revision 8840)
@@ -23,5 +23,5 @@
 public class BoundingXYVisitor extends AbstractVisitor {
 
-    private ProjectionBounds bounds = null;
+    private ProjectionBounds bounds;
 
     @Override
Index: /trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/MapRendererFactory.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/MapRendererFactory.java	(revision 8839)
+++ /trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/MapRendererFactory.java	(revision 8840)
@@ -109,5 +109,5 @@
 
     private final List<Descriptor> descriptors = new ArrayList<>();
-    private Class<? extends AbstractMapRenderer> activeRenderer = null;
+    private Class<? extends AbstractMapRenderer> activeRenderer;
 
     private MapRendererFactory() {
Index: /trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java	(revision 8839)
+++ /trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java	(revision 8840)
@@ -35,5 +35,5 @@
     private final Color defaultColor;
 
-    private static volatile Color backgroundColorCache = null;
+    private static volatile Color backgroundColorCache;
 
     private static final MapPaintSylesUpdateListener styleOverrideListener = new MapPaintSylesUpdateListener() {
Index: /trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java	(revision 8839)
+++ /trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java	(revision 8840)
@@ -103,5 +103,5 @@
         private int idx;
 
-        private Point prev = null;
+        private Point prev;
         /* 'prev0' is a point that has distance 'offset' from 'prev' and the
          * line from 'prev' to 'prev0' is perpendicular to the way segment from
Index: /trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/WireframeMapRenderer.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/WireframeMapRenderer.java	(revision 8839)
+++ /trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/WireframeMapRenderer.java	(revision 8840)
@@ -74,5 +74,5 @@
 
     /** Color cache to draw subsequent segments of same color as one <code>Path</code>. */
-    protected Color currentColor = null;
+    protected Color currentColor;
     /** Path store to draw subsequent segments of same color as one <code>Path</code>. */
     protected GeneralPath currentPath = new GeneralPath();
Index: /trunk/src/org/openstreetmap/josm/data/projection/AbstractProjection.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/projection/AbstractProjection.java	(revision 8839)
+++ /trunk/src/org/openstreetmap/josm/data/projection/AbstractProjection.java	(revision 8840)
@@ -26,8 +26,8 @@
     protected Datum datum;
     protected Proj proj;
-    protected double x0 = 0.0;     /* false easting (in meters) */
-    protected double y0 = 0.0;     /* false northing (in meters) */
-    protected double lon0 = 0.0;   /* central meridian */
-    protected double k0 = 1.0;     /* general scale factor */
+    protected double x0;       /* false easting (in meters) */
+    protected double y0;       /* false northing (in meters) */
+    protected double lon0;     /* central meridian */
+    protected double k0 = 1.0; /* general scale factor */
 
     public final Ellipsoid getEllipsoid() {
Index: /trunk/src/org/openstreetmap/josm/data/projection/datum/NTV2GridShiftFileWrapper.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/projection/datum/NTV2GridShiftFileWrapper.java	(revision 8839)
+++ /trunk/src/org/openstreetmap/josm/data/projection/datum/NTV2GridShiftFileWrapper.java	(revision 8840)
@@ -34,5 +34,5 @@
     // CHECKSTYLE.ON: LineLength
 
-    private NTV2GridShiftFile instance = null;
+    private NTV2GridShiftFile instance;
     private String gridFileName;
 
Index: /trunk/src/org/openstreetmap/josm/data/validation/OsmValidator.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/validation/OsmValidator.java	(revision 8839)
+++ /trunk/src/org/openstreetmap/josm/data/validation/OsmValidator.java	(revision 8840)
@@ -73,5 +73,5 @@
 public class OsmValidator implements LayerChangeListener {
 
-    public static volatile ValidatorLayer errorLayer = null;
+    public static volatile ValidatorLayer errorLayer;
 
     /** The validate action */
@@ -297,5 +297,5 @@
     }
 
-    private static boolean testsInitialized = false;
+    private static boolean testsInitialized;
 
     /**
Index: /trunk/src/org/openstreetmap/josm/data/validation/TestError.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/validation/TestError.java	(revision 8839)
+++ /trunk/src/org/openstreetmap/josm/data/validation/TestError.java	(revision 8840)
@@ -33,5 +33,5 @@
 public class TestError implements Comparable<TestError>, DataSetListener {
     /** is this error on the ignore list */
-    private boolean ignored = false;
+    private boolean ignored;
     /** Severity */
     private Severity severity;
Index: /trunk/src/org/openstreetmap/josm/data/validation/tests/Coastlines.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/validation/tests/Coastlines.java	(revision 8839)
+++ /trunk/src/org/openstreetmap/josm/data/validation/tests/Coastlines.java	(revision 8840)
@@ -38,5 +38,5 @@
     private List<Way> coastlines;
 
-    private Area downloadedArea = null;
+    private Area downloadedArea;
 
     /**
Index: /trunk/src/org/openstreetmap/josm/data/validation/tests/Highways.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/validation/tests/Highways.java	(revision 8839)
+++ /trunk/src/org/openstreetmap/josm/data/validation/tests/Highways.java	(revision 8840)
@@ -58,10 +58,10 @@
     private static final Set<String> ISO_COUNTRIES = new HashSet<>(Arrays.asList(Locale.getISOCountries()));
 
-    private boolean leftByPedestrians = false;
-    private boolean leftByCyclists = false;
-    private boolean leftByCars = false;
-    private int pedestrianWays = 0;
-    private int cyclistWays = 0;
-    private int carsWays = 0;
+    private boolean leftByPedestrians;
+    private boolean leftByCyclists;
+    private boolean leftByCars;
+    private int pedestrianWays;
+    private int cyclistWays;
+    private int carsWays;
 
     /**
Index: /trunk/src/org/openstreetmap/josm/data/validation/tests/MapCSSTagChecker.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/validation/tests/MapCSSTagChecker.java	(revision 8839)
+++ /trunk/src/org/openstreetmap/josm/data/validation/tests/MapCSSTagChecker.java	(revision 8840)
@@ -241,5 +241,5 @@
         protected final Map<String, Boolean> assertions = new HashMap<>();
         protected final Set<String> setClassExpressions = new HashSet<>();
-        protected boolean deletion = false;
+        protected boolean deletion;
 
         TagCheck(GroupedMapCSSRule rule) {
Index: /trunk/src/org/openstreetmap/josm/data/validation/tests/RelationChecker.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/validation/tests/RelationChecker.java	(revision 8839)
+++ /trunk/src/org/openstreetmap/josm/data/validation/tests/RelationChecker.java	(revision 8840)
@@ -95,5 +95,5 @@
 
     private static class RoleInfo {
-        private int total = 0;
+        private int total;
     }
 
Index: /trunk/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java	(revision 8839)
+++ /trunk/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java	(revision 8840)
@@ -97,8 +97,8 @@
     public static final String PREF_CHECK_FIXMES_BEFORE_UPLOAD = PREF_CHECK_FIXMES + "BeforeUpload";
 
-    protected boolean checkKeys = false;
-    protected boolean checkValues = false;
-    protected boolean checkComplex = false;
-    protected boolean checkFixmes = false;
+    protected boolean checkKeys;
+    protected boolean checkValues;
+    protected boolean checkComplex;
+    protected boolean checkFixmes;
 
     protected JCheckBox prefCheckKeys;
@@ -667,7 +667,7 @@
             public Object value;
             public boolean noMatch;
-            public boolean tagAll = false;
-            public boolean valueAll = false;
-            public boolean valueBool = false;
+            public boolean tagAll;
+            public boolean valueAll;
+            public boolean valueBool;
 
             private Pattern getPattern(String str) throws PatternSyntaxException {
Index: /trunk/src/org/openstreetmap/josm/data/validation/util/Entities.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/validation/util/Entities.java	(revision 8839)
+++ /trunk/src/org/openstreetmap/josm/data/validation/util/Entities.java	(revision 8840)
@@ -334,5 +334,5 @@
     };
 
-    private static volatile Map<String, String> mapNameToValue = null;
+    private static volatile Map<String, String> mapNameToValue;
 
     public String unescape(String str) {
Index: /trunk/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java	(revision 8839)
+++ /trunk/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java	(revision 8840)
@@ -98,5 +98,5 @@
 
     /** the current list of tags used as naming tags in relations */
-    private static List<String> namingTagsForRelations =  null;
+    private static List<String> namingTagsForRelations;
 
     /**
Index: /trunk/src/org/openstreetmap/josm/gui/ExtendedDialog.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/ExtendedDialog.java	(revision 8839)
+++ /trunk/src/org/openstreetmap/josm/gui/ExtendedDialog.java	(revision 8840)
@@ -75,9 +75,9 @@
 public class ExtendedDialog extends JDialog {
     private final boolean disposeOnClose;
-    private volatile int result = 0;
+    private volatile int result;
     public static final int DialogClosedOtherwise = 0;
-    private boolean toggleable = false;
+    private boolean toggleable;
     private String rememberSizePref = "";
-    private transient WindowGeometry defaultWindowGeometry = null;
+    private transient WindowGeometry defaultWindowGeometry;
     private String togglePref = "";
     private int toggleValue = -1;
@@ -90,8 +90,8 @@
     private Set<Integer> cancelButtonIdx = Collections.emptySet();
     private int defaultButtonIdx = 1;
-    protected JButton defaultButton = null;
+    protected JButton defaultButton;
     private transient Icon icon;
     private boolean modal;
-    private boolean focusOnDefaultButton = false;
+    private boolean focusOnDefaultButton;
 
     /** true, if the dialog should include a help button */
@@ -304,5 +304,5 @@
     }
 
-    private boolean setupDone = false;
+    private boolean setupDone;
 
     /**
Index: /trunk/src/org/openstreetmap/josm/gui/GettingStarted.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/GettingStarted.java	(revision 8839)
+++ /trunk/src/org/openstreetmap/josm/gui/GettingStarted.java	(revision 8840)
@@ -38,5 +38,5 @@
     private final LinkGeneral lg;
     private String content = "";
-    private boolean contentInitialized = false;
+    private boolean contentInitialized;
 
     private static final String STYLE = "<style type=\"text/css\">\n"
Index: /trunk/src/org/openstreetmap/josm/gui/IconToggleButton.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/IconToggleButton.java	(revision 8839)
+++ /trunk/src/org/openstreetmap/josm/gui/IconToggleButton.java	(revision 8840)
@@ -26,5 +26,5 @@
     public boolean groupbutton;
     private transient ShowHideButtonListener listener;
-    private boolean hideIfDisabled = false;
+    private boolean hideIfDisabled;
     private boolean isExpert;
 
Index: /trunk/src/org/openstreetmap/josm/gui/MainMenu.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/MainMenu.java	(revision 8839)
+++ /trunk/src/org/openstreetmap/josm/gui/MainMenu.java	(revision 8840)
@@ -386,5 +386,5 @@
      * audioMenu contains all audio-related actions. Be careful, this menu is not guaranteed to be displayed at all
      */
-    public JMenu audioMenu = null;
+    public JMenu audioMenu;
     /**
      * helpMenu contains JOSM general actions (Help, About, etc.)
@@ -402,5 +402,5 @@
     public final TaggingPresetSearchPrimitiveDialog.Action presetSearchPrimitiveAction = new TaggingPresetSearchPrimitiveDialog.Action();
     public final DialogsToggleAction dialogsToggleAction = new DialogsToggleAction();
-    public FullscreenToggleAction fullscreenToggleAction = null;
+    public FullscreenToggleAction fullscreenToggleAction;
 
     /**
@@ -1015,5 +1015,5 @@
         private final JTextField searchField;
         private final MainMenu mainMenu;
-        private String currentSearchText = null;
+        private String currentSearchText;
 
         SearchFieldTextListener(MainMenu mainMenu, JTextField searchField) {
Index: /trunk/src/org/openstreetmap/josm/gui/MapMover.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/MapMover.java	(revision 8839)
+++ /trunk/src/org/openstreetmap/josm/gui/MapMover.java	(revision 8840)
@@ -83,5 +83,5 @@
     private final JPanel contentPane;
 
-    private boolean movementInPlace = false;
+    private boolean movementInPlace;
 
     /**
Index: /trunk/src/org/openstreetmap/josm/gui/MapSlider.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/MapSlider.java	(revision 8839)
+++ /trunk/src/org/openstreetmap/josm/gui/MapSlider.java	(revision 8840)
@@ -17,5 +17,5 @@
 
     private final MapView mv;
-    private boolean preventChange = false;
+    private boolean preventChange;
 
     MapSlider(MapView mv) {
Index: /trunk/src/org/openstreetmap/josm/gui/MapStatus.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/MapStatus.java	(revision 8839)
+++ /trunk/src/org/openstreetmap/josm/gui/MapStatus.java	(revision 8840)
@@ -197,5 +197,5 @@
 
     // Determines if angle panel is enabled or not
-    private boolean angleEnabled = false;
+    private boolean angleEnabled;
 
     /**
@@ -340,5 +340,5 @@
          * popup
          */
-        private List<JLabel> popupLabels = null;
+        private List<JLabel> popupLabels;
         /**
          * The popup displayed to show additional information
Index: /trunk/src/org/openstreetmap/josm/gui/MapView.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/MapView.java	(revision 8839)
+++ /trunk/src/org/openstreetmap/josm/gui/MapView.java	(revision 8840)
@@ -123,5 +123,5 @@
     }
 
-    public boolean viewportFollowing = false;
+    public boolean viewportFollowing;
 
     /**
@@ -240,5 +240,5 @@
      * The play head marker: there is only one of these so it isn't in any specific layer
      */
-    public transient PlayHeadMarker playHeadMarker = null;
+    public transient PlayHeadMarker playHeadMarker;
 
     /**
@@ -342,6 +342,6 @@
 
     // remebered geometry of the component
-    private Dimension oldSize = null;
-    private Point oldLoc = null;
+    private Dimension oldSize;
+    private Point oldLoc;
 
     /**
@@ -535,5 +535,5 @@
     }
 
-    private boolean virtualNodesEnabled = false;
+    private boolean virtualNodesEnabled;
 
     public void setVirtualNodesEnabled(boolean enabled) {
Index: /trunk/src/org/openstreetmap/josm/gui/MenuScroller.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/MenuScroller.java	(revision 8839)
+++ /trunk/src/org/openstreetmap/josm/gui/MenuScroller.java	(revision 8840)
@@ -50,5 +50,5 @@
     private int interval;
     private int topFixedCount;
-    private int firstIndex = 0;
+    private int firstIndex;
 
     private static final int ARROW_ICON_HEIGHT = 10;
Index: /trunk/src/org/openstreetmap/josm/gui/NavigatableComponent.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/NavigatableComponent.java	(revision 8839)
+++ /trunk/src/org/openstreetmap/josm/gui/NavigatableComponent.java	(revision 8840)
@@ -189,6 +189,6 @@
 
     private final transient Object paintRequestLock = new Object();
-    private Rectangle paintRect = null;
-    private Polygon paintPoly = null;
+    private Rectangle paintRect;
+    private Polygon paintPoly;
 
     protected transient ViewportData initialViewport;
Index: /trunk/src/org/openstreetmap/josm/gui/NotificationManager.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/NotificationManager.java	(revision 8839)
+++ /trunk/src/org/openstreetmap/josm/gui/NotificationManager.java	(revision 8840)
@@ -71,5 +71,5 @@
     private long elapsedTime;
 
-    private static NotificationManager INSTANCE = null;
+    private static NotificationManager INSTANCE;
 
     private static final Color PANEL_SEMITRANSPARENT = new Color(224, 236, 249, 230);
Index: /trunk/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java	(revision 8839)
+++ /trunk/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java	(revision 8840)
@@ -24,5 +24,5 @@
  */
 public abstract class PleaseWaitRunnable implements Runnable, CancelListener {
-    private boolean canceled = false;
+    private boolean canceled;
     private boolean ignoreException;
     private final String title;
Index: /trunk/src/org/openstreetmap/josm/gui/ScrollViewport.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/ScrollViewport.java	(revision 8839)
+++ /trunk/src/org/openstreetmap/josm/gui/ScrollViewport.java	(revision 8840)
@@ -66,5 +66,5 @@
 
     private JViewport vp = new JViewport();
-    private JComponent component = null;
+    private JComponent component;
 
     private List<JButton> buttons = new ArrayList<>();
Index: /trunk/src/org/openstreetmap/josm/gui/bbox/SizeButton.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/bbox/SizeButton.java	(revision 8839)
+++ /trunk/src/org/openstreetmap/josm/gui/bbox/SizeButton.java	(revision 8840)
@@ -20,10 +20,10 @@
 public class SizeButton extends JComponent {
 
-    private int x = 0;
-    private int y = 0;
+    private int x;
+    private int y;
 
     private ImageIcon enlargeImage;
     private ImageIcon shrinkImage;
-    private boolean isEnlarged = false;
+    private boolean isEnlarged;
     private final SlippyMapBBoxChooser slippyMapBBoxChooser;
 
Index: /trunk/src/org/openstreetmap/josm/gui/bbox/SlippyMapControler.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/bbox/SlippyMapControler.java	(revision 8839)
+++ /trunk/src/org/openstreetmap/josm/gui/bbox/SlippyMapControler.java	(revision 8840)
@@ -203,8 +203,8 @@
 
         /** The horizontal direction of movement, -1:left, 0:stop, 1:right */
-        private int directionX = 0;
+        private int directionX;
 
         /** The vertical direction of movement, -1:up, 0:stop, 1:down */
-        private int directionY = 0;
+        private int directionY;
 
         /**
@@ -212,5 +212,5 @@
          * executed via timer) or disabled
          */
-        protected boolean scheduled = false;
+        protected boolean scheduled;
 
         protected void setDirectionX(int directionX) {
Index: /trunk/src/org/openstreetmap/josm/gui/bbox/SourceButton.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/bbox/SourceButton.java	(revision 8839)
+++ /trunk/src/org/openstreetmap/josm/gui/bbox/SourceButton.java	(revision 8840)
@@ -40,5 +40,5 @@
     private Font font;
 
-    private boolean isEnlarged = false;
+    private boolean isEnlarged;
 
     private int currentMap;
Index: /trunk/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java	(revision 8839)
+++ /trunk/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java	(revision 8840)
@@ -530,5 +530,5 @@
     private static class TileAddressValidator extends AbstractTextComponentValidator {
 
-        private TileBounds tileBounds = null;
+        private TileBounds tileBounds;
 
         TileAddressValidator(JTextComponent tc) {
Index: /trunk/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java	(revision 8839)
+++ /trunk/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java	(revision 8840)
@@ -67,5 +67,5 @@
     public static final String THEIR_PRIMITIVE_PROP = ConflictResolver.class.getName() + ".theirPrimitive";
 
-    private JTabbedPane tabbedPane = null;
+    private JTabbedPane tabbedPane;
     private TagMerger tagMerger;
     private NodeListMerger nodeListMerger;
Index: /trunk/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java	(revision 8839)
+++ /trunk/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java	(revision 8840)
@@ -88,5 +88,5 @@
 
     private final Set<PropertyChangeListener> listeners;
-    private boolean isFrozen = false;
+    private boolean isFrozen;
     private final ComparePairListModel comparePairListModel;
 
Index: /trunk/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberTableCellRenderer.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberTableCellRenderer.java	(revision 8839)
+++ /trunk/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberTableCellRenderer.java	(revision 8840)
@@ -23,5 +23,5 @@
  */
 public  class RelationMemberTableCellRenderer extends JLabel implements TableCellRenderer {
-    private transient Border rowNumberBorder = null;
+    private transient Border rowNumberBorder;
 
     /**
Index: /trunk/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java	(revision 8839)
+++ /trunk/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java	(revision 8840)
@@ -17,7 +17,7 @@
 public class TagMergeItem {
 
-    private String key = null;
-    private String myTagValue = null;
-    private String theirTagValue = null;
+    private String key;
+    private String myTagValue;
+    private String theirTagValue;
     private MergeDecisionType mergeDecision = MergeDecisionType.UNDECIDED;
 
Index: /trunk/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeModel.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeModel.java	(revision 8839)
+++ /trunk/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeModel.java	(revision 8840)
@@ -38,5 +38,5 @@
     private final transient Set<PropertyChangeListener> listeners;
 
-    private int numUndecidedTags = 0;
+    private int numUndecidedTags;
 
     /**
Index: /trunk/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java	(revision 8839)
+++ /trunk/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java	(revision 8840)
@@ -62,5 +62,5 @@
     private JTabbedPane tpResolvers;
     private Mode mode;
-    private boolean canceled = false;
+    private boolean canceled;
 
     private final ImageIcon iconResolved;
Index: /trunk/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java	(revision 8839)
+++ /trunk/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java	(revision 8840)
@@ -28,6 +28,6 @@
     private int numConflicts;
     private PropertyChangeSupport support;
-    private boolean showTagsWithConflictsOnly = false;
-    private boolean showTagsWithMultiValuesOnly = false;
+    private boolean showTagsWithConflictsOnly;
+    private boolean showTagsWithMultiValuesOnly;
 
     /**
Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/DialogsPanel.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/dialogs/DialogsPanel.java	(revision 8839)
+++ /trunk/src/org/openstreetmap/josm/gui/dialogs/DialogsPanel.java	(revision 8840)
@@ -34,5 +34,5 @@
     }
 
-    public boolean initialized = false; // read only from outside
+    public boolean initialized; // read only from outside
 
     public void initialize(List<ToggleDialog> pAllDialogs) {
Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java	(revision 8839)
+++ /trunk/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java	(revision 8840)
@@ -84,5 +84,5 @@
 
     /** Last selected element */
-    private DefaultMutableTreeNode lastSelectedNode = null;
+    private DefaultMutableTreeNode lastSelectedNode;
 
     private transient OsmDataLayer linkedLayer;
Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java	(revision 8839)
+++ /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java	(revision 8840)
@@ -64,5 +64,5 @@
     private final ZoomInCurrentLayerAction       actZoomInCurrentLayerAction = new ZoomInCurrentLayerAction();
 
-    private transient Changeset current = null;
+    private transient Changeset current;
 
     protected JPanel buildActionButtonPanel() {
Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDiscussionPanel.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDiscussionPanel.java	(revision 8839)
+++ /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDiscussionPanel.java	(revision 8840)
@@ -40,5 +40,5 @@
     private JTable table;
 
-    private transient Changeset current = null;
+    private transient Changeset current;
 
     protected JPanel buildActionButtonPanel() {
Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java	(revision 8839)
+++ /trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java	(revision 8840)
@@ -821,6 +821,6 @@
         private List<Integer> position = new ArrayList<>();
         private Iterable<OsmPrimitive> selection;
-        private String positionString = null;
-        private String roleString = null;
+        private String positionString;
+        private String roleString;
 
         MemberInfo(Iterable<OsmPrimitive> selection) {
Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/properties/TagEditHelper.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/dialogs/properties/TagEditHelper.java	(revision 8839)
+++ /trunk/src/org/openstreetmap/josm/gui/dialogs/properties/TagEditHelper.java	(revision 8840)
@@ -102,6 +102,6 @@
     };
 
-    private String lastAddKey = null;
-    private String lastAddValue = null;
+    private String lastAddKey;
+    private String lastAddValue;
 
     public static final int DEFAULT_LRU_TAGS_NUMBER = 5;
Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberRoleCellEditor.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberRoleCellEditor.java	(revision 8839)
+++ /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberRoleCellEditor.java	(revision 8840)
@@ -15,10 +15,10 @@
 
 public class MemberRoleCellEditor extends AbstractCellEditor implements TableCellEditor {
-    private AutoCompletingTextField editor = null;
+    private AutoCompletingTextField editor;
     private final transient DataSet ds;
     private final transient Relation relation;
 
     /** user input is matched against this list of auto completion items */
-    private AutoCompletionList autoCompletionList = null;
+    private AutoCompletionList autoCompletionList;
 
     /**
Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableModel.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableModel.java	(revision 8839)
+++ /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableModel.java	(revision 8840)
@@ -51,5 +51,5 @@
      **/
     private transient List<RelationMember> members;
-    private transient List<WayConnectionType> connectionType = null;
+    private transient List<WayConnectionType> connectionType;
 
     private DefaultListSelectionModel listSelectionModel;
Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/sort/RelationNodeMap.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/sort/RelationNodeMap.java	(revision 8839)
+++ /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/sort/RelationNodeMap.java	(revision 8840)
@@ -168,7 +168,7 @@
     }
 
-    private Integer firstOneway = null;
-    private Node lastOnewayNode = null;
-    private Node firstCircular = null;
+    private Integer firstOneway;
+    private Node lastOnewayNode;
+    private Node firstCircular;
 
     /**
Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/sort/WayConnectionType.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/sort/WayConnectionType.java	(revision 8839)
+++ /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/sort/WayConnectionType.java	(revision 8840)
@@ -36,8 +36,8 @@
     public boolean isLoop;
 
-    public boolean isOnewayLoopForwardPart = false;
-    public boolean isOnewayLoopBackwardPart = false;
-    public boolean isOnewayHead = false;
-    public boolean isOnewayTail = false;
+    public boolean isOnewayLoopForwardPart;
+    public boolean isOnewayLoopBackwardPart;
+    public boolean isOnewayHead;
+    public boolean isOnewayTail;
 
     public WayConnectionType(boolean linkPrev, boolean linkNext, Direction direction) {
Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/validator/ValidatorTreePanel.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/dialogs/validator/ValidatorTreePanel.java	(revision 8839)
+++ /trunk/src/org/openstreetmap/josm/gui/dialogs/validator/ValidatorTreePanel.java	(revision 8840)
@@ -73,5 +73,5 @@
      * that refer to one of the primitives in the filter.
      */
-    private transient Set<? extends OsmPrimitive> filter = null;
+    private transient Set<? extends OsmPrimitive> filter;
 
     /** a counter to check if tree has been rebuild */
Index: /trunk/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java	(revision 8839)
+++ /trunk/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java	(revision 8840)
@@ -42,5 +42,5 @@
 public class BoundingBoxSelection implements DownloadSelection {
 
-    private JosmTextField[] latlon = null;
+    private JosmTextField[] latlon;
     private final JosmTextArea tfOsmUrl = new JosmTextArea();
     private final JosmTextArea showUrl = new JosmTextArea();
Index: /trunk/src/org/openstreetmap/josm/gui/download/DownloadDialog.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/download/DownloadDialog.java	(revision 8839)
+++ /trunk/src/org/openstreetmap/josm/gui/download/DownloadDialog.java	(revision 8840)
@@ -75,5 +75,5 @@
     protected JCheckBox cbStartup;
     protected final JLabel sizeCheck = new JLabel();
-    protected transient Bounds currentBounds = null;
+    protected transient Bounds currentBounds;
     protected boolean canceled;
 
Index: /trunk/src/org/openstreetmap/josm/gui/download/PlaceSelection.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/download/PlaceSelection.java	(revision 8839)
+++ /trunk/src/org/openstreetmap/josm/gui/download/PlaceSelection.java	(revision 8840)
@@ -184,6 +184,6 @@
         public double lat;
         public double lon;
-        public int zoom = 0;
-        public Bounds bounds = null;
+        public int zoom;
+        public Bounds bounds;
 
         public Bounds getDownloadArea() {
@@ -198,7 +198,7 @@
      */
     private static class NameFinderResultParser extends DefaultHandler {
-        private SearchResult currentResult = null;
-        private StringBuffer description = null;
-        private int depth = 0;
+        private SearchResult currentResult;
+        private StringBuffer description;
+        private int depth;
         private List<SearchResult> data = new LinkedList<>();
 
@@ -330,5 +330,5 @@
         private HttpURLConnection connection;
         private List<SearchResult> data;
-        private boolean canceled = false;
+        private boolean canceled;
         private Server useserver;
         private Exception lastException;
@@ -452,6 +452,6 @@
 
     static class NamedResultTableColumnModel extends DefaultTableColumnModel {
-        private TableColumn col3 = null;
-        private TableColumn col4 = null;
+        private TableColumn col3;
+        private TableColumn col4;
         protected final void createColumns() {
             TableColumn col = null;
Index: /trunk/src/org/openstreetmap/josm/gui/help/HelpBrowserHistory.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/help/HelpBrowserHistory.java	(revision 8839)
+++ /trunk/src/org/openstreetmap/josm/gui/help/HelpBrowserHistory.java	(revision 8840)
@@ -10,5 +10,5 @@
     private HelpBrowser browser;
     private List<String> history;
-    private int historyPos = 0;
+    private int historyPos;
 
     public HelpBrowserHistory(HelpBrowser browser) {
Index: /trunk/src/org/openstreetmap/josm/gui/history/DiffTableModel.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/history/DiffTableModel.java	(revision 8839)
+++ /trunk/src/org/openstreetmap/josm/gui/history/DiffTableModel.java	(revision 8840)
@@ -15,5 +15,5 @@
 class DiffTableModel extends AbstractTableModel {
     private transient List<TwoColumnDiff.Item> rows = new ArrayList<>();
-    private boolean reversed = false;
+    private boolean reversed;
 
     public void setRows(List<TwoColumnDiff.Item> rows, boolean reversed) {
Index: /trunk/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java	(revision 8839)
+++ /trunk/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java	(revision 8840)
@@ -50,9 +50,9 @@
 public class HistoryLoadTask extends PleaseWaitRunnable {
 
-    private boolean canceled = false;
-    private Exception lastException  = null;
+    private boolean canceled;
+    private Exception lastException;
     private Set<PrimitiveId> toLoad;
     private HistoryDataSet loadedData;
-    private OsmServerHistoryReader reader = null;
+    private OsmServerHistoryReader reader;
 
     /**
Index: /trunk/src/org/openstreetmap/josm/gui/history/NodeListViewer.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/history/NodeListViewer.java	(revision 8839)
+++ /trunk/src/org/openstreetmap/josm/gui/history/NodeListViewer.java	(revision 8840)
@@ -89,5 +89,5 @@
     protected TableModelListener newReversedChangeListener(final JTable table, final NodeListTableColumnModel columnModel) {
         return new TableModelListener() {
-            private Boolean reversed = null;
+            private Boolean reversed;
             private final String nonReversedText = tr("Nodes") + (table.getFont().canDisplay('\u25bc') ? " \u25bc" : " (1-n)");
             private final String reversedText = tr("Nodes") + (table.getFont().canDisplay('\u25b2') ? " \u25b2" : " (n-1)");
Index: /trunk/src/org/openstreetmap/josm/gui/history/TwoColumnDiff.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/history/TwoColumnDiff.java	(revision 8839)
+++ /trunk/src/org/openstreetmap/josm/gui/history/TwoColumnDiff.java	(revision 8840)
@@ -62,5 +62,5 @@
     private Object[] reference;
     private Object[] current;
-    boolean referenceReversed = false;
+    boolean referenceReversed;
 
     TwoColumnDiff(Object[] reference, Object[] current) {
Index: /trunk/src/org/openstreetmap/josm/gui/io/AbstractUploadDialog.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/io/AbstractUploadDialog.java	(revision 8839)
+++ /trunk/src/org/openstreetmap/josm/gui/io/AbstractUploadDialog.java	(revision 8840)
@@ -15,5 +15,5 @@
 public abstract class AbstractUploadDialog extends JDialog {
 
-    private boolean canceled = false;
+    private boolean canceled;
 
     /**
Index: /trunk/src/org/openstreetmap/josm/gui/io/DownloadPrimitivesWithReferrersTask.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/io/DownloadPrimitivesWithReferrersTask.java	(revision 8839)
+++ /trunk/src/org/openstreetmap/josm/gui/io/DownloadPrimitivesWithReferrersTask.java	(revision 8840)
@@ -53,7 +53,7 @@
     private DownloadPrimitivesTask mainTask;
     /** Flag indicated that user ask for cancel this task */
-    private boolean canceled = false;
+    private boolean canceled;
     /** Reference to the task currently running */
-    private PleaseWaitRunnable currentTask = null;
+    private PleaseWaitRunnable currentTask;
 
     /**
Index: /trunk/src/org/openstreetmap/josm/gui/io/OpenChangesetComboBoxModel.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/io/OpenChangesetComboBoxModel.java	(revision 8839)
+++ /trunk/src/org/openstreetmap/josm/gui/io/OpenChangesetComboBoxModel.java	(revision 8840)
@@ -19,5 +19,5 @@
 public class OpenChangesetComboBoxModel extends DefaultComboBoxModel<Changeset> implements ChangesetCacheListener {
     private transient List<Changeset> changesets;
-    private transient Changeset selectedChangeset = null;
+    private transient Changeset selectedChangeset;
 
     protected Changeset getChangesetById(long id) {
Index: /trunk/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java	(revision 8839)
+++ /trunk/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java	(revision 8840)
@@ -92,5 +92,5 @@
     }
 
-    private JButton saveAndProceedActionButton = null;
+    private JButton saveAndProceedActionButton;
 
     /**
Index: /trunk/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java	(revision 8839)
+++ /trunk/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java	(revision 8840)
@@ -43,6 +43,6 @@
  */
 public class UploadPrimitivesTask extends AbstractUploadTask {
-    private boolean uploadCanceled = false;
-    private Exception lastException = null;
+    private boolean uploadCanceled;
+    private Exception lastException;
     private APIDataSet toUpload;
     private OsmServerWriter writer;
Index: /trunk/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java	(revision 8839)
+++ /trunk/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java	(revision 8840)
@@ -61,5 +61,5 @@
     private JMultilineLabel lblMultiChangesetPoliciesHeader;
 
-    private long numUploadedObjects = 0;
+    private long numUploadedObjects;
 
     /**
Index: /trunk/src/org/openstreetmap/josm/gui/layer/AbstractCachedTileSourceLayer.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/layer/AbstractCachedTileSourceLayer.java	(revision 8839)
+++ /trunk/src/org/openstreetmap/josm/gui/layer/AbstractCachedTileSourceLayer.java	(revision 8840)
@@ -30,5 +30,5 @@
     private static final String PREFERENCE_PREFIX = "imagery.cache.";
 
-    private static volatile TileLoaderFactory loaderFactoryOverride = null;
+    private static volatile TileLoaderFactory loaderFactoryOverride;
 
     /**
Index: /trunk/src/org/openstreetmap/josm/gui/layer/AbstractTileSourceLayer.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/layer/AbstractTileSourceLayer.java	(revision 8839)
+++ /trunk/src/org/openstreetmap/josm/gui/layer/AbstractTileSourceLayer.java	(revision 8840)
@@ -473,5 +473,5 @@
      */
     private static final class TileHolder {
-        private Tile t = null;
+        private Tile t;
 
         public Tile getTile() {
@@ -1299,7 +1299,7 @@
 
     private static class TileSetInfo {
-        public boolean hasVisibleTiles = false;
-        public boolean hasOverzoomedTiles = false;
-        public boolean hasLoadingTiles = false;
+        public boolean hasVisibleTiles;
+        public boolean hasOverzoomedTiles;
+        public boolean hasLoadingTiles;
     }
 
Index: /trunk/src/org/openstreetmap/josm/gui/layer/ImageryLayer.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/layer/ImageryLayer.java	(revision 8839)
+++ /trunk/src/org/openstreetmap/josm/gui/layer/ImageryLayer.java	(revision 8840)
@@ -75,6 +75,6 @@
     protected Icon icon;
 
-    protected double dx = 0.0;
-    protected double dy = 0.0;
+    protected double dx;
+    protected double dy;
 
     protected GammaImageProcessor gammaImageProcessor = new GammaImageProcessor();
Index: /trunk/src/org/openstreetmap/josm/gui/layer/Layer.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/layer/Layer.java	(revision 8839)
+++ /trunk/src/org/openstreetmap/josm/gui/layer/Layer.java	(revision 8840)
@@ -109,5 +109,5 @@
      *
      */
-    private boolean background = false;
+    private boolean background;
 
     /**
Index: /trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java	(revision 8839)
+++ /trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java	(revision 8840)
@@ -109,6 +109,6 @@
     public static final String REQUIRES_UPLOAD_TO_SERVER_PROP = OsmDataLayer.class.getName() + ".requiresUploadToServer";
 
-    private boolean requiresSaveToFile = false;
-    private boolean requiresUploadToServer = false;
+    private boolean requiresSaveToFile;
+    private boolean requiresUploadToServer;
     private boolean isChanged = true;
     private int highlightUpdateCount;
@@ -137,5 +137,5 @@
 
     /** the global counter for created data layers */
-    private static int dataLayerCounter = 0;
+    private static int dataLayerCounter;
 
     /**
Index: /trunk/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java	(revision 8839)
+++ /trunk/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java	(revision 8840)
@@ -92,5 +92,5 @@
     private static List<GpxData> loadedGpxData = new ArrayList<>();
 
-    private transient GeoImageLayer yLayer = null;
+    private transient GeoImageLayer yLayer;
     private double timezone;
     private long delta;
@@ -237,5 +237,5 @@
 
     // remember the last number of matched photos
-    private int lastNumMatched = 0;
+    private int lastNumMatched;
 
     /** This class is called when the user doesn't find the GPX file he needs in the files that have
Index: /trunk/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java	(revision 8839)
+++ /trunk/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java	(revision 8840)
@@ -93,10 +93,10 @@
     private int currentPhoto = -1;
 
-    boolean useThumbs = false;
+    boolean useThumbs;
     private ExecutorService thumbsLoaderExecutor =
             Executors.newSingleThreadExecutor(Utils.newThreadFactory("thumbnail-loader-%d", Thread.MIN_PRIORITY));
     private ThumbsLoader thumbsloader;
-    private boolean thumbsLoaderRunning = false;
-    volatile boolean thumbsLoaded = false;
+    private boolean thumbsLoaderRunning;
+    volatile boolean thumbsLoaded;
     private BufferedImage offscreenBuffer;
     boolean updateOffscreenBuffer = true;
@@ -109,5 +109,5 @@
     private static final class Loader extends PleaseWaitRunnable {
 
-        private boolean canceled = false;
+        private boolean canceled;
         private GeoImageLayer layer;
         private Collection<File> selection;
@@ -902,5 +902,5 @@
     }
 
-    private static volatile List<MapMode> supportedMapModes = null;
+    private static volatile List<MapMode> supportedMapModes;
 
     /**
@@ -938,6 +938,6 @@
     }
 
-    private MouseAdapter mouseAdapter = null;
-    private MapModeChangeListener mapModeListener = null;
+    private MouseAdapter mouseAdapter;
+    private MapModeChangeListener mapModeListener;
 
     @Override
Index: /trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java	(revision 8839)
+++ /trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java	(revision 8840)
@@ -33,23 +33,23 @@
 
     /** The file that is currently displayed */
-    private File file = null;
+    private File file;
 
     /** The image currently displayed */
-    private transient Image image = null;
+    private transient Image image;
 
     /** The image currently displayed */
-    private boolean errorLoading = false;
+    private boolean errorLoading;
 
     /** The rectangle (in image coordinates) of the image that is visible. This rectangle is calculated
      * each time the zoom is modified */
-    private Rectangle visibleRect = null;
+    private Rectangle visibleRect;
 
     /** When a selection is done, the rectangle of the selection (in image coordinates) */
-    private Rectangle selectedRect = null;
+    private Rectangle selectedRect;
 
     /** The tracker to load the images */
     private MediaTracker tracker = new MediaTracker(this);
 
-    private String osdText = null;
+    private String osdText;
 
     private static final int DRAG_BUTTON = Main.pref.getBoolean("geoimage.agpifo-style-drag-and-zoom", false) ? 1 : 3;
@@ -136,7 +136,7 @@
     private class ImgDisplayMouseListener implements MouseListener, MouseWheelListener, MouseMotionListener {
 
-        private boolean mouseIsDragging = false;
-        private long lastTimeForMousePoint = 0L;
-        private Point mousePointInImg = null;
+        private boolean mouseIsDragging;
+        private long lastTimeForMousePoint;
+        private Point mousePointInImg;
 
         /** Zoom in and out, trying to preserve the point of the image that was under the mouse cursor
Index: /trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ImageEntry.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ImageEntry.java	(revision 8839)
+++ /trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ImageEntry.java	(revision 8840)
@@ -23,7 +23,7 @@
      * The flag can used to decide for which image file the EXIF GPS data is (re-)written.
      */
-    private boolean isNewGpsData = false;
+    private boolean isNewGpsData;
     /** Temporary source of GPS time if not correlated with GPX track. */
-    private Date exifGpsTime = null;
+    private Date exifGpsTime;
     Image thumbnail;
 
Index: /trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java	(revision 8839)
+++ /trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java	(revision 8840)
@@ -46,10 +46,10 @@
 
     private ImageDisplay imgDisplay = new ImageDisplay();
-    private boolean centerView = false;
+    private boolean centerView;
 
     // Only one instance of that class is present at one time
     private static volatile ImageViewerDialog dialog;
 
-    private boolean collapseButtonClicked = false;
+    private boolean collapseButtonClicked;
 
     static void newInstance() {
@@ -276,6 +276,6 @@
     }
 
-    private transient GeoImageLayer currentLayer = null;
-    private transient ImageEntry currentEntry = null;
+    private transient GeoImageLayer currentLayer;
+    private transient ImageEntry currentEntry;
 
     public void displayImage(GeoImageLayer layer, ImageEntry entry) {
Index: /trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ThumbsLoader.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ThumbsLoader.java	(revision 8839)
+++ /trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ThumbsLoader.java	(revision 8840)
@@ -26,5 +26,5 @@
     public static final int maxSize = 120;
     public static final int minSize = 22;
-    public volatile boolean stop = false;
+    public volatile boolean stop;
     private List<ImageEntry> data;
     private GeoImageLayer layer;
Index: /trunk/src/org/openstreetmap/josm/gui/layer/gpx/ChooseTrackVisibilityAction.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/layer/gpx/ChooseTrackVisibilityAction.java	(revision 8839)
+++ /trunk/src/org/openstreetmap/josm/gui/layer/gpx/ChooseTrackVisibilityAction.java	(revision 8840)
@@ -184,5 +184,5 @@
     }
 
-    private boolean noUpdates = false;
+    private boolean noUpdates;
 
     /** selects all rows (=tracks) in the table that are currently visible on the layer*/
Index: /trunk/src/org/openstreetmap/josm/gui/layer/gpx/DownloadAlongTrackAction.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/layer/gpx/DownloadAlongTrackAction.java	(revision 8839)
+++ /trunk/src/org/openstreetmap/josm/gui/layer/gpx/DownloadAlongTrackAction.java	(revision 8840)
@@ -102,6 +102,6 @@
 
             private Area a = new Area();
-            private boolean cancel = false;
-            private int ticks = 0;
+            private boolean cancel;
+            private int ticks;
             private Rectangle2D r = new Rectangle2D.Double();
 
Index: /trunk/src/org/openstreetmap/josm/gui/layer/gpx/GpxDrawHelper.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/layer/gpx/GpxDrawHelper.java	(revision 8839)
+++ /trunk/src/org/openstreetmap/josm/gui/layer/gpx/GpxDrawHelper.java	(revision 8840)
@@ -53,5 +53,5 @@
 
     //// Variables used only to check cache validity
-    private boolean computeCacheInSync = false;
+    private boolean computeCacheInSync;
     private int computeCacheMaxLineLengthUsed;
     private Color computeCacheColorUsed;
Index: /trunk/src/org/openstreetmap/josm/gui/layer/gpx/ImportAudioAction.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/layer/gpx/ImportAudioAction.java	(revision 8839)
+++ /trunk/src/org/openstreetmap/josm/gui/layer/gpx/ImportAudioAction.java	(revision 8840)
@@ -43,6 +43,6 @@
 
     private static class Markers {
-        public boolean timedMarkersOmitted = false;
-        public boolean untimedMarkersOmitted = false;
+        public boolean timedMarkersOmitted;
+        public boolean untimedMarkersOmitted;
     }
 
Index: /trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/AudioMarker.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/AudioMarker.java	(revision 8839)
+++ /trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/AudioMarker.java	(revision 8840)
@@ -23,7 +23,7 @@
 
     private URL audioUrl;
-    private static volatile AudioMarker recentlyPlayedMarker = null;
+    private static volatile AudioMarker recentlyPlayedMarker;
     public double syncOffset;
-    public boolean timeFromAudio = false; // as opposed to from the GPX track
+    public boolean timeFromAudio; // as opposed to from the GPX track
 
     public AudioMarker(LatLon ll, TemplateEngineDataProvider dataProvider, URL audioUrl, MarkerLayer parentLayer, double time, double offset) {
@@ -34,5 +34,6 @@
     }
 
-    @Override public void actionPerformed(ActionEvent ev) {
+    @Override
+    public void actionPerformed(ActionEvent ev) {
         play();
     }
Index: /trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/Marker.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/Marker.java	(revision 8839)
+++ /trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/Marker.java	(revision 8840)
@@ -276,5 +276,5 @@
 
     protected final ImageIcon symbol;
-    private BufferedImage redSymbol = null;
+    private BufferedImage redSymbol;
     public final MarkerLayer parentLayer;
     /** Absolute time of marker in seconds since epoch */
@@ -287,5 +287,5 @@
     private CachedLatLon coor;
 
-    private boolean erroneous = false;
+    private boolean erroneous;
 
     public Marker(LatLon ll, TemplateEngineDataProvider dataProvider, String iconName, MarkerLayer parentLayer,
Index: /trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java	(revision 8839)
+++ /trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java	(revision 8840)
@@ -69,8 +69,8 @@
      */
     public final List<Marker> data;
-    private boolean mousePressed = false;
-    public GpxLayer fromLayer = null;
+    private boolean mousePressed;
+    public GpxLayer fromLayer;
     private Marker currentMarker;
-    public AudioMarker syncAudioMarker = null;
+    public AudioMarker syncAudioMarker;
 
     /**
Index: /trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java	(revision 8839)
+++ /trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java	(revision 8840)
@@ -35,13 +35,13 @@
 public final class PlayHeadMarker extends Marker {
 
-    private Timer timer = null;
-    private double animationInterval = 0.0; // seconds
-    private static volatile PlayHeadMarker playHead = null;
-    private MapMode oldMode = null;
+    private Timer timer;
+    private double animationInterval; // seconds
+    private static volatile PlayHeadMarker playHead;
+    private MapMode oldMode;
     private LatLon oldCoor;
     private boolean enabled;
-    private boolean wasPlaying = false;
+    private boolean wasPlaying;
     private int dropTolerance; /* pixels */
-    private boolean jumpToMarker = false;
+    private boolean jumpToMarker;
 
     /**
Index: /trunk/src/org/openstreetmap/josm/gui/mappaint/BoxTextElemStyle.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/mappaint/BoxTextElemStyle.java	(revision 8839)
+++ /trunk/src/org/openstreetmap/josm/gui/mappaint/BoxTextElemStyle.java	(revision 8840)
@@ -180,5 +180,5 @@
      * session. There should be preference listener updating this cache.
      */
-    private static volatile Color DEFAULT_TEXT_COLOR = null;
+    private static volatile Color DEFAULT_TEXT_COLOR;
 
     private static void initDefaultParameters() {
Index: /trunk/src/org/openstreetmap/josm/gui/mappaint/ElemStyle.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/mappaint/ElemStyle.java	(revision 8839)
+++ /trunk/src/org/openstreetmap/josm/gui/mappaint/ElemStyle.java	(revision 8840)
@@ -96,6 +96,6 @@
      * a JOSM session. Should have a listener listening to preference changes.
      */
-    private static volatile String DEFAULT_FONT_NAME = null;
-    private static volatile Float DEFAULT_FONT_SIZE = null;
+    private static volatile String DEFAULT_FONT_NAME;
+    private static volatile Float DEFAULT_FONT_SIZE;
     private static final Object lock = new Object();
 
Index: /trunk/src/org/openstreetmap/josm/gui/mappaint/Environment.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/mappaint/Environment.java	(revision 8839)
+++ /trunk/src/org/openstreetmap/josm/gui/mappaint/Environment.java	(revision 8840)
@@ -37,10 +37,10 @@
      * index of node in parent way or member in parent relation. Must be != null in LINK context.
      */
-    public Integer index = null;
+    public Integer index;
 
     /**
      * count of nodes in parent way or members in parent relation. Must be != null in LINK context.
      */
-    public Integer count = null;
+    public Integer count;
 
     /**
Index: /trunk/src/org/openstreetmap/josm/gui/mappaint/MapImage.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/mappaint/MapImage.java	(revision 8839)
+++ /trunk/src/org/openstreetmap/josm/gui/mappaint/MapImage.java	(revision 8840)
@@ -36,6 +36,6 @@
     public int width = -1;
     public int height = -1;
-    public int offsetX = 0;
-    public int offsetY = 0;
+    public int offsetX;
+    public int offsetY;
 
     private boolean temporary;
@@ -54,5 +54,5 @@
     /**
      * Get the image associated with this MapImage object.
-     * 
+     *
      * @param disabled {@code} true to request disabled version, {@code false} for the standard version
      * @return the image
Index: /trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java	(revision 8839)
+++ /trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java	(revision 8840)
@@ -85,5 +85,5 @@
 
     private Color backgroundColorOverride;
-    private String css = null;
+    private String css;
     private ZipFile zipFile;
 
Index: /trunk/src/org/openstreetmap/josm/gui/mappaint/xml/Prototype.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/mappaint/xml/Prototype.java	(revision 8839)
+++ /trunk/src/org/openstreetmap/josm/gui/mappaint/xml/Prototype.java	(revision 8840)
@@ -14,5 +14,5 @@
     public int priority;
     public String code;
-    public Collection<XmlCondition> conditions = null;
+    public Collection<XmlCondition> conditions;
 
     public Prototype(Range range) {
Index: /trunk/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java	(revision 8839)
+++ /trunk/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java	(revision 8840)
@@ -82,5 +82,5 @@
         private String name = "";
         private String icon = "";
-        private ImageIcon ico = null;
+        private ImageIcon ico;
         private final Map<String, Object> parameters = new ConcurrentHashMap<>();
 
Index: /trunk/src/org/openstreetmap/josm/gui/preferences/imagery/WMSLayerTree.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/preferences/imagery/WMSLayerTree.java	(revision 8839)
+++ /trunk/src/org/openstreetmap/josm/gui/preferences/imagery/WMSLayerTree.java	(revision 8840)
@@ -28,5 +28,5 @@
     private final JTree layerTree = new JTree(treeData);
     private final List<WMSImagery.LayerDetails> selectedLayers = new LinkedList<>();
-    private boolean previouslyShownUnsupportedCrsError = false;
+    private boolean previouslyShownUnsupportedCrsError;
 
     /**
Index: /trunk/src/org/openstreetmap/josm/gui/preferences/plugin/PluginPreference.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/preferences/plugin/PluginPreference.java	(revision 8839)
+++ /trunk/src/org/openstreetmap/josm/gui/preferences/plugin/PluginPreference.java	(revision 8840)
@@ -155,5 +155,5 @@
      * by the user
      */
-    private boolean pluginPreferencesActivated = false;
+    private boolean pluginPreferencesActivated;
 
     protected JPanel buildSearchFieldPanel() {
Index: /trunk/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java	(revision 8839)
+++ /trunk/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java	(revision 8840)
@@ -168,5 +168,5 @@
 
     class ValidateApiUrlAction extends AbstractAction implements DocumentListener {
-        private String lastTestedUrl = null;
+        private String lastTestedUrl;
 
         ValidateApiUrlAction() {
Index: /trunk/src/org/openstreetmap/josm/gui/progress/PleaseWaitProgressMonitor.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/progress/PleaseWaitProgressMonitor.java	(revision 8839)
+++ /trunk/src/org/openstreetmap/josm/gui/progress/PleaseWaitProgressMonitor.java	(revision 8840)
@@ -41,5 +41,5 @@
     private final Component dialogParent;
 
-    private int currentProgressValue = 0;
+    private int currentProgressValue;
     private String customText;
     private String title;
Index: /trunk/src/org/openstreetmap/josm/gui/progress/SwingRenderingProgressMonitor.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/progress/SwingRenderingProgressMonitor.java	(revision 8839)
+++ /trunk/src/org/openstreetmap/josm/gui/progress/SwingRenderingProgressMonitor.java	(revision 8840)
@@ -16,5 +16,5 @@
 public class SwingRenderingProgressMonitor extends AbstractProgressMonitor {
     private static final int PROGRESS_BAR_MAX = 100;
-    private int currentProgressValue = 0;
+    private int currentProgressValue;
     private ProgressRenderer delegate;
 
Index: /trunk/src/org/openstreetmap/josm/gui/tagging/TagCellEditor.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/tagging/TagCellEditor.java	(revision 8839)
+++ /trunk/src/org/openstreetmap/josm/gui/tagging/TagCellEditor.java	(revision 8840)
@@ -19,12 +19,12 @@
 public class TagCellEditor extends AbstractCellEditor implements TableCellEditor{
 
-    protected AutoCompletingTextField editor = null;
-    protected transient TagModel currentTag = null;
+    protected AutoCompletingTextField editor;
+    protected transient TagModel currentTag;
 
     /** the cache of auto completion items derived from the current JOSM data set */
-    protected transient AutoCompletionManager autocomplete = null;
+    protected transient AutoCompletionManager autocomplete;
 
     /** user input is matched against this list of auto completion items */
-    protected AutoCompletionList autoCompletionList = null;
+    protected AutoCompletionList autoCompletionList;
 
     /**
Index: /trunk/src/org/openstreetmap/josm/gui/tagging/TagCellRenderer.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/tagging/TagCellRenderer.java	(revision 8839)
+++ /trunk/src/org/openstreetmap/josm/gui/tagging/TagCellRenderer.java	(revision 8840)
@@ -20,6 +20,6 @@
  */
 public class TagCellRenderer extends JLabel implements TableCellRenderer  {
-    private Font fontStandard = null;
-    private Font fontItalic = null;
+    private Font fontStandard;
+    private Font fontItalic;
 
     /**
Index: /trunk/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java	(revision 8839)
+++ /trunk/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java	(revision 8840)
@@ -38,5 +38,5 @@
 
     /** indicates whether the model is dirty */
-    private boolean dirty =  false;
+    private boolean dirty;
     private final PropertyChangeSupport propChangeSupport = new PropertyChangeSupport(this);
 
Index: /trunk/src/org/openstreetmap/josm/gui/tagging/TagModel.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/tagging/TagModel.java	(revision 8839)
+++ /trunk/src/org/openstreetmap/josm/gui/tagging/TagModel.java	(revision 8840)
@@ -8,8 +8,8 @@
 
     /** the name of the tag */
-    private String name = null;
+    private String name;
 
     /** the list of values */
-    private List<String> values = null;
+    private List<String> values;
 
     /**
Index: /trunk/src/org/openstreetmap/josm/gui/tagging/TagTable.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/tagging/TagTable.java	(revision 8839)
+++ /trunk/src/org/openstreetmap/josm/gui/tagging/TagTable.java	(revision 8840)
@@ -57,5 +57,5 @@
 public class TagTable extends JTable  {
     /** the table cell editor used by this table */
-    private TagCellEditor editor = null;
+    private TagCellEditor editor;
     private final TagEditorModel model;
     private Component nextFocusComponent;
@@ -367,11 +367,11 @@
 
     /** the delete action */
-    private RunnableAction deleteAction = null;
+    private RunnableAction deleteAction;
 
     /** the add action */
-    private RunnableAction addAction = null;
+    private RunnableAction addAction;
 
     /** the tag paste action */
-    private RunnableAction pasteAction = null;
+    private RunnableAction pasteAction;
 
     /**
Index: /trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java	(revision 8839)
+++ /trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java	(revision 8840)
@@ -77,5 +77,5 @@
     public static final int DIALOG_ANSWER_CANCEL = 3;
 
-    public TaggingPresetMenu group = null;
+    public TaggingPresetMenu group;
     public String name;
     public String iconName;
@@ -212,5 +212,5 @@
 
     private static class PresetPanel extends JPanel {
-        private boolean hasElements = false;
+        private boolean hasElements;
 
         PresetPanel() {
@@ -414,5 +414,5 @@
      * True whenever the original selection given into createSelection was empty
      */
-    private boolean originalSelectionEmpty = false;
+    private boolean originalSelectionEmpty;
 
     /**
Index: /trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPresetItems.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPresetItems.java	(revision 8839)
+++ /trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPresetItems.java	(revision 8840)
@@ -81,5 +81,5 @@
     }
 
-    private static int auto_increment_selected = 0;
+    private static int auto_increment_selected;
     /** Translatation of "&lt;different&gt;". Use in combo boxes to display en entry matching several different values. */
     public static final String DIFFERENT = tr("<different>");
@@ -189,6 +189,6 @@
         public SearchCompiler.Match memberExpression;
 
-        public boolean required = false;
-        private long count = 0;
+        public boolean required;
+        private long count;
 
         public void setType(String types) throws SAXException {
@@ -307,6 +307,6 @@
     public static class Usage {
         private SortedSet<String> values;
-        private boolean hadKeys = false;
-        private boolean hadEmpty = false;
+        private boolean hadKeys;
+        private boolean hadEmpty;
 
         public boolean hasUniqueValue() {
@@ -885,7 +885,7 @@
         public String value_off = OsmUtils.falseval;
         /** whether the off value is disabled in the dialog, i.e., only unset or yes are provided */
-        public boolean disable_off = false;
+        public boolean disable_off;
         /** "on" or "off" or unset (default is unset) */
-        public String default_ = null; // only used for tagless objects
+        public String default_; // only used for tagless objects
 
         private QuadStateCheckBox check;
@@ -1010,5 +1010,5 @@
         protected JComponent component;
         protected final Map<String, PresetListEntry> lhm = new LinkedHashMap<>();
-        private boolean initialized = false;
+        private boolean initialized;
         protected Usage usage;
         protected Object originalValue;
Index: /trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPresetMenu.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPresetMenu.java	(revision 8839)
+++ /trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPresetMenu.java	(revision 8840)
@@ -25,5 +25,5 @@
 
 public class TaggingPresetMenu extends TaggingPreset {
-    public JMenu menu = null; // set by TaggingPresets
+    public JMenu menu; // set by TaggingPresets
 
     private static class PresetTextComparator implements Comparator<JMenuItem>, Serializable {
Index: /trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPresetReader.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPresetReader.java	(revision 8839)
+++ /trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPresetReader.java	(revision 8840)
@@ -50,5 +50,5 @@
     }
 
-    private static volatile File zipIcons = null;
+    private static volatile File zipIcons;
     private static volatile boolean loadIcons = true;
 
@@ -103,5 +103,5 @@
 
     static class HashSetWithLast<E> extends LinkedHashSet<E> {
-        protected E last = null;
+        protected E last;
 
         @Override
Index: /trunk/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletingComboBox.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletingComboBox.java	(revision 8839)
+++ /trunk/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletingComboBox.java	(revision 8840)
@@ -47,5 +47,5 @@
     class AutoCompletingComboBoxDocument extends PlainDocument {
         private final JosmComboBox<AutoCompletionListItem> comboBox;
-        private boolean selecting = false;
+        private boolean selecting;
 
         /**
Index: /trunk/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletingTextField.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletingTextField.java	(revision 8839)
+++ /trunk/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletingTextField.java	(revision 8840)
@@ -119,7 +119,7 @@
 
     /** the auto completion list user input is matched against */
-    protected AutoCompletionList autoCompletionList = null;
+    protected AutoCompletionList autoCompletionList;
     /** a string which should not be auto completed */
-    protected String noAutoCompletionString = null;
+    protected String noAutoCompletionString;
 
     @Override
Index: /trunk/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletionList.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletionList.java	(revision 8839)
+++ /trunk/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletionList.java	(revision 8840)
@@ -33,9 +33,9 @@
 
     /** the bare list of AutoCompletionItems */
-    private transient List<AutoCompletionListItem> list = null;
+    private transient List<AutoCompletionListItem> list;
     /**  the filtered list of AutoCompletionItems */
-    private transient ArrayList<AutoCompletionListItem> filtered = null;
+    private transient ArrayList<AutoCompletionListItem> filtered;
     /** the filter expression */
-    private String filter = null;
+    private String filter;
     /** map from value to priority */
     private transient Map<String, AutoCompletionListItem> valutToItemMap;
Index: /trunk/src/org/openstreetmap/josm/gui/widgets/AbstractTextComponentValidator.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/widgets/AbstractTextComponentValidator.java	(revision 8839)
+++ /trunk/src/org/openstreetmap/josm/gui/widgets/AbstractTextComponentValidator.java	(revision 8840)
@@ -40,5 +40,5 @@
      * we don't know yet
      */
-    private Boolean valid = null;
+    private Boolean valid;
     // remember the message
     private String msg;
Index: /trunk/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java	(revision 8839)
+++ /trunk/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java	(revision 8840)
@@ -28,5 +28,5 @@
 public class BoundingBoxSelectionPanel extends JPanel {
 
-    private JosmTextField[] tfLatLon = null;
+    private JosmTextField[] tfLatLon;
     private final JosmTextField tfOsmUrl = new JosmTextField();
 
Index: /trunk/src/org/openstreetmap/josm/gui/widgets/ChangesetIdTextField.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/widgets/ChangesetIdTextField.java	(revision 8839)
+++ /trunk/src/org/openstreetmap/josm/gui/widgets/ChangesetIdTextField.java	(revision 8840)
@@ -44,5 +44,5 @@
     public static class ChangesetIdValidator extends AbstractTextComponentValidator {
 
-        private int id = 0;
+        private int id;
 
         /**
Index: /trunk/src/org/openstreetmap/josm/gui/widgets/JMultilineLabel.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/widgets/JMultilineLabel.java	(revision 8839)
+++ /trunk/src/org/openstreetmap/josm/gui/widgets/JMultilineLabel.java	(revision 8840)
@@ -21,6 +21,6 @@
 public class JMultilineLabel extends JEditorPane {
     private int maxWidth = Integer.MAX_VALUE;
-    private Rectangle oldbounds = null;
-    private Dimension oldPreferred = null;
+    private Rectangle oldbounds;
+    private Dimension oldPreferred;
 
     /**
Index: /trunk/src/org/openstreetmap/josm/gui/widgets/MultiSplitLayout.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/widgets/MultiSplitLayout.java	(revision 8839)
+++ /trunk/src/org/openstreetmap/josm/gui/widgets/MultiSplitLayout.java	(revision 8840)
@@ -819,7 +819,7 @@
      */
     public abstract static class Node {
-        private Split parent = null;
+        private Split parent;
         private Rectangle bounds = new Rectangle();
-        private double weight = 0.0;
+        private double weight;
 
         /**
Index: /trunk/src/org/openstreetmap/josm/gui/widgets/MultiSplitPane.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/widgets/MultiSplitPane.java	(revision 8839)
+++ /trunk/src/org/openstreetmap/josm/gui/widgets/MultiSplitPane.java	(revision 8840)
@@ -47,5 +47,5 @@
  */
 public class MultiSplitPane extends JPanel {
-    private transient AccessibleContext accessibleContext = null;
+    private transient AccessibleContext accessibleContext;
     private boolean continuousLayout = true;
     private transient DividerPainter dividerPainter = new DefaultDividerPainter();
@@ -219,10 +219,10 @@
     }
 
-    private boolean dragUnderway = false;
-    private transient MultiSplitLayout.Divider dragDivider = null;
-    private Rectangle initialDividerBounds = null;
+    private boolean dragUnderway;
+    private transient MultiSplitLayout.Divider dragDivider;
+    private Rectangle initialDividerBounds;
     private boolean oldFloatingDividers = true;
-    private int dragOffsetX = 0;
-    private int dragOffsetY = 0;
+    private int dragOffsetX;
+    private int dragOffsetY;
     private int dragMin = -1;
     private int dragMax = -1;
Index: /trunk/src/org/openstreetmap/josm/gui/widgets/TextContextualPopupMenu.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/widgets/TextContextualPopupMenu.java	(revision 8839)
+++ /trunk/src/org/openstreetmap/josm/gui/widgets/TextContextualPopupMenu.java	(revision 8840)
@@ -45,5 +45,5 @@
     private static final String EDITABLE = "editable";
 
-    protected JTextComponent component = null;
+    protected JTextComponent component;
     protected boolean undoRedo;
     protected final UndoAction undoAction = new UndoAction();
Index: /trunk/src/org/openstreetmap/josm/io/CacheCustomContent.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/io/CacheCustomContent.java	(revision 8839)
+++ /trunk/src/org/openstreetmap/josm/io/CacheCustomContent.java	(revision 8840)
@@ -38,5 +38,5 @@
      * Where the data will be stored
      */
-    private byte[] data = null;
+    private byte[] data;
 
     /**
Index: /trunk/src/org/openstreetmap/josm/io/CachedFile.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/io/CachedFile.java	(revision 8839)
+++ /trunk/src/org/openstreetmap/josm/io/CachedFile.java	(revision 8840)
@@ -69,6 +69,6 @@
     protected CachingStrategy cachingStrategy;
 
-    protected File cacheFile = null;
-    protected boolean initialized = false;
+    protected File cacheFile;
+    protected boolean initialized;
 
     public static final long DEFAULT_MAXTIME = -1L;
Index: /trunk/src/org/openstreetmap/josm/io/ChangesetQuery.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/io/ChangesetQuery.java	(revision 8839)
+++ /trunk/src/org/openstreetmap/josm/io/ChangesetQuery.java	(revision 8840)
@@ -36,18 +36,18 @@
 
     /** the user id this query is restricted to. null, if no restriction to a user id applies */
-    private Integer uid = null;
+    private Integer uid;
     /** the user name this query is restricted to. null, if no restriction to a user name applies */
-    private String userName = null;
+    private String userName;
     /** the bounding box this query is restricted to. null, if no restriction to a bounding box applies */
-    private Bounds bounds = null;
-
-    private Date closedAfter = null;
-    private Date createdBefore = null;
+    private Bounds bounds;
+
+    private Date closedAfter;
+    private Date createdBefore;
     /** indicates whether only open changesets are queried. null, if no restrictions regarding open changesets apply */
-    private Boolean open = null;
+    private Boolean open;
     /** indicates whether only closed changesets are queried. null, if no restrictions regarding open changesets apply */
-    private Boolean closed = null;
+    private Boolean closed;
     /** a collection of changeset ids to query for */
-    private Collection<Long> changesetIds = null;
+    private Collection<Long> changesetIds;
 
     /**
Index: /trunk/src/org/openstreetmap/josm/io/DefaultProxySelector.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/io/DefaultProxySelector.java	(revision 8839)
+++ /trunk/src/org/openstreetmap/josm/io/DefaultProxySelector.java	(revision 8840)
@@ -41,5 +41,5 @@
      * We therefore read the property at class loading time and remember it's value.
      */
-    private static boolean JVM_WILL_USE_SYSTEM_PROXIES = false;
+    private static boolean JVM_WILL_USE_SYSTEM_PROXIES;
     static {
         String v = System.getProperty("java.net.useSystemProxies");
Index: /trunk/src/org/openstreetmap/josm/io/GpxReader.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/io/GpxReader.java	(revision 8839)
+++ /trunk/src/org/openstreetmap/josm/io/GpxReader.java	(revision 8840)
@@ -69,5 +69,5 @@
         private StringBuffer accumulator = new StringBuffer();
 
-        private boolean nokiaSportsTrackerBug = false;
+        private boolean nokiaSportsTrackerBug;
 
         @Override
Index: /trunk/src/org/openstreetmap/josm/io/MessageNotifier.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/io/MessageNotifier.java	(revision 8839)
+++ /trunk/src/org/openstreetmap/josm/io/MessageNotifier.java	(revision 8840)
@@ -52,9 +52,9 @@
     private static final Runnable WORKER = new Worker();
 
-    private static volatile ScheduledFuture<?> task = null;
+    private static volatile ScheduledFuture<?> task;
 
     private static class Worker implements Runnable {
 
-        private int lastUnreadCount = 0;
+        private int lastUnreadCount;
 
         @Override
Index: /trunk/src/org/openstreetmap/josm/io/NmeaReader.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/io/NmeaReader.java	(revision 8839)
+++ /trunk/src/org/openstreetmap/josm/io/NmeaReader.java	(revision 8840)
@@ -217,10 +217,10 @@
         protected WayPoint pWp;
 
-        protected int success = 0; // number of successfully parsed sentences
-        protected int malformed = 0;
-        protected int checksumErrors = 0;
-        protected int noChecksum = 0;
-        protected int unknown = 0;
-        protected int zeroCoord = 0;
+        protected int success; // number of successfully parsed sentences
+        protected int malformed;
+        protected int checksumErrors;
+        protected int noChecksum;
+        protected int unknown;
+        protected int zeroCoord;
     }
 
Index: /trunk/src/org/openstreetmap/josm/io/OsmApi.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/io/OsmApi.java	(revision 8839)
+++ /trunk/src/org/openstreetmap/josm/io/OsmApi.java	(revision 8840)
@@ -81,5 +81,5 @@
     private static Map<String, OsmApi> instances = new HashMap<>();
 
-    private URL url = null;
+    private URL url;
 
     /**
@@ -120,11 +120,11 @@
 
     /** API version used for server communications */
-    private String version = null;
+    private String version;
 
     /** API capabilities */
-    private Capabilities capabilities = null;
+    private Capabilities capabilities;
 
     /** true if successfully initialized */
-    private boolean initialized = false;
+    private boolean initialized;
 
     /**
Index: /trunk/src/org/openstreetmap/josm/io/OsmChangeBuilder.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/io/OsmChangeBuilder.java	(revision 8839)
+++ /trunk/src/org/openstreetmap/josm/io/OsmChangeBuilder.java	(revision 8840)
@@ -25,5 +25,5 @@
     private OsmWriter osmwriter;
     private String apiVersion = DEFAULT_API_VERSION;
-    private boolean prologWritten = false;
+    private boolean prologWritten;
 
     public OsmChangeBuilder(Changeset changeset) {
Index: /trunk/src/org/openstreetmap/josm/io/OsmChangesetParser.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/io/OsmChangesetParser.java	(revision 8839)
+++ /trunk/src/org/openstreetmap/josm/io/OsmChangesetParser.java	(revision 8840)
@@ -71,11 +71,11 @@
 
         /** The current changeset */
-        private Changeset current = null;
+        private Changeset current;
 
         /** The current comment */
-        private ChangesetDiscussionComment comment = null;
+        private ChangesetDiscussionComment comment;
 
         /** The current comment text */
-        private StringBuilder text = null;
+        private StringBuilder text;
 
         protected void parseChangesetAttributes(Changeset cs, Attributes atts) throws XmlParsingException {
Index: /trunk/src/org/openstreetmap/josm/io/OsmConnection.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/io/OsmConnection.java	(revision 8839)
+++ /trunk/src/org/openstreetmap/josm/io/OsmConnection.java	(revision 8840)
@@ -12,7 +12,4 @@
 import java.nio.charset.StandardCharsets;
 
-import oauth.signpost.OAuthConsumer;
-import oauth.signpost.exception.OAuthException;
-
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.oauth.OAuthParameters;
@@ -23,4 +20,7 @@
 import org.openstreetmap.josm.tools.Base64;
 
+import oauth.signpost.OAuthConsumer;
+import oauth.signpost.exception.OAuthException;
+
 /**
  * Base class that handles common things like authentication for the reader and writer
@@ -30,5 +30,5 @@
  */
 public class OsmConnection {
-    protected boolean cancel = false;
+    protected boolean cancel;
     protected HttpURLConnection activeConnection;
     protected OAuthParameters oauthParameters;
Index: /trunk/src/org/openstreetmap/josm/io/OsmServerLocationReader.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/io/OsmServerLocationReader.java	(revision 8839)
+++ /trunk/src/org/openstreetmap/josm/io/OsmServerLocationReader.java	(revision 8840)
@@ -36,5 +36,5 @@
         protected final ProgressMonitor progressMonitor;
         protected final Compression compression;
-        protected InputStream in = null;
+        protected InputStream in;
 
         public Parser(ProgressMonitor progressMonitor, Compression compression) {
Index: /trunk/src/org/openstreetmap/josm/io/OsmServerReader.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/io/OsmServerReader.java	(revision 8839)
+++ /trunk/src/org/openstreetmap/josm/io/OsmServerReader.java	(revision 8840)
@@ -36,5 +36,5 @@
 public abstract class OsmServerReader extends OsmConnection {
     private OsmApi api = OsmApi.getOsmApi();
-    private boolean doAuthenticate = false;
+    private boolean doAuthenticate;
     protected boolean gpxParsedProperly;
 
Index: /trunk/src/org/openstreetmap/josm/io/OsmServerWriter.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/io/OsmServerWriter.java	(revision 8839)
+++ /trunk/src/org/openstreetmap/josm/io/OsmServerWriter.java	(revision 8840)
@@ -52,5 +52,5 @@
 
     private OsmApi api = OsmApi.getOsmApi();
-    private boolean canceled = false;
+    private boolean canceled;
 
     private static final int MSECS_PER_SECOND = 1000;
Index: /trunk/src/org/openstreetmap/josm/io/ProgressInputStream.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/io/ProgressInputStream.java	(revision 8839)
+++ /trunk/src/org/openstreetmap/josm/io/ProgressInputStream.java	(revision 8840)
@@ -18,6 +18,6 @@
 
     private final InputStream in;
-    private int readSoFar = 0;
-    private int lastDialogUpdate = 0;
+    private int readSoFar;
+    private int lastDialogUpdate;
     private boolean sizeKnown;
     private final URLConnection connection;
Index: /trunk/src/org/openstreetmap/josm/io/remotecontrol/RemoteControlHttpServer.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/io/remotecontrol/RemoteControlHttpServer.java	(revision 8839)
+++ /trunk/src/org/openstreetmap/josm/io/remotecontrol/RemoteControlHttpServer.java	(revision 8840)
@@ -20,10 +20,10 @@
 
     /** The server socket */
-    private ServerSocket server = null;
+    private ServerSocket server;
 
     /** The server instance for IPv4 */
-    private static volatile RemoteControlHttpServer instance4 = null;
+    private static volatile RemoteControlHttpServer instance4;
     /** The server instance for IPv6 */
-    private static volatile RemoteControlHttpServer instance6 = null;
+    private static volatile RemoteControlHttpServer instance6;
 
     /**
Index: /trunk/src/org/openstreetmap/josm/io/remotecontrol/RemoteControlHttpsServer.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/io/remotecontrol/RemoteControlHttpsServer.java	(revision 8839)
+++ /trunk/src/org/openstreetmap/josm/io/remotecontrol/RemoteControlHttpsServer.java	(revision 8840)
@@ -72,10 +72,10 @@
 
     /** The server socket */
-    private ServerSocket server = null;
+    private ServerSocket server;
 
     /** The server instance for IPv4 */
-    private static volatile RemoteControlHttpsServer instance4 = null;
+    private static volatile RemoteControlHttpsServer instance4;
     /** The server instance for IPv6 */
-    private static volatile RemoteControlHttpsServer instance6 = null;
+    private static volatile RemoteControlHttpsServer instance6;
 
     /** SSL context information for connections */
Index: /trunk/src/org/openstreetmap/josm/plugins/Plugin.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/plugins/Plugin.java	(revision 8839)
+++ /trunk/src/org/openstreetmap/josm/plugins/Plugin.java	(revision 8840)
@@ -50,5 +50,5 @@
      * is a bit hacky, but it works).
      */
-    private PluginInformation info = null;
+    private PluginInformation info;
 
     /**
Index: /trunk/src/org/openstreetmap/josm/plugins/PluginHandler.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/plugins/PluginHandler.java	(revision 8839)
+++ /trunk/src/org/openstreetmap/josm/plugins/PluginHandler.java	(revision 8840)
@@ -249,5 +249,5 @@
     }
 
-    private static PluginDownloadTask pluginDownloadTask = null;
+    private static PluginDownloadTask pluginDownloadTask;
 
     public static Collection<ClassLoader> getResourceClassLoaders() {
Index: /trunk/src/org/openstreetmap/josm/plugins/PluginInformation.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/plugins/PluginInformation.java	(revision 8839)
+++ /trunk/src/org/openstreetmap/josm/plugins/PluginInformation.java	(revision 8840)
@@ -44,35 +44,35 @@
 
     /** The plugin jar file. */
-    public File file = null;
+    public File file;
     /** The plugin name. */
-    public String name = null;
+    public String name;
     /** The lowest JOSM version required by this plugin (from plugin list). **/
-    public int mainversion = 0;
+    public int mainversion;
     /** The lowest JOSM version required by this plugin (from locally available jar). **/
-    public int localmainversion = 0;
+    public int localmainversion;
     /** The plugin class name. */
-    public String className = null;
+    public String className;
     /** Determines if the plugin is an old version loaded for incompatibility with latest JOSM (from plugin list) */
-    public boolean oldmode = false;
+    public boolean oldmode;
     /** The list of required plugins, separated by ';' (from plugin list). */
-    public String requires = null;
+    public String requires;
     /** The list of required plugins, separated by ';' (from locally available jar). */
-    public String localrequires = null;
+    public String localrequires;
     /** The plugin link (for documentation). */
-    public String link = null;
+    public String link;
     /** The plugin description. */
-    public String description = null;
+    public String description;
     /** Determines if the plugin must be loaded early or not. */
-    public boolean early = false;
+    public boolean early;
     /** The plugin author. */
-    public String author = null;
+    public String author;
     /** The plugin stage, determining the loading sequence order of plugins. */
     public int stage = 50;
     /** The plugin version (from plugin list). **/
-    public String version = null;
+    public String version;
     /** The plugin version (from locally available jar). **/
-    public String localversion = null;
+    public String localversion;
     /** The plugin download link. */
-    public String downloadlink = null;
+    public String downloadlink;
     /** The plugin icon path inside jar. */
     public String iconPath;
@@ -80,5 +80,5 @@
     public ImageIcon icon;
     /** Plugin can be loaded at any time and not just at start. */
-    public boolean canloadatruntime = false;
+    public boolean canloadatruntime;
     /** The libraries referenced in Class-Path manifest attribute. */
     public List<URL> libraries = new LinkedList<>();
Index: /trunk/src/org/openstreetmap/josm/tools/AudioPlayer.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/tools/AudioPlayer.java	(revision 8839)
+++ /trunk/src/org/openstreetmap/josm/tools/AudioPlayer.java	(revision 8840)
@@ -26,5 +26,5 @@
 public final class AudioPlayer extends Thread {
 
-    private static volatile AudioPlayer audioPlayer = null;
+    private static volatile AudioPlayer audioPlayer;
 
     private enum State { INITIALIZING, NOTPLAYING, PLAYING, PAUSED, INTERRUPTED }
Index: /trunk/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java	(revision 8839)
+++ /trunk/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java	(revision 8840)
@@ -41,8 +41,8 @@
 public final class BugReportExceptionHandler implements Thread.UncaughtExceptionHandler {
 
-    private static boolean handlingInProgress = false;
-    private static volatile BugReporterThread bugReporterThread = null;
-    private static int exceptionCounter = 0;
-    private static boolean suppressExceptionDialogs = false;
+    private static boolean handlingInProgress;
+    private static volatile BugReporterThread bugReporterThread;
+    private static int exceptionCounter;
+    private static boolean suppressExceptionDialogs;
 
     private static class BugReporterThread extends Thread {
Index: /trunk/src/org/openstreetmap/josm/tools/CopyList.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/tools/CopyList.java	(revision 8839)
+++ /trunk/src/org/openstreetmap/josm/tools/CopyList.java	(revision 8840)
@@ -148,5 +148,5 @@
          * Index of element to be returned by subsequent call to next.
          */
-        private int cursor = 0;
+        private int cursor;
 
         /**
Index: /trunk/src/org/openstreetmap/josm/tools/Diff.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/tools/Diff.java	(revision 8839)
+++ /trunk/src/org/openstreetmap/josm/tools/Diff.java	(revision 8840)
@@ -107,9 +107,9 @@
     With this heuristic, for files with a constant small density
     of changes, the algorithm is linear in the file size.  */
-    public boolean heuristic = false;
+    public boolean heuristic;
 
     /** When set to true, the algorithm returns a guarranteed minimal
       set of changes.  This makes things slower, sometimes much slower. */
-    public boolean noDiscards = false;
+    public boolean noDiscards;
 
     private int[] xvec, yvec; /* Vectors being compared. */
@@ -376,5 +376,5 @@
     }
 
-    private boolean inhibit = false;
+    private boolean inhibit;
 
     /** Adjust inserts/deletes of blank lines to join changes
Index: /trunk/src/org/openstreetmap/josm/tools/I18n.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/tools/I18n.java	(revision 8839)
+++ /trunk/src/org/openstreetmap/josm/tools/I18n.java	(revision 8840)
@@ -171,6 +171,6 @@
         "OptionPane.cancelButtonText"
     };
-    private static volatile Map<String, String> strings = null;
-    private static volatile Map<String, String[]> pstrings = null;
+    private static volatile Map<String, String> strings;
+    private static volatile Map<String, String[]> pstrings;
     private static Map<String, PluralMode> languages = new HashMap<>();
 
Index: /trunk/src/org/openstreetmap/josm/tools/ImageProvider.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/tools/ImageProvider.java	(revision 8839)
+++ /trunk/src/org/openstreetmap/josm/tools/ImageProvider.java	(revision 8840)
@@ -184,5 +184,5 @@
     protected Collection<ClassLoader> additionalClassLoaders;
     /** ordered list of overlay images */
-    protected List<ImageOverlay> overlayInfo = null;
+    protected List<ImageOverlay> overlayInfo;
 
     private static SVGUniverse svgUniverse;
Index: /trunk/src/org/openstreetmap/josm/tools/ImageResource.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/tools/ImageResource.java	(revision 8839)
+++ /trunk/src/org/openstreetmap/josm/tools/ImageResource.java	(revision 8840)
@@ -40,6 +40,6 @@
      * ordered list of overlay images
      */
-    protected List<ImageOverlay> overlayInfo = null;
-    private Image baseImage = null;
+    protected List<ImageOverlay> overlayInfo;
+    private Image baseImage;
 
     /**
Index: /trunk/src/org/openstreetmap/josm/tools/Shortcut.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/tools/Shortcut.java	(revision 8839)
+++ /trunk/src/org/openstreetmap/josm/tools/Shortcut.java	(revision 8840)
@@ -311,5 +311,5 @@
 
     // bootstrap
-    private static boolean initdone = false;
+    private static boolean initdone;
     private static void doInit() {
         if (initdone) return;
Index: /trunk/src/org/openstreetmap/josm/tools/TextTagParser.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/tools/TextTagParser.java	(revision 8839)
+++ /trunk/src/org/openstreetmap/josm/tools/TextTagParser.java	(revision 8840)
@@ -40,6 +40,6 @@
 
     public static class TextAnalyzer {
-        private boolean quotesStarted = false;
-        private boolean esc = false;
+        private boolean quotesStarted;
+        private boolean esc;
         private StringBuilder s = new StringBuilder(200);
         private int pos;
Index: /trunk/src/org/openstreetmap/josm/tools/XmlObjectParser.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/tools/XmlObjectParser.java	(revision 8839)
+++ /trunk/src/org/openstreetmap/josm/tools/XmlObjectParser.java	(revision 8840)
@@ -232,5 +232,5 @@
      */
     private List<Object> queue = new LinkedList<>();
-    private Iterator<Object> queueIterator = null;
+    private Iterator<Object> queueIterator;
 
     /**