Index: /trunk/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java	(revision 10732)
+++ /trunk/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java	(revision 10733)
@@ -1400,5 +1400,5 @@
             final String lang = LanguageInfo.getLanguageCodeXML();
             cachedFile = new CachedFile(url);
-            try (final BufferedReader reader = cachedFile.getContentReader()) {
+            try (BufferedReader reader = cachedFile.getContentReader()) {
 
                 String line;
Index: /trunk/src/org/openstreetmap/josm/tools/OverpassTurboQueryWizard.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/tools/OverpassTurboQueryWizard.java	(revision 10732)
+++ /trunk/src/org/openstreetmap/josm/tools/OverpassTurboQueryWizard.java	(revision 10733)
@@ -39,6 +39,6 @@
     private OverpassTurboQueryWizard() {
 
-        try (final CachedFile file = new CachedFile("resource://data/overpass-wizard.js");
-             final Reader reader = file.getContentReader()) {
+        try (CachedFile file = new CachedFile("resource://data/overpass-wizard.js");
+             Reader reader = file.getContentReader()) {
             engine.eval("var console = {error: " + Main.class.getCanonicalName() + ".warn};");
             engine.eval("var global = {};");
Index: /trunk/test/functional/org/openstreetmap/josm/tools/HttpClientTest.java
===================================================================
--- /trunk/test/functional/org/openstreetmap/josm/tools/HttpClientTest.java	(revision 10732)
+++ /trunk/test/functional/org/openstreetmap/josm/tools/HttpClientTest.java	(revision 10733)
@@ -73,6 +73,6 @@
         assertThat(response.getHeaderFields().get("Content-Type"), is(Collections.singletonList("application/json")));
         assertThat(response.getHeaderFields().get("Content-TYPE"), is(Collections.singletonList("application/json")));
-        try (final InputStream in = response.getContent();
-             final JsonReader json = JsonProvider.provider().createReader(in)) {
+        try (InputStream in = response.getContent();
+             JsonReader json = JsonProvider.provider().createReader(in)) {
             final JsonObject root = json.readObject();
             assertThat(root.getJsonObject("args").getString("foo"), is("bar"));
@@ -83,6 +83,6 @@
     @Test
     public void testUserAgent() throws IOException {
-        try (final InputStream in = HttpClient.create(new URL("https://httpbin.org/user-agent")).connect(progress).getContent();
-             final JsonReader json = JsonProvider.provider().createReader(in)) {
+        try (InputStream in = HttpClient.create(new URL("https://httpbin.org/user-agent")).connect(progress).getContent();
+             JsonReader json = JsonProvider.provider().createReader(in)) {
             assertThat(json.readObject().getString("user-agent"), is(Version.getInstance().getFullAgentString()));
         }
@@ -107,6 +107,6 @@
                 .connect(progress);
         assertThat(response.getResponseCode(), is(200));
-        try (final InputStream in = response.getContent();
-             final JsonReader json = JsonProvider.provider().createReader(in)) {
+        try (InputStream in = response.getContent();
+             JsonReader json = JsonProvider.provider().createReader(in)) {
             assertThat(json.readObject().getString("data"), is(text));
         }
@@ -121,6 +121,6 @@
                 .connect(progress);
         assertThat(response.getResponseCode(), is(200));
-        try (final InputStream in = response.getContent();
-             final JsonReader json = JsonProvider.provider().createReader(in)) {
+        try (InputStream in = response.getContent();
+             JsonReader json = JsonProvider.provider().createReader(in)) {
             assertThat(json.readObject().getString("data"), is(""));
         }
Index: /trunk/test/unit/org/openstreetmap/josm/data/osm/NodeDataTest.java
===================================================================
--- /trunk/test/unit/org/openstreetmap/josm/data/osm/NodeDataTest.java	(revision 10732)
+++ /trunk/test/unit/org/openstreetmap/josm/data/osm/NodeDataTest.java	(revision 10733)
@@ -20,8 +20,8 @@
         data.setChangesetId(314159);
         final Object readData;
-        try (final ByteArrayOutputStream bytes = new ByteArrayOutputStream();
-             final ObjectOutputStream out = new ObjectOutputStream(bytes)) {
+        try (ByteArrayOutputStream bytes = new ByteArrayOutputStream();
+             ObjectOutputStream out = new ObjectOutputStream(bytes)) {
             out.writeObject(data);
-            try (final ObjectInputStream in = new ObjectInputStream(new ByteArrayInputStream(bytes.toByteArray()))) {
+            try (ObjectInputStream in = new ObjectInputStream(new ByteArrayInputStream(bytes.toByteArray()))) {
                 readData = in.readObject();
             }
Index: /trunk/test/unit/org/openstreetmap/josm/data/osm/WayDataTest.java
===================================================================
--- /trunk/test/unit/org/openstreetmap/josm/data/osm/WayDataTest.java	(revision 10732)
+++ /trunk/test/unit/org/openstreetmap/josm/data/osm/WayDataTest.java	(revision 10733)
@@ -20,8 +20,8 @@
         data.setChangesetId(314159);
         final Object readData;
-        try (final ByteArrayOutputStream bytes = new ByteArrayOutputStream();
-             final ObjectOutputStream out = new ObjectOutputStream(bytes)) {
+        try (ByteArrayOutputStream bytes = new ByteArrayOutputStream();
+             ObjectOutputStream out = new ObjectOutputStream(bytes)) {
             out.writeObject(data);
-            try (final ObjectInputStream in = new ObjectInputStream(new ByteArrayInputStream(bytes.toByteArray()))) {
+            try (ObjectInputStream in = new ObjectInputStream(new ByteArrayInputStream(bytes.toByteArray()))) {
                 readData = in.readObject();
             }
Index: /trunk/test/unit/org/openstreetmap/josm/io/GpxReaderTest.java
===================================================================
--- /trunk/test/unit/org/openstreetmap/josm/io/GpxReaderTest.java	(revision 10732)
+++ /trunk/test/unit/org/openstreetmap/josm/io/GpxReaderTest.java	(revision 10733)
@@ -32,6 +32,6 @@
     public static GpxData parseGpxData(String filename) throws IOException, SAXException {
         final GpxData result;
-        try (final FileInputStream in = new FileInputStream(new File(filename))) {
-            final GpxReader reader = new GpxReader(in);
+        try (FileInputStream in = new FileInputStream(new File(filename))) {
+            GpxReader reader = new GpxReader(in);
             assertTrue(reader.parse(false));
             result = reader.getGpxData();