- removed the interfaces for scala.Object and s...

- removed the interfaces for scala.Object and scala.Function<n>

3 files changed, 7 insertions, 21 deletions

diff --git a/sources/scala/Function.tmpl b/sources/scala/Function.tmpl
index 69c438dcda..343db5a808 100644
--- a/sources/scala/Function.tmpl
+++ b/sources/scala/Function.tmpl
@@ -12,22 +12,14 @@
 
 package scala;
 
-/** @meta class [#type-params#] extends scala.Object;
+/** @meta class [#type-params#];
  */
-public interface Function[#n#] extends Object {
-    /** @meta method [#scala-params#];
-     */
-    public java.lang.Object apply([#java-params#]);
-}
-
-/** @meta class [#type-params#] extends scala.Object$class with scala.Function[#n#][#type-params#];
- */
-public abstract class Function[#n#]$class extends Object$class implements Function[#n#] {
-    /** @meta constr();
+abstract public class Function[#n#] {
+    /** @meta constr;
      */
-    public Function[#n#]$class() {}
+    public Function[#n#]() {}
 
     /** @meta method [#scala-params#];
      */
-    public abstract java.lang.Object apply([#java-params#]);
+    abstract public java.lang.Object apply([#java-params#]);
 }
diff --git a/sources/scala/Object.java b/sources/scala/Object.java
index 694bf3d319..e0144b1cae 100644
--- a/sources/scala/Object.java
+++ b/sources/scala/Object.java
@@ -11,13 +11,7 @@
 
 package scala;
 
-
-/** @meta class extends scala.AnyRef;
- */
-public interface Object {
-}
-
 /** @meta class extends scala.AnyRef;
  */
-public class Object$class implements Object {
+public class Object {
 }
diff --git a/sources/scala/Ref.java b/sources/scala/Ref.java
index 6d208e8776..5635e433a5 100644
--- a/sources/scala/Ref.java
+++ b/sources/scala/Ref.java
@@ -13,7 +13,7 @@ package scala;
 
 /** @meta class [?T] extends scala.Object;
  */
-public class Ref extends scala.Object$class {
+public class Ref extends scala.Object {
 
     /** @meta field ?T;
      */