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                                                     "

2 files changed, 0 insertions, 84 deletions

diff --git a/test/disabled/run/getClassTest.check b/test/disabled/run/getClassTest.check
deleted file mode 100644
index 94e86c3889..0000000000
--- a/test/disabled/run/getClassTest.check
+++ /dev/null
@@ -1,18 +0,0 @@
-f1: java.lang.Class<?>
-f2: java.lang.Class<?>
-f3: java.lang.Class<java.lang.Object>
-f4: java.lang.Class<? extends java.lang.Integer>
-f5: java.lang.Class<?>
-f0: T
-f1: class java.lang.Object
-f2: class java.lang.Object
-f3: class AnyRefs$A
-f4: class AnyRefs$B
-f5: class java.lang.Object
-f6: class java.lang.Object
-f7: class AnyRefs$A
-f8: class AnyRefs$B
-f1: java.lang.Class<? extends MoreAnyRefs$A>
-f2: java.lang.Class<? extends MoreAnyRefs$B>
-f3: java.lang.Class<?>
-f4: java.lang.Class<? extends MoreAnyRefs$A>
diff --git a/test/disabled/run/getClassTest.scala b/test/disabled/run/getClassTest.scala
deleted file mode 100644
index 951cc8d931..0000000000
--- a/test/disabled/run/getClassTest.scala
+++ /dev/null
@@ -1,66 +0,0 @@
-class AnyVals {
-  def f1 = (5: Any).getClass
-  def f2 = (5: AnyVal).getClass
-  def f3 = 5.getClass
-  def f4 = (5: java.lang.Integer).getClass
-  def f5 = (5.asInstanceOf[AnyRef]).getClass
-
-  // scalap says:
-  //
-  // def f1 : java.lang.Class[?0] forSome {type ?0} = { /* compiled code */ }
-  // def f2 : java.lang.Class[?0] forSome {type ?0} = { /* compiled code */ }
-  // def f3 : java.lang.Class[scala.Int] = { /* compiled code */ }
-  // def f4 : java.lang.Class[?0] forSome {type ?0 <: java.lang.Integer} = { /* compiled code */ }
-  // def f5 : java.lang.Class[?0] forSome {type ?0 <: scala.AnyRef} = { /* compiled code */ }
-  //
-  // java generic signature says:
-  //
-  // f1: java.lang.Class<?>
-  // f2: java.lang.Class<?>
-  // f3: java.lang.Class<java.lang.Object>
-  // f4: java.lang.Class<? extends java.lang.Integer>
-  // f5: java.lang.Class<?>
-}
-
-class AnyRefs {
-  class A
-  class B extends A
-
-  def f1 = (new B: Any).getClass().newInstance()
-  def f2 = (new B: AnyRef).getClass().newInstance()
-  def f3 = (new B: A).getClass().newInstance()
-  def f4 = (new B: B).getClass().newInstance()
-
-  def f0[T >: B] = (new B: T).getClass().newInstance()
-
-  def f5 = f0[Any]
-  def f6 = f0[AnyRef]
-  def f7 = f0[A]
-  def f8 = f0[B]
-}
-
-class MoreAnyRefs {
-  trait A
-  trait B
-
-  // don't leak anon/refinements
-  def f1 = (new A with B { }).getClass()
-  def f2 = (new B with A { }).getClass()
-  def f3 = (new { def bippy() = 5 }).getClass()
-  def f4 = (new A { def bippy() = 5 }).getClass()
-}
-
-object Test {
-  def returnTypes[T: Manifest] = (
-    manifest[T].erasure.getMethods.toList
-      filter (_.getName startsWith "f")
-      sortBy (_.getName)
-      map (m => m.getName + ": " + m.getGenericReturnType.toString)
-  )
-
-  def main(args: Array[String]): Unit = {
-    returnTypes[AnyVals] foreach println
-    returnTypes[AnyRefs] foreach println
-    returnTypes[MoreAnyRefs] foreach println
-  }
-}