summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sources/scala/ListMap.scala13
-rw-r--r--sources/scala/ListSet.scala22
2 files changed, 21 insertions, 14 deletions
diff --git a/sources/scala/ListMap.scala b/sources/scala/ListMap.scala
index eac7ca8478..814e42799f 100644
--- a/sources/scala/ListMap.scala
+++ b/sources/scala/ListMap.scala
@@ -4,25 +4,28 @@
** __\ \/ /__/ __ |/ /__/ __ | **
** /____/\___/_/ |_/____/_/ | | **
** |/ **
-** $Id$
\* */
+// $Id$
+
+
package scala;
class ListMap[A, B] extends MutableMap[A, B] with DefaultMapModel[A, B] {
- var xs: List[Entry] = Nil;
+ var xs: List[Entry] = Nil;
def size: Int = xs.length;
override def clear: Unit = { xs = Nil; }
- protected def findEntry(key: A) = xs find {e => e.key == key};
+ protected def findEntry(key: A) = xs find {e => e.key == key};
- protected def addEntry(e: Entry) = { xs = e :: xs; }
+ protected def addEntry(e: Entry) = { xs = e :: xs; }
def remove(key: A) = { xs = xs filter {e => e.key != key}; }
- protected def entries = xs.elements;
+ protected def entries = xs.elements;
+
}
diff --git a/sources/scala/ListSet.scala b/sources/scala/ListSet.scala
index e56e44bb67..970308db2c 100644
--- a/sources/scala/ListSet.scala
+++ b/sources/scala/ListSet.scala
@@ -4,27 +4,31 @@
** __\ \/ /__/ __ |/ /__/ __ | **
** /____/\___/_/ |_/____/_/ | | **
** |/ **
-** $Id$
\* */
+// $Id$
+
+
package scala;
/** I promise, there will be some documentation soon! :-) Matthias
*/
class ListSet[A] extends MutableSet[A] {
- protected var elems: List[A] = Nil;
- def size: Int = elems.length;
+ protected var elems: List[A] = Nil;
+
+ def size: Int = elems.length;
+
+ def contains(elem: A): Boolean = elems.contains(elem);
- def contains(elem: A): Boolean = elems.contains(elem);
+ def add(elem: A): Unit = if (!elems.contains(elem)) elems = elem :: elems;
- def add(elem: A): Unit = if (!elems.contains(elem)) elems = elem :: elems;
+ def remove(elem: A): Unit = { elems = elems.filter(e => e != elem); }
- def remove(elem: A): Unit = { elems = elems.filter(e => e != elem); }
+ def clear: Unit = { elems = Nil; }
- def clear: Unit = { elems = Nil; }
+ def elements: Iterator[A] = elems.elements;
- def elements: Iterator[A] = elems.elements;
+ override def toList: List[A] = elems;
- override def toList: List[A] = elems;
}