Fixed Java signatures of forwarders for inherit...

Fixed Java signatures of forwarders for inherited members, and
references to scala.Nothing are translated to scala.runtime.Nothing$
(see #1254, #1822, #1555). Moved a Java test that was not run to its
proper subdirectory, to make partest happy.

2 files changed, 28 insertions, 0 deletions

diff --git a/test/files/pos5/t1186.java b/test/files/pos5/t1186/t1186.java
index c1bfcecab8..c1bfcecab8 100644
--- a/test/files/pos5/t1186.java
+++ b/test/files/pos5/t1186/t1186.java
diff --git a/test/files/pos5/t1254/t1254.java b/test/files/pos5/t1254/t1254.java
new file mode 100644
index 0000000000..25b733cf28
--- /dev/null
+++ b/test/files/pos5/t1254/t1254.java
@@ -0,0 +1,28 @@
+/* Taken from ticket #1254. Tests Java signatures in mirror classes and that
+   Nothing is translated to Nothing$.
+*/
+
+import scala.None;
+
+// This compiles with javac but fails with Eclipse java compiler:
+// 'The type scala.Nothing cannot be resolved. It is indirectly referenced from required .class files'
+class NothingBug3 {
+    public NothingBug3() {
+	scala.Option<?> o = scala.None$.MODULE$;
+
+        test(o);
+        None.toLeft(new scala.Function0<Integer>() {
+                public Integer apply() { return 0; }
+            });
+    }
+
+    public <T>void test(scala.Option<T> f) {}
+}
+
+// This compiles with javac but fails with Eclipse java compiler:
+// 'The type scala.Nothing cannot be resolved. It is indirectly referenced from required .class files'
+class NothingBug4 {
+    public NothingBug4() {
+	scala.Option o = scala.None$.MODULE$;
+    }
+}