Fix quality flaw: fix number of nested if

SonarSource · Oct 4, 2016 · ef4579d · ef4579d
1 parent 263e7a3
commit ef4579d
Showing 1 changed file with 15 additions and 14 deletions.
diff --git a/java-checks/src/main/java/org/sonar/java/checks/EqualsNotOverridenWithCompareToCheck.java b/java-checks/src/main/java/org/sonar/java/checks/EqualsNotOverridenWithCompareToCheck.java
@@ -43,25 +43,26 @@ public List<Tree.Kind> nodesToVisit() {
   @Override
   public void visitNode(Tree tree) {
     ClassTree classTree = (ClassTree) tree;
-    if (isComparable(classTree)) {
-      boolean hasEquals = false;
-      MethodTree compare = null;
+    if (!isComparable(classTree)) {
+      return;
+    }
+    boolean hasEquals = false;
+    MethodTree compare = null;
 
-      for (Tree member : classTree.members()) {
-        if (member.is(Tree.Kind.METHOD)) {
-          MethodTree method = (MethodTree) member;
+    for (Tree member : classTree.members()) {
+      if (member.is(Tree.Kind.METHOD)) {
+        MethodTree method = (MethodTree) member;
 
-          if (isEqualsMethod(method)) {
-            hasEquals = true;
-          } else if (isCompareToMethod(method)) {
-            compare = method;
-          }
+        if (isEqualsMethod(method)) {
+          hasEquals = true;
+        } else if (isCompareToMethod(method)) {
+          compare = method;
         }
       }
+    }
 
-      if (compare != null && !hasEquals) {
-        reportIssue(compare.simpleName(), "Override \"equals(Object obj)\" to comply with the contract of the \"compareTo(T o)\" method.");
-      }
+    if (compare != null && !hasEquals) {
+      reportIssue(compare.simpleName(), "Override \"equals(Object obj)\" to comply with the contract of the \"compareTo(T o)\" method.");
     }
   }