Progress.

Author: khatchad

edu.cuny.hunter.streamrefactoring.core/src/edu/cuny/hunter/streamrefactoring/core/messages/messages.properties

@@ -2,6 +2,7 @@ Name=Optimize Streams
 CategoryName=Stream Changes
 CategoryDescription=Optimizes Java 8 streams
 StreamsNotSpecified=No streams to refactor.
-CheckingPreconditions=Checking preconditions...
+CheckingPreconditions=Checking preconditions (may take a while)...
 CompilingSource=Compiling source ...
-CreatingChange=Creating change...
+CreatingChange=Creating change...
+NoStreamsHavePassedThePreconditions=No streams have passed preconditions.

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

@@ -466,21 +466,6 @@ public Set<Stream> getStreamSet() {
 		return this.streamSet;
 	}
 
-	private ITypeHierarchy getTypeHierarchy(IType type, Optional<IProgressMonitor> monitor) throws JavaModelException {
-		try {
-			ITypeHierarchy ret = this.getTypeToTypeHierarchyMap().get(type);
-
-			if (ret == null) {
-				ret = type.newTypeHierarchy(monitor.orElseGet(NullProgressMonitor::new));
-				this.getTypeToTypeHierarchyMap().put(type, ret);
-			}
-
-			return ret;
-		} finally {
-			monitor.ifPresent(IProgressMonitor::done);
-		}
-	}
-
 	protected Map<ITypeRoot, CompilationUnit> getTypeRootToCompilationUnitMap() {
 		return this.typeRootToCompilationUnitMap;
 	}
@@ -493,19 +478,35 @@ public Set<Stream> getUnoptimizableStreams() {
 		return this.getStreamSet().parallelStream().filter(s -> s.getStatus().hasError()).collect(Collectors.toSet());
 	}
 
