Extract method.

Author: khatchad

edu.cuny.hunter.streamrefactoring.core/src/edu/cuny/hunter/streamrefactoring/core/analysis/Util.java

@@ -687,4 +687,23 @@ private static boolean wouldOrderingBeConsistent(final Collection<TypeAbstractio
 
 	private Util() {
 	}
+
+	/**
+	 * If it's a ctor, return the declaring class, otherwise, return the return
+	 * type.
+	 * 
+	 * @param method
+	 *            The {@link IMethod} in question.
+	 * @return The declaring class of target if target is a ctor and the return type
+	 *         otherwise.
+	 */
+	public static TypeReference getEvaluationType(IMethod method) {
+		// if it's a ctor.
+		if (method.isInit())
+			// then, use the declaring type.
+			return method.getDeclaringClass().getReference();
+		else // otherwise.
+				// use the return type.
+			return method.getReturnType();
+	}
 }

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

@@ -127,16 +127,7 @@ protected Map<CallStringTriple, CallStringWithReceivers> getCallStringWithReceiv
 	 */
 	@Override
 	protected int getLength(CGNode caller, CallSiteReference site, IMethod target) {
-		TypeReference typeToCheck;
-
-		// if it's a ctor.
-		if (target.isInit())
-			// then, use the declaring type.
-			typeToCheck = target.getDeclaringClass().getReference();
-		else // otherwise.
-				// use the return type.
-			typeToCheck = target.getReturnType();
-
+		TypeReference typeToCheck = Util.getEvaluationType(target);
 		boolean implementsBaseStream = Util.implementsBaseStream(typeToCheck, target.getClassHierarchy());
 
 		if (implementsBaseStream)