From f90c462b42b7587a9ac0f53a66e235b1b27e28c8 Mon Sep 17 00:00:00 2001
From: Adriaan Moors <adriaan.moors@epfl.ch>
Date: Mon, 4 Jul 2011 10:05:39 +0000
Subject: quick fix to get the build going again on Java 1.5

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

diff --git a/src/compiler/scala/tools/nsc/interactive/ScratchPadMaker.scala b/src/compiler/scala/tools/nsc/interactive/ScratchPadMaker.scala
index a54513c9ab..e284b816fd 100644
--- a/src/compiler/scala/tools/nsc/interactive/ScratchPadMaker.scala
+++ b/src/compiler/scala/tools/nsc/interactive/ScratchPadMaker.scala
@@ -83,7 +83,8 @@ trait ScratchPadMaker { self: Global =>
       case PackageDef(_, _) =>
         super.traverse(tree)
       case ModuleDef(_, name, Template(_, _, body)) =>
-        if (objectName.isEmpty) objectName = tree.symbol.fullName
+        if (objectName.length == 0 /* objectName.isEmpty does not compile on Java 5 due to ambiguous implicit conversions: augmentString, stringToTermName */)
+          objectName = tree.symbol.fullName
         body foreach traverseStat
       case _ =>
     }
-- 
cgit v1.2.3