Index: trunk/test/functional/org/openstreetmap/josm/gui/history/HistoryBrowserTest.java
===================================================================
--- trunk/test/functional/org/openstreetmap/josm/gui/history/HistoryBrowserTest.java	(revision 7025)
+++ trunk/test/functional/org/openstreetmap/josm/gui/history/HistoryBrowserTest.java	(revision 7030)
@@ -38,11 +38,6 @@
         // load properties
         //
-        try {
-            InputStream is = HistoryBrowserTest.class.getResourceAsStream("/test-functional-env.properties");
-            try {
-                testProperties.load(is);
-            } finally {
-                is.close();
-            }
+        try (InputStream is = HistoryBrowserTest.class.getResourceAsStream("/test-functional-env.properties");) {
+            testProperties.load(is);
         } catch(IOException e){
             logger.log(Level.SEVERE, MessageFormat.format("failed to load property file ''{0}''", "test-functional-env.properties"));
Index: trunk/test/functional/org/openstreetmap/josm/io/MultiFetchServerObjectReaderTest.java
===================================================================
--- trunk/test/functional/org/openstreetmap/josm/io/MultiFetchServerObjectReaderTest.java	(revision 7025)
+++ trunk/test/functional/org/openstreetmap/josm/io/MultiFetchServerObjectReaderTest.java	(revision 7030)
@@ -134,5 +134,5 @@
 
     @BeforeClass
-    public static void  init() throws OsmTransferException {
+    public static void init() throws OsmTransferException {
         logger.info("initializing ...");
         testProperties = new Properties();
@@ -140,11 +140,6 @@
         // load properties
         //
-        try {
-            InputStream is = MultiFetchServerObjectReaderTest.class.getResourceAsStream("/test-functional-env.properties");
-            try {
-                testProperties.load(is);
-            } finally {
-                is.close();
-            }
+        try (InputStream is = MultiFetchServerObjectReaderTest.class.getResourceAsStream("/test-functional-env.properties")) {
+            testProperties.load(is);
         } catch(IOException e){
             logger.log(Level.SEVERE, MessageFormat.format("failed to load property file ''{0}''", "test-functional-env.properties"));
@@ -211,16 +206,15 @@
         createDataSetOnServer(testDataSet);
 
-        try {
+        try (
             PrintWriter pw = new PrintWriter(
                     new OutputStreamWriter(new FileOutputStream(dataSetCacheOutputFile), Utils.UTF_8)
-            );
+        )) {
             logger.info(MessageFormat.format("caching test data set in ''{0}'' ...", dataSetCacheOutputFile.toString()));
-            OsmWriter w = new OsmWriter(pw, false, testDataSet.getVersion());
-            w.header();
-            w.writeDataSources(testDataSet);
-            w.writeContent(testDataSet);
-            w.footer();
-            w.close();
-            pw.close();
+            try (OsmWriter w = new OsmWriter(pw, false, testDataSet.getVersion())) {
+                w.header();
+                w.writeDataSources(testDataSet);
+                w.writeContent(testDataSet);
+                w.footer();
+            }
         } catch(IOException e) {
             fail(MessageFormat.format("failed to open file ''{0}'' for writing", dataSetCacheOutputFile.toString()));
@@ -238,7 +232,7 @@
         logger.info(MessageFormat.format("reading cached dataset ''{0}''", f.toString()));
         ds = new DataSet();
-        FileInputStream fis = new FileInputStream(f);
-        ds = OsmReader.parseDataSet(fis, NullProgressMonitor.INSTANCE);
-        fis.close();
+        try (FileInputStream fis = new FileInputStream(f)) {
+            ds = OsmReader.parseDataSet(fis, NullProgressMonitor.INSTANCE);
+        }
     }
 
Index: trunk/test/functional/org/openstreetmap/josm/io/OsmServerBackreferenceReaderTest.java
===================================================================
--- trunk/test/functional/org/openstreetmap/josm/io/OsmServerBackreferenceReaderTest.java	(revision 7025)
+++ trunk/test/functional/org/openstreetmap/josm/io/OsmServerBackreferenceReaderTest.java	(revision 7030)
@@ -147,11 +147,6 @@
         // load properties
         //
-        try {
-            InputStream is = MultiFetchServerObjectReaderTest.class.getResourceAsStream("/test-functional-env.properties");
-            try {
-                testProperties.load(is);
-            } finally {
-                is.close();
-            }
+        try (InputStream is = MultiFetchServerObjectReaderTest.class.getResourceAsStream("/test-functional-env.properties")) {
+            testProperties.load(is);
         } catch(IOException e){
             logger.log(Level.SEVERE, MessageFormat.format("failed to load property file ''{0}''", "test-functional-env.properties"));
@@ -218,16 +213,15 @@
         createDataSetOnServer(testDataSet);
 
-        try {
+        try (
             PrintWriter pw = new PrintWriter(
                     new OutputStreamWriter(new FileOutputStream(dataSetCacheOutputFile), Utils.UTF_8)
-            );
+        )) {
             logger.info(MessageFormat.format("caching test data set in ''{0}'' ...", dataSetCacheOutputFile.toString()));
-            OsmWriter w = new OsmWriter(pw, false, testDataSet.getVersion());
-            w.header();
-            w.writeDataSources(testDataSet);
-            w.writeContent(testDataSet);
-            w.footer();
-            w.close();
-            pw.close();
+            try (OsmWriter w = new OsmWriter(pw, false, testDataSet.getVersion())) {
+                w.header();
+                w.writeDataSources(testDataSet);
+                w.writeContent(testDataSet);
+                w.footer();
+            }
         } catch(IOException e) {
             fail(MessageFormat.format("failed to open file ''{0}'' for writing", dataSetCacheOutputFile.toString()));
@@ -245,7 +239,7 @@
         logger.info(MessageFormat.format("reading cached dataset ''{0}''", f.toString()));
         ds = new DataSet();
-        FileInputStream fis = new FileInputStream(f);
-        ds = OsmReader.parseDataSet(fis, NullProgressMonitor.INSTANCE);
-        fis.close();
+        try (FileInputStream fis = new FileInputStream(f)) {
+            ds = OsmReader.parseDataSet(fis, NullProgressMonitor.INSTANCE);
+        }
     }