Use iterators instead of streams for tree building.

Author: baffles

codepulse/src/main/scala/com/secdec/codepulse/data/bytecode/CodeForestBuilder.scala

@@ -44,8 +44,8 @@ class CodeForestBuilder {
 	}
 
 	def result = {
-		roots.toStream flatMap { root =>
-			root.streamTree map { node =>
+		roots.toIterator flatMap { root =>
+			root.iterateTree map { node =>
 				val id = node.id
 				val name = node.name
 				val parentId = node.parentId

codepulse/src/main/scala/com/secdec/codepulse/data/bytecode/CodeTree2.scala

@@ -54,9 +54,9 @@ trait CodeTreeNode {
 		for (child <- children) child.visitTree(callback)
 	}
 
-	/* Stream this node and all of its descendants */
-	def streamTree(): Stream[CodeTreeNode] = {
-		this +: (children.toStream.flatMap(_.streamTree))
+	/* Iterate this node and all of its descendants */
+	def iterateTree(): Iterator[CodeTreeNode] = {
+		Iterator.single(this) ++ (children.toIterator.flatMap(_.iterateTree))
 	}
 
 	def findChild(predicate: CodeTreeNode => Boolean): Option[CodeTreeNode] = {

codepulse/src/main/scala/com/secdec/codepulse/tracer/TraceUploadData.scala

@@ -148,7 +148,7 @@ object TraceUploadData {
 		} else {
 			val importer = TreeNodeImporter(traceData.treeNodeData)
 
-			importer ++= treemapNodes map {
+			importer ++= treemapNodes.toIterable map {
 				case (root, node) =>
 					node -> (node.kind match {
 						case CodeTreeNodeKind.Grp | CodeTreeNodeKind.Pkg => Some(tracedGroups contains root.name)