Merge branch 'master' into issue_80

khatchad · web-flow · commit fbf16053320e · 2018-02-20T11:39:40.000-05:00
diff --git a/edu.cuny.hunter.streamrefactoring.core/src/edu/cuny/hunter/streamrefactoring/core/analysis/Util.java b/edu.cuny.hunter.streamrefactoring.core/src/edu/cuny/hunter/streamrefactoring/core/analysis/Util.java
@@ -569,6 +569,7 @@ else if (Modifier.isAbstract(clazz.getModifiers()))
 		else
 			return false;
 	}
+  
 
 	public static boolean isBaseStream(IClass clazz) {
 		return Util.isType(clazz, "java/util/stream", "BaseStream");
@@ -707,7 +708,7 @@ public static TypeReference getEvaluationType(IMethod method) {
 				// use the return type.
 			return method.getReturnType();
 	}
-
+  
 	/**
 	 * Returns the index of the first {@link IMethod} in methods that is client
 	 * code.
@@ -727,4 +728,4 @@ public static int findIndexOfFirstClientMethod(IMethod[] methods) {
 	
 		return -1; // not found.
 	}
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -569,6 +569,7 @@ else if (Modifier.isAbstract(clazz.getModifiers()))`
`569`	`569`	`else`
`570`	`570`	`return false;`
`571`	`571`	`}`
	`572`	`+`
`572`	`573`
`573`	`574`	`public static boolean isBaseStream(IClass clazz) {`
`574`	`575`	`return Util.isType(clazz, "java/util/stream", "BaseStream");`
`@@ -707,7 +708,7 @@ public static TypeReference getEvaluationType(IMethod method) {`
`707`	`708`	`// use the return type.`
`708`	`709`	`return method.getReturnType();`
`709`	`710`	`}`
`710`		`-`
	`711`	`+`
`711`	`712`	`/**`
`712`	`713`	`* Returns the index of the first {@link IMethod} in methods that is client`
`713`	`714`	`* code.`
`@@ -727,4 +728,4 @@ public static int findIndexOfFirstClientMethod(IMethod[] methods) {`
`727`	`728`
`728`	`729`	`return -1; // not found.`
`729`	`730`	`}`
`730`		`-}`
	`731`	`+}`