(commons-collections) 03/09: No need to nest

[ggregory]

This is an automated email from the ASF dual-hosted git repository.

ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-collections.git

commit 592f1b0f243a0b2ad85fa4a8e57615e43d5c82dc
Author: Gary D. Gregory <garydgreg...@gmail.com>
AuthorDate: Fri Apr 18 22:02:35 2025 -0400

    No need to nest
    
    Reduce vertical whitespace
---
 .../commons/collections4/bidimap/TreeBidiMap.java  | 43 ++++++++--------------
 1 file changed, 15 insertions(+), 28 deletions(-)

diff --git 
a/src/main/java/org/apache/commons/collections4/bidimap/TreeBidiMap.java 
b/src/main/java/org/apache/commons/collections4/bidimap/TreeBidiMap.java
index 70797c1fc..fc6b10512 100644
--- a/src/main/java/org/apache/commons/collections4/bidimap/TreeBidiMap.java
+++ b/src/main/java/org/apache/commons/collections4/bidimap/TreeBidiMap.java
@@ -1210,13 +1210,9 @@ public class TreeBidiMap<K extends Comparable<K>, V 
extends Comparable<V>>
             if (deletedNode.getLeft(dataElement) != null && 
deletedNode.getRight(dataElement) != null) {
                 swapPosition(nextGreater(deletedNode, dataElement), 
deletedNode, dataElement);
             }
-
-            final Node<K, V> replacement = deletedNode.getLeft(dataElement) != 
null ?
-                    deletedNode.getLeft(dataElement) : 
deletedNode.getRight(dataElement);
-
+            final Node<K, V> replacement = deletedNode.getLeft(dataElement) != 
null ? deletedNode.getLeft(dataElement) : deletedNode.getRight(dataElement);
             if (replacement != null) {
                 replacement.setParent(deletedNode.getParent(dataElement), 
dataElement);
-
                 if (deletedNode.getParent(dataElement) == null) {
                     rootNode[dataElement.ordinal()] = replacement;
                 } else if (deletedNode == 
deletedNode.getParent(dataElement).getLeft(dataElement)) {
@@ -1224,37 +1220,28 @@ public class TreeBidiMap<K extends Comparable<K>, V 
extends Comparable<V>>
                 } else {
                     deletedNode.getParent(dataElement).setRight(replacement, 
dataElement);
                 }
-
                 deletedNode.setLeft(null, dataElement);
                 deletedNode.setRight(null, dataElement);
                 deletedNode.setParent(null, dataElement);
-
                 if (isBlack(deletedNode, dataElement)) {
                     doRedBlackDeleteFixup(replacement, dataElement);
                 }
-            } else {
-
+            } else if (deletedNode.getParent(dataElement) == null) {
                 // replacement is null
-                if (deletedNode.getParent(dataElement) == null) {
-
-                    // empty tree
-                    rootNode[dataElement.ordinal()] = null;
-                } else {
-
-                    // deleted node had no children
-                    if (isBlack(deletedNode, dataElement)) {
-                        doRedBlackDeleteFixup(deletedNode, dataElement);
-                    }
-
-                    if (deletedNode.getParent(dataElement) != null) {
-                        if (deletedNode == 
deletedNode.getParent(dataElement).getLeft(dataElement)) {
-                            deletedNode.getParent(dataElement).setLeft(null, 
dataElement);
-                        } else {
-                            deletedNode.getParent(dataElement).setRight(null, 
dataElement);
-                        }
-
-                        deletedNode.setParent(null, dataElement);
+                // empty tree
+                rootNode[dataElement.ordinal()] = null;
+            } else {
+                // deleted node had no children
+                if (isBlack(deletedNode, dataElement)) {
+                    doRedBlackDeleteFixup(deletedNode, dataElement);
+                }
+                if (deletedNode.getParent(dataElement) != null) {
+                    if (deletedNode == 
deletedNode.getParent(dataElement).getLeft(dataElement)) {
+                        deletedNode.getParent(dataElement).setLeft(null, 
dataElement);
+                    } else {
+                        deletedNode.getParent(dataElement).setRight(null, 
dataElement);
                     }
+                    deletedNode.setParent(null, dataElement);
                 }
             }
         }