From 5dc127e69cae1d88aa6910ea6378ad5dc1aaeaab Mon Sep 17 00:00:00 2001 From: Adriaan Moors Date: Thu, 23 Jun 2011 10:26:42 +0000 Subject: getting the revamped getClass to work on Java 5 hunch by adriaan (needed to change Object to Any in strategic location), location + fix determined by paul, menial work (reverts of obsolete spears and introduction of fix) by adriaan review by extempore Revert "A line missed from spear thrust, no review. Revert " "Thrusting spear into darkened alcove attempting to slay java5 " Revert "New theory: fails running on java 1.5. Put in hack to " discover Revert "Everything builds for me, but apparently not for " jenkins. First " --- src/compiler/scala/tools/nsc/Properties.scala | 3 --- 1 file changed, 3 deletions(-) (limited to 'src/compiler/scala/tools/nsc/Properties.scala') diff --git a/src/compiler/scala/tools/nsc/Properties.scala b/src/compiler/scala/tools/nsc/Properties.scala index 5c47c3b887..f88b7e82fc 100644 --- a/src/compiler/scala/tools/nsc/Properties.scala +++ b/src/compiler/scala/tools/nsc/Properties.scala @@ -11,9 +11,6 @@ object Properties extends scala.util.PropertiesTrait { protected def propCategory = "compiler" protected def pickJarBasedOn = classOf[Global] - def isJava5 = javaVersion startsWith "1.5" - def isJava6 = javaVersion startsWith "1.6" - // settings based on jar properties def fileEndingString = scalaPropOrElse("file.ending", ".scala|.java") def residentPromptString = scalaPropOrElse("resident.prompt", "\nnsc> ") -- cgit v1.2.3