From ffe546326a6944d4d2535f05d7c02f5b1daed744 Mon Sep 17 00:00:00 2001
From: Philipp Haller <hallerp@gmail.com>
Date: Fri, 31 Oct 2008 11:23:01 +0000
Subject: Java parser handles final modifier for types.

---
 src/compiler/scala/tools/nsc/javac/JavaParsers.scala | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/compiler/scala/tools/nsc/javac/JavaParsers.scala b/src/compiler/scala/tools/nsc/javac/JavaParsers.scala
index 6920028e28..1e0d20da1b 100755
--- a/src/compiler/scala/tools/nsc/javac/JavaParsers.scala
+++ b/src/compiler/scala/tools/nsc/javac/JavaParsers.scala
@@ -278,6 +278,7 @@ trait JavaParsers extends JavaScanners {
 
     def typ(): Tree =
       optArrayBrackets {
+        if (in.token == FINAL) in.nextToken
         if (in.token == IDENTIFIER) {
           var t = typeArgs(atPos(in.currentPos)(Ident(ident())))
           while (in.token == DOT) {
@@ -616,7 +617,7 @@ trait JavaParsers extends JavaScanners {
     def makeCompanionObject(cdef: ClassDef, statics: List[Tree]): Tree =
       atPos(cdef.pos) {
         ModuleDef(cdef.mods & (Flags.AccessFlags | Flags.JAVA), cdef.name.toTermName,
-                  makeTemplate(List(javaLangObject()), statics))
+                  makeTemplate(List(), statics))
       }
 
     def importCompanionObject(cdef: ClassDef): Tree =
-- 
cgit v1.2.3