diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/compiler/scala/tools/nsc/util/ClassPath.scala | 4 | ||||
| -rw-r--r-- | src/compiler/scala/tools/util/PathResolver.scala | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/src/compiler/scala/tools/nsc/util/ClassPath.scala b/src/compiler/scala/tools/nsc/util/ClassPath.scala index 906a575d90..fb5dfb58de 100644 --- a/src/compiler/scala/tools/nsc/util/ClassPath.scala +++ b/src/compiler/scala/tools/nsc/util/ClassPath.scala @@ -139,9 +139,7 @@ object ClassPath { def newClassPath(dir: AbstractFile) = new DirectoryClassPath(dir, this) } - object DefaultJavaContext extends JavaContext { - override def isValidName(name: String) = !ReflectionUtils.scalacShouldntLoadClassfile(name) - } + object DefaultJavaContext extends JavaContext private def endsClass(s: String) = s.length > 6 && s.substring(s.length - 6) == ".class" private def endsScala(s: String) = s.length > 6 && s.substring(s.length - 6) == ".scala" diff --git a/src/compiler/scala/tools/util/PathResolver.scala b/src/compiler/scala/tools/util/PathResolver.scala index 82f2c5dc74..6022344208 100644 --- a/src/compiler/scala/tools/util/PathResolver.scala +++ b/src/compiler/scala/tools/util/PathResolver.scala @@ -193,7 +193,7 @@ object PathResolver { class PathResolver(settings: Settings, context: JavaContext) { import PathResolver.{ Defaults, Environment, AsLines, MkLines, ppcp } - def this(settings: Settings) = this(settings, if (settings.inline) new JavaContext else DefaultJavaContext) + def this(settings: Settings) = this(settings, DefaultJavaContext) private def cmdLineOrElse(name: String, alt: String) = { (commandLineFor(name) match { |