Changeset 32180 in osm for applications/viewer/jmapviewer/src

Timestamp:

2016-05-15T15:33:36+02:00 (9 years ago)

Author:

donvip

Message:

sonar - squid:S2221 - "Exception" should not be caught when not required by called methods

Location:

applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer

Files:

• JMapViewer.java (modified) (3 diffs)
• MemoryTileCache.java (modified) (1 diff)
• OsmTileLoader.java (modified) (1 diff)
• Tile.java (modified) (1 diff)
• tilesources/BingAerialTileSource.java (modified) (1 diff)

applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/JMapViewer.java

@@ -10 +10 @@
 import java.awt.event.ActionListener;
 import java.awt.event.MouseEvent;
+import java.net.URL;
 import java.util.Collections;
 import java.util.LinkedList;
@@ -170 +171 @@
         add(zoomSlider);
         int size = 18;
-        try {
-            ImageIcon icon = new ImageIcon(JMapViewer.class.getResource("images/plus.png"));
+        URL url = JMapViewer.class.getResource("images/plus.png");
+        if (url != null) {
+            ImageIcon icon = new ImageIcon(url);
             zoomInButton = new JButton(icon);
-        } catch (Exception e) {
+        } else {
             zoomInButton = new JButton("+");
             zoomInButton.setFont(new Font("sansserif", Font.BOLD, 9));
@@ -188 +190 @@
         zoomInButton.setFocusable(false);
         add(zoomInButton);
-        try {
-            ImageIcon icon = new ImageIcon(JMapViewer.class.getResource("images/minus.png"));
+        url = JMapViewer.class.getResource("images/minus.png");
+        if (url != null) {
+            ImageIcon icon = new ImageIcon(url);
             zoomOutButton = new JButton(icon);
-        } catch (Exception e) {
+        } else {
             zoomOutButton = new JButton("-");
             zoomOutButton.setFont(new Font("sansserif", Font.BOLD, 9));

applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/MemoryTileCache.java

@@ -78 +78 @@
                 removeEntry(lruTiles.getLastElement());
             }
-        } catch (Exception e) {
+        } catch (NullPointerException e) {
             log.warning(e.getMessage());
         }

applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/OsmTileLoader.java

@@ -62 +62 @@
                 tile.setLoaded(true);
                 listener.tileLoadingFinished(tile, true);
-            } catch (Exception e) {
+            } catch (IOException e) {
                 tile.setError(e.getMessage());
                 listener.tileLoadingFinished(tile, false);

applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/Tile.java

@@ -82 +82 @@
         try {
             return ImageIO.read(JMapViewer.class.getResourceAsStream(path));
-        } catch (Exception ex) {
+        } catch (IOException | IllegalArgumentException ex) {
             ex.printStackTrace();
             return null;

applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/tilesources/BingAerialTileSource.java

@@ -290 +290 @@
             }
             return a.toString();
-        } catch (Exception e) {
+        } catch (RuntimeException e) {
             e.printStackTrace();
         }