Fix ctor problem in other places.

Author: khatchad

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

@@ -96,9 +96,10 @@ private String findStreamCreationMethod(TypeAbstraction typeAbstraction) {
 	private String findStreamCreationMethod(IClass type) {
 		Collection<com.ibm.wala.classLoader.IMethod> allMethods = type.getAllMethods();
 		for (com.ibm.wala.classLoader.IMethod method : allMethods) {
-			TypeReference returnType = method.getReturnType();
+			TypeReference typeToCheck = Util.getEvaluationType(method);
+
 			// find the first one that returns a stream.
-			if (Util.implementsBaseStream(returnType, this.getClassHierarchy()))
+			if (Util.implementsBaseStream(typeToCheck, this.getClassHierarchy()))
 				return method.getName().toString();
 		}
 

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

@@ -272,10 +272,10 @@ private static Collection<? extends InstanceKey> getAdditionalNecessaryReceivers
 			// who's the caller?
 			LOGGER.fine(() -> "Called method is: " + calledMethod);
 
-			TypeReference returnType = calledMethod.getReturnType();
-			LOGGER.fine(() -> "Return type is: " + returnType);
+			TypeReference evaluationType = Util.getEvaluationType(calledMethod);
+			LOGGER.fine(() -> "Evaluation type is: " + evaluationType);
 
-			boolean implementsBaseStream = Util.implementsBaseStream(returnType, hierarchy);
+			boolean implementsBaseStream = Util.implementsBaseStream(evaluationType, hierarchy);
 			LOGGER.fine(() -> "Is it a stream? " + implementsBaseStream);
 
 			if (implementsBaseStream) {