Merge branch 'master' of https://github.com/ponder-lab/Java-8-Stream-Refactoring

Author: khatchad

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

@@ -1,5 +1,8 @@
 package edu.cuny.hunter.streamrefactoring.core.analysis;
 
+import static edu.cuny.hunter.streamrefactoring.core.wala.AnalysisUtils.isJDKClass;
+import static edu.cuny.hunter.streamrefactoring.core.wala.AnalysisUtils.isLibraryClass;
+
 import java.io.UTFDataFormatException;
 import java.lang.reflect.Modifier;
 import java.util.ArrayList;
@@ -172,7 +175,7 @@ public static Set<Entrypoint> findBenchmarkEntryPoints(IClassHierarchy classHier
 		final Set<Entrypoint> result = new HashSet<>();
 
 		for (IClass klass : classHierarchy)
-			if (!AnalysisUtils.isJDKClass(klass)) {
+			if (!(isJDKClass(klass) || isLibraryClass(klass))) {
 				boolean isBenchmarkClass = false;
 				// iterate over all declared methods
 				for (com.ibm.wala.classLoader.IMethod method : klass.getDeclaredMethods()) {
@@ -218,7 +221,7 @@ public static Set<Entrypoint> findEntryPoints(IClassHierarchy classHierarchy) {
 		final Set<Entrypoint> result = new HashSet<>();
 
 		for (IClass klass : classHierarchy)
-			if (!AnalysisUtils.isJDKClass(klass)) {
+			if (!(isJDKClass(klass) || isLibraryClass(klass)))
 				boolean entryPointClass = false;
 				boolean addedInstanceMethod = false;