updated syntax

2 files changed, 15 insertions, 15 deletions

diff --git a/src/compiler/scala/tools/nsc/Main.scala b/src/compiler/scala/tools/nsc/Main.scala
index 33d267f87e..45fb576081 100644
--- a/src/compiler/scala/tools/nsc/Main.scala
+++ b/src/compiler/scala/tools/nsc/Main.scala
@@ -8,7 +8,7 @@ package scala.tools.nsc
 
 import java.io.File
 
-import scala.tools.nsc.doc.{DocDriver => DocGenerator}
+import scala.tools.nsc.doc.DocDriver
 import scala.tools.nsc.reporters.{Reporter, ConsoleReporter}
 import scala.tools.nsc.util.FakePos //{Position}
 
@@ -85,11 +85,11 @@ object Main extends AnyRef with EvalLoop {
             val run = new compiler.Run
             run compile command.files
             if (command.settings.doc.value) {
-              object generator extends DocGenerator {
+              object generator extends DocDriver {
                 val global: compiler.type = compiler
                 def settings = command.settings
               }
-              generator.process(run.units)
+              generator process run.units
             }
             reporter.printSummary()
           }
diff --git a/src/compiler/scala/tools/nsc/doc/DocDriver.scala b/src/compiler/scala/tools/nsc/doc/DocDriver.scala
index 26b05d51ef..819591aaef 100644
--- a/src/compiler/scala/tools/nsc/doc/DocDriver.scala
+++ b/src/compiler/scala/tools/nsc/doc/DocDriver.scala
@@ -29,7 +29,7 @@ abstract class DocDriver extends ModelFrames with ModelToXML {
         case _ =>
       }
     }
-    def init: Unit = {}
+    def init {}
   }
 
   def process(units: Iterator[CompilationUnit]) {
@@ -78,11 +78,11 @@ abstract class DocDriver extends ModelFrames with ModelToXML {
 
       def title = "List of all classes and objects"
       def path = "all-classes"
-      def navLabel = null; // "root-page"
+      def navLabel = null  // "root-page"
       // override protected def navSuffix = ".html";
-      override def optional(cls : ClassOrObject) : NodeSeq = {
-        val path = cls.path.map(_.name);
-        val key = (cls.path.map(_.name), cls.isInstanceOf[Clazz]);
+      override def optional(cls: ClassOrObject): NodeSeq = {
+        val path = cls.path.map(_.name)
+        val key = (cls.path.map(_.name), cls.isInstanceOf[Clazz])
         assert(!organized(key).isEmpty);
         (if (!organized(key).tail.isEmpty) Text(" (" +{
           //Console.println("CONFLICT: " + path + " " + organized(key));
@@ -195,12 +195,12 @@ abstract class DocDriver extends ModelFrames with ModelToXML {
   roots("scala-library") = "http://www.scala-lang.org/docu/files/api";
 
   private def keyFor(file: ZipFile): String = {
-    var name = file.getName;
-    var idx = name.lastIndexOf(java.io.File.pathSeparator);
-    if (idx == -1) idx = name.lastIndexOf('/');
-    if (idx != -1) name = name.substring(idx + 1);
-    if (name.endsWith(".jar")) return name.substring(0, name.length - (".jar").length);
-    else return null;
+    var name = file.getName
+    var idx = name.lastIndexOf(java.io.File.pathSeparator)
+    if (idx == -1) idx = name.lastIndexOf('/')
+    if (idx != -1) name = name.substring(idx + 1)
+    if (name endsWith ".jar") name.substring(0, name.length - (".jar").length)
+    else null
   }
 
   // <code>{Text(string + " - ")}</code>;
@@ -218,7 +218,7 @@ abstract class DocDriver extends ModelFrames with ModelToXML {
       case null =>
       case _ =>
     }
-    return false;
+    false
   }
 
   def aref(href: String, label: String)(implicit frame: Frame) =