Index: trunk/test/functional/org/openstreetmap/josm/data/imagery/ImageryCompareTestIT.java
===================================================================
--- trunk/test/functional/org/openstreetmap/josm/data/imagery/ImageryCompareTestIT.java	(revision 16910)
+++ trunk/test/functional/org/openstreetmap/josm/data/imagery/ImageryCompareTestIT.java	(revision 16913)
@@ -20,6 +20,6 @@
 public class ImageryCompareTestIT {
 
-    private static String BLACK_PREFIX = "<pre style=\"margin:3px;color:black\">";
-    private static String RED_PREFIX = "<pre style=\"margin:3px;color:red\">";
+    private static final String BLACK_PREFIX = "<pre style=\"margin:3px;color:black\">";
+    private static final String RED_PREFIX = "<pre style=\"margin:3px;color:red\">";
 
     /**
Index: trunk/test/functional/org/openstreetmap/josm/gui/mappaint/MapCSSRendererTest.java
===================================================================
--- trunk/test/functional/org/openstreetmap/josm/gui/mappaint/MapCSSRendererTest.java	(revision 16910)
+++ trunk/test/functional/org/openstreetmap/josm/gui/mappaint/MapCSSRendererTest.java	(revision 16913)
@@ -68,5 +68,5 @@
     public JOSMTestRules test = new JOSMTestRules().preferences().projection();
 
-    private TestConfig testConfig;
+    private final TestConfig testConfig;
 
     // development flag - set to true in order to update all reference images
Index: trunk/test/functional/org/openstreetmap/josm/io/MultiFetchServerObjectReaderTest.java
===================================================================
--- trunk/test/functional/org/openstreetmap/josm/io/MultiFetchServerObjectReaderTest.java	(revision 16910)
+++ trunk/test/functional/org/openstreetmap/josm/io/MultiFetchServerObjectReaderTest.java	(revision 16913)
@@ -52,5 +52,5 @@
 @SuppressFBWarnings(value = "CRLF_INJECTION_LOGS")
 public class MultiFetchServerObjectReaderTest {
-    private static Logger logger = Logger.getLogger(MultiFetchServerObjectReader.class.getName());
+    private static final Logger logger = Logger.getLogger(MultiFetchServerObjectReader.class.getName());
 
     /**
Index: trunk/test/performance/org/openstreetmap/josm/data/osm/KeyValuePerformanceTest.java
===================================================================
--- trunk/test/performance/org/openstreetmap/josm/data/osm/KeyValuePerformanceTest.java	(revision 16910)
+++ trunk/test/performance/org/openstreetmap/josm/data/osm/KeyValuePerformanceTest.java	(revision 16913)
@@ -34,5 +34,5 @@
     private static final int STRING_INTERN_TESTS = 5000000;
     private static final double[] TAG_NODE_RATIOS = new double[] {.05, .3, 3, 20, 200};
-    private ArrayList<String> testStrings = new ArrayList<>();
+    private final ArrayList<String> testStrings = new ArrayList<>();
     private Random random;
 
Index: trunk/test/performance/org/openstreetmap/josm/data/osm/OsmDataGenerator.java
===================================================================
--- trunk/test/performance/org/openstreetmap/josm/data/osm/OsmDataGenerator.java	(revision 16910)
+++ trunk/test/performance/org/openstreetmap/josm/data/osm/OsmDataGenerator.java	(revision 16913)
@@ -80,5 +80,5 @@
      */
     public abstract static class DataGenerator {
-        private String datasetName;
+        private final String datasetName;
         protected final Random random;
         private DataSet ds;
Index: trunk/test/performance/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSourceFilterTest.java
===================================================================
--- trunk/test/performance/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSourceFilterTest.java	(revision 16910)
+++ trunk/test/performance/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSourceFilterTest.java	(revision 16913)
@@ -25,5 +25,5 @@
     private static class CssGenerator {
         StringBuilder sb = new StringBuilder();
-        private KeyValueDataGenerator generator;
+        private final KeyValueDataGenerator generator;
 
         /**
Index: trunk/test/performance/org/openstreetmap/josm/io/OsmReaderPerformanceTest.java
===================================================================
--- trunk/test/performance/org/openstreetmap/josm/io/OsmReaderPerformanceTest.java	(revision 16910)
+++ trunk/test/performance/org/openstreetmap/josm/io/OsmReaderPerformanceTest.java	(revision 16913)
@@ -31,5 +31,5 @@
 public class OsmReaderPerformanceTest {
     private static final int TIMES = 4;
-    private static String DATA_FILE = "nodist/data/neubrandenburg.osm.bz2";
+    private static final String DATA_FILE = "nodist/data/neubrandenburg.osm.bz2";
 
     /**
Index: trunk/test/unit/org/openstreetmap/josm/data/cache/HostLimitQueueTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/data/cache/HostLimitQueueTest.java	(revision 16910)
+++ trunk/test/unit/org/openstreetmap/josm/data/cache/HostLimitQueueTest.java	(revision 16913)
@@ -37,6 +37,6 @@
      */
     static class Task extends JCSCachedTileLoaderJob<String, CacheEntry> {
-        private URL url;
-        private AtomicInteger counter;
+        private final URL url;
+        private final AtomicInteger counter;
 
         Task(ICacheAccess<String, CacheEntry> cache, URL url, AtomicInteger counter) {
Index: trunk/test/unit/org/openstreetmap/josm/data/cache/JCSCachedTileLoaderJobTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/data/cache/JCSCachedTileLoaderJobTest.java	(revision 16910)
+++ trunk/test/unit/org/openstreetmap/josm/data/cache/JCSCachedTileLoaderJobTest.java	(revision 16913)
@@ -44,6 +44,6 @@
 
     private static class TestCachedTileLoaderJob extends JCSCachedTileLoaderJob<String, CacheEntry> {
-        private String url;
-        private String key;
+        private final String url;
+        private final String key;
 
         TestCachedTileLoaderJob(String url, String key) {
Index: trunk/test/unit/org/openstreetmap/josm/data/imagery/TMSCachedTileLoaderJobTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/data/imagery/TMSCachedTileLoaderJobTest.java	(revision 16910)
+++ trunk/test/unit/org/openstreetmap/josm/data/imagery/TMSCachedTileLoaderJobTest.java	(revision 16913)
@@ -66,6 +66,6 @@
 
     private static class TestCachedTileLoaderJob extends TMSCachedTileLoaderJob {
-        private String url;
-        private String key;
+        private final String url;
+        private final String key;
 
         TestCachedTileLoaderJob(TileLoaderListener listener, Tile tile, String key) throws IOException {
Index: trunk/test/unit/org/openstreetmap/josm/data/imagery/WMTSTileSourceTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/data/imagery/WMTSTileSourceTest.java	(revision 16910)
+++ trunk/test/unit/org/openstreetmap/josm/data/imagery/WMTSTileSourceTest.java	(revision 16913)
@@ -53,19 +53,19 @@
     public WireMockRule tileServer = new WireMockRule(WireMockConfiguration.options().dynamicPort());
 
-    private ImageryInfo testImageryTMS = new ImageryInfo("test imagery", "http://localhost", "tms", null, null);
-    private ImageryInfo testImageryPSEUDO_MERCATOR = getImagery(TestUtils.getTestDataRoot() + "wmts/getcapabilities-pseudo-mercator.xml");
-    private ImageryInfo testImageryTOPO_PL = getImagery(TestUtils.getTestDataRoot() + "wmts/getcapabilities-TOPO.xml");
-    private ImageryInfo testImageryORTO_PL = getImagery(TestUtils.getTestDataRoot() + "wmts/getcapabilities-ORTO.xml");
-    private ImageryInfo testImageryWIEN = getImagery(TestUtils.getTestDataRoot() + "wmts/getCapabilities-wien.xml");
-    private ImageryInfo testImageryWALLONIE = getImagery(TestUtils.getTestDataRoot() + "wmts/WMTSCapabilities-Wallonie.xml");
-    private ImageryInfo testImageryOntario = getImagery(TestUtils.getTestDataRoot() + "wmts/WMTSCapabilities-Ontario.xml");
-    private ImageryInfo testImageryGeoAdminCh = getImagery(TestUtils.getTestDataRoot() + "wmts/WMTSCapabilities-GeoAdminCh.xml");
-    private ImageryInfo testImagery12168 = getImagery(TestUtils.getTestDataRoot() + "wmts/bug12168-WMTSCapabilities.xml");
-    private ImageryInfo testLotsOfLayers = getImagery(TestUtils.getTestDataRoot() + "wmts/getCapabilities-lots-of-layers.xml");
-    private ImageryInfo testDuplicateTags = getImagery(TestUtils.getTestDataRoot() + "wmts/bug12573-wmts-identifier.xml");
-    private ImageryInfo testMissingStyleIdentifer = getImagery(TestUtils.getTestDataRoot() + "wmts/bug12573-wmts-missing-style-identifier.xml");
-    private ImageryInfo testMultipleTileMatrixForLayer = getImagery(TestUtils.getTestDataRoot() +
+    private final ImageryInfo testImageryTMS = new ImageryInfo("test imagery", "http://localhost", "tms", null, null);
+    private final ImageryInfo testImageryPSEUDO_MERCATOR = getImagery(TestUtils.getTestDataRoot() + "wmts/getcapabilities-pseudo-mercator.xml");
+    private final ImageryInfo testImageryTOPO_PL = getImagery(TestUtils.getTestDataRoot() + "wmts/getcapabilities-TOPO.xml");
+    private final ImageryInfo testImageryORTO_PL = getImagery(TestUtils.getTestDataRoot() + "wmts/getcapabilities-ORTO.xml");
+    private final ImageryInfo testImageryWIEN = getImagery(TestUtils.getTestDataRoot() + "wmts/getCapabilities-wien.xml");
+    private final ImageryInfo testImageryWALLONIE = getImagery(TestUtils.getTestDataRoot() + "wmts/WMTSCapabilities-Wallonie.xml");
+    private final ImageryInfo testImageryOntario = getImagery(TestUtils.getTestDataRoot() + "wmts/WMTSCapabilities-Ontario.xml");
+    private final ImageryInfo testImageryGeoAdminCh = getImagery(TestUtils.getTestDataRoot() + "wmts/WMTSCapabilities-GeoAdminCh.xml");
+    private final ImageryInfo testImagery12168 = getImagery(TestUtils.getTestDataRoot() + "wmts/bug12168-WMTSCapabilities.xml");
+    private final ImageryInfo testLotsOfLayers = getImagery(TestUtils.getTestDataRoot() + "wmts/getCapabilities-lots-of-layers.xml");
+    private final ImageryInfo testDuplicateTags = getImagery(TestUtils.getTestDataRoot() + "wmts/bug12573-wmts-identifier.xml");
+    private final ImageryInfo testMissingStyleIdentifer = getImagery(TestUtils.getTestDataRoot() + "wmts/bug12573-wmts-missing-style-identifier.xml");
+    private final ImageryInfo testMultipleTileMatrixForLayer = getImagery(TestUtils.getTestDataRoot() +
             "wmts/bug13975-multiple-tile-matrices-for-one-layer-projection.xml");
-    private ImageryInfo testImageryGisKtnGvAt = getImagery(TestUtils.getTestDataRoot() + "wmts/gis.ktn.gv.at.xml");
+    private final ImageryInfo testImageryGisKtnGvAt = getImagery(TestUtils.getTestDataRoot() + "wmts/gis.ktn.gv.at.xml");
 
     private static ImageryInfo getImagery(String path) {
Index: trunk/test/unit/org/openstreetmap/josm/data/osm/OsmPrimitiveTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/data/osm/OsmPrimitiveTest.java	(revision 16910)
+++ trunk/test/unit/org/openstreetmap/josm/data/osm/OsmPrimitiveTest.java	(revision 16913)
@@ -33,5 +33,5 @@
     }
 
-    private DataSet dataSet = new DataSet();
+    private final DataSet dataSet = new DataSet();
 
     /**
Index: trunk/test/unit/org/openstreetmap/josm/data/projection/ProjectionTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/data/projection/ProjectionTest.java	(revision 16910)
+++ trunk/test/unit/org/openstreetmap/josm/data/projection/ProjectionTest.java	(revision 16913)
@@ -21,5 +21,5 @@
 public class ProjectionTest {
 
-    private static Random rand = new SecureRandom();
+    private static final Random rand = new SecureRandom();
 
     boolean error;
Index: trunk/test/unit/org/openstreetmap/josm/data/projection/SwissGridTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/data/projection/SwissGridTest.java	(revision 16910)
+++ trunk/test/unit/org/openstreetmap/josm/data/projection/SwissGridTest.java	(revision 16913)
@@ -19,5 +19,5 @@
 public class SwissGridTest {
     private static final String SWISS_EPSG_CODE = "EPSG:21781";
-    private boolean debug = false;
+    private final boolean debug = false;
 
     /**
Index: trunk/test/unit/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModelTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModelTest.java	(revision 16910)
+++ trunk/test/unit/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModelTest.java	(revision 16913)
@@ -36,6 +36,6 @@
 public class NodeListMergeModelTest {
 
-    private DatasetFactory my = new DatasetFactory();
-    private DatasetFactory their = new DatasetFactory();
+    private final DatasetFactory my = new DatasetFactory();
+    private final DatasetFactory their = new DatasetFactory();
 
     /**
Index: trunk/test/unit/org/openstreetmap/josm/gui/dialogs/relation/sort/WayConnectionTypeCalculatorTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/gui/dialogs/relation/sort/WayConnectionTypeCalculatorTest.java	(revision 16910)
+++ trunk/test/unit/org/openstreetmap/josm/gui/dialogs/relation/sort/WayConnectionTypeCalculatorTest.java	(revision 16913)
@@ -33,6 +33,6 @@
 public class WayConnectionTypeCalculatorTest {
 
-    private RelationSorter sorter = new RelationSorter();
-    private WayConnectionTypeCalculator wayConnectionTypeCalculator = new WayConnectionTypeCalculator();
+    private final RelationSorter sorter = new RelationSorter();
+    private final WayConnectionTypeCalculator wayConnectionTypeCalculator = new WayConnectionTypeCalculator();
     private DataSet testDataset;
 
Index: trunk/test/unit/org/openstreetmap/josm/plugins/PluginHandlerTestIT.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/plugins/PluginHandlerTestIT.java	(revision 16910)
+++ trunk/test/unit/org/openstreetmap/josm/plugins/PluginHandlerTestIT.java	(revision 16913)
@@ -46,5 +46,5 @@
 public class PluginHandlerTestIT {
 
-    private static List<String> errorsToIgnore = new ArrayList<>();
+    private static final List<String> errorsToIgnore = new ArrayList<>();
     /**
      * Setup test.
Index: trunk/test/unit/org/openstreetmap/josm/testutils/JOSMTestRules.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/testutils/JOSMTestRules.java	(revision 16910)
+++ trunk/test/unit/org/openstreetmap/josm/testutils/JOSMTestRules.java	(revision 16913)
@@ -726,6 +726,6 @@
     private static class FailOnTimeoutStatement extends Statement {
 
-        private int timeout;
-        private Statement original;
+        private final int timeout;
+        private final Statement original;
 
         FailOnTimeoutStatement(Statement original, int timeout) {
@@ -760,5 +760,5 @@
     private static final class TimeoutThread extends Thread {
         public boolean isDone;
-        private Statement original;
+        private final Statement original;
         private Throwable exceptionCaught;