More work on #148.

Author: khatchad

edu.cuny.hunter.streamrefactoring.core/src/edu/cuny/hunter/streamrefactoring/core/safe/InstructionBasedSolver.java

@@ -21,7 +21,7 @@
 import edu.cuny.hunter.streamrefactoring.core.utils.LoggerNames;
 
 public class InstructionBasedSolver extends TrackingUniqueSolver {
-	
+
 	private static final Logger LOGGER = Logger.getLogger(LoggerNames.LOGGER_NAME);
 
 	private SSAInvokeInstruction instruction;
@@ -43,7 +43,7 @@ protected Collection<InstanceKey> computeTrackedInstances() throws PropertiesExc
 
 		for (InstanceKey instanceKey : trackedInstancesByType) {
 			LOGGER.info("Examining instance: " + instanceKey);
-			if (Util.instanceKeyCorrespondsWithInstantiationInstruction(instanceKey, this.getInstruction(),
+			if (Util.instanceKeyCorrespondsWithInstantiationInstruction(instanceKey, this.getInstruction(), null,
 					this.getCallGraph()))
 				ret.add(instanceKey);
 		}

edu.cuny.hunter.streamrefactoring.tests/resources/ConvertStreamToParallel/testConcat/in/A.java

@@ -11,6 +11,7 @@
 class A {
 	@EntryPoint
 	void m() {
-		concat(new HashSet().parallelStream(), new HashSet().parallelStream()).count();
+		concat(new HashSet().parallelStream(),
+				new HashSet().parallelStream()).count();
 	}
-}
+}