#103 change iterator

Author: yiming-tang-cs

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

@@ -643,24 +643,6 @@ protected CGNode getEnclosingMethodNode() throws IOException, CoreException, NoE
 		else
 			return nodes.iterator().next(); // just return the first.
 	}
-	
-	/**
-	 * add all CGNodes in call graph to a hash set
-	 * @return a hash set of CGNode
-	 * @throws IOException
-	 * @throws CoreException
-	 * @throws NoEnclosingMethodNodeFoundException
-	 */
-	protected HashSet<CGNode> getCGNodesInGraph() throws IOException, CoreException {
-		HashSet<CGNode> cgNodes = new HashSet<>();
-
-		Iterator<CGNode> cgNodeIterator = this.getAnalysisEngine().getCallGraph().iterator();
-		for (; cgNodeIterator.hasNext();) {
-			cgNodes.add(cgNodeIterator.next());
-		}
-
-		return cgNodes;
-	}
 
 	/**
 	 * Returns true iff all of the predecessors of all of the given {@link CGNode}s

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

@@ -280,7 +280,9 @@ public void start() throws IOException, CoreException, CallGraphBuilderCancelExc
 				// the node of where the stream was declared: TODO: Can this be
 				// somehow rewritten to get blocks corresponding to terminal
 				// operations?
-				for (CGNode cgNode : this.getStream().getCGNodesInGraph()) {
+				Iterator<CGNode> cgNodes = this.getStream().getAnalysisEngine().getCallGraph().iterator();
+				for (;cgNodes.hasNext();) {
+					CGNode cgNode = cgNodes.next();
 					for (Iterator<CallSiteReference> callSites = cgNode.iterateCallSites(); callSites.hasNext();) {
 						CallSiteReference callSiteReference = callSites.next();
 						MethodReference calledMethod = callSiteReference.getDeclaredTarget();