Clean up.

Author: khatchad

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

@@ -3,6 +3,8 @@
  */
 package edu.cuny.hunter.streamrefactoring.core.utils;
 
+import static org.eclipse.jdt.core.dom.ASTNode.PARENTHESIZED_EXPRESSION;
+
 import java.util.Optional;
 
 import org.eclipse.core.runtime.CoreException;
@@ -155,7 +157,7 @@ public static String getQualifiedNameFromTypeSignature(String typeSignature, ITy
 	}
 
 	public static ASTNode stripParenthesizedExpressions(ASTNode node) {
-		if (node != null && node.getNodeType() == ASTNode.PARENTHESIZED_EXPRESSION) {
+		if (node != null && node.getNodeType() == PARENTHESIZED_EXPRESSION) {
 			ParenthesizedExpression parenthesizedExpression = (ParenthesizedExpression) node;
 			return stripParenthesizedExpressions(parenthesizedExpression.getExpression());
 		} else

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

@@ -3,9 +3,14 @@
  */
 package edu.cuny.hunter.streamrefactoring.core.wala;
 
+import static com.ibm.wala.ide.util.EclipseProjectPath.AnalysisScopeType.NO_SOURCE;
+import static com.ibm.wala.types.ClassLoaderReference.Primordial;
+import static edu.cuny.hunter.streamrefactoring.core.utils.LoggerNames.LOGGER_NAME;
+
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
+import java.nio.file.Path;
 import java.util.jar.JarFile;
 import java.util.logging.Logger;
 
@@ -17,7 +22,6 @@
 
 import com.ibm.wala.cast.java.client.JDTJavaSourceAnalysisEngine;
 import com.ibm.wala.ide.util.EclipseProjectPath;
-import com.ibm.wala.ide.util.EclipseProjectPath.AnalysisScopeType;
 import com.ibm.wala.ipa.callgraph.AnalysisCache;
 import com.ibm.wala.ipa.callgraph.AnalysisOptions;
 import com.ibm.wala.ipa.callgraph.CallGraph;
@@ -32,8 +36,6 @@
 import com.ibm.wala.util.CancelException;
 import com.ibm.wala.util.config.FileOfClasses;
 
-import edu.cuny.hunter.streamrefactoring.core.utils.LoggerNames;
-
 /**
  * Modified from EclipseAnalysisEngine.java, originally from Keshmesh. Authored
  * by Mohsen Vakilian and Stas Negara. Modified by Nicholas Chen and Raffi
@@ -42,7 +44,7 @@
  */
 public class EclipseProjectAnalysisEngine<I extends InstanceKey> extends JDTJavaSourceAnalysisEngine<I> {
 
-	private static final Logger LOGGER = Logger.getLogger(LoggerNames.LOGGER_NAME);
+	private static final Logger LOGGER = Logger.getLogger(LOGGER_NAME);
 
 	/**
 	 * The N value used to create the {@link nCFABuilder}.
@@ -94,7 +96,7 @@ public void buildAnalysisScope() throws IOException {
 
 			IVMInstall defaultVMInstall = JavaRuntime.getDefaultVMInstall();
 			File installLocation = defaultVMInstall.getInstallLocation();
-			java.nio.file.Path installPath = installLocation.toPath();
+			Path installPath = installLocation.toPath();
 
 			if (Util.isWindows()) {
 				addToScopeWindows("resources.jar", installPath);
@@ -118,21 +120,19 @@ public void buildAnalysisScope() throws IOException {
 		}
 	}
 
-	void addToScopeWindows(String fileName, java.nio.file.Path installPath) throws IOException {
-		scope.addToScope(ClassLoaderReference.Primordial,
-				new JarFile(installPath.resolve("lib").resolve(fileName).toFile()));
+	void addToScopeWindows(String fileName, Path installPath) throws IOException {
+		scope.addToScope(Primordial, new JarFile(installPath.resolve("lib").resolve(fileName).toFile()));
 	}
 
-	void addToScopeNotWindows(String fileName, java.nio.file.Path installPath) throws IOException {
-		scope.addToScope(ClassLoaderReference.Primordial,
-				new JarFile(installPath.resolve("jre").resolve("lib").resolve(fileName).toFile()));
+	void addToScopeNotWindows(String fileName, Path installPath) throws IOException {
+		scope.addToScope(Primordial, new JarFile(installPath.resolve("jre").resolve("lib").resolve(fileName).toFile()));
 	}
 
 	@Override
 	protected EclipseProjectPath<?, IJavaProject> createProjectPath(IJavaProject project)
 			throws IOException, CoreException {
 		project.open(new NullProgressMonitor());
-		return TestableJavaEclipseProjectPath.create(project, AnalysisScopeType.NO_SOURCE);
+		return TestableJavaEclipseProjectPath.create(project, NO_SOURCE);
 	}
 
 	@Override

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

@@ -2,6 +2,14 @@
 
 import static com.ibm.wala.ipa.callgraph.impl.Util.addDefaultBypassLogic;
 import static com.ibm.wala.ipa.callgraph.impl.Util.addDefaultSelectors;
+import static com.ibm.wala.ipa.callgraph.propagation.cfa.ZeroXInstanceKeys.ALLOCATIONS;
+import static com.ibm.wala.ipa.callgraph.propagation.cfa.ZeroXInstanceKeys.SMUSH_MANY;
+import static com.ibm.wala.ipa.callgraph.propagation.cfa.ZeroXInstanceKeys.SMUSH_PRIMITIVE_HOLDERS;
+import static com.ibm.wala.ipa.callgraph.propagation.cfa.ZeroXInstanceKeys.SMUSH_STRINGS;
+import static com.ibm.wala.ipa.callgraph.propagation.cfa.ZeroXInstanceKeys.SMUSH_THROWABLES;
+import static com.ibm.wala.types.ClassLoaderReference.Application;
+import static com.ibm.wala.types.ClassLoaderReference.Extension;
+import static com.ibm.wala.types.ClassLoaderReference.Primordial;
 
 import java.io.File;
 import java.io.IOException;
@@ -83,8 +91,7 @@ public static SSAPropagationCallGraphBuilder makeNCFABuilder(int n, AnalysisOpti
 		// nCFABuilder uses type-based heap abstraction by default, but we want
 		// allocation sites
 		result.setInstanceKeys(new ZeroXInstanceKeys(options, cha, result.getContextInterpreter(),
-				ZeroXInstanceKeys.ALLOCATIONS | ZeroXInstanceKeys.SMUSH_MANY | ZeroXInstanceKeys.SMUSH_PRIMITIVE_HOLDERS
-						| ZeroXInstanceKeys.SMUSH_STRINGS | ZeroXInstanceKeys.SMUSH_THROWABLES));
+				ALLOCATIONS | SMUSH_MANY | SMUSH_PRIMITIVE_HOLDERS | SMUSH_STRINGS | SMUSH_THROWABLES));
 		return result;
 	}
 
@@ -98,9 +105,9 @@ public static AnalysisScope mergeProjectPaths(Collection<EclipseProjectPath> pro
 		// to avoid duplicates, we first add all application modules, then
 		// extension
 		// modules, then primordial
-		buildScope(ClassLoaderReference.Application, projectPaths, scope, seen);
-		buildScope(ClassLoaderReference.Extension, projectPaths, scope, seen);
-		buildScope(ClassLoaderReference.Primordial, projectPaths, scope, seen);
+		buildScope(Application, projectPaths, scope, seen);
+		buildScope(Extension, projectPaths, scope, seen);
+		buildScope(Primordial, projectPaths, scope, seen);
 		return scope;
 	}