Changeset 13068 in josm

Timestamp:

2017-11-01T19:35:45+01:00 (6 years ago)

Author:

Don-vip

Message:

sonar - fix a few issues

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/JoinAreasAction.java (modified) (1 diff)
• gui/bugreport/JosmUpdatePanel.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/actions/JoinAreasAction.java

@@ -601 +601 @@
         // Dataset retrieving allows to call this code without relying on Main.getCurrentDataSet(), thus, on a mapview instance
         if (!areas.isEmpty()) {
-            ds = areas.iterator().next().getOuterWay().getDataSet();
+            ds = areas.get(0).getOuterWay().getDataSet();
         }
 

trunk/src/org/openstreetmap/josm/gui/bugreport/JosmUpdatePanel.java

@@ -61 +61 @@
 
     private static int getTestedVersion() {
-        try {
-            CachedFile testedVersion = new CachedFile(Main.getJOSMWebsite() + "/tested");
-            testedVersion.setMaxAge(60 * 15); // 15 Minutes
+        try (CachedFile testedVersion = new CachedFile(Main.getJOSMWebsite() + "/tested")) {
+            testedVersion.setMaxAge(60L * 15); // 15 Minutes
             String testedString = new String(testedVersion.getByteContent(), StandardCharsets.ISO_8859_1);
             return Integer.parseInt(testedString.trim());