Changeset 30436 in osm for applications/editors/josm/plugins/reverter

Timestamp:

2014-05-09T05:21:14+02:00 (11 years ago)

Author:

donvip

Message:

[josm_plugins] see #josm8465 - Java 7 code update

Location:

applications/editors/josm/plugins/reverter/src/reverter

Files:

• OsmServerMultiObjectReader.java (modified) (3 diffs)
• corehacks/OsmServerChangesetReader.java (modified) (1 diff)

applications/editors/josm/plugins/reverter/src/reverter/OsmServerMultiObjectReader.java

@@ -12 +12 @@
 import org.openstreetmap.josm.io.OsmServerReader;
 import org.openstreetmap.josm.io.OsmTransferException;
-import org.openstreetmap.josm.tools.Utils;
 import org.xml.sax.SAXException;
 
@@ -30 +29 @@
         sb.append(version);
         progressMonitor.beginTask("", 1);
-        InputStream in = getInputStream(sb.toString(), progressMonitor.createSubTaskMonitor(1, true));
-        try {
+        try (InputStream in = getInputStream(sb.toString(), progressMonitor.createSubTaskMonitor(1, true))) {
             rdr.addData(in);
         } catch (Exception e) {
@@ -37 +35 @@
         } finally {
             progressMonitor.finishTask();
-            Utils.close(in);
         }
     }

applications/editors/josm/plugins/reverter/src/reverter/corehacks/OsmServerChangesetReader.java

@@ -70 +70 @@
                 return null;
             monitor.indeterminateSubTask(tr("Downloading changesets ..."));
-            List<Changeset> changesets = OsmChangesetParser.parse(in, monitor.createSubTaskMonitor(1, true));
-            return changesets;
+            return OsmChangesetParser.parse(in, monitor.createSubTaskMonitor(1, true));
         } catch(OsmTransferException e) {
             throw e;