Changeset 13743 in josm for trunk/src/org/openstreetmap

Timestamp:

2018-05-13T09:16:14+02:00 (7 years ago)

Author:

wiktorn

Message:

Fix bugs spotted by findbugs

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/imagery/LayerDetails.java (modified) (1 diff)
• data/imagery/TMSCachedTileLoaderJob.java (modified) (2 diffs)
• gui/preferences/imagery/AddWMTSLayerPanel.java (modified) (1 diff)
• io/imagery/ImageryReader.java (modified) (2 diffs)
• io/imagery/WMSImagery.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/data/imagery/LayerDetails.java

@@ -53 +53 @@
         }
         ret.addAll(crs);
-        return crs;
+        return ret;
     }
 

trunk/src/org/openstreetmap/josm/data/imagery/TMSCachedTileLoaderJob.java

@@ -37 +37 @@
 import org.openstreetmap.josm.tools.Utils;
 
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+
 /**
  * Class bridging TMS requests to JCS cache requests
@@ -65 +67 @@
      * @param downloadExecutor that will be executing the jobs
      */
+    @SuppressFBWarnings(value = "JLM_JSR166_UTILCONCURRENT_MONITORENTER")
     public TMSCachedTileLoaderJob(TileLoaderListener listener, Tile tile,
             ICacheAccess<String, BufferedImageCacheEntry> cache,

trunk/src/org/openstreetmap/josm/gui/preferences/imagery/AddWMTSLayerPanel.java

@@ -76 +76 @@
                 layerPanel.add(scrollPane, GBC.eol().fill());
                 layerPanel.revalidate();
-            } catch (Exception ex) {
+            } catch (IOException | WMTSGetCapabilitiesException ex) {
                 JOptionPane.showMessageDialog(
                         getParent(),

trunk/src/org/openstreetmap/josm/io/imagery/ImageryReader.java

@@ -354 +354 @@
                     switch(qName) {
                     case "type":
-                        ImageryType.values();
                         boolean found = false;
                         for (ImageryType type : ImageryType.values()) {
@@ -524 +523 @@
                     break;
                 case "minimum-tile-expire":
-                    entry.setMinimumTileExpire(Integer.valueOf(accumulator.toString()));
+                    entry.setMinimumTileExpire(Integer.parseInt(accumulator.toString()));
                     break;
                 default: // Do nothing

trunk/src/org/openstreetmap/josm/io/imagery/WMSImagery.java

@@ -574 +574 @@
         }
         if (conv != null) {
-            new Bounds(
+            return new Bounds(
                     conv.eastNorth2latlon(new EastNorth(getDecimalDegree(minx), getDecimalDegree(miny))),
                     conv.eastNorth2latlon(new EastNorth(getDecimalDegree(maxx), getDecimalDegree(maxy)))