Clean up.

Author: khatchad

edu.cuny.hunter.streamrefactoring.core/src/edu/cuny/hunter/streamrefactoring/core/wala/nCFAContextWithReceiversSelector.java

@@ -19,22 +19,27 @@
 
 public class nCFAContextWithReceiversSelector extends nCFAContextSelector {
 
-	/**
-	 * The N to use if the instance implements BaseStream.
-	 */
-	public static final int CONTEXT_LENGTH_FOR_STREAMS = 2;
-
 	protected class CallStringTriple {
 
+		CGNode node;
+
+		CallSiteReference site;
+		IMethod target;
+
 		public CallStringTriple(CGNode node, CallSiteReference site, IMethod target) {
 			this.node = node;
 			this.site = site;
 			this.target = target;
 		}
 
-		CGNode node;
-		CallSiteReference site;
-		IMethod target;
+		@Override
+		public boolean equals(Object obj) {
+			if (obj instanceof CallStringTriple) {
+				CallStringTriple rhs = (CallStringTriple) obj;
+				return this.node.equals(rhs.node) && this.site.equals(rhs.site) && this.target.equals(rhs.target);
+			} else
+				return false;
+		}
 
 		@Override
 		public int hashCode() {
@@ -46,17 +51,13 @@ public int hashCode() {
 
 			return builder.toString().hashCode();
 		}
-
-		@Override
-		public boolean equals(Object obj) {
-			if (obj instanceof CallStringTriple) {
-				CallStringTriple rhs = (CallStringTriple) obj;
-				return this.node.equals(rhs.node) && this.site.equals(rhs.site) && this.target.equals(rhs.target);
-			} else
-				return false;
-		}
 	}
 
+	/**
+	 * The N to use if the instance implements BaseStream.
+	 */
+	public static final int CONTEXT_LENGTH_FOR_STREAMS = 2;
+
 	protected Map<CallStringTriple, CallStringWithReceivers> callStringWithReceiversMap = new HashMap<>();
 
 	public nCFAContextWithReceiversSelector(int n, ContextSelector base) {
@@ -66,15 +67,14 @@ public nCFAContextWithReceiversSelector(int n, ContextSelector base) {
 	@Override
 	public Context getCalleeTarget(CGNode caller, CallSiteReference site, IMethod callee,
 			InstanceKey[] actualParameters) {
-		Context baseContext = base.getCalleeTarget(caller, site, callee, actualParameters);
-		CallStringWithReceivers cs = getCallString(caller, site, callee, actualParameters);
-		if (cs == null) {
+		Context baseContext = this.base.getCalleeTarget(caller, site, callee, actualParameters);
+		CallStringWithReceivers cs = this.getCallString(caller, site, callee, actualParameters);
+		if (cs == null)
 			return baseContext;
-		} else if (baseContext == Everywhere.EVERYWHERE) {
+		else if (baseContext == Everywhere.EVERYWHERE)
 			return new CallStringContext(cs);
-		} else {
+		else
 			return new CallStringContextPair(cs, baseContext);
-		}
 	}
 
 	protected CallStringWithReceivers getCallString(CGNode caller, CallSiteReference site, IMethod target,
@@ -94,17 +94,15 @@ protected CallStringWithReceivers getCallString(CGNode caller, CallSiteReference
 			// not found. Compute it.
 			CallStringWithReceivers ret = null;
 
-			int length = getLength(caller, site, target);
+			int length = this.getLength(caller, site, target);
 			if (length > 0) {
-				if (caller.getContext().get(CALL_STRING) != null) {
+				if (caller.getContext().get(CALL_STRING) != null)
 					ret = new CallStringWithReceivers(site, caller.getMethod(), length,
 							(CallString) caller.getContext().get(CALL_STRING));
-				} else {
+				else
 					ret = new CallStringWithReceivers(site, caller.getMethod());
-				}
-			} else {
+			} else
 				ret = null;
-			}
 
 			// if we have a receiver.
 			if (ret != null && actualParameters != null && actualParameters.length > 0)
@@ -117,14 +115,14 @@ protected CallStringWithReceivers getCallString(CGNode caller, CallSiteReference
 	}
 
 	protected Map<CallStringTriple, CallStringWithReceivers> getCallStringWithReceiversMap() {
-		return callStringWithReceiversMap;
+		return this.callStringWithReceiversMap;
 	}
 
 	/**
 	 * {@inheritDoc}
-	 * 
-	 * @return CONTEXT_LENGTH_FOR_STREAMS if the target's return type implements {@link BaseStream},
-	 *         otherwise, return the original value.
+	 *
+	 * @return CONTEXT_LENGTH_FOR_STREAMS if the target's return type implements
+	 *         {@link BaseStream}, otherwise, return the original value.
 	 */
 	@Override
 	protected int getLength(CGNode caller, CallSiteReference site, IMethod target) {