Reverting some recent signature code and tempor...

Reverting some recent signature code and temporarily disabling a test so
I can work this out without shattering the tranquility of the build. No
review.

2 files changed, 0 insertions, 41 deletions

diff --git a/test/files/jvm/t2585/Test.java b/test/files/jvm/t2585/Test.java
deleted file mode 100644
index 51fe20d81e..0000000000
--- a/test/files/jvm/t2585/Test.java
+++ /dev/null
@@ -1,16 +0,0 @@
-class J { S s ; }
-
-public class Test {
-  public static void main(String[] args) {
-    final X x = new X();
-    final OuterImpl o = new OuterImpl(x);
-
-    final OuterImpl.Inner i1 = o.newInner();
-    i1.getT().getI().getT().getI();  // <--- Error: "The method getI() is undefined for the type Object"
-
-    final Outer<X>.Inner i2 = o.newInner();
-    i2.getT().getI().getT().getI(); // <--- Error: "The method getI() is undefined for the type Object"
-
-    HashMap<String, String> map = new HashMap<String, String>();
-  }
-}
\ No newline at end of file
diff --git a/test/files/jvm/t2585/genericouter.scala b/test/files/jvm/t2585/genericouter.scala
deleted file mode 100644
index e06aa8101e..0000000000
--- a/test/files/jvm/t2585/genericouter.scala
+++ /dev/null
@@ -1,25 +0,0 @@
-case class S(n:Int)
-
-trait TraversableLike[+A, +Repr] {
-  class WithFilter(p: A => Boolean)
-  def withFilter(p: A => Boolean): WithFilter = new WithFilter(p)
-}
-
-class HashMap[K, +V] extends TraversableLike[(K, V), HashMap[K, V]]
-
-class Outer[T](val t: T) {
-  class Inner {
-    def getT : T = t
-  }
-}
-
-class OuterImpl(x: X) extends Outer[X](x) {
-  def newInner = new Inner
-}
-
-class X {
-  def getI : Outer[X]#Inner = {
-    val oImpl = new OuterImpl(this)
-    new oImpl.Inner
-  }
-}
\ No newline at end of file