Changeset 19238 in josm for trunk/src/org

Timestamp:

2024-10-09T14:17:52+02:00 (6 weeks ago)

Author:

taylor.smock

Message:

See #23926: Fix new coverity issues

Coverity doesn't like null checks when a previous statement would have thrown
a NullPointerException on the object being checked for null. This fixes the
"defect" by removing the null checks and adding a null check in
ColorScale#addTitle.

Location:

trunk/src/org/openstreetmap/josm

Files:

• gui/layer/gpx/GpxDrawHelper.java (modified) (1 diff)
• tools/ColorScale.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/gui/layer/gpx/GpxDrawHelper.java

@@ -241 +241 @@
     /** maxTime saves the end time of the track as epoch seconds */
     private double maxTime;
-
 
     private void setupColors() {

trunk/src/org/openstreetmap/josm/tools/ColorScale.java

@@ -14 +14 @@
 import java.time.ZonedDateTime;
 import java.time.format.DateTimeFormatter;
+import java.util.Objects;
 
 import org.openstreetmap.josm.data.preferences.NamedColorProperty;
@@ -205 +206 @@
      */
     public ColorScale addTitle(String title) {
+        Objects.requireNonNull(title);
         this.title = title;
         return this;
@@ -325 +327 @@
 
         // legend title
-        if (title != null) {
-            g.setColor(LEGEND_TITLE);
-            g.drawString(title, xRect + rectWidth / 2 - titleWidth / 2, y - fh * 3 / 2 - 10);
-        }
+        g.setColor(LEGEND_TITLE);
+        g.drawString(title, xRect + rectWidth / 2 - titleWidth / 2, y - fh * 3 / 2 - 10);
 
         // legend texts
@@ -385 +385 @@
 
         // legend title
-        if (title != null) {
-            g.setColor(LEGEND_TITLE);
-            g.drawString(title, xRect + rectWidth / 2 - titleWidth / 2, y - fh * 3 / 2 - padding / 2);
-        }
+        g.setColor(LEGEND_TITLE);
+        g.drawString(title, xRect + rectWidth / 2 - titleWidth / 2, y - fh * 3 / 2 - padding / 2);
 
         // legend texts