java: reduce the depth of some deeply nested if blocks

Change-Id: I3c0c7f08d4d8ea594e72fc0d9b93d085d4ab4bf5

1 files changed, 12 insertions, 20 deletions

diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/palm/Record.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/palm/Record.java
index ac7ba521884b..cf9fad8c15ad 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/palm/Record.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/palm/Record.java
@@ -151,28 +151,20 @@ public final class Record {
      */
     @Override
     public boolean equals(Object obj) {
-
-        boolean bool = false;
-
-        if (obj instanceof Record) {
-
-            Record rec = (Record) obj;
-
-            checkLabel: {
-
-                if (rec.getAttributes() != attributes) {
-                    break checkLabel;
-                }
-                if (rec.getSize() == data.length) {
-                    for (int i = 0; i < data.length; i++) {
-                        if (data[i] != rec.data[i]) {
-                            break checkLabel;
-                        }
-                    }
-                    bool = true;
+        if (!(obj instanceof Record)) {
+            return false;
+        }
+        Record rec = (Record) obj;
+        if (rec.getAttributes() != attributes) {
+            return false;
+        }
+        if (rec.getSize() == data.length) {
+            for (int i = 0; i < data.length; i++) {
+                if (data[i] != rec.data[i]) {
+                    return false;
                 }
             }
         }
-        return bool;
+        return false;
     }
 }
\ No newline at end of file