From f0a9305ba202c2c60d559cdcff2a55c3a2ffcbdf Mon Sep 17 00:00:00 2001 From: Mark Harrah Date: Sat, 23 Jul 2011 23:07:54 -0400 Subject: [PATCH] clean up graphSettings --- main/Project.scala | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/main/Project.scala b/main/Project.scala index 3920b1a66..77b865c9b 100644 --- a/main/Project.scala +++ b/main/Project.scala @@ -266,15 +266,18 @@ object Project extends Init[Scope] with ProjectExtra graph(false, "declared_dependencies") } def graphSettings(structure: BuildStructure, actual: Boolean, graphName: String, file: File) + { + val rel = relation(structure, actual) + val keyToString = (key: ScopedKey[_]) => Project display key + DotGraph.generateGraph(file, graphName, rel, keyToString, keyToString) + } + def relation(structure: BuildStructure, actual: Boolean) = { type Rel = Relation[ScopedKey[_], ScopedKey[_]] val cMap = compiled(structure.settings, actual)(structure.delegates, structure.scopeLocal) - val relation = - ((Relation.empty: Rel) /: cMap) { case (r, (key, value)) => - r + (key, value.dependencies) - } - val keyToString = (key: ScopedKey[_]) => Project display key - DotGraph.generateGraph(file, graphName, relation, keyToString, keyToString) + ((Relation.empty: Rel) /: cMap) { case (r, (key, value)) => + r + (key, value.dependencies) + } } def reverseDependencies(cMap: CompiledMap, scoped: ScopedKey[_]): Iterable[ScopedKey[_]] = for( (key,compiled) <- cMap; dep <- compiled.dependencies if dep == scoped) yield key