renamed method parameters hiding fields

10 files changed, 85 insertions, 83 deletions

diff --git a/lib/jinterface/java_src/com/ericsson/otp/erlang/AbstractConnection.java b/lib/jinterface/java_src/com/ericsson/otp/erlang/AbstractConnection.java
index 9778ccccc7..bfc4c92c28 100644
--- a/lib/jinterface/java_src/com/ericsson/otp/erlang/AbstractConnection.java
+++ b/lib/jinterface/java_src/com/ericsson/otp/erlang/AbstractConnection.java
@@ -1054,25 +1054,25 @@ public abstract class AbstractConnection extends Thread {
 	return res;
     }
 
-    protected void sendName(final int dist, final int flags) throws IOException {
+    protected void sendName(final int dist, final int aflags) throws IOException {
 
 	final OtpOutputStream obuf = new OtpOutputStream();
 	final String str = localNode.node();
 	obuf.write2BE(str.length() + 7); // 7 bytes + nodename
 	obuf.write1(AbstractNode.NTYPE_R6);
 	obuf.write2BE(dist);
-	obuf.write4BE(flags);
+	obuf.write4BE(aflags);
 	obuf.write(str.getBytes());
 
 	obuf.writeTo(socket.getOutputStream());
 
 	if (traceLevel >= handshakeThreshold) {
-	    System.out.println("-> " + "HANDSHAKE sendName" + " flags=" + flags
+	    System.out.println("-> " + "HANDSHAKE sendName" + " flags=" + aflags
 		    + " dist=" + dist + " local=" + localNode);
 	}
     }
 
-    protected void sendChallenge(final int dist, final int flags,
+    protected void sendChallenge(final int dist, final int aflags,
 	    final int challenge) throws IOException {
 
 	final OtpOutputStream obuf = new OtpOutputStream();
@@ -1080,7 +1080,7 @@ public abstract class AbstractConnection extends Thread {
 	obuf.write2BE(str.length() + 11); // 11 bytes + nodename
 	obuf.write1(AbstractNode.NTYPE_R6);
 	obuf.write2BE(dist);
-	obuf.write4BE(flags);
+	obuf.write4BE(aflags);
 	obuf.write4BE(challenge);
 	obuf.write(str.getBytes());
 
@@ -1088,7 +1088,7 @@ public abstract class AbstractConnection extends Thread {
 
 	if (traceLevel >= handshakeThreshold) {
 	    System.out.println("-> " + "HANDSHAKE sendChallenge" + " flags="
-		    + flags + " dist=" + dist + " challenge=" + challenge
+		    + aflags + " dist=" + dist + " challenge=" + challenge
 		    + " local=" + localNode);
 	}
     }
@@ -1107,7 +1107,7 @@ public abstract class AbstractConnection extends Thread {
 	return tmpbuf;
     }
 
-    protected void recvName(final OtpPeer peer) throws IOException {
+    protected void recvName(final OtpPeer apeer) throws IOException {
 
 	String hisname = "";
 
@@ -1116,32 +1116,32 @@ public abstract class AbstractConnection extends Thread {
 	    final OtpInputStream ibuf = new OtpInputStream(tmpbuf, 0);
 	    byte[] tmpname;
 	    final int len = tmpbuf.length;
-	    peer.ntype = ibuf.read1();
-	    if (peer.ntype != AbstractNode.NTYPE_R6) {
+	    apeer.ntype = ibuf.read1();
+	    if (apeer.ntype != AbstractNode.NTYPE_R6) {
 		throw new IOException("Unknown remote node type");
 	    }
-	    peer.distLow = peer.distHigh = ibuf.read2BE();
-	    if (peer.distLow < 5) {
+	    apeer.distLow = apeer.distHigh = ibuf.read2BE();
+	    if (apeer.distLow < 5) {
 		throw new IOException("Unknown remote node type");
 	    }
-	    peer.flags = ibuf.read4BE();
+	    apeer.flags = ibuf.read4BE();
 	    tmpname = new byte[len - 7];
 	    ibuf.readN(tmpname);
 	    hisname = OtpErlangString.newString(tmpname);
 	    // Set the old nodetype parameter to indicate hidden/normal status
 	    // When the old handshake is removed, the ntype should also be.
-	    if ((peer.flags & AbstractNode.dFlagPublished) != 0) {
-		peer.ntype = AbstractNode.NTYPE_R4_ERLANG;
+	    if ((apeer.flags & AbstractNode.dFlagPublished) != 0) {
+		apeer.ntype = AbstractNode.NTYPE_R4_ERLANG;
 	    } else {
-		peer.ntype = AbstractNode.NTYPE_R4_HIDDEN;
+		apeer.ntype = AbstractNode.NTYPE_R4_HIDDEN;
 	    }
 
-	    if ((peer.flags & AbstractNode.dFlagExtendedReferences) == 0) {
+	    if ((apeer.flags & AbstractNode.dFlagExtendedReferences) == 0) {
 		throw new IOException(
 			"Handshake failed - peer cannot handle extended references");
 	    }
 
-	    if ((peer.flags & AbstractNode.dFlagExtendedPidsPorts) == 0) {
+	    if ((apeer.flags & AbstractNode.dFlagExtendedPidsPorts) == 0) {
 		throw new IOException(
 			"Handshake failed - peer cannot handle extended pids and ports");
 	    }
@@ -1151,13 +1151,13 @@ public abstract class AbstractConnection extends Thread {
 	}
 
 	final int i = hisname.indexOf('@', 0);
-	peer.node = hisname;
-	peer.alive = hisname.substring(0, i);
-	peer.host = hisname.substring(i + 1, hisname.length());
+	apeer.node = hisname;
+	apeer.alive = hisname.substring(0, i);
+	apeer.host = hisname.substring(i + 1, hisname.length());
 
 	if (traceLevel >= handshakeThreshold) {
-	    System.out.println("<- " + "HANDSHAKE" + " ntype=" + peer.ntype
-		    + " dist=" + peer.distHigh + " remote=" + peer);
+	    System.out.println("<- " + "HANDSHAKE" + " ntype=" + apeer.ntype
+		    + " dist=" + apeer.distHigh + " remote=" + apeer);
 	}
     }
 
diff --git a/lib/jinterface/java_src/com/ericsson/otp/erlang/Link.java b/lib/jinterface/java_src/com/ericsson/otp/erlang/Link.java
index de8b27496d..c8b4fcebde 100644
--- a/lib/jinterface/java_src/com/ericsson/otp/erlang/Link.java
+++ b/lib/jinterface/java_src/com/ericsson/otp/erlang/Link.java
@@ -41,9 +41,9 @@ class Link {
 	return local.equals(pid) || remote.equals(pid);
     }
 
-    public boolean equals(final OtpErlangPid local, final OtpErlangPid remote) {
-	return this.local.equals(local) && this.remote.equals(remote)
-		|| this.local.equals(remote) && this.remote.equals(local);
+    public boolean equals(final OtpErlangPid alocal, final OtpErlangPid aremote) {
+    return local.equals(alocal) && remote.equals(aremote)
+        || local.equals(aremote) && remote.equals(alocal);
     }
     
     @Override
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 9eec107fb5..bff3e2c0e3 100644
--- a/lib/jinterface/java_src/com/ericsson/otp/erlang/OtpErlangAtom.java
+++ b/lib/jinterface/java_src/com/ericsson/otp/erlang/OtpErlangAtom.java
@@ -136,8 +136,8 @@ public class OtpErlangAtom extends OtpErlangObject {
 	    return false;
 	}
 
-	final OtpErlangAtom atom = (OtpErlangAtom) o;
-	return this.atom.compareTo(atom.atom) == 0;
+	final OtpErlangAtom other = (OtpErlangAtom) o;
+	return this.atom.compareTo(other.atom) == 0;
     }
     
     @Override
diff --git a/lib/jinterface/java_src/com/ericsson/otp/erlang/OtpErlangBitstr.java b/lib/jinterface/java_src/com/ericsson/otp/erlang/OtpErlangBitstr.java
index 4963de9ffa..8cb4e0e685 100644
--- a/lib/jinterface/java_src/com/ericsson/otp/erlang/OtpErlangBitstr.java
+++ b/lib/jinterface/java_src/com/ericsson/otp/erlang/OtpErlangBitstr.java
@@ -61,18 +61,18 @@ public class OtpErlangBitstr extends OtpErlangObject {
 	check_bitstr(this.bin, this.pad_bits);
     }
 
-    private void check_bitstr(final byte[] bin, final int pad_bits) {
-	if (pad_bits < 0 || 7 < pad_bits) {
+    private void check_bitstr(final byte[] abin, final int a_pad_bits) {
+	if (a_pad_bits < 0 || 7 < a_pad_bits) {
 	    throw new java.lang.IllegalArgumentException(
 		    "Padding must be in range 0..7");
 	}
-	if (pad_bits != 0 && bin.length == 0) {
+	if (a_pad_bits != 0 && abin.length == 0) {
 	    throw new java.lang.IllegalArgumentException(
 		    "Padding on zero length bitstr");
 	}
-	if (bin.length != 0) {
+	if (abin.length != 0) {
 	    // Make sure padding is zero
-	    bin[bin.length - 1] &= ~((1 << pad_bits) - 1);
+	    abin[abin.length - 1] &= ~((1 << a_pad_bits) - 1);
 	}
     }
 
diff --git a/lib/jinterface/java_src/com/ericsson/otp/erlang/OtpErlangDouble.java b/lib/jinterface/java_src/com/ericsson/otp/erlang/OtpErlangDouble.java
index a1e9eacc73..e92ce11431 100644
--- a/lib/jinterface/java_src/com/ericsson/otp/erlang/OtpErlangDouble.java
+++ b/lib/jinterface/java_src/com/ericsson/otp/erlang/OtpErlangDouble.java
@@ -118,8 +118,8 @@ public class OtpErlangDouble extends OtpErlangObject {
 	    return false;
 	}
 
-	final OtpErlangDouble d = (OtpErlangDouble) o;
-	return this.d == d.d;
+	final OtpErlangDouble other = (OtpErlangDouble) o;
+	return this.d == other.d;
     }
     
     @Override
diff --git a/lib/jinterface/java_src/com/ericsson/otp/erlang/OtpInputStream.java b/lib/jinterface/java_src/com/ericsson/otp/erlang/OtpInputStream.java
index b81d0bd5dc..8d490d1370 100644
--- a/lib/jinterface/java_src/com/ericsson/otp/erlang/OtpInputStream.java
+++ b/lib/jinterface/java_src/com/ericsson/otp/erlang/OtpInputStream.java
@@ -108,8 +108,8 @@ public class OtpInputStream extends ByteArrayInputStream {
      * @exception OtpErlangDecodeException
      *                if the next byte cannot be read.
      */
-    public int readN(final byte[] buf) throws OtpErlangDecodeException {
-	return this.readN(buf, 0, buf.length);
+    public int readN(final byte[] abuf) throws OtpErlangDecodeException {
+	return this.readN(abuf, 0, abuf.length);
     }
 
     /**
@@ -121,12 +121,12 @@ public class OtpInputStream extends ByteArrayInputStream {
      * @exception OtpErlangDecodeException
      *                if the next byte cannot be read.
      */
-    public int readN(final byte[] buf, final int off, final int len)
+    public int readN(final byte[] abuf, final int off, final int len)
 	    throws OtpErlangDecodeException {
 	if (len == 0 && available() == 0) {
 	    return 0;
 	}
-	final int i = super.read(buf, off, len);
+	final int i = super.read(abuf, off, len);
 	if (i < 0) {
 	    throw new OtpErlangDecodeException("Cannot read from input stream");
 	}
@@ -1144,13 +1144,13 @@ public class OtpInputStream extends ByteArrayInputStream {
 	}
 
 	final int size = read4BE();
-	final byte[] buf = new byte[size];
+	final byte[] abuf = new byte[size];
 	final java.util.zip.InflaterInputStream is = 
 	    new java.util.zip.InflaterInputStream(this, new java.util.zip.Inflater(), size);
 	int curPos = 0;
 	try {
 	    int curRead;
-	    while(curPos < size && (curRead = is.read(buf, curPos, size - curPos)) != -1) {
+	    while(curPos < size && (curRead = is.read(abuf, curPos, size - curPos)) != -1) {
 		curPos += curRead;
 	    }
 	    if (curPos != size) {
@@ -1161,7 +1161,7 @@ public class OtpInputStream extends ByteArrayInputStream {
 	    throw new OtpErlangDecodeException("Cannot read from input stream");
 	}
 
-	final OtpInputStream ois = new OtpInputStream(buf, flags);
+	final OtpInputStream ois = new OtpInputStream(abuf, flags);
 	return ois.read_any();
     }
 
diff --git a/lib/jinterface/java_src/com/ericsson/otp/erlang/OtpMbox.java b/lib/jinterface/java_src/com/ericsson/otp/erlang/OtpMbox.java
index 4a4a1e7f8f..fc592c222c 100644
--- a/lib/jinterface/java_src/com/ericsson/otp/erlang/OtpMbox.java
+++ b/lib/jinterface/java_src/com/ericsson/otp/erlang/OtpMbox.java
@@ -128,14 +128,14 @@ public class OtpMbox {
      * supercede that name.
      * </p>
      * 
-     * @param name
+     * @param aname
      *                the name to register for the mailbox. Specify null to
      *                unregister the existing name from this mailbox.
      * 
      * @return true if the name was available, or false otherwise.
      */
-    public synchronized boolean registerName(final String name) {
-	return home.registerName(name, this);
+    public synchronized boolean registerName(final String aname) {
+	return home.registerName(aname, this);
     }
 
     /**
@@ -350,21 +350,21 @@ public class OtpMbox {
      * Send a message to a named mailbox created from the same node as this
      * mailbox.
      * 
-     * @param name
+     * @param aname
      *                the registered name of recipient mailbox.
      * 
      * @param msg
      *                the body of the message to send.
      * 
      */
-    public void send(final String name, final OtpErlangObject msg) {
-	home.deliver(new OtpMsg(self, name, (OtpErlangObject) msg.clone()));
+    public void send(final String aname, final OtpErlangObject msg) {
+	home.deliver(new OtpMsg(self, aname, (OtpErlangObject) msg.clone()));
     }
 
     /**
      * Send a message to a named mailbox created from another node.
      * 
-     * @param name
+     * @param aname
      *                the registered name of recipient mailbox.
      * 
      * @param node
@@ -375,23 +375,23 @@ public class OtpMbox {
      *                the body of the message to send.
      * 
      */
-    public void send(final String name, final String node,
+    public void send(final String aname, final String node,
 	    final OtpErlangObject msg) {
 	try {
 	    final String currentNode = home.node();
 	    if (node.equals(currentNode)) {
-		send(name, msg);
+		send(aname, msg);
 	    } else if (node.indexOf('@', 0) < 0
 		    && node.equals(currentNode.substring(0, currentNode
 			    .indexOf('@', 0)))) {
-		send(name, msg);
+		send(aname, msg);
 	    } else {
 		// other node
 		final OtpCookedConnection conn = home.getConnection(node);
 		if (conn == null) {
 		    return;
 		}
-		conn.send(self, name, msg);
+		conn.send(self, aname, msg);
 	    }
 	} catch (final Exception e) {
 	}
@@ -629,8 +629,8 @@ public class OtpMbox {
      * @return the {@link OtpErlangPid pid} corresponding to the registered
      *         name, or null if the name is not known on this node.
      */
-    public OtpErlangPid whereis(final String name) {
-	return home.whereis(name);
+    public OtpErlangPid whereis(final String aname) {
+	return home.whereis(aname);
     }
 
     /**
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 b214c8b9fa..68addb9f2c 100644
--- a/lib/jinterface/java_src/com/ericsson/otp/erlang/OtpNode.java
+++ b/lib/jinterface/java_src/com/ericsson/otp/erlang/OtpNode.java
@@ -143,12 +143,12 @@ public class OtpNode extends OtpLocalNode {
 	init(port);
     }
 
-    private synchronized void init(final int port) throws IOException {
+    private synchronized void init(final int aport) throws IOException {
 	if (!initDone) {
 	    connections = new Hashtable<String, OtpCookedConnection>(17,
 		    (float) 0.95);
 	    mboxes = new Mailboxes();
-	    acceptor = new Acceptor(port);
+	    acceptor = new Acceptor(aport);
 	    initDone = true;
 	}
     }
@@ -314,13 +314,13 @@ public class OtpNode extends OtpLocalNode {
      * OtpNodeStatus} handler object contains callback methods, that will be
      * called when certain events occur.
      * 
-     * @param handler
+     * @param ahandler
      *            the callback object to register. To clear the handler, specify
      *            null as the handler to use.
      * 
      */
-    public synchronized void registerStatusHandler(final OtpNodeStatus handler) {
-	this.handler = handler;
+    public synchronized void registerStatusHandler(final OtpNodeStatus ahandler) {
+	this.handler = ahandler;
     }
 
     /**
@@ -344,7 +344,7 @@ public class OtpNode extends OtpLocalNode {
      *     ;
      * </pre>
      * 
-     * @param node
+     * @param anode
      *            the name of the node to ping.
      * 
      * @param timeout
@@ -362,11 +362,11 @@ public class OtpNode extends OtpLocalNode {
      * 
      * the reply: <- SEND {2,'',#Pid<[email protected]>} {#Ref<[email protected]>,yes}
      */
-    public boolean ping(final String node, final long timeout) {
-	if (node.equals(this.node)) {
+    public boolean ping(final String anode, final long timeout) {
+	if (anode.equals(this.node)) {
 	    return true;
-	} else if (node.indexOf('@', 0) < 0
-		&& node.equals(this.node
+	} else if (anode.indexOf('@', 0) < 0
+		&& anode.equals(this.node
 			.substring(0, this.node.indexOf('@', 0)))) {
 	    return true;
 	}
@@ -375,7 +375,7 @@ public class OtpNode extends OtpLocalNode {
 	OtpMbox mbox = null;
 	try {
 	    mbox = createMbox();
-	    mbox.send("net_kernel", node, getPingTuple(mbox));
+	    mbox.send("net_kernel", anode, getPingTuple(mbox));
 	    final OtpErlangObject reply = mbox.receive(timeout);
 
 	    final OtpErlangTuple t = (OtpErlangTuple) reply;
@@ -392,17 +392,17 @@ public class OtpNode extends OtpLocalNode {
     private OtpErlangTuple getPingTuple(final OtpMbox mbox) {
 	final OtpErlangObject[] ping = new OtpErlangObject[3];
 	final OtpErlangObject[] pid = new OtpErlangObject[2];
-	final OtpErlangObject[] node = new OtpErlangObject[2];
+	final OtpErlangObject[] anode = new OtpErlangObject[2];
 
 	pid[0] = mbox.self();
 	pid[1] = createRef();
 
-	node[0] = new OtpErlangAtom("is_auth");
-	node[1] = new OtpErlangAtom(node());
+	anode[0] = new OtpErlangAtom("is_auth");
+	anode[1] = new OtpErlangAtom(node());
 
 	ping[0] = new OtpErlangAtom("$gen_call");
 	ping[1] = new OtpErlangTuple(pid);
-	ping[2] = new OtpErlangTuple(node);
+	ping[2] = new OtpErlangTuple(anode);
 
 	return new OtpErlangTuple(ping);
     }
@@ -479,17 +479,17 @@ public class OtpNode extends OtpLocalNode {
     /*
      * find or create a connection to the given node
      */
-    OtpCookedConnection getConnection(final String node) {
+    OtpCookedConnection getConnection(final String anode) {
 	OtpPeer peer = null;
 	OtpCookedConnection conn = null;
 
 	synchronized (connections) {
 	    // first just try looking up the name as-is
-	    conn = connections.get(node);
+	    conn = connections.get(anode);
 
 	    if (conn == null) {
 		// in case node had no '@' add localhost info and try again
-		peer = new OtpPeer(node);
+		peer = new OtpPeer(anode);
 		conn = connections.get(peer.node());
 
 		if (conn == null) {
@@ -521,35 +521,35 @@ public class OtpNode extends OtpLocalNode {
     }
 
     /* use these wrappers to call handler functions */
-    private synchronized void remoteStatus(final String node, final boolean up,
+    private synchronized void remoteStatus(final String anode, final boolean up,
 	    final Object info) {
 	if (handler == null) {
 	    return;
 	}
 	try {
-	    handler.remoteStatus(node, up, info);
+	    handler.remoteStatus(anode, up, info);
 	} catch (final Exception e) {
 	}
     }
 
-    synchronized void localStatus(final String node, final boolean up,
+    synchronized void localStatus(final String anode, final boolean up,
 	    final Object info) {
 	if (handler == null) {
 	    return;
 	}
 	try {
-	    handler.localStatus(node, up, info);
+	    handler.localStatus(anode, up, info);
 	} catch (final Exception e) {
 	}
     }
 
-    synchronized void connAttempt(final String node, final boolean incoming,
+    synchronized void connAttempt(final String anode, final boolean incoming,
 	    final Object info) {
 	if (handler == null) {
 	    return;
 	}
 	try {
-	    handler.connAttempt(node, incoming, info);
+	    handler.connAttempt(anode, incoming, info);
 	} catch (final Exception e) {
 	}
     }
diff --git a/lib/jinterface/java_src/com/ericsson/otp/erlang/OtpOutputStream.java b/lib/jinterface/java_src/com/ericsson/otp/erlang/OtpOutputStream.java
index 2ac721ef04..e082a1bda0 100644
--- a/lib/jinterface/java_src/com/ericsson/otp/erlang/OtpOutputStream.java
+++ b/lib/jinterface/java_src/com/ericsson/otp/erlang/OtpOutputStream.java
@@ -158,9 +158,9 @@ public class OtpOutputStream extends ByteArrayOutputStream {
      * @see java.io.ByteArrayOutputStream#write(byte[])
      */
     @Override
-    public void write(final byte[] buf) {
+    public void write(final byte[] abuf) {
 	// don't assume that super.write(byte[]) calls write(buf, 0, buf.length)
-	write(buf, 0, buf.length);
+	write(abuf, 0, abuf.length);
     }
 
     /* (non-Javadoc)
diff --git a/lib/jinterface/test/jinterface_SUITE_data/FunEquals.java b/lib/jinterface/test/jinterface_SUITE_data/FunEquals.java
index 14f884cee7..961e462cb3 100644
--- a/lib/jinterface/test/jinterface_SUITE_data/FunEquals.java
+++ b/lib/jinterface/test/jinterface_SUITE_data/FunEquals.java
@@ -17,9 +17,11 @@
  * %CopyrightEnd%
  */
 
-import java.util.Arrays;
-
-import com.ericsson.otp.erlang.*;
+import com.ericsson.otp.erlang.OtpErlangAtom;
+import com.ericsson.otp.erlang.OtpErlangFun;
+import com.ericsson.otp.erlang.OtpErlangLong;
+import com.ericsson.otp.erlang.OtpErlangObject;
+import com.ericsson.otp.erlang.OtpErlangPid;
 
 public class FunEquals {