Rename `java.scala` -> `JavaConverters.scala`

5 files changed, 9 insertions, 7 deletions

diff --git a/doc-tool/src/dotty/tools/dottydoc/DocDriver.scala b/doc-tool/src/dotty/tools/dottydoc/DocDriver.scala
index b675cabb6..515de9ae9 100644
--- a/doc-tool/src/dotty/tools/dottydoc/DocDriver.scala
+++ b/doc-tool/src/dotty/tools/dottydoc/DocDriver.scala
@@ -14,8 +14,8 @@ import staticsite.Site
  *  tool. It's methods are used by the external scala and java APIs.
  */
 class DocDriver extends Driver {
-  import _root_.java.util.{ Map => JMap }
-  import model.java._
+  import java.util.{ Map => JMap }
+  import model.JavaConverters._
 
   override def setup(args: Array[String], rootCtx: Context): (List[String], Context) = {
     val ctx     = rootCtx.fresh
diff --git a/doc-tool/src/dotty/tools/dottydoc/model/java.scala b/doc-tool/src/dotty/tools/dottydoc/model/JavaConverters.scala
index b30c10734..9c423c3ea 100644
--- a/doc-tool/src/dotty/tools/dottydoc/model/java.scala
+++ b/doc-tool/src/dotty/tools/dottydoc/model/JavaConverters.scala
@@ -7,7 +7,7 @@ import references._
 import _root_.java.util.HashMap
 import _root_.java.util.LinkedList
 
-object java {
+object JavaConverters {
   import scala.collection.JavaConverters._
   import _root_.java.util.{ Optional => JOptional, Map => JMap }
 
@@ -253,7 +253,8 @@ object java {
         "scala" -> ref
       ).asJava
 
-      case EmptyReference => ???
+      case EmptyReference =>
+        throw new IllegalStateException("Empty reference discovered while converting to Java Map")
     }
   }
 
diff --git a/doc-tool/src/dotty/tools/dottydoc/model/comment/CommentCleaner.scala b/doc-tool/src/dotty/tools/dottydoc/model/comment/CommentCleaner.scala
index 30b3b0de0..5b60cd5f9 100644
--- a/doc-tool/src/dotty/tools/dottydoc/model/comment/CommentCleaner.scala
+++ b/doc-tool/src/dotty/tools/dottydoc/model/comment/CommentCleaner.scala
@@ -4,6 +4,7 @@ package comment
 
 trait CommentCleaner {
   import Regexes._
+  import java.util.regex.Matcher
 
   def clean(comment: String): List[String] = {
     def cleanLine(line: String): String = {
@@ -18,7 +19,7 @@ trait CommentCleaner {
     val javadoclessComment = JavadocTags.replaceAllIn(safeComment, { javadocReplacement(_) })
     val markedTagComment =
       SafeTags.replaceAllIn(javadoclessComment, { mtch =>
-        _root_.java.util.regex.Matcher.quoteReplacement(safeTagMarker + mtch.matched + safeTagMarker)
+        Matcher.quoteReplacement(safeTagMarker + mtch.matched + safeTagMarker)
       })
     markedTagComment.lines.toList map (cleanLine)
   }
diff --git a/doc-tool/src/dotty/tools/dottydoc/staticsite/DefaultParams.scala b/doc-tool/src/dotty/tools/dottydoc/staticsite/DefaultParams.scala
index cc1f8862f..066b23e0b 100644
--- a/doc-tool/src/dotty/tools/dottydoc/staticsite/DefaultParams.scala
+++ b/doc-tool/src/dotty/tools/dottydoc/staticsite/DefaultParams.scala
@@ -15,7 +15,7 @@ case class DefaultParams(
   sidebar: Sidebar,
   entity: Entity = NonEntity
 ) {
-  import model.java._
+  import model.JavaConverters._
 
   def toMap: Map[String, AnyRef] = Map(
     "docs" -> docs,
diff --git a/doc-tool/src/dotty/tools/dottydoc/staticsite/Site.scala b/doc-tool/src/dotty/tools/dottydoc/staticsite/Site.scala
index 895668df2..4d4dbc75d 100644
--- a/doc-tool/src/dotty/tools/dottydoc/staticsite/Site.scala
+++ b/doc-tool/src/dotty/tools/dottydoc/staticsite/Site.scala
@@ -30,7 +30,7 @@ import scala.collection.mutable.ArrayBuffer
 case class Site(val root: JFile, val projectTitle: String, val documentation: Map[String, Package]) extends ResourceFinder {
   /** Documentation serialized to java maps */
   private val docs: JList[_] = {
-    import model.java._
+    import model.JavaConverters._
     documentation.toJavaList
   }