Clean up.

Author: khatchad

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

@@ -117,6 +117,13 @@ public boolean visit(MethodInvocation node) {
 
 	private static final String SETUP = "org.openjdk.jmh.annotations.Setup";
 
+	private static void addEntryPoint(Set<Entrypoint> result, final IMethod method, IClassHierarchy classHierarchy) {
+		if (method != null) {
+			Entrypoint entrypoint = new DefaultEntrypoint(method, classHierarchy);
+			result.add(entrypoint);
+		}
+	}
+
 	public static boolean allEqual(Collection<?> collection) {
 		if (collection.isEmpty())
 			return true;
@@ -196,13 +203,6 @@ public static Set<Entrypoint> findBenchmarkEntryPoints(IClassHierarchy classHier
 		return result;
 	}
 
-	private static void addEntryPoint(Set<Entrypoint> result, final IMethod method, IClassHierarchy classHierarchy) {
-		if (method != null) {
-			Entrypoint entrypoint = new DefaultEntrypoint(method, classHierarchy);
-			result.add(entrypoint);
-		}
-	}
-
 	private static MethodInvocation findCorrespondingMethodInvocation(CompilationUnit unit,
 			SourcePosition sourcePosition, MethodReference method) {
 		CorrespondingASTVisitor visitor = new CorrespondingASTVisitor(unit, sourcePosition, method);
@@ -261,32 +261,6 @@ public static Set<Entrypoint> findEntryPoints(IClassHierarchy classHierarchy) {
 		return result;
 	}
 
-	/**
-	 * A null get value means that there is no unique ctor.
-	 * 
-	 * @param klass
-	 *            The {@link IClass} to find a unique ctor.
-	 * @return The one and only ctor for klass and <code>null</code> if it doesn't
-	 *         exist.
-	 */
-	private static IMethod getUniqueConstructor(IClass klass) {
-		// try to find the default ctor.
-		IMethod ctor = klass.getMethod(MethodReference.initSelector);
-
-		// if not found, get all constructors.
-		if (ctor == null) {
-			Set<IMethod> allDeclaredConstructors = klass.getDeclaredMethods().stream()
-					.filter(m -> m.getName().startsWith(MethodReference.initAtom)).collect(Collectors.toSet());
-
-			// if there is a unique one.
-			if (allDeclaredConstructors.size() == 1)
-				// use that.
-				ctor = allDeclaredConstructors.iterator().next();
-		}
-
-		return ctor;
-	}
-
 	static Set<ITypeBinding> getAllInterfaces(ITypeBinding type) {
 		Set<ITypeBinding> ret = new HashSet<>();
 		ITypeBinding[] interfaces = type.getInterfaces();
@@ -495,6 +469,32 @@ public static Collection<TypeAbstraction> getPossibleTypesInterprocedurally(CGNo
 		return ret;
 	}
 
+	/**
+	 * A null get value means that there is no unique ctor.
+	 *
+	 * @param klass
+	 *            The {@link IClass} to find a unique ctor.
+	 * @return The one and only ctor for klass and <code>null</code> if it doesn't
+	 *         exist.
+	 */
+	private static IMethod getUniqueConstructor(IClass klass) {
+		// try to find the default ctor.
+		IMethod ctor = klass.getMethod(MethodReference.initSelector);
+
+		// if not found, get all constructors.
+		if (ctor == null) {
+			Set<IMethod> allDeclaredConstructors = klass.getDeclaredMethods().stream()
+					.filter(m -> m.getName().startsWith(MethodReference.initAtom)).collect(Collectors.toSet());
+
+			// if there is a unique one.
+			if (allDeclaredConstructors.size() == 1)
+				// use that.
+				ctor = allDeclaredConstructors.iterator().next();
+		}
+
+		return ctor;
+	}
+
 	static boolean implementsBaseStream(ITypeBinding type) {
 		Set<ITypeBinding> implementedInterfaces = getImplementedInterfaces(type);
 		return implementedInterfaces.stream()