git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@5835 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
This commit is contained in:
parent
9262d84013
commit
a7e1c10032
|
@ -56,8 +56,10 @@ class ClassPath(onlyPresentation: Boolean) {
|
||||||
else {
|
else {
|
||||||
val ret = find0(entries.tail);
|
val ret = find0(entries.tail);
|
||||||
val head = entries.head;
|
val head = entries.head;
|
||||||
|
val name0 = name + (if (!isDir) ".class" else "");
|
||||||
|
System.err.println("LOOKUP: " + name0 + " in " + head.location);
|
||||||
val clazz = if (head.location == null) null;
|
val clazz = if (head.location == null) null;
|
||||||
else head.location.lookupPath(name + (if (!isDir) ".class" else ""), isDir);
|
else head.location.lookupPath(name0, isDir);
|
||||||
|
|
||||||
val source0 = if (head.source == null) null; else {
|
val source0 = if (head.source == null) null; else {
|
||||||
val source1 = head.source.location.lookupPath(
|
val source1 = head.source.location.lookupPath(
|
||||||
|
@ -77,9 +79,6 @@ class ClassPath(onlyPresentation: Boolean) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
val ret = find0(entries);
|
val ret = find0(entries);
|
||||||
if (false && this.toString().indexOf("scala") != -1)
|
|
||||||
System.err.println("FIND " + name + " in " + this + " => " + ret);
|
|
||||||
|
|
||||||
if (ret.entries.isEmpty) {
|
if (ret.entries.isEmpty) {
|
||||||
System.err.println("BAD_FILE: " + name + " in " + this)
|
System.err.println("BAD_FILE: " + name + " in " + this)
|
||||||
null
|
null
|
||||||
|
|
Loading…
Reference in New Issue