Changeset 31788 in osm for applications/editors/josm

Timestamp:

2015-12-02T15:30:51+01:00 (9 years ago)

Author:

floscher

Message:

[mapillary] Fix more "blocker" Sonar issues

Location:

applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary

Files:

• history/commands/CommandDelete.java (modified) (1 diff)
• history/commands/CommandImport.java (modified) (1 diff)
• history/commands/CommandJoin.java (modified) (1 diff)
• history/commands/CommandMove.java (modified) (1 diff)
• history/commands/CommandTurn.java (modified) (1 diff)
• history/commands/CommandUnjoin.java (modified) (1 diff)
• history/commands/MapillaryCommand.java (modified) (1 diff)
• history/commands/MapillaryExecutableCommand.java (modified) (1 diff)
• io/download/MapillaryImageInfoDownloadThread.java (modified) (2 diffs)
• io/download/MapillarySequenceDownloadThread.java (modified) (1 diff)
• io/download/MapillaryTrafficSignDownloadThread.java (modified) (1 diff)

applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/history/commands/CommandDelete.java

@@ +1 @@
+// License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.plugins.mapillary.history.commands;
 

applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/history/commands/CommandImport.java

@@ +1 @@
+// License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.plugins.mapillary.history.commands;
 

applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/history/commands/CommandJoin.java

@@ +1 @@
+// License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.plugins.mapillary.history.commands;
 

applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/history/commands/CommandMove.java

@@ +1 @@
+// License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.plugins.mapillary.history.commands;
 

applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/history/commands/CommandTurn.java

@@ +1 @@
+// License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.plugins.mapillary.history.commands;
 

applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/history/commands/CommandUnjoin.java

@@ +1 @@
+// License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.plugins.mapillary.history.commands;
 

applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/history/commands/MapillaryCommand.java

@@ +1 @@
+// License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.plugins.mapillary.history.commands;
 

applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/history/commands/MapillaryExecutableCommand.java

@@ +1 @@
+// License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.plugins.mapillary.history.commands;
 

applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/io/download/MapillaryImageInfoDownloadThread.java

@@ -45 +45 @@
   @Override
   public void run() {
-    try {
-      BufferedReader br = new BufferedReader(new InputStreamReader(new URL(URL
-          + this.queryString).openStream(), "UTF-8"));
+    try (
+      BufferedReader br = new BufferedReader(new InputStreamReader(
+        new URL(URL + this.queryString).openStream(), "UTF-8")
+      );
+    ) {
       JsonObject jsonobj = Json.createReader(br).readObject();
       if (!jsonobj.getBoolean("more"))
@@ -56 +58 @@
         data = jsonarr.getJsonObject(i);
         String key = data.getString("key");
-        for (MapillaryAbstractImage image : MapillaryLayer.getInstance().getData()
-            .getImages()) {
-          if (image instanceof MapillaryImage) {
-            if (((MapillaryImage) image).getKey().equals(key)
-                && ((MapillaryImage) image).getUser() == null) {
-              ((MapillaryImage) image).setUser(data.getString("user"));
-              ((MapillaryImage) image).setCapturedAt(data.getJsonNumber(
-                  "captured_at").longValue());
-            }
+        for (MapillaryAbstractImage image : MapillaryLayer.getInstance().getData().getImages()) {
+          if (
+            image instanceof MapillaryImage
+              && ((MapillaryImage) image).getKey().equals(key)
+              && ((MapillaryImage) image).getUser() == null
+          ) {
+            ((MapillaryImage) image).setUser(data.getString("user"));
+            ((MapillaryImage) image).setCapturedAt(data.getJsonNumber("captured_at").longValue());
           }
         }

applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/io/download/MapillarySequenceDownloadThread.java

@@ -52 +52 @@
   @Override
   public void run() {
-    try {
-      BufferedReader br;
-      br = new BufferedReader(new InputStreamReader(new URL(URL
-          + this.queryString).openStream(), "UTF-8"));
+    try (
+      BufferedReader br = new BufferedReader(new InputStreamReader(
+        new URL(URL + this.queryString).openStream(), "UTF-8"
+      ));
+    ) {
       JsonObject jsonall = Json.createReader(br).readObject();
 

applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/io/download/MapillaryTrafficSignDownloadThread.java

@@ -46 +46 @@
   @Override
   public void run() {
-    BufferedReader br;
-    try {
-      br = new BufferedReader(new InputStreamReader(new URL(URL
-          + this.queryString).openStream(), "UTF-8"));
+
+    try (
+      BufferedReader br = new BufferedReader(new InputStreamReader(
+        new URL(URL + this.queryString).openStream(), "UTF-8"
+      ));
+    ) {
       JsonObject jsonobj = Json.createReader(br).readObject();
       if (!jsonobj.getBoolean("more")) {