Changeset 2990 in josm for trunk/test/functional

Timestamp:

2010-02-15T09:03:57+01:00 (15 years ago)

Author:

jttt

Message:

Fix some eclipse warnings

Location:

trunk/test/functional/org/openstreetmap/josm/io

Files:

• MultiFetchServerObjectReaderTest.java (modified) (1 diff)
• OsmServerBackreferenceReaderTest.java (modified) (1 diff)

trunk/test/functional/org/openstreetmap/josm/io/MultiFetchServerObjectReaderTest.java

@@ -204 +204 @@
         createDataSetOnServer(testDataSet);
 
-        PrintWriter pw = null;
         try {
-            pw = new PrintWriter(
+            PrintWriter pw = new PrintWriter(
                     new FileWriter(dataSetCacheOutputFile)
             );
+            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();
         } catch(IOException e) {
             fail(MessageFormat.format("failed to open file ''{0}'' for writing", dataSetCacheOutputFile.toString()));
         }
-        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();
     }
 

trunk/test/functional/org/openstreetmap/josm/io/OsmServerBackreferenceReaderTest.java

@@ -211 +211 @@
         createDataSetOnServer(testDataSet);
 
-        PrintWriter pw = null;
         try {
-            pw = new PrintWriter(
+            PrintWriter pw = new PrintWriter(
                     new FileWriter(dataSetCacheOutputFile)
             );
+            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();
         } catch(IOException e) {
             fail(MessageFormat.format("failed to open file ''{0}'' for writing", dataSetCacheOutputFile.toString()));
         }
-        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();
     }