fixed #1150

2 files changed, 7 insertions, 6 deletions

diff --git a/src/compiler/scala/tools/nsc/javac/JavaParsers.scala b/src/compiler/scala/tools/nsc/javac/JavaParsers.scala
index 000a90cb5b..2eb5611265 100755
--- a/src/compiler/scala/tools/nsc/javac/JavaParsers.scala
+++ b/src/compiler/scala/tools/nsc/javac/JavaParsers.scala
@@ -847,8 +847,7 @@ trait JavaParsers extends JavaScanners {
         case Ident(name) => name.toTypeName
         case Select(_, name) => name.toTypeName
       }
-      val importJavaLang = Import(javaDot(nme.lang), List((nme.WILDCARD, null)))
-      val buf = new ListBuffer[Tree]+importJavaLang
+      val buf = new ListBuffer[Tree]
       while (in.token == IMPORT)
         buf ++= importDecl()
       while (in.token != EOF && in.token != RBRACE) {
diff --git a/src/compiler/scala/tools/nsc/typechecker/Contexts.scala b/src/compiler/scala/tools/nsc/typechecker/Contexts.scala
index a87dda4447..61a8533abd 100644
--- a/src/compiler/scala/tools/nsc/typechecker/Contexts.scala
+++ b/src/compiler/scala/tools/nsc/typechecker/Contexts.scala
@@ -42,10 +42,12 @@ trait Contexts { self: Analyzer =>
     if (!settings.noimports.value) {
       assert(isDefinitionsInitialized)
       imps += JavaLangPackage
-      assert(ScalaPackage ne null, "Scala package is null")
-      imps += ScalaPackage
-      if (!(treeInfo.isPredefUnit(unit.body) || treeInfo.containsLeadingPredefImport(List(unit.body))))
-        imps += PredefModule
+      if (!unit.isJava) {
+        assert(ScalaPackage ne null, "Scala package is null")
+        imps += ScalaPackage
+        if (!(treeInfo.isPredefUnit(unit.body) || treeInfo.containsLeadingPredefImport(List(unit.body))))
+          imps += PredefModule
+      }
     }
     imps.toList
   }