luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

classfile analyzer should pass full name to AnalysisCallback

This commit is contained in:
Mark Harrah 2012-05-08 20:25:25 -04:00
parent 1ed64e4d5f
commit 9414f98f2c
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
util/classfile/Analyze.scala
View File

@ -55,19 +55,15 @@ private[sbt] object Analyze
{ {
for (url <- Option(loader.getResource(tpe.replace('.', '/') + ClassExt)); file <- IO.urlAsFile(url)) for (url <- Option(loader.getResource(tpe.replace('.', '/') + ClassExt)); file <- IO.urlAsFile(url))
{ {
val name = {
val lastDot = tpe.lastIndexOf('.')
if (lastDot < 0) tpe else tpe.substring(lastDot + 1)
}
if(url.getProtocol == "jar") if(url.getProtocol == "jar")
analysis.binaryDependency(file, name, source) analysis.binaryDependency(file, tpe, source)
else else
{ {
assume(url.getProtocol == "file") assume(url.getProtocol == "file")
productToSource.get(file) match productToSource.get(file) match
{ {
case Some(dependsOn) => analysis.sourceDependency(dependsOn, source) case Some(dependsOn) => analysis.sourceDependency(dependsOn, source)
case None => analysis.binaryDependency(file, name, source) case None => analysis.binaryDependency(file, tpe, source)
} }
} }
} }