#103 improve

Author: yiming-tang-cs

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

@@ -637,29 +637,30 @@ private void inferInitialOrdering()
 	 */
 	protected CGNode getEnclosingMethodNode() throws IOException, CoreException, NoEnclosingMethodNodeFoundException {
 		MethodReference methodReference = this.getEnclosingMethodReference();
-		return getEnclosingMethodNode(methodReference);
-	}
-
-	protected CGNode getEnclosingMethodNode(MethodReference methodReference)
-			throws IOException, CoreException, NoEnclosingMethodNodeFoundException {
 		Set<CGNode> nodes = this.getAnalysisEngine().getCallGraph().getNodes(methodReference);
 
 		if (nodes.isEmpty())
 			throw new NoEnclosingMethodNodeFoundException(methodReference);
 		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> getEnclosingMethodNodes()
 			throws IOException, CoreException, NoEnclosingMethodNodeFoundException {
 		HashSet<CGNode> cgNodes = new HashSet<>();
-		com.ibm.wala.classLoader.IMethod[] methods = ((CallStringContext) (getEnclosingMethodNode().getContext()))
-				.getCallString().getMethods();
 
-		for (int i = 0; i < methods.length - 1; ++i) {
-			cgNodes.add(getEnclosingMethodNode(methods[i].getReference()));
+		Iterator<CGNode> cgNodeIterator = this.getAnalysisEngine().getCallGraph().iterator();
+		for (; cgNodeIterator.hasNext();) {
+			cgNodes.add(cgNodeIterator.next());
 		}
-		cgNodes.add(this.getEnclosingMethodNode());
+
 		return cgNodes;
 	}
 

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

@@ -280,7 +280,6 @@ 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?
-				// CGNode cgNode = this.getStream().getEnclosingMethodNode();
 				for (CGNode cgNode : this.getStream().getEnclosingMethodNodes()) {
 					for (Iterator<CallSiteReference> callSites = cgNode.iterateCallSites(); callSites.hasNext();) {
 						CallSiteReference callSiteReference = callSites.next();