-	private boolean getUseImplicitBenchmarkEntrypoints() {
+	public boolean getUseImplicitBenchmarkEntrypoints() {
 		return this.useImplicitBenchmarkEntrypoints;
 	}
 
-	private boolean getUseImplicitEntrypoints() {
+	public boolean getUseImplicitEntrypoints() {
 		return this.useImplicitEntrypoints;
 	}
 
-	private boolean getUseImplicitJavaFXEntrypoints() {
+	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;
 	}
 
-	private boolean getUseImplicitTestEntrypoints() {
+	public boolean getUseImplicitTestEntrypoints() {
 		return this.useImplicitTestEntrypoints;
 	}
 

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

@@ -15,7 +15,7 @@
 import org.eclipse.jdt.internal.corext.refactoring.Checks;
 import org.eclipse.jdt.internal.corext.util.JdtFlags;
 
-import edu.cuny.hunter.streamrefactoring.core.refactorings.ConvertToParallelStreamRefactoringProcessor;
+import edu.cuny.hunter.streamrefactoring.core.refactorings.OptimizeStreamsRefactoringProcessor;
 
 /**
  * @author <a href="mailto:[email protected]">Raffi
@@ -64,7 +64,7 @@ private RefactoringAvailabilityTester() {
 //		}
 //
 //		// ensure that there is a target method.
-//		IMethod targetMethod = ConvertToParallelStreamRefactoringProcessor.getTargetMethod(method,
+//		IMethod targetMethod = OptimizeStreamsRefactoringProcessor.getTargetMethod(method,
 //				monitor);
 //		if (targetMethod == null) // no possible target.
 //			return false;

edu.cuny.hunter.streamrefactoring.ui/src/edu/cuny/hunter/streamrefactoring/ui/handlers/OptimizeStreamHandler.java

@@ -1,6 +1,5 @@
 package edu.cuny.hunter.streamrefactoring.ui.handlers;
 
-import java.util.Formatter;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Optional;
@@ -10,24 +9,15 @@
 import org.eclipse.core.commands.ExecutionEvent;
 import org.eclipse.core.commands.ExecutionException;
 import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jdt.core.ICompilationUnit;
 import org.eclipse.jdt.core.IJavaElement;
 import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jdt.core.IPackageFragmentRoot;
-import org.eclipse.jdt.core.IType;
 import org.eclipse.jdt.core.JavaModelException;
 import org.eclipse.jdt.internal.ui.JavaPlugin;
 import org.eclipse.jdt.internal.ui.util.SelectionUtil;
-import org.eclipse.jdt.ui.JavaElementLabels;
 import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.ui.handlers.HandlerUtil;
-import org.osgi.framework.FrameworkUtil;
 
 import edu.cuny.hunter.streamrefactoring.ui.messages.Messages;
 import edu.cuny.hunter.streamrefactoring.ui.wizards.OptimizeStreamRefactoringWizard;
@@ -70,85 +60,4 @@ public Object execute(ExecutionEvent event) throws ExecutionException {
 			}
 		return null;
 	}
-
-	private Set<IMethod> extractMethodsFromClass(IType type, Optional<IProgressMonitor> monitor)
-			throws JavaModelException {
-		Set<IMethod> methodSet = new HashSet<>();
-
-		if (type.isClass())
-			for (IMethod method : type.getMethods())
-				// if (RefactoringAvailabilityTester.isInterfaceMigrationAvailable(method,
-				// monitor)) {
-				if (true) {
-					this.logPossiblyMigratableMethod(method);
-					methodSet.add(method);
-				} else
-					this.logNonMigratableMethod(method);
-
-		return methodSet;
-	}
-
-	private Set<IMethod> extractMethodsFromCompilationUnit(ICompilationUnit cu, Optional<IProgressMonitor> monitor)
-			throws JavaModelException {
-		Set<IMethod> methodSet = new HashSet<>();
-		IType[] types = cu.getTypes();
-
-		for (IType iType : types)
-			methodSet.addAll(this.extractMethodsFromClass(iType, monitor));
-
-		return methodSet;
-	}
-
-	private Set<IMethod> extractMethodsFromJavaProject(IJavaProject jProj, Optional<IProgressMonitor> monitor)
-			throws JavaModelException {
-		Set<IMethod> methodSet = new HashSet<>();
-
-		IPackageFragmentRoot[] roots = jProj.getPackageFragmentRoots();
-		for (IPackageFragmentRoot iPackageFragmentRoot : roots)
-			methodSet.addAll(this.extractMethodsFromPackageFragmentRoot(iPackageFragmentRoot, monitor));
-
-		return methodSet;
-	}
-
-	private Set<IMethod> extractMethodsFromPackageFragment(IPackageFragment frag, Optional<IProgressMonitor> monitor)
-			throws JavaModelException {
-		Set<IMethod> methodSet = new HashSet<>();
-		ICompilationUnit[] units = frag.getCompilationUnits();
-
-		for (ICompilationUnit iCompilationUnit : units)
-			methodSet.addAll(this.extractMethodsFromCompilationUnit(iCompilationUnit, monitor));
-
-		return methodSet;
-	}
-
-	private Set<IMethod> extractMethodsFromPackageFragmentRoot(IPackageFragmentRoot root,
-			Optional<IProgressMonitor> monitor) throws JavaModelException {
-		Set<IMethod> methodSet = new HashSet<>();
-
-		IJavaElement[] children = root.getChildren();
-		for (IJavaElement child : children)
-			if (child.getElementType() == IJavaElement.PACKAGE_FRAGMENT)
-				methodSet.addAll(this.extractMethodsFromPackageFragment((IPackageFragment) child, monitor));
-
-		return methodSet;
-	}
-
-	private void logMethod(IMethod method, String format) {
-		Formatter formatter = new Formatter();
-
-		formatter.format(format, JavaElementLabels.getElementLabel(method, JavaElementLabels.ALL_FULLY_QUALIFIED));
-
-		JavaPlugin.log(new Status(IStatus.INFO, FrameworkUtil.getBundle(this.getClass()).getSymbolicName(),
-				formatter.toString()));
-
-		formatter.close();
-	}
-
-	private void logNonMigratableMethod(IMethod method) {
-		this.logMethod(method, "Method: %s is not migratable.");
-	}
-
-	private void logPossiblyMigratableMethod(IMethod method) {
-		this.logMethod(method, "Method: %s is possibly migratable.");
-	}
 }