refactor boolean expressions

OpenBEL · Jun 12, 2013 · d0baeb3 · d0baeb3
1 parent 5003617
commit d0baeb3
Showing 1 changed file with 5 additions and 8 deletions.
diff --git a/org.openbel.framework.api/src/main/java/org/openbel/framework/api/KAMStoreImpl.java b/org.openbel.framework.api/src/main/java/org/openbel/framework/api/KAMStoreImpl.java
@@ -121,8 +121,7 @@ public boolean exists(final Kam k) {
     @Override
     public boolean exists(final KamInfo info) {
         if (info == null) throw new InvalidArgument(DEFAULT_MSG);
-        if (exists(info.getName())) return true;
-        return false;
+        return exists(info.getName());
     }
 
     /**
@@ -135,12 +134,10 @@ public boolean exists(final String name) {
 
             @Override
             public boolean match(KamInfo t) {
-                if (name.equals(t.getName())) return true;
-                return false;
+                return name.equals(t.getName());
             }
         });
-        if (ki != null) return true;
-        return false;
+        return ki != null;
     }
 
     /**
@@ -456,7 +453,7 @@ public List<BelTerm> getSupportingTerms(KamNode kamNode,
         }
 
         // Check for duplicates
-        if (removeDuplicates == true) {
+        if (removeDuplicates) {
             HashMap<String, BelTerm> map = new HashMap<String, BelTerm>();
             // FIXME: this is inefficient
             for (BelTerm belTerm : terms) {
@@ -497,7 +494,7 @@ public KamNode getKamNode(final Kam kam, String belTermString) {
             throw new InvalidArgument("belTermString", belTermString);
         KamInfo ki = kam.getKamInfo();
         if (!exists(ki)) return null;
-        KamNode kamNode = null;
+        KamNode kamNode;
         Integer nodeID;
         try {
             nodeID = kamStoreDao(ki).getKamNodeId(belTermString);