From b73db446ac9681fdfc4ad602c6da7ce3e36a8588 Mon Sep 17 00:00:00 2001
From: Noel Grandin <noel@peralex.com>
Date: Thu, 5 Nov 2015 14:16:35 +0200
Subject: java: combine nested if statements

Change-Id: I0457b81668e9427a3c8d6a4af93438b7fb2bb7ba
---
 toolkit/test/accessibility/AccessibilityTree.java          |  5 ++---
 toolkit/test/accessibility/AccessibleComponentHandler.java |  5 ++---
 toolkit/test/accessibility/Canvas.java                     | 11 +++++------
 3 files changed, 9 insertions(+), 12 deletions(-)

(limited to 'toolkit/test')

diff --git a/toolkit/test/accessibility/AccessibilityTree.java b/toolkit/test/accessibility/AccessibilityTree.java
index d750bf75c811..fdf44177a783 100644
--- a/toolkit/test/accessibility/AccessibilityTree.java
+++ b/toolkit/test/accessibility/AccessibilityTree.java
@@ -365,9 +365,8 @@ public class AccessibilityTree
             {
                 AccTreeNode aNode = (AccTreeNode)aObject;
                 XAccessibleContext xContext = aNode.getContext();
-                if (xContext != null)
-                    if (xContext.getAccessibleRole() >= 100)
-                        return true;
+                if (xContext != null && xContext.getAccessibleRole() >= 100)
+                    return true;
             }
             return false;
         }
diff --git a/toolkit/test/accessibility/AccessibleComponentHandler.java b/toolkit/test/accessibility/AccessibleComponentHandler.java
index 7420a00daf51..229612b8dd11 100644
--- a/toolkit/test/accessibility/AccessibleComponentHandler.java
+++ b/toolkit/test/accessibility/AccessibleComponentHandler.java
@@ -115,8 +115,7 @@ class AccessibleComponentHandler
     public void update (AccessibleTreeNode aNode)
     {
         maChildList.clear();
-        if (aNode instanceof AccTreeNode)
-            if (((AccTreeNode)aNode).getComponent() != null)
-                maChildList.setSize (4);
+        if (aNode instanceof AccTreeNode && ((AccTreeNode)aNode).getComponent() != null)
+            maChildList.setSize (4);
     }
 }
diff --git a/toolkit/test/accessibility/Canvas.java b/toolkit/test/accessibility/Canvas.java
index c254ed62c5e8..e9149ff82e35 100644
--- a/toolkit/test/accessibility/Canvas.java
+++ b/toolkit/test/accessibility/Canvas.java
@@ -395,12 +395,11 @@ class Canvas
         for (int i=nCount-1; i>=0; --i)
         {
             CanvasShape aObject = maObjectList.get(i);
-            if (aObject != null)
-                if (aObject.contains (e.getX(),e.getY()))
-                {
-                    aObjectUnderMouse = aObject;
-                    break;
-                }
+            if (aObject != null && aObject.contains (e.getX(),e.getY()))
+            {
+                aObjectUnderMouse = aObject;
+                break;
+            }
         }
         return aObjectUnderMouse;
     }
-- 
cgit