summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--sources/scala/AnyVal.java2
-rw-r--r--sources/scala/Byte.java2
-rw-r--r--sources/scala/CaseClass.scala2
-rw-r--r--sources/scala/Char.java2
-rw-r--r--sources/scala/Double.java2
-rw-r--r--sources/scala/Float.java2
-rw-r--r--sources/scala/Function.scala.tmpl2
-rw-r--r--sources/scala/Int.java2
-rw-r--r--sources/scala/List.scala8
-rw-r--r--sources/scala/Long.java2
-rw-r--r--sources/scala/Option.scala2
-rw-r--r--sources/scala/Short.java2
-rw-r--r--sources/scala/collection/immutable/Tree.scala7
-rw-r--r--sources/scala/collection/mutable/DefaultMapModel.scala3
-rw-r--r--sources/scala/collection/mutable/HashTable.scala3
-rw-r--r--sources/scala/collection/mutable/ResizableArray.scala3
-rw-r--r--sources/scala/xml/MetaData.scala3
-rw-r--r--sources/scala/xml/NamespaceBinding.scala3
18 files changed, 30 insertions, 22 deletions
diff --git a/sources/scala/AnyVal.java b/sources/scala/AnyVal.java
index 8dbbef50db..a7a96d0a6d 100644
--- a/sources/scala/AnyVal.java
+++ b/sources/scala/AnyVal.java
@@ -11,4 +11,4 @@
package scala;
/** @meta class extends scala.Any; */
-public abstract class AnyVal implements java.io.Serializable {}
+public abstract class AnyVal {}
diff --git a/sources/scala/Byte.java b/sources/scala/Byte.java
index 18a9dc5e9c..a779d07f6a 100644
--- a/sources/scala/Byte.java
+++ b/sources/scala/Byte.java
@@ -10,7 +10,7 @@
package scala;
-public abstract class Byte extends AnyVal {
+public abstract class Byte extends AnyVal implements java.io.Serializable {
public final byte value;
diff --git a/sources/scala/CaseClass.scala b/sources/scala/CaseClass.scala
index 0b9f869ce9..ef0864c97f 100644
--- a/sources/scala/CaseClass.scala
+++ b/sources/scala/CaseClass.scala
@@ -13,7 +13,7 @@ package scala;
*
* @author Burak Emir
*/
-trait CaseClass extends AnyRef with java.io.Serializable {
+trait CaseClass extends AnyRef {
/** for a case class A(x_0,...,x_(k-1)), returns x_i for 0 <= i < k,
** null otherwise
diff --git a/sources/scala/Char.java b/sources/scala/Char.java
index 64b169eb8e..20bdb7126a 100644
--- a/sources/scala/Char.java
+++ b/sources/scala/Char.java
@@ -10,7 +10,7 @@
package scala;
-public abstract class Char extends AnyVal {
+public abstract class Char extends AnyVal implements java.io.Serializable {
public final char value;
diff --git a/sources/scala/Double.java b/sources/scala/Double.java
index 372b51ad0b..9a62ab9dfa 100644
--- a/sources/scala/Double.java
+++ b/sources/scala/Double.java
@@ -10,7 +10,7 @@
package scala;
-public abstract class Double extends AnyVal {
+public abstract class Double extends AnyVal implements java.io.Serializable {
public final double value;
diff --git a/sources/scala/Float.java b/sources/scala/Float.java
index 055d1a945c..ecac94fcaf 100644
--- a/sources/scala/Float.java
+++ b/sources/scala/Float.java
@@ -10,7 +10,7 @@
package scala;
-public abstract class Float extends AnyVal {
+public abstract class Float extends AnyVal implements java.io.Serializable {
public final float value;
diff --git a/sources/scala/Function.scala.tmpl b/sources/scala/Function.scala.tmpl
index 8807a5238d..83d0c99c27 100644
--- a/sources/scala/Function.scala.tmpl
+++ b/sources/scala/Function.scala.tmpl
@@ -10,6 +10,6 @@
package scala;
-trait Function{#n#}{#ClassSignature#} extends AnyRef with java.io.Serializable {
+trait Function{#n#}{#ClassSignature#} extends AnyRef {
def apply{#ApplySignature#};
}
diff --git a/sources/scala/Int.java b/sources/scala/Int.java
index cd7a1cb3f3..df6d14e539 100644
--- a/sources/scala/Int.java
+++ b/sources/scala/Int.java
@@ -10,7 +10,7 @@
package scala;
-public abstract class Int extends AnyVal {
+public abstract class Int extends AnyVal implements java.io.Serializable {
public final int value;
diff --git a/sources/scala/List.scala b/sources/scala/List.scala
index aeacd2f88f..53bb24b1e8 100644
--- a/sources/scala/List.scala
+++ b/sources/scala/List.scala
@@ -890,7 +890,9 @@ sealed trait List[+a] extends Seq[a] { // todo make sealed once we figure out ho
* @author Martin Odersky
* @version 1.0, 15/07/2003
*/
-case object Nil extends List[All] with java.io.Serializable {
+[SerialVersionUID(0 - 8256821097970055419L)]
+case object Nil extends List[All] {
+ // still needed - the backend doesn't recognize the SerialVersionUID attribute
private val serialVersionUID = 0 - 8256821097970055419L;
def isEmpty = true;
def head: All = error("head of empty list");
@@ -902,7 +904,9 @@ case object Nil extends List[All] with java.io.Serializable {
* @author Martin Odersky
* @version 1.0, 15/07/2003
*/
-final case class ::[+b](hd: b, tl: List[b]) extends List[b] with java.io.Serializable {
+[SerialVersionUID(0 - 8476791151983527571L)]
+final case class ::[+b](hd: b, tl: List[b]) extends List[b] {
+ // still needed - the backend doesn't recognize the SerialVersionUID attribute
private val serialVersionUID = 0 - 8476791151983527571L;
def isEmpty: boolean = false;
def head: b = hd;
diff --git a/sources/scala/Long.java b/sources/scala/Long.java
index 2cf7c0296c..a8966894fd 100644
--- a/sources/scala/Long.java
+++ b/sources/scala/Long.java
@@ -10,7 +10,7 @@
package scala;
-public abstract class Long extends AnyVal {
+public abstract class Long extends AnyVal implements java.io.Serializable {
public final long value;
diff --git a/sources/scala/Option.scala b/sources/scala/Option.scala
index 19b501e0b8..7d9dbce459 100644
--- a/sources/scala/Option.scala
+++ b/sources/scala/Option.scala
@@ -20,7 +20,7 @@ import Predef._;
* @author Matthias Zenger
* @version 1.0, 16/07/2003
*/
-trait Option[+A] extends Iterable[A] with java.io.Serializable {
+trait Option[+A] extends Iterable[A] {
def isEmpty: Boolean = this match {
case None => true
diff --git a/sources/scala/Short.java b/sources/scala/Short.java
index fed2aa38d8..d34a423c13 100644
--- a/sources/scala/Short.java
+++ b/sources/scala/Short.java
@@ -10,7 +10,7 @@
package scala;
-public abstract class Short extends AnyVal {
+public abstract class Short extends AnyVal implements java.io.Serializable {
public final short value;
diff --git a/sources/scala/collection/immutable/Tree.scala b/sources/scala/collection/immutable/Tree.scala
index 061ed34dd7..c6f48bae1e 100644
--- a/sources/scala/collection/immutable/Tree.scala
+++ b/sources/scala/collection/immutable/Tree.scala
@@ -61,7 +61,7 @@ import java.lang.Math;
* @author Michel Schinz
* @version 1.1, 2005-01-20
*/
-abstract class Tree[A <% Ordered[A], B]() extends AnyRef with java.io.Serializable {
+abstract class Tree[A <% Ordered[A], B]() extends AnyRef {
/* Data structure:
** - size:Int - the number of elements in the tree.
** - tree:T, which is composed of nodes of the form:
@@ -186,8 +186,7 @@ abstract class Tree[A <% Ordered[A], B]() extends AnyRef with java.io.Serializab
New(size, tree.balance(size));
}
-protected abstract class InsertTree[A <% Ordered[A],B]()
- extends AnyRef with java.io.Serializable {
+protected abstract class InsertTree[A <% Ordered[A],B]() extends AnyRef {
def insertLeft(k: A, v: B, t: GBTree[A,B]): InsertTree[A,B];
def insertRight(k: A, v: B, t: GBTree[A,B]): InsertTree[A,B];
def node: GBTree[A,B];
@@ -225,7 +224,7 @@ private case class INode[A <% Ordered[A],B](t1: GBTree[A,B],
* GBTree is an internal class used by Tree.
*/
-protected abstract class GBTree[A <% Ordered[A],B] extends AnyRef with java.io.Serializable {
+protected abstract class GBTree[A <% Ordered[A],B] extends AnyRef {
type aNode = GBTree[A,B];
type anInsertTree = InsertTree[A,B];
diff --git a/sources/scala/collection/mutable/DefaultMapModel.scala b/sources/scala/collection/mutable/DefaultMapModel.scala
index 932ea22a2b..6ae089bc3e 100644
--- a/sources/scala/collection/mutable/DefaultMapModel.scala
+++ b/sources/scala/collection/mutable/DefaultMapModel.scala
@@ -43,7 +43,8 @@ trait DefaultMapModel[A, B] extends AnyRef with scala.collection.mutable.Map[A,
}
}
-protected class DefaultEntry[A,B](k: A, v: B) extends AnyRef with java.io.Serializable {
+[serializable]
+protected class DefaultEntry[A,B](k: A, v: B) extends AnyRef {
def key = k;
var value = v;
def toPair = Pair(k, value);
diff --git a/sources/scala/collection/mutable/HashTable.scala b/sources/scala/collection/mutable/HashTable.scala
index 382cd43f69..37d51204f6 100644
--- a/sources/scala/collection/mutable/HashTable.scala
+++ b/sources/scala/collection/mutable/HashTable.scala
@@ -28,7 +28,8 @@ import Predef._;
* @author Matthias Zenger
* @version 1.0, 08/07/2003
*/
-abstract class HashTable[A] extends AnyRef with java.io.Serializable {
+[serializable]
+abstract class HashTable[A] extends AnyRef {
/** The load factor for the hash table.
*/
diff --git a/sources/scala/collection/mutable/ResizableArray.scala b/sources/scala/collection/mutable/ResizableArray.scala
index 8f9052465d..425db28c97 100644
--- a/sources/scala/collection/mutable/ResizableArray.scala
+++ b/sources/scala/collection/mutable/ResizableArray.scala
@@ -16,7 +16,8 @@ package scala.collection.mutable;
* @author Matthias Zenger, Burak Emir
* @version 1.0, 03/05/2004
*/
-abstract class ResizableArray[A] extends AnyRef with Iterable[A] with java.io.Serializable {
+[serializable]
+abstract class ResizableArray[A] extends AnyRef with Iterable[A] {
import java.lang.System.arraycopy;
protected val initialSize: Int = 16;
diff --git a/sources/scala/xml/MetaData.scala b/sources/scala/xml/MetaData.scala
index a7284b231f..5ddc0f3646 100644
--- a/sources/scala/xml/MetaData.scala
+++ b/sources/scala/xml/MetaData.scala
@@ -9,7 +9,8 @@ package scala.xml;
*
* @todo _vlue should be a normalized attribute value
*/
-abstract class MetaData extends Iterable[MetaData] with java.io.Serializable {
+[serializable]
+abstract class MetaData extends Iterable[MetaData] {
/** appends given MetaData items to this MetaData list */
def append(m: MetaData): MetaData =
diff --git a/sources/scala/xml/NamespaceBinding.scala b/sources/scala/xml/NamespaceBinding.scala
index 20549861b8..e24454e229 100644
--- a/sources/scala/xml/NamespaceBinding.scala
+++ b/sources/scala/xml/NamespaceBinding.scala
@@ -7,7 +7,8 @@ import Predef._;
* represented with the null uri. Neither prefix nor uri may be empty,
* which is not checked.
*/
-class NamespaceBinding(val prefix: String, val uri: String, val parent: NamespaceBinding) extends AnyRef with java.io.Serializable {
+[serializable]
+class NamespaceBinding(val prefix: String, val uri: String, val parent: NamespaceBinding) extends AnyRef {
private val serialVersionUID = 0 - 2518644165573446725L;
generated by cgit v1.2.3 (git 2.39.1) at 2024-09-22 15:16:52 +0000