Clean up.

Author: khatchad

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

@@ -1,6 +1,6 @@
 package edu.cuny.hunter.streamrefactoring.core.analysis;
 
 public enum ExecutionMode {
-	SEQUENTIAL,
-	PARALLEL
+	PARALLEL,
+	SEQUENTIAL
 }

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

@@ -3,25 +3,24 @@
 import java.util.Arrays;
 
 public enum PreconditionFailure {
-	INCONSISTENT_POSSIBLE_STREAM_SOURCE_ORDERING(1),
-	NON_ITERABLE_POSSIBLE_STREAM_SOURCE(2),
-	NON_INSTANTIABLE_POSSIBLE_STREAM_SOURCE(3),
-	NON_DETERMINABLE_STREAM_SOURCE_ORDERING(4),
-	NON_DETERMINABLE_REDUCTION_ORDERING(5),
+	CURRENTLY_NOT_HANDLED(14),
+	HAS_SIDE_EFFECTS(8),
+	HAS_SIDE_EFFECTS2(9),
 	INCONSISTENT_POSSIBLE_EXECUTION_MODES(6),
 	INCONSISTENT_POSSIBLE_ORDERINGS(7),
-	HAS_SIDE_EFFECTS(8), // P1.
-	HAS_SIDE_EFFECTS2(9), // P2.
-	REDUCE_ORDERING_MATTERS(10), // P3.
-	NO_STATEFUL_INTERMEDIATE_OPERATIONS(11), // P4 or P5.
-	UNORDERED(12), // P4 or P4.
-	NO_TERMINAL_OPERATIONS(13),
-	CURRENTLY_NOT_HANDLED(14), // should just be #97 currently.
-	STREAM_CODE_NOT_REACHABLE(15), // either pivotal code isn't reachable or
+	INCONSISTENT_POSSIBLE_STREAM_SOURCE_ORDERING(1),
+	NO_APPLICATION_CODE_IN_CALL_STRINGS(17),
 	// entry points are misconfigured.
-	NO_ENTRY_POINT(16), // user didn't specify entry points.
-	NO_APPLICATION_CODE_IN_CALL_STRINGS(17); // N may be too small.
-
+	NO_ENTRY_POINT(16), // P1.
+	NO_STATEFUL_INTERMEDIATE_OPERATIONS(11), // P2.
+	NO_TERMINAL_OPERATIONS(13), // P3.
+	NON_DETERMINABLE_REDUCTION_ORDERING(5), // P4 or P5.
+	NON_DETERMINABLE_STREAM_SOURCE_ORDERING(4), // P4 or P4.
+	NON_INSTANTIABLE_POSSIBLE_STREAM_SOURCE(3),
+	NON_ITERABLE_POSSIBLE_STREAM_SOURCE(2), // should just be #97 currently.
+	REDUCE_ORDERING_MATTERS(10), // either pivotal code isn't reachable or
+	STREAM_CODE_NOT_REACHABLE(15), // user didn't specify entry points.
+	UNORDERED(12); // N may be too small.
 
 	static {
 		// check that the codes are unique.

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

@@ -181,7 +181,7 @@ public StreamAnalyzer(boolean visitDocTags, int nForStreams, boolean findImplici
 
 	/**
 	 * Analyzes this {@link StreamAnalyzer}'s streams.
-	 * 
+	 *
 	 * @param subMonitor
 	 * @param optional
 	 *

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

@@ -2,7 +2,7 @@
 
 public enum TransformationAction {
 	CONVERT_TO_PARALLEL,
-	UNORDER,
-	CONVERT_TO_SEQUENTIAL
+	CONVERT_TO_SEQUENTIAL,
+	UNORDER
 
 }

edu.cuny.hunter.streamrefactoring.core/src/edu/cuny/hunter/streamrefactoring/core/messages/Messages.java

@@ -6,7 +6,8 @@
 import org.eclipse.osgi.util.NLS;
 
 /**
- * @author <a href="mailto:[email protected]">Raffi Khatchadourian</a>
+ * @author <a href="mailto:[email protected]">Raffi
+ *         Khatchadourian</a>
  */
 public class Messages extends NLS {
 	private static final String BUNDLE_NAME = "edu.cuny.hunter.streamrefactoring.core.messages.messages"; //$NON-NLS-1$
@@ -19,10 +20,10 @@ public class Messages extends NLS {
 	public static String Name;
 	public static String NoStreamsHavePassedThePreconditions;
 	public static String NoStreamsToConvert;
+	public static String NoStreamsToOptimize;
 	public static String PreconditionFailed;
 	public static String RefactoringNotPossible;
 	public static String StreamsNotSpecified;
-	public static String NoStreamsToOptimize;
 
 	static {
 		// initialize resource bundle

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

@@ -358,7 +358,7 @@ public Change createChange(IProgressMonitor pm) throws CoreException, OperationC
 
 			pm.beginTask("Transforming streams ...", optimizableStreams.size());
 			for (Stream stream : optimizableStreams) {
-				CompilationUnitRewrite rewrite = getCompilationUnitRewrite(
+				CompilationUnitRewrite rewrite = this.getCompilationUnitRewrite(
 						stream.getEnclosingEclipseMethod().getCompilationUnit(), stream.getEnclosingCompilationUnit());
 				stream.transform(rewrite);
 				pm.worked(1);
@@ -510,22 +510,6 @@ public boolean getUseImplicitEntrypoints() {
 		return this.useImplicitEntrypoints;
 	}
 
-	public void setUseImplicitBenchmarkEntrypoints(boolean useImplicitBenchmarkEntrypoints) {
-		this.useImplicitBenchmarkEntrypoints = useImplicitBenchmarkEntrypoints;
-	}
-
-	public void setUseImplicitEntrypoints(boolean useImplicitEntrypoints) {
-		this.useImplicitEntrypoints = useImplicitEntrypoints;
-	}
-
-	public void setUseImplicitJavaFXEntrypoints(boolean useImplicitJavaFXEntrypoints) {
-		this.useImplicitJavaFXEntrypoints = useImplicitJavaFXEntrypoints;
-	}
-
-	public void setUseImplicitTestEntrypoints(boolean useImplicitTestEntrypoints) {
-		this.useImplicitTestEntrypoints = useImplicitTestEntrypoints;
-	}
-
 	public boolean getUseImplicitJavaFXEntrypoints() {
 		return this.useImplicitJavaFXEntrypoints;
 	}
@@ -580,4 +564,20 @@ protected void setNumberOfSkippedStreamInstances(int numberOfSkippedStreamInstan
 	protected void setStreamSet(Set<Stream> streamSet) {
 		this.streamSet = streamSet;
 	}
+
+	public void setUseImplicitBenchmarkEntrypoints(boolean useImplicitBenchmarkEntrypoints) {
+		this.useImplicitBenchmarkEntrypoints = useImplicitBenchmarkEntrypoints;
+	}
+
+	public void setUseImplicitEntrypoints(boolean useImplicitEntrypoints) {
+		this.useImplicitEntrypoints = useImplicitEntrypoints;
+	}
+
+	public void setUseImplicitJavaFXEntrypoints(boolean useImplicitJavaFXEntrypoints) {
+		this.useImplicitJavaFXEntrypoints = useImplicitJavaFXEntrypoints;
+	}
+
+	public void setUseImplicitTestEntrypoints(boolean useImplicitTestEntrypoints) {
+		this.useImplicitTestEntrypoints = useImplicitTestEntrypoints;
+	}
 }

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

@@ -40,31 +40,31 @@ public static OptimizeStreamsRefactoringProcessor createConvertToParallelStreamR
 			boolean useImplicitBenchmarkEntrypoints, boolean useImplicitJavaFXEntrypoints,
 			Optional<IProgressMonitor> monitor) throws JavaModelException {
 		CodeGenerationSettings settings = JavaPreferencesSettings.getCodeGenerationSettings(projects[0]);
-		OptimizeStreamsRefactoringProcessor processor = new OptimizeStreamsRefactoringProcessor(
-				projects, settings, false, useImplicitEntrypoints, useImplicitTestEntrypoints,
-				useImplicitBenchmarkEntrypoints, useImplicitJavaFXEntrypoints, monitor);
+		OptimizeStreamsRefactoringProcessor processor = new OptimizeStreamsRefactoringProcessor(projects, settings,
+				false, useImplicitEntrypoints, useImplicitTestEntrypoints, useImplicitBenchmarkEntrypoints,
+				useImplicitJavaFXEntrypoints, monitor);
 		return processor;
 	}
 
 	public static OptimizeStreamsRefactoringProcessor createConvertToParallelStreamRefactoringProcessor(
 			IJavaProject[] projects, int nForStreams, boolean useImplicitEntrypoints,
 			boolean useImplicitTestEntrypoints, boolean useImplicitBenchmarkEntrypoints,
 			boolean useImplicitJavaFXEntrypoints, Optional<IProgressMonitor> monitor) throws JavaModelException {
-		OptimizeStreamsRefactoringProcessor processor = createConvertToParallelStreamRefactoringProcessor(
-				projects, useImplicitEntrypoints, useImplicitTestEntrypoints, useImplicitBenchmarkEntrypoints,
+		OptimizeStreamsRefactoringProcessor processor = createConvertToParallelStreamRefactoringProcessor(projects,
+				useImplicitEntrypoints, useImplicitTestEntrypoints, useImplicitBenchmarkEntrypoints,
 				useImplicitJavaFXEntrypoints, monitor);
 		processor.setNForStreams(nForStreams);
 		return processor;
 	}
 
 	public static OptimizeStreamsRefactoringProcessor createConvertToParallelStreamRefactoringProcessor(
 			IJavaProject[] projects, Optional<IProgressMonitor> monitor) throws JavaModelException {
-		if (projects.length < 1) 
+		if (projects.length < 1)
 			throw new IllegalArgumentException("No projects.");
-		
+
 		CodeGenerationSettings settings = JavaPreferencesSettings.getCodeGenerationSettings(projects[0]);
-		OptimizeStreamsRefactoringProcessor processor = new OptimizeStreamsRefactoringProcessor(
-				projects, settings, monitor);
+		OptimizeStreamsRefactoringProcessor processor = new OptimizeStreamsRefactoringProcessor(projects, settings,
+				monitor);
 		return processor;
 	}
 
@@ -75,8 +75,8 @@ public static ProcessorBasedRefactoring createRefactoring() throws JavaModelExce
 
 	public static ProcessorBasedRefactoring createRefactoring(IJavaProject[] projects,
 			Optional<IProgressMonitor> monitor) throws JavaModelException {
-		OptimizeStreamsRefactoringProcessor processor = createConvertToParallelStreamRefactoringProcessor(
-				projects, monitor);
+		OptimizeStreamsRefactoringProcessor processor = createConvertToParallelStreamRefactoringProcessor(projects,
+				monitor);
 		return new ProcessorBasedRefactoring(processor);
 	}
 

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

@@ -38,7 +38,6 @@
 import com.ibm.wala.ipa.cha.IClassHierarchy;
 import com.ibm.wala.types.ClassLoaderReference;
 import com.ibm.wala.util.CancelException;
-import com.ibm.wala.util.MonitorUtil;
 import com.ibm.wala.util.config.FileOfClasses;
 
 /**