simplify 'if' statements

7 files changed, 13 insertions, 28 deletions

diff --git a/lib/jinterface/java_src/com/ericsson/otp/erlang/AbstractNode.java b/lib/jinterface/java_src/com/ericsson/otp/erlang/AbstractNode.java
index 3ef44b8851..51a0b8ad5d 100644
--- a/lib/jinterface/java_src/com/ericsson/otp/erlang/AbstractNode.java
+++ b/lib/jinterface/java_src/com/ericsson/otp/erlang/AbstractNode.java
@@ -260,8 +260,7 @@ public class AbstractNode {
 	    final String drive = System.getenv("HOMEDRIVE");
 	    final String path = System.getenv("HOMEPATH");
 	    return (drive != null && path != null) ? drive + path : home;
-	} else {
-	    return home;
 	}
+    return home;
     }
 }
diff --git a/lib/jinterface/java_src/com/ericsson/otp/erlang/OtpErlangAtom.java b/lib/jinterface/java_src/com/ericsson/otp/erlang/OtpErlangAtom.java
index f3e94d2651..9eec107fb5 100644
--- a/lib/jinterface/java_src/com/ericsson/otp/erlang/OtpErlangAtom.java
+++ b/lib/jinterface/java_src/com/ericsson/otp/erlang/OtpErlangAtom.java
@@ -117,9 +117,8 @@ public class OtpErlangAtom extends OtpErlangObject {
     public String toString() {
 	if (atomNeedsQuoting(atom)) {
 	    return "'" + escapeSpecialChars(atom) + "'";
-	} else {
-	    return atom;
 	}
+    return atom;
     }
 
     /**
diff --git a/lib/jinterface/java_src/com/ericsson/otp/erlang/OtpErlangList.java b/lib/jinterface/java_src/com/ericsson/otp/erlang/OtpErlangList.java
index 24e5762473..77c107a7ea 100644
--- a/lib/jinterface/java_src/com/ericsson/otp/erlang/OtpErlangList.java
+++ b/lib/jinterface/java_src/com/ericsson/otp/erlang/OtpErlangList.java
@@ -186,12 +186,11 @@ public class OtpErlangList extends OtpErlangObject implements
     public OtpErlangObject[] elements() {
 	if (arity() == 0) {
 	    return NO_ELEMENTS;
-	} else {
+    }
 	    final OtpErlangObject[] res = new OtpErlangObject[arity()];
 	    System.arraycopy(elems, 0, res, 0, res.length);
 	    return res;
 	}
-    }
 
     /**
      * Get the string representation of the list.
@@ -360,9 +359,8 @@ public class OtpErlangList extends OtpErlangObject implements
 	if (arity >= n) {
 	    if (arity == n && lastTail != null) {
 		return lastTail;
-	    } else {
-		return new SubList(this, n);
 	    }
+        return new SubList(this, n);
 	}
 	return null;
     }
diff --git a/lib/jinterface/java_src/com/ericsson/otp/erlang/OtpErlangLong.java b/lib/jinterface/java_src/com/ericsson/otp/erlang/OtpErlangLong.java
index fdd8c92f40..c6021a6ae1 100644
--- a/lib/jinterface/java_src/com/ericsson/otp/erlang/OtpErlangLong.java
+++ b/lib/jinterface/java_src/com/ericsson/otp/erlang/OtpErlangLong.java
@@ -92,9 +92,8 @@ public class OtpErlangLong extends OtpErlangObject {
     public BigInteger bigIntegerValue() {
 	if (bigVal != null) {
 	    return bigVal;
-	} else {
-	    return BigInteger.valueOf(val);
 	}
+    return BigInteger.valueOf(val);
     }
 
     /**
@@ -107,9 +106,8 @@ public class OtpErlangLong extends OtpErlangObject {
     public long longValue() {
 	if (bigVal != null) {
 	    return bigVal.longValue();
-	} else {
-	    return val;
 	}
+    return val;
     }
 
     /**
@@ -157,7 +155,7 @@ public class OtpErlangLong extends OtpErlangObject {
 	}
 	if (val == 0 || val == -1) {
 	    return 0;
-	} else {
+    }
 	    // Binary search for bit length
 	    int i = 32; // mask length
 	    long m = (1L << i) - 1; // AND mask with ones in little end
@@ -191,7 +189,6 @@ public class OtpErlangLong extends OtpErlangObject {
 	    }
 	    return i;
 	}
-    }
 
     /**
      * Return the signum function of this object.
@@ -201,9 +198,8 @@ public class OtpErlangLong extends OtpErlangObject {
     public int signum() {
 	if (bigVal != null) {
 	    return bigVal.signum();
-	} else {
-	    return val > 0 ? 1 : val < 0 ? -1 : 0;
 	}
+    return val > 0 ? 1 : val < 0 ? -1 : 0;
     }
 
     /**
@@ -340,9 +336,8 @@ public class OtpErlangLong extends OtpErlangObject {
     public String toString() {
 	if (bigVal != null) {
 	    return "" + bigVal;
-	} else {
-	    return "" + val;
 	}
+    return "" + val;
     }
 
     /**
@@ -390,8 +385,7 @@ public class OtpErlangLong extends OtpErlangObject {
     protected int doHashCode() {
 	if (bigVal != null) {
 	    return bigVal.hashCode();
-	} else {
-	    return BigInteger.valueOf(val).hashCode();
 	}
+    return BigInteger.valueOf(val).hashCode();
     }
 }
diff --git a/lib/jinterface/java_src/com/ericsson/otp/erlang/OtpErlangPid.java b/lib/jinterface/java_src/com/ericsson/otp/erlang/OtpErlangPid.java
index cf24e68e62..4c9f5c78a3 100644
--- a/lib/jinterface/java_src/com/ericsson/otp/erlang/OtpErlangPid.java
+++ b/lib/jinterface/java_src/com/ericsson/otp/erlang/OtpErlangPid.java
@@ -195,14 +195,11 @@ public class OtpErlangPid extends OtpErlangObject implements Comparable<Object>
 	    if (serial == pid.serial) {
 		if (id == pid.id) {
 		    return node.compareTo(pid.node);
-		} else {
+        }
 		    return id - pid.id;
 		}
-	    } else {
 		return serial - pid.serial;
 	    }
-	} else {
 	    return creation - pid.creation;
 	}
     }
-}
diff --git a/lib/jinterface/java_src/com/ericsson/otp/erlang/OtpErlangTuple.java b/lib/jinterface/java_src/com/ericsson/otp/erlang/OtpErlangTuple.java
index af5a110a3b..dffaa530cd 100644
--- a/lib/jinterface/java_src/com/ericsson/otp/erlang/OtpErlangTuple.java
+++ b/lib/jinterface/java_src/com/ericsson/otp/erlang/OtpErlangTuple.java
@@ -49,9 +49,8 @@ public class OtpErlangTuple extends OtpErlangObject {
 	if (elem == null) {
 	    throw new java.lang.IllegalArgumentException(
 		    "Tuple element cannot be null");
-	} else {
-	    elems = new OtpErlangObject[] { elem };
 	}
+    elems = new OtpErlangObject[] { elem };
     }
 
     /**
diff --git a/lib/jinterface/java_src/com/ericsson/otp/erlang/OtpNode.java b/lib/jinterface/java_src/com/ericsson/otp/erlang/OtpNode.java
index 7ead0b9c54..69b9a7e0d9 100644
--- a/lib/jinterface/java_src/com/ericsson/otp/erlang/OtpNode.java
+++ b/lib/jinterface/java_src/com/ericsson/otp/erlang/OtpNode.java
@@ -450,9 +450,8 @@ public class OtpNode extends OtpLocalNode {
 		/* special case for netKernel requests */
 		if (name.equals("net_kernel")) {
 		    return netKernel(m);
-		} else {
-		    mbox = mboxes.get(name);
 		}
+        mbox = mboxes.get(name);
 	    } else {
 		mbox = mboxes.get(m.getRecipientPid());
 	    }