Changeset 18265 in josm for trunk/src

Timestamp:

2021-10-10T01:04:11+02:00 (3 years ago)

Author:

Don-vip

Message:

fix new defects reported by coverity

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• download/BookmarkSelection.java (modified) (1 diff)
• layer/geoimage/GeoImageLayer.java (modified) (1 diff)
• tagging/presets/items/MultiSelect.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java

@@ -309 +309 @@
                 return;
             Bookmark b = bookmarks.getModel().getElementAt(idx);
-            parent.startDownload(b.getArea());
+            if (b != null) {
+                parent.startDownload(b.getArea());
+            }
         }
     }

trunk/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java

@@ -483 +483 @@
 
     protected static void drawDirectionArrow(Graphics2D g, Point p, double dir, Dimension imgDim) {
-        System.out.println(dir);
         // Multiplier must be larger than sqrt(2)/2=0.71.
         double arrowlength = Math.max(25, Math.max(imgDim.width, imgDim.height) * 0.85);

trunk/src/org/openstreetmap/josm/gui/tagging/presets/items/MultiSelect.java

@@ -83 +83 @@
             // and size the scrollpane accordingly.
             Rectangle r = list.getCellBounds(0, Math.min(rows, model.size() - 1));
-            Insets insets = list.getInsets();
-            r.width += insets.left + insets.right;
-            r.height += insets.top + insets.bottom;
-            insets = sp.getInsets();
-            r.width += insets.left + insets.right;
-            r.height += insets.top + insets.bottom;
-            sp.setPreferredSize(new Dimension(r.width, r.height));
+            if (r != null) {
+                Insets insets = list.getInsets();
+                r.width += insets.left + insets.right;
+                r.height += insets.top + insets.bottom;
+                insets = sp.getInsets();
+                r.width += insets.left + insets.right;
+                r.height += insets.top + insets.bottom;
+                sp.setPreferredSize(new Dimension(r.width, r.height));
+            }
         }
         p.add(sp, GBC.eol().fill(GBC.HORIZONTAL)); // NOSONAR