Index: trunk/src/org/openstreetmap/josm/data/Preferences.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/Preferences.java	(revision 9977)
+++ trunk/src/org/openstreetmap/josm/data/Preferences.java	(revision 9978)
@@ -153,5 +153,5 @@
      * Used to decide whether to write backup preference file in {@link #save()}
      */
-    protected boolean initSuccessful = false;
+    protected boolean initSuccessful;
 
     /**
Index: trunk/src/org/openstreetmap/josm/data/imagery/ImageryInfo.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/imagery/ImageryInfo.java	(revision 9977)
+++ trunk/src/org/openstreetmap/josm/data/imagery/ImageryInfo.java	(revision 9978)
@@ -188,9 +188,9 @@
     private String countryCode = "";
     /** mirrors of different type for this entry */
-    private List<ImageryInfo> mirrors = null;
+    private List<ImageryInfo> mirrors;
     /** icon used in menu */
     private String icon;
-    private boolean isGeoreferenceValid = false;
-    private boolean isEpsg4326To3857Supported = false;
+    private boolean isGeoreferenceValid;
+    private boolean isEpsg4326To3857Supported;
     // when adding a field, also adapt the ImageryInfo(ImageryInfo)
     // and ImageryInfo(ImageryPreferenceEntry) constructor, equals method, and ImageryPreferenceEntry
Index: trunk/src/org/openstreetmap/josm/data/osm/TagMap.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/osm/TagMap.java	(revision 9977)
+++ trunk/src/org/openstreetmap/josm/data/osm/TagMap.java	(revision 9978)
@@ -37,5 +37,5 @@
          * Current tag index. Always a multiple of 2.
          */
-        private int currentIndex = 0;
+        private int currentIndex;
 
         /**
Index: trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java	(revision 9977)
+++ trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java	(revision 9978)
@@ -267,5 +267,5 @@
 
     /* can be set by tests, if detailed benchmark data is requested */
-    public BenchmarkData benchmarkData = null;
+    public BenchmarkData benchmarkData;
 
     private static Map<Font, Boolean> IS_GLYPH_VECTOR_DOUBLE_TRANSLATION_BUG = new HashMap<>();
Index: trunk/src/org/openstreetmap/josm/data/preferences/PreferencesReader.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/preferences/PreferencesReader.java	(revision 9977)
+++ trunk/src/org/openstreetmap/josm/data/preferences/PreferencesReader.java	(revision 9978)
@@ -42,5 +42,5 @@
     private final SortedMap<String, Setting<?>> settings = new TreeMap<>();
     private XMLStreamReader parser;
-    private int version = 0;
+    private int version;
     private Reader reader;
     private File file;
Index: trunk/src/org/openstreetmap/josm/data/validation/routines/DomainValidator.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/validation/routines/DomainValidator.java	(revision 9977)
+++ trunk/src/org/openstreetmap/josm/data/validation/routines/DomainValidator.java	(revision 9978)
@@ -1565,5 +1565,5 @@
      * synchronized methods.
      */
-    private static boolean inUse = false;
+    private static boolean inUse;
 
     /*
Index: trunk/src/org/openstreetmap/josm/gui/MapStatus.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/MapStatus.java	(revision 9977)
+++ trunk/src/org/openstreetmap/josm/gui/MapStatus.java	(revision 9978)
@@ -183,5 +183,5 @@
 
     /** The {@link CoordinateFormat} set in the previous update */
-    private transient CoordinateFormat previousCoordinateFormat = null;
+    private transient CoordinateFormat previousCoordinateFormat;
     private final ImageLabel latText = new ImageLabel("lat",
             null, LatLon.SOUTH_POLE.latToString(CoordinateFormat.DEGREES_MINUTES_SECONDS).length(), PROP_BACKGROUND_COLOR.get());
Index: trunk/src/org/openstreetmap/josm/gui/layer/Layer.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/layer/Layer.java	(revision 9977)
+++ trunk/src/org/openstreetmap/josm/gui/layer/Layer.java	(revision 9978)
@@ -138,5 +138,5 @@
      * This is set if user renamed this layer.
      */
-    private boolean renamed = false;
+    private boolean renamed;
 
     /**
Index: trunk/src/org/openstreetmap/josm/gui/widgets/CompileSearchTextDecorator.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/widgets/CompileSearchTextDecorator.java	(revision 9977)
+++ trunk/src/org/openstreetmap/josm/gui/widgets/CompileSearchTextDecorator.java	(revision 9978)
@@ -19,5 +19,5 @@
     private final JTextComponent textComponent;
     private final String originalToolTipText;
-    private SearchCompiler.Match filter = null;
+    private SearchCompiler.Match filter;
 
     private CompileSearchTextDecorator(JTextComponent textComponent) {
Index: trunk/src/org/openstreetmap/josm/gui/widgets/FileChooserManager.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/widgets/FileChooserManager.java	(revision 9977)
+++ trunk/src/org/openstreetmap/josm/gui/widgets/FileChooserManager.java	(revision 9978)
@@ -38,12 +38,12 @@
     private final String curDir;
 
-    private boolean multiple = false;
-    private String title = null;
+    private boolean multiple;
+    private String title;
     private Collection<? extends FileFilter> filters;
     private FileFilter defaultFilter;
     private int selectionMode = JFileChooser.FILES_ONLY;
-    private String extension = null;
-    private boolean allTypes = false;
-    private File file = null;
+    private String extension;
+    private boolean allTypes;
+    private File file;
 
     private AbstractFileChooser fc;
Index: trunk/src/org/openstreetmap/josm/gui/widgets/QuadStateCheckBox.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/widgets/QuadStateCheckBox.java	(revision 9977)
+++ trunk/src/org/openstreetmap/josm/gui/widgets/QuadStateCheckBox.java	(revision 9978)
@@ -129,5 +129,5 @@
     private final class QuadStateDecorator implements ButtonModel {
         private final ButtonModel other;
-        private String propertyText = null;
+        private String propertyText;
 
         private QuadStateDecorator(ButtonModel other) {