From 68443fc04783419df2084a8e91dc5cdd14d26248 Mon Sep 17 00:00:00 2001 From: Mark Harrah Date: Fri, 22 Feb 2013 16:31:32 -0500 Subject: [PATCH] minor improvement to use stripSuffix in DotGraph --- main/actions/src/main/scala/sbt/DotGraph.scala | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/main/actions/src/main/scala/sbt/DotGraph.scala b/main/actions/src/main/scala/sbt/DotGraph.scala index c5f4768e7..8f8545024 100644 --- a/main/actions/src/main/scala/sbt/DotGraph.scala +++ b/main/actions/src/main/scala/sbt/DotGraph.scala @@ -58,13 +58,8 @@ object DotGraph IO.writeLines(file, lines) } def sourceToString(roots: Iterable[File], source: File) = - { - val rawName = relativized(roots, source).trim - if(rawName.endsWith(".scala")) - rawName.substring(0, rawName.length - ".scala".length) - else - rawName - } + relativized(roots, source).trim.stripSuffix(".scala").stripSuffix(".java") + private def relativized(roots: Iterable[File], path: File): String = { val relativized = roots.flatMap(root => Path.relativize(root, path))