Internalize transformation.

Author: khatchad

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

@@ -772,21 +772,38 @@ public String toString() {
 		return builder.toString();
 	}
 
-	public void convertToParallel(CompilationUnitRewrite rewrite) {
+	protected void convertToParallel(CompilationUnitRewrite rewrite) {
 		LOGGER.info("Converting to parallel.");
 		MethodInvocation creation = this.getCreation();
 		ASTRewrite astRewrite = rewrite.getASTRewrite();
 		SimpleName newMethodName = creation.getAST().newSimpleName("parallelStream");
 		astRewrite.replace(creation.getName(), newMethodName, null);
 	}
 
-	public void convertToSequential(CompilationUnitRewrite rewrite) {
+	protected void convertToSequential(CompilationUnitRewrite rewrite) {
 		// TODO Auto-generated method stub
 		LOGGER.info("Converting to sequential.");
 	}
 
-	public void unorder(CompilationUnitRewrite rewrite) {
+	protected void unorder(CompilationUnitRewrite rewrite) {
 		// TODO Auto-generated method stub
 		LOGGER.info("Unordering.");
 	}
+
+	public void transform(CompilationUnitRewrite rewrite) {
+		// for each stream transformation.
+		for (TransformationAction action : getActions()) {
+			switch (action) {
+			case CONVERT_TO_PARALLEL:
+				convertToParallel(rewrite);
+				break;
+			case CONVERT_TO_SEQUENTIAL:
+				convertToSequential(rewrite);
+				break;
+			case UNORDER:
+				unorder(rewrite);
+				break;
+			}
+		}
+	}
 }

edu.cuny.hunter.streamrefactoring.core/src/edu/cuny/hunter/streamrefactoring/core/refactorings/OptimizeStreamsRefactoringProcessor.java

@@ -57,7 +57,6 @@
 import edu.cuny.hunter.streamrefactoring.core.analysis.PreconditionFailure;
 import edu.cuny.hunter.streamrefactoring.core.analysis.Stream;
 import edu.cuny.hunter.streamrefactoring.core.analysis.StreamAnalyzer;
-import edu.cuny.hunter.streamrefactoring.core.analysis.TransformationAction;
 import edu.cuny.hunter.streamrefactoring.core.descriptors.OptimizeStreamRefactoringDescriptor;
 import edu.cuny.hunter.streamrefactoring.core.messages.Messages;
 import edu.cuny.hunter.streamrefactoring.core.utils.TimeCollector;
@@ -349,21 +348,7 @@ public Change createChange(IProgressMonitor pm) throws CoreException, OperationC
 			for (Stream stream : optimizableStreams) {
 				CompilationUnitRewrite rewrite = getCompilationUnitRewrite(stream.getEnclosingEclipseMethod().getCompilationUnit(),
 						stream.getEnclosingCompilationUnit());
-				
-				// for each stream transformation.
-				for (TransformationAction action : stream.getActions()) {
-					switch (action) {
-					case CONVERT_TO_PARALLEL:
-						stream.convertToParallel(rewrite);
-						break;
-					case CONVERT_TO_SEQUENTIAL:
-						stream.convertToSequential(rewrite);
-						break;
-					case UNORDER:
-						stream.unorder(rewrite);
-						break;
-					}
-				}
+				stream.transform(rewrite);
 				pm.worked(1);
 			}