Fix redundant null checks identified by SpotBugs

google-labs-jules[bot] · google-labs-jules[bot] · commit de2cf7e3088d · 2025-12-21T03:39:32.000Z
diff --git a/CodenameOne/src/com/codename1/compat/java/util/Objects.java b/CodenameOne/src/com/codename1/compat/java/util/Objects.java
@@ -48,7 +48,7 @@ public static boolean equals(Object a, Object b) {
         if (a == b) {
             return true;
         }
-        return a == null ? b == null : a.equals(b);
+        return a != null && a.equals(b);
     }
 
     /**
diff --git a/CodenameOne/src/com/codename1/io/ConnectionRequest.java b/CodenameOne/src/com/codename1/io/ConnectionRequest.java
@@ -2747,9 +2747,6 @@ public void run() {
                         if (fs.exists(file)) {
                             try {
                                 EncodedImage img = EncodedImage.create(fs.openInputStream(file), (int) fs.getLength(file));
-                                if (img == null) {
-                                    throw new IOException("Failed to load image at " + file);
-                                }
                                 CallbackDispatcher.dispatchSuccess(onSuccess, img);
                             } catch (Exception ex) {
                                 CallbackDispatcher.dispatchError(onFail, ex);
@@ -2763,9 +2760,6 @@ public void run() {
                         if (fs.exists(file)) {
                             try {
                                 EncodedImage img = EncodedImage.create(fs.createInputStream(file), fs.entrySize(file));
-                                if (img == null) {
-                                    throw new IOException("Failed to load image at " + file);
-                                }
                                 CallbackDispatcher.dispatchSuccess(onSuccess, img);
                             } catch (Exception ex) {
                                 CallbackDispatcher.dispatchError(onFail, ex);
diff --git a/CodenameOne/src/com/codename1/io/gzip/Inflate.java b/CodenameOne/src/com/codename1/io/gzip/Inflate.java
@@ -151,9 +151,11 @@ int inflateInit(int w) {
             inflateEnd();
             return Z_STREAM_ERROR;
         }
-        if (blocks != null && wbits != w) {
-            blocks.free();
-            blocks = null;
+        if (wbits != w) {
+            if (blocks != null) {
+                blocks.free();
+                blocks = null;
+            }
         }
 
         // set window size
diff --git a/CodenameOne/src/com/codename1/l10n/SimpleDateFormat.java b/CodenameOne/src/com/codename1/l10n/SimpleDateFormat.java
@@ -521,9 +521,7 @@ public Date parse(String source) throws ParseException {
 
                         throwInvalid("timezone", startIndex);
                     }
-                    if (res != null) {
-                        parsedTimeZone = res.timeZone;
-                    }
+                    parsedTimeZone = res.timeZone;
                     tzMinutes = ((tzMinutes == -1) ? 0 : tzMinutes) + v;
                     break;
                 case YEAR_LETTER:
@@ -844,10 +842,11 @@ String readAmPmMarker(String source, int ofs) {
         if (i == -1) {
             i = source.length();
         }
-        String fragment = readSubstring(source, ofs, i).toLowerCase();
+        String fragment = readSubstring(source, ofs, i);
         if (fragment == null) {
             return null;
         }
+        fragment = fragment.toLowerCase();
         DateFormatSymbols ds = getDateFormatSymbols();
         String[] markers = ds.getAmPmStrings();
         for (String marker : markers) {
diff --git a/CodenameOne/src/com/codename1/processing/ContainsEvaluator.java b/CodenameOne/src/com/codename1/processing/ContainsEvaluator.java
@@ -73,9 +73,6 @@ private String[] _getLeftValue(StructuredContent element, String lvalue) {
      */
     protected Object evaluateLeftContainsRight(StructuredContent element, String lvalue, String rvalue) {
         String[] lvalues = _getLeftValue(element, lvalue);
-        if (lvalues == null) {
-            return null;
-        }
         // if the rvalue is wrapped with "()", the caller explicitly expects the lvalue to be an array of values,
         // otherwise try to do a "string contains" match first if there's only one lvalue
         if (rvalue.indexOf("(") == -1 && lvalues.length == 1) {
diff --git a/CodenameOne/src/com/codename1/processing/TextEvaluator.java b/CodenameOne/src/com/codename1/processing/TextEvaluator.java
@@ -80,9 +80,6 @@ private String[] _getLeftValue(StructuredContent element, String lvalue) {
     protected Object evaluateLeftLessRight(StructuredContent element,
                                            String lvalue, String rvalue) {
         String[] v = _getLeftValue(element, lvalue);
-        if (v == null) {
-            return null;
-        }
         int vlen = v.length;
         for (int i = 0; i < vlen; i++) {
             if (isNumeric(rvalue) && isNumeric(v[i])) {
@@ -112,9 +109,6 @@ protected Object evaluateLeftLessRight(StructuredContent element,
     protected Object evaluateLeftGreaterRight(StructuredContent element,
                                               String lvalue, String rvalue) {
         String[] v = _getLeftValue(element, lvalue);
-        if (v == null) {
-            return null;
-        }
         int vlen = v.length;
         for (int i = 0; i < vlen; i++) {
             if (isNumeric(rvalue) && isNumeric(v[i])) {
@@ -144,9 +138,6 @@ protected Object evaluateLeftGreaterRight(StructuredContent element,
     protected Object evaluateLeftEqualsRight(StructuredContent element,
                                              String lvalue, String rvalue) {
         String[] v = _getLeftValue(element, lvalue);
-        if (v == null) {
-            return null;
-        }
         int vlen = v.length;
         for (int i = 0; i < vlen; i++) {
             if (isNumeric(rvalue) && isNumeric(v[i])) {
diff --git a/CodenameOne/src/com/codename1/properties/PropertyXMLElement.java b/CodenameOne/src/com/codename1/properties/PropertyXMLElement.java
@@ -61,15 +61,13 @@ public boolean contains(Element element) {
             return true;
         }
         Vector children = getChildren();
-        if (children != null) {
-            int i = 0;
-            while (i < children.size()) {
-                Element child = (Element) children.get(i);
-                if (child.contains(element)) {
-                    return true;
-                }
-                i++;
+        int i = 0;
+        while (i < children.size()) {
+            Element child = (Element) children.get(i);
+            if (child.contains(element)) {
+                return true;
             }
+            i++;
         }
         return false;
     }
@@ -193,17 +191,14 @@ public Element getElementById(String id) {
             return this;
         }
         Vector children = getChildren();
-        if (children != null) {
-            int i = 0;
-            while (i < children.size()) {
-                Element child = (Element) children.get(i);
-                Element match = child.getElementById(id);
-                if (match != null) {
-                    return match;
-                }
-                i++;
+        int i = 0;
+        while (i < children.size()) {
+            Element child = (Element) children.get(i);
+            Element match = child.getElementById(id);
+            if (match != null) {
+                return match;
             }
-
+            i++;
         }
         return null;
     }
@@ -389,10 +384,8 @@ public String toString(String spacing) {
         }
         str += ">\n";
         Vector children = getChildren();
-        if (children != null) {
-            for (int i = 0; i < children.size(); i++) {
-                str += ((Element) children.get(i)).toString(spacing + ' ');
-            }
+        for (int i = 0; i < children.size(); i++) {
+            str += ((Element) children.get(i)).toString(spacing + ' ');
         }
         str += spacing + "</" + getTagName() + ">\n";
         return str;
diff --git a/CodenameOne/src/com/codename1/ui/BrowserComponent.java b/CodenameOne/src/com/codename1/ui/BrowserComponent.java
@@ -1263,14 +1263,12 @@ public void execute(String js, Object[] params) {
      * @return the string returned from the Javascript call
      */
     public String executeAndReturnString(String javaScript) {
-        if (internal == null) {
-            while (internal == null) {
-                CN.invokeAndBlock(new Runnable() {
-                    public void run() {
-                        Util.sleep(50);
-                    }
-                });
-            }
+        while (internal == null) {
+            CN.invokeAndBlock(new Runnable() {
+                public void run() {
+                    Util.sleep(50);
+                }
+            });
         }
         if (Display.impl.supportsBrowserExecuteAndReturnString(internal)) {
             return Display.impl.browserExecuteAndReturnString(internal, javaScript);
diff --git a/CodenameOne/src/com/codename1/ui/Command.java b/CodenameOne/src/com/codename1/ui/Command.java
@@ -278,7 +278,7 @@ public boolean equals(Object obj) {
                     ((Command) obj).materialIcon == materialIcon && ((Command) obj).materialIconSize == materialIconSize &&
                     (Objects.equals(clientProperties, ((Command) obj).clientProperties));
         } else {
-            return (obj != null) && obj.getClass() == getClass() && ((Command) obj).command.equals(command) &&
+            return obj.getClass() == getClass() && ((Command) obj).command.equals(command) &&
                     ((Command) obj).icon == icon && ((Command) obj).commandId == commandId &&
                     ((Command) obj).materialIcon == materialIcon && ((Command) obj).materialIconSize == materialIconSize &&
                     (Objects.equals(clientProperties, ((Command) obj).clientProperties));
diff --git a/CodenameOne/src/com/codename1/ui/Component.java b/CodenameOne/src/com/codename1/ui/Component.java
@@ -2028,7 +2028,9 @@ public boolean containsOrOwns(int x, int y) {
         Form f = getComponentForm();
         if (f != null) {
             Component cmp = f.getComponentAt(x, y);
-            return cmp != null && cmp.isOwnedBy(this);
+            if (cmp != null && cmp.isOwnedBy(this)) {
+                return true;
+            }
         }
         return false;
 
diff --git a/CodenameOne/src/com/codename1/ui/ComponentSelector.java b/CodenameOne/src/com/codename1/ui/ComponentSelector.java
@@ -914,22 +914,19 @@ public void run() {
 
 
                     }
-                    if (mgr != null) {
-                        final AnimationManager fmgr = mgr;
-                        $(new Runnable() {
-                            public void run() {
-                                fmgr.addAnimation(ComponentAnimation.compoundAnimation(animations2.toArray(new ComponentAnimation[animations2.size()])), new Runnable() {
-                                    public void run() {
-                                        if (callback != null) {
-                                            callback.onSucess(ComponentSelector.this);
-                                        }
+                    final AnimationManager fmgr = mgr;
+                    $(new Runnable() {
+                        public void run() {
+                            fmgr.addAnimation(ComponentAnimation.compoundAnimation(animations2.toArray(new ComponentAnimation[animations2.size()])), new Runnable() {
+                                public void run() {
+                                    if (callback != null) {
+                                        callback.onSucess(ComponentSelector.this);
                                     }
+                                }
 
-                                });
-                            }
-                        });
-
-                    }
+                            });
+                        }
+                    });
 
 
                 }
diff --git a/CodenameOne/src/com/codename1/ui/CustomFont.java b/CodenameOne/src/com/codename1/ui/CustomFont.java
@@ -133,17 +133,16 @@ private boolean checkCacheCurrentColor(int newColor) {
         Object newCache = colorCache.get(newColorKey);
         if (newCache != null) {
             Image i = (Image) newCache;
-            if (i != null) {
-                cache = i;
-                if (colorCache.size() > COLOR_CACHE_SIZE) {
+            cache = i;
+            if (colorCache.size() > COLOR_CACHE_SIZE) {
                     // remove a random cache element
                     colorCache.remove(colorCache.keys().nextElement());
                 }
                 return true;
             } else {
                 colorCache.remove(newColorKey);
             }
-        }
+
         if (colorCache.size() > COLOR_CACHE_SIZE) {
             // remove a random cache element
             colorCache.remove(colorCache.keys().nextElement());
diff --git a/CodenameOne/src/com/codename1/ui/Display.java b/CodenameOne/src/com/codename1/ui/Display.java
@@ -1608,7 +1608,7 @@ void setCurrent(final Form newForm, boolean reverse) {
                     // transitions which are a bit sensitive
                     if (current != null && (!(newForm instanceof Dialog))) {
                         Transition t = current.getTransitionOutAnimator();
-                        if (current != null && t != null) {
+                        if (t != null) {
                             transitionExists = initTransition(t.copy(reverse), current, newForm);
                         }
                     }
@@ -2360,7 +2360,7 @@ private int handleEvent(int offset, int[] inputEventStackTmp) {
 
                 // make sure the released event is sent to the same Form that got a
                 // pressed event
-                if (xy == f || (f != null && f.shouldSendPointerReleaseToOtherForm())) {
+                if (xy == f || f.shouldSendPointerReleaseToOtherForm()) {
                     int[] array1 = readArrayStackArgument(offset);
                     offset += array1.length + 1;
                     int[] array2 = readArrayStackArgument(offset);
diff --git a/CodenameOne/src/com/codename1/ui/Form.java b/CodenameOne/src/com/codename1/ui/Form.java
@@ -3083,7 +3083,7 @@ public void keyRepeated(int keyCode) {
             int game = Display.getInstance().getGameAction(keyCode);
             // this has issues in the WTK
             // Fix for issue 433: the focus might be changed by the key repeated method in a way that can turn it to null
-            if (focused != null && !focused.handlesInput()
+            if (!focused.handlesInput()
                     && (game == Display.GAME_DOWN || game == Display.GAME_UP || game == Display.GAME_LEFT || game == Display.GAME_RIGHT)) {
                 keyPressed(keyCode);
                 keyReleased(keyCode);
diff --git a/CodenameOne/src/com/codename1/ui/Sheet.java b/CodenameOne/src/com/codename1/ui/Sheet.java
@@ -176,9 +176,6 @@ public void actionPerformed(ActionEvent evt) {
                 return;
             }
             Component cmp = f.getComponentAt(evt.getX(), evt.getY());
-            if (cmp == null) {
-                return;
-            }
             if (Sheet.this.contains(cmp) || Sheet.this == cmp || cmp.isOwnedBy(Sheet.this)) {
                 // do nothing.
             } else {
diff --git a/CodenameOne/src/com/codename1/ui/SideMenuBar.java b/CodenameOne/src/com/codename1/ui/SideMenuBar.java
@@ -363,7 +363,7 @@ public void actionPerformed(ActionEvent evt) {
                     initialDragY = evt.getY();
                     if (sideSwipePotential || rightSideSwipePotential || topSwipePotential) {
                         Component c = Display.getInstance().getCurrent().getComponentAt(initialDragX, initialDragY);
-                        if (c != null && c.shouldBlockSideSwipe()) {
+                        if (c.shouldBlockSideSwipe()) {
                             sideSwipePotential = false;
                         }
                     }
diff --git a/CodenameOne/src/com/codename1/ui/Tabs.java b/CodenameOne/src/com/codename1/ui/Tabs.java
@@ -1757,9 +1757,6 @@ private boolean isEventBlockedByHigherComponent(ActionEvent evt) {
                 return false;
             }
             final Component targetComponent = currentForm.getComponentAt(x, y);
-            if (targetComponent == null) {
-                return false;
-            }
             return !contentPane.equals(targetComponent) && !contentPane.contains(targetComponent);
         }
     }
diff --git a/CodenameOne/src/com/codename1/ui/html/HTMLComponent.java b/CodenameOne/src/com/codename1/ui/html/HTMLComponent.java
@@ -822,11 +822,6 @@ public boolean setBodyText(String htmlText, String encoding) {
     public boolean setHTML(String htmlText, String encoding, String title, boolean isFullHTML) {
         boolean success = true;
         InputStreamReader isr = getStream(htmlText, encoding, title, isFullHTML);
-
-        if (isr == null) {
-            isr = getStream("Encoding error loading string", null, title, isFullHTML); //TODO - dynamic error messages
-            success = false;
-        }
         final InputStreamReader isReader = isr;
 
         Display.getInstance().startThread(new Runnable() {
diff --git a/CodenameOne/src/com/codename1/ui/html/ResourceThreadQueue.java b/CodenameOne/src/com/codename1/ui/html/ResourceThreadQueue.java
@@ -464,10 +464,6 @@ public void streamReady(InputStream is, DocumentInfo docInfo) {
                     }
                 }
 
-                if (img == null) {
-                    threadQueue.threadFinished(this, false);
-                    return;
-                }
                 if (!cancelled) {
                     Display.getInstance().callSerially(new Runnable() {
                         public void run() {
diff --git a/CodenameOne/src/com/codename1/ui/layouts/mig/CodenameOneMiGComponentWrapper.java b/CodenameOne/src/com/codename1/ui/layouts/mig/CodenameOneMiGComponentWrapper.java
@@ -109,8 +109,7 @@ public final int getBaseline(int width, int height) {
         int baseLine = c.getBaseline(width < 0 ? c.getWidth() : width, height < 0 ? c.getHeight() : height);
         if (baseLine != -1) {
             int[] visPad = getVisualPadding();
-            if (visPad != null)
-                baseLine += (visPad[2] - visPad[0] + 1) / 2;
+            baseLine += (visPad[2] - visPad[0] + 1) / 2;
         }
         return baseLine;
     }
diff --git a/CodenameOne/src/com/codename1/ui/layouts/mig/Grid.java b/CodenameOne/src/com/codename1/ui/layouts/mig/Grid.java
@@ -1618,8 +1618,8 @@ private int[] getAbsoluteDimBounds(CompWrap cw, int refSize, boolean isHor) {
 
         // If absolute, use those coordinates instead.
         if (pos != null) {
-            UnitValue stUV = pos != null ? pos[isHor ? 0 : 1] : null;
-            UnitValue endUV = pos != null ? pos[isHor ? 2 : 3] : null;
+                UnitValue stUV = pos[isHor ? 0 : 1];
+                UnitValue endUV = pos[isHor ? 2 : 3];
 
             int minSz = cw.getSize(LayoutUtil.MIN, isHor);
             int maxSz = cw.getSize(LayoutUtil.MAX, isHor);
diff --git a/CodenameOne/src/com/codename1/ui/plaf/DefaultLookAndFeel.java b/CodenameOne/src/com/codename1/ui/plaf/DefaultLookAndFeel.java
@@ -454,29 +454,6 @@ public Span calculateLabelSpan(TextSelection sel, Label l) {
         int x = cmpX + leftPadding;
         int y = cmpY + topPadding;
         boolean opposite = false;
-        if (stateIcon != null) {
-            stateIconSize = stateIcon.getWidth(); //square image width == height
-            preserveSpaceForState = stateIconSize + gap;
-            int tX = cmpX;
-            if (((Button) l).isOppositeSide()) {
-                if (rtl) {
-                    tX += leftPadding;
-                } else {
-                    tX = tX + cmpWidth - leftPadding - stateIconSize;
-                }
-                cmpWidth -= leftPadding - stateIconSize;
-                preserveSpaceForState = 0;
-                opposite = true;
-            } else {
-                x = cmpX + leftPadding + preserveSpaceForState;
-                if (rtl) {
-                    tX = tX + cmpWidth - leftPadding - stateIconSize;
-                } else {
-                    tX += leftPadding;
-                }
-            }
-
-        }
 
         //default for bottom left alignment
         int align = reverseAlignForBidi(l, style.getAlignment());
diff --git a/CodenameOne/src/com/codename1/ui/plaf/RoundBorder.java b/CodenameOne/src/com/codename1/ui/plaf/RoundBorder.java
diff --git a/CodenameOne/src/com/codename1/ui/plaf/StyleParser.java b/CodenameOne/src/com/codename1/ui/plaf/StyleParser.java
diff --git a/CodenameOne/src/com/codename1/ui/spinner/Picker.java b/CodenameOne/src/com/codename1/ui/spinner/Picker.java
diff --git a/CodenameOne/src/com/codename1/ui/table/Table.java b/CodenameOne/src/com/codename1/ui/table/Table.java
diff --git a/CodenameOne/src/com/codename1/ui/tree/Tree.java b/CodenameOne/src/com/codename1/ui/tree/Tree.java
diff --git a/CodenameOne/src/com/codename1/ui/util/Resources.java b/CodenameOne/src/com/codename1/ui/util/Resources.java
diff --git a/CodenameOne/src/com/codename1/ui/util/UIBuilder.java b/CodenameOne/src/com/codename1/ui/util/UIBuilder.java

Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ public static boolean equals(Object a, Object b) {`
`48`	`48`	`if (a == b) {`
`49`	`49`	`return true;`
`50`	`50`	`}`
`51`		`- return a == null ? b == null : a.equals(b);`
	`51`	`+ return a != null && a.equals(b);`
`52`	`52`	`}`
`53`	`53`
`54`	`54`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -151,9 +151,11 @@ int inflateInit(int w) {`
`151`	`151`	`inflateEnd();`
`152`	`152`	`return Z_STREAM_ERROR;`
`153`	`153`	`}`
`154`		`- if (blocks != null && wbits != w) {`
`155`		`- blocks.free();`
`156`		`- blocks = null;`
	`154`	`+ if (wbits != w) {`
	`155`	`+ if (blocks != null) {`
	`156`	`+ blocks.free();`
	`157`	`+ blocks = null;`
	`158`	`+ }`
`157`	`159`	`}`
`158`	`160`
`159`	`161`	`// set window size`