Changeset 10212 in josm for trunk/src/org/openstreetmap/josm/gui/bbox

Timestamp:

2016-05-15T00:51:10+02:00 (8 years ago)

Author:

Don-vip

Message:

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

Location:

trunk/src/org/openstreetmap/josm/gui/bbox

Files:

• SlippyMapBBoxChooser.java (modified) (1 diff)
• TileSelectionBBoxChooser.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/bbox/SlippyMapBBoxChooser.java

@@ -199 +199 @@
     @Override
     public void paint(Graphics g) {
-        try {
-            super.paint(g);
-
-            // draw selection rectangle
-            if (iSelectionRectStart != null && iSelectionRectEnd != null) {
-                Rectangle box = new Rectangle(getMapPosition(iSelectionRectStart, false));
-                box.add(getMapPosition(iSelectionRectEnd, false));
-
-                g.setColor(new Color(0.9f, 0.7f, 0.7f, 0.6f));
-                g.fillRect(box.x, box.y, box.width, box.height);
-
-                g.setColor(Color.BLACK);
-                g.drawRect(box.x, box.y, box.width, box.height);
-            }
-        } catch (Exception e) {
-            Main.error(e);
+        super.paint(g);
+
+        // draw selection rectangle
+        if (iSelectionRectStart != null && iSelectionRectEnd != null) {
+            Rectangle box = new Rectangle(getMapPosition(iSelectionRectStart, false));
+            box.add(getMapPosition(iSelectionRectEnd, false));
+
+            g.setColor(new Color(0.9f, 0.7f, 0.7f, 0.6f));
+            g.fillRect(box.x, box.y, box.width, box.height);
+
+            g.setColor(Color.BLACK);
+            g.drawRect(box.x, box.y, box.width, box.height);
         }
     }

trunk/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java

@@ -45 +45 @@
 import org.openstreetmap.gui.jmapviewer.interfaces.MapMarker;
 import org.openstreetmap.gui.jmapviewer.interfaces.TileLoader;
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.Bounds;
 import org.openstreetmap.josm.data.Version;
@@ -694 +693 @@
         @Override
         public void paint(Graphics g) {
-            try {
-                super.paint(g);
-                if (min == null || max == null) return;
-                int zoomDiff = MAX_ZOOM - zoom;
-                Point tlc = getTopLeftCoordinates();
-                int xMin = (min.x >> zoomDiff) - tlc.x;
-                int yMin = (min.y >> zoomDiff) - tlc.y;
-                int xMax = (max.x >> zoomDiff) - tlc.x;
-                int yMax = (max.y >> zoomDiff) - tlc.y;
-
-                int w = xMax - xMin;
-                int h = yMax - yMin;
-                g.setColor(new Color(0.9f, 0.7f, 0.7f, 0.6f));
-                g.fillRect(xMin, yMin, w, h);
-
-                g.setColor(Color.BLACK);
-                g.drawRect(xMin, yMin, w, h);
-            } catch (Exception e) {
-                Main.error(e);
-            }
+            super.paint(g);
+            if (min == null || max == null) return;
+            int zoomDiff = MAX_ZOOM - zoom;
+            Point tlc = getTopLeftCoordinates();
+            int xMin = (min.x >> zoomDiff) - tlc.x;
+            int yMin = (min.y >> zoomDiff) - tlc.y;
+            int xMax = (max.x >> zoomDiff) - tlc.x;
+            int yMax = (max.y >> zoomDiff) - tlc.y;
+
+            int w = xMax - xMin;
+            int h = yMax - yMin;
+            g.setColor(new Color(0.9f, 0.7f, 0.7f, 0.6f));
+            g.fillRect(xMin, yMin, w, h);
+
+            g.setColor(Color.BLACK);
+            g.drawRect(xMin, yMin, w, h);
         }
     }