diff options
author | mihaylov <mihaylov@epfl.ch> | 2006-03-05 00:33:02 +0000 |
---|---|---|
committer | mihaylov <mihaylov@epfl.ch> | 2006-03-05 00:33:02 +0000 |
commit | 208bb6e42dc0c951ddf029d479e52b0e709915cf (patch) | |
tree | f13b6ca66ca67a21fd4970249cc3ca9e05631720 | |
parent | 4f42f5b49bb150be0c07d75d20dec616412934eb (diff) | |
download | scala-208bb6e42dc0c951ddf029d479e52b0e709915cf.tar.gz scala-208bb6e42dc0c951ddf029d479e52b0e709915cf.tar.bz2 scala-208bb6e42dc0c951ddf029d479e52b0e709915cf.zip |
Rearranged header and updated copyright info
162 files changed, 1100 insertions, 222 deletions
diff --git a/src/library/scala/concurrent/Actor.scala b/src/library/scala/concurrent/Actor.scala index c37240aab9..f810a65ac8 100644 --- a/src/library/scala/concurrent/Actor.scala +++ b/src/library/scala/concurrent/Actor.scala @@ -1,6 +1,6 @@ /* __ *\ ** ________ ___ / / ___ Scala API ** -** / __/ __// _ | / / / _ | (c) 2003-2005, LAMP/EPFL ** +** / __/ __// _ | / / / _ | (c) 2003-2006, LAMP/EPFL ** ** __\ \/ /__/ __ |/ /__/ __ | ** ** /____/\___/_/ |_/____/_/ | | ** ** |/ ** @@ -8,8 +8,10 @@ // $Id$ + package scala.concurrent; + abstract class Actor extends Thread { private val in = new MailBox; diff --git a/src/library/scala/concurrent/Channel.scala b/src/library/scala/concurrent/Channel.scala index a57fd7f530..1638a8f10c 100644 --- a/src/library/scala/concurrent/Channel.scala +++ b/src/library/scala/concurrent/Channel.scala @@ -1,6 +1,6 @@ /* __ *\ ** ________ ___ / / ___ Scala API ** -** / __/ __// _ | / / / _ | (c) 2003-2005, LAMP/EPFL ** +** / __/ __// _ | / / / _ | (c) 2003-2006, LAMP/EPFL ** ** __\ \/ /__/ __ |/ /__/ __ | ** ** /____/\___/_/ |_/____/_/ | | ** ** |/ ** @@ -8,8 +8,10 @@ // $Id$ + package scala.concurrent; + class Channel[a] { class LinkedList[a] { var elem: a = _; diff --git a/src/library/scala/concurrent/Lock.scala b/src/library/scala/concurrent/Lock.scala index a473c358c8..dd89517362 100644 --- a/src/library/scala/concurrent/Lock.scala +++ b/src/library/scala/concurrent/Lock.scala @@ -1,14 +1,17 @@ /* __ *\ ** ________ ___ / / ___ Scala API ** -** / __/ __// _ | / / / _ | (c) 2003-04, LAMP/EPFL ** +** / __/ __// _ | / / / _ | (c) 2003-2006, LAMP/EPFL ** ** __\ \/ /__/ __ |/ /__/ __ | ** ** /____/\___/_/ |_/____/_/ | | ** ** |/ ** -** $Id$ \* */ +// $Id$ + + package scala.concurrent; + class Lock { var available = true; def acquire = synchronized { diff --git a/src/library/scala/concurrent/MailBox.scala b/src/library/scala/concurrent/MailBox.scala index e23d6adf4a..049259a988 100644 --- a/src/library/scala/concurrent/MailBox.scala +++ b/src/library/scala/concurrent/MailBox.scala @@ -1,12 +1,14 @@ /* __ *\ ** ________ ___ / / ___ Scala API ** -** / __/ __// _ | / / / _ | (c) 2003-04, LAMP/EPFL ** +** / __/ __// _ | / / / _ | (c) 2003-2006, LAMP/EPFL ** ** __\ \/ /__/ __ |/ /__/ __ | ** ** /____/\___/_/ |_/____/_/ | | ** ** |/ ** -** $Id$ \* */ +// $Id$ + + package scala.concurrent; diff --git a/src/library/scala/concurrent/NameServer.scala b/src/library/scala/concurrent/NameServer.scala index b7646e6deb..57c75ce543 100644 --- a/src/library/scala/concurrent/NameServer.scala +++ b/src/library/scala/concurrent/NameServer.scala @@ -1,12 +1,14 @@ /* __ *\ ** ________ ___ / / ___ Scala API ** -** / __/ __// _ | / / / _ | (c) 2003-04, LAMP/EPFL ** +** / __/ __// _ | / / / _ | (c) 2003-2006, LAMP/EPFL ** ** __\ \/ /__/ __ |/ /__/ __ | ** ** /____/\___/_/ |_/____/_/ | | ** ** |/ ** -** $Id$ \* */ +// $Id$ + + package scala.concurrent; diff --git a/src/library/scala/concurrent/Pid.scala b/src/library/scala/concurrent/Pid.scala index 3c86106683..1f3bb033e1 100644 --- a/src/library/scala/concurrent/Pid.scala +++ b/src/library/scala/concurrent/Pid.scala @@ -6,8 +6,12 @@ ** |/ ** \* */ +// $Id$ + + package scala.concurrent; + class Pid(actor: Actor) { var target = actor; diff --git a/src/library/scala/concurrent/Process.scala b/src/library/scala/concurrent/Process.scala index ee17bf7cf1..24e1185353 100644 --- a/src/library/scala/concurrent/Process.scala +++ b/src/library/scala/concurrent/Process.scala @@ -8,6 +8,7 @@ // $Id$ + package scala.concurrent; diff --git a/src/library/scala/concurrent/SyncChannel.scala b/src/library/scala/concurrent/SyncChannel.scala index 6cab7b2ad6..d7ae5fb366 100644 --- a/src/library/scala/concurrent/SyncChannel.scala +++ b/src/library/scala/concurrent/SyncChannel.scala @@ -1,12 +1,14 @@ /* __ *\ ** ________ ___ / / ___ Scala API ** -** / __/ __// _ | / / / _ | (c) 2003-04, LAMP/EPFL ** +** / __/ __// _ | / / / _ | (c) 2003-2006, LAMP/EPFL ** ** __\ \/ /__/ __ |/ /__/ __ | ** ** /____/\___/_/ |_/____/_/ | | ** ** |/ ** -** $Id$ \* */ +// $Id$ + + package scala.concurrent; diff --git a/src/library/scala/concurrent/SyncVar.scala b/src/library/scala/concurrent/SyncVar.scala index 0e1b9fd38c..b0a76d73b4 100644 --- a/src/library/scala/concurrent/SyncVar.scala +++ b/src/library/scala/concurrent/SyncVar.scala @@ -1,12 +1,14 @@ /* __ *\ ** ________ ___ / / ___ Scala API ** -** / __/ __// _ | / / / _ | (c) 2003-04, LAMP/EPFL ** +** / __/ __// _ | / / / _ | (c) 2003-2006, LAMP/EPFL ** ** __\ \/ /__/ __ |/ /__/ __ | ** ** /____/\___/_/ |_/____/_/ | | ** ** |/ ** -** $Id$ \* */ +// $Id$ + + package scala.concurrent; diff --git a/src/library/scala/concurrent/TIMEOUT.scala b/src/library/scala/concurrent/TIMEOUT.scala index 681fc9a66b..4a3b0a8dc6 100644 --- a/src/library/scala/concurrent/TIMEOUT.scala +++ b/src/library/scala/concurrent/TIMEOUT.scala @@ -1,12 +1,19 @@ /* __ *\ ** ________ ___ / / ___ Scala API ** -** / __/ __// _ | / / / _ | (c) 2003-04, LAMP/EPFL ** +** / __/ __// _ | / / / _ | (c) 2003-2006, LAMP/EPFL ** ** __\ \/ /__/ __ |/ /__/ __ | ** ** /____/\___/_/ |_/____/_/ | | ** ** |/ ** -** $Id$ \* */ +// $Id$ + + package scala.concurrent; + +/** + * The message sent to a message box when the period specified in + * <code>receiveWithin</code? expires. + */ case object TIMEOUT; diff --git a/src/library/scala/concurrent/jolib.scala b/src/library/scala/concurrent/jolib.scala index 08611be513..6388f9a495 100644 --- a/src/library/scala/concurrent/jolib.scala +++ b/src/library/scala/concurrent/jolib.scala @@ -1,12 +1,14 @@ /* __ *\ ** ________ ___ / / ___ Scala API ** -** / __/ __// _ | / / / _ | (c) 2003-04, LAMP/EPFL ** +** / __/ __// _ | / / / _ | (c) 2003-2006, LAMP/EPFL ** ** __\ \/ /__/ __ |/ /__/ __ | ** ** /____/\___/_/ |_/____/_/ | | ** ** |/ ** -** $Id$ \* */ +// $Id$ + + package scala.concurrent; diff --git a/src/library/scala/concurrent/ops.scala b/src/library/scala/concurrent/ops.scala index 04bee676ec..584ac4e738 100644 --- a/src/library/scala/concurrent/ops.scala +++ b/src/library/scala/concurrent/ops.scala @@ -1,12 +1,14 @@ /* __ *\ ** ________ ___ / / ___ Scala API ** -** / __/ __// _ | / / / _ | (c) 2003-04, LAMP/EPFL ** +** / __/ __// _ | / / / _ | (c) 2003-2006, LAMP/EPFL ** ** __\ \/ /__/ __ |/ /__/ __ | ** ** /____/\___/_/ |_/____/_/ | | ** ** |/ ** -** $Id$ \* */ +// $Id$ + + package scala.concurrent; diff --git a/src/library/scala/concurrent/pilib.scala b/src/library/scala/concurrent/pilib.scala index 4e334b6e13..9d8611383d 100644 --- a/src/library/scala/concurrent/pilib.scala +++ b/src/library/scala/concurrent/pilib.scala @@ -8,8 +8,10 @@ // $Id$ + package scala.concurrent; + /** * Library for using Pi-calculus concurrent primitives in Scala. As an example, the definition of a two-place buffer using the <b>pilib</b> library looks like: diff --git a/src/library/scala/dbc/DataType.scala b/src/library/scala/dbc/DataType.scala index b984169350..f9b12bc431 100644 --- a/src/library/scala/dbc/DataType.scala +++ b/src/library/scala/dbc/DataType.scala @@ -1,13 +1,17 @@ /* __ *\ ** ________ ___ / / ___ Scala API ** -** / __/ __// _ | / / / _ | (c) 2003-2005, LAMP/EPFL ** +** / __/ __// _ | / / / _ | (c) 2003-2006, LAMP/EPFL ** ** __\ \/ /__/ __ |/ /__/ __ | ** ** /____/\___/_/ |_/____/_/ | | ** ** |/ ** \* */ +// $Id$ + + package scala.dbc; + /** An ISO-9075:2003 (SQL) data type. Mappings between SQL types and * database specific types should be provided by the database driver. */ diff --git a/src/library/scala/dbc/Database.scala b/src/library/scala/dbc/Database.scala index 28270184b5..cd1ff4e6b1 100644 --- a/src/library/scala/dbc/Database.scala +++ b/src/library/scala/dbc/Database.scala @@ -1,13 +1,17 @@ /* __ *\ ** ________ ___ / / ___ Scala API ** -** / __/ __// _ | / / / _ | (c) 2003-2005, LAMP/EPFL ** +** / __/ __// _ | / / / _ | (c) 2003-2006, LAMP/EPFL ** ** __\ \/ /__/ __ |/ /__/ __ | ** ** /____/\___/_/ |_/____/_/ | | ** ** |/ ** \* */ +// $Id$ + + package scala.dbc; + import java.sql._; /** A link to a database. The <code>Database</code> abstract class must diff --git a/src/library/scala/dbc/Syntax.scala b/src/library/scala/dbc/Syntax.scala index cde8112979..d8ed87740a 100644 --- a/src/library/scala/dbc/Syntax.scala +++ b/src/library/scala/dbc/Syntax.scala @@ -1,13 +1,17 @@ /* __ *\ -** ________ ___ / / ___ Scala API tests ** -** / __/ __// _ | / / / _ | (c) 2003-2005, LAMP/EPFL ** +** ________ ___ / / ___ Scala API ** +** / __/ __// _ | / / / _ | (c) 2003-2006, LAMP/EPFL ** ** __\ \/ /__/ __ |/ /__/ __ | ** ** /____/\___/_/ |_/____/_/ | | ** ** |/ ** \* */ +// $Id$ + + package scala.dbc; + import java.math.{BigDecimal, BigInteger}; diff --git a/src/library/scala/dbc/Utilities.scala b/src/library/scala/dbc/Utilities.scala index 46ca27a019..54c9bb405a 100644 --- a/src/library/scala/dbc/Utilities.scala +++ b/src/library/scala/dbc/Utilities.scala @@ -1,13 +1,17 @@ /* __ *\ ** ________ ___ / / ___ Scala API ** -** / __/ __// _ | / / / _ | (c) 2003-2005, LAMP/EPFL ** +** / __/ __// _ | / / / _ | (c) 2003-2006, LAMP/EPFL ** ** __\ \/ /__/ __ |/ /__/ __ | ** ** /____/\___/_/ |_/____/_/ | | ** ** |/ ** \* */ +// $Id$ + + package scala.dbc; + /** An object offering transformation methods (views) on various values. * This object's members must be visible in an expression to use value * auto-conversion. diff --git a/src/library/scala/dbc/Value.scala b/src/library/scala/dbc/Value.scala index 3ab2d0cbe5..13a7678928 100644 --- a/src/library/scala/dbc/Value.scala +++ b/src/library/scala/dbc/Value.scala @@ -1,13 +1,17 @@ /* __ *\ ** ________ ___ / / ___ Scala API ** -** / __/ __// _ | / / / _ | (c) 2003-2005, LAMP/EPFL ** +** / __/ __// _ | / / / _ | (c) 2003-2006, LAMP/EPFL ** ** __\ \/ /__/ __ |/ /__/ __ | ** ** /____/\___/_/ |_/____/_/ | | ** ** |/ ** \* */ +// $Id$ + + package scala.dbc; + /** A SQL-99 value of any type. */ abstract class Value { @@ -21,4 +25,4 @@ abstract class Value { /** A SQL-99 compliant string representation of the value. */ def sqlString: String; -}
\ No newline at end of file +} diff --git a/src/library/scala/dbc/Vendor.scala b/src/library/scala/dbc/Vendor.scala index db44ddec42..b9b3595d95 100644 --- a/src/library/scala/dbc/Vendor.scala +++ b/src/library/scala/dbc/Vendor.scala @@ -1,13 +1,17 @@ /* __ *\ ** ________ ___ / / ___ Scala API ** -** / __/ __// _ | / / / _ | (c) 2003-2005, LAMP/EPFL ** +** / __/ __// _ | / / / _ | (c) 2003-2006, LAMP/EPFL ** ** __\ \/ /__/ __ |/ /__/ __ | ** ** /____/\___/_/ |_/____/_/ | | ** ** |/ ** \* */ +// $Id$ + + package scala.dbc; + import java.sql.{Connection, Driver}; diff --git a/src/library/scala/dbc/datatype/ApproximateNumeric.scala b/src/library/scala/dbc/datatype/ApproximateNumeric.scala index d75da1eb50..8943f46364 100644 --- a/src/library/scala/dbc/datatype/ApproximateNumeric.scala +++ b/src/library/scala/dbc/datatype/ApproximateNumeric.scala @@ -1,13 +1,17 @@ /* __ *\ ** ________ ___ / / ___ Scala API ** -** / __/ __// _ | / / / _ | (c) 2003-2005, LAMP/EPFL ** +** / __/ __// _ | / / / _ | (c) 2003-2006, LAMP/EPFL ** ** __\ \/ /__/ __ |/ /__/ __ | ** ** /____/\___/_/ |_/____/_/ | | ** ** |/ ** \* */ +// $Id$ + + package scala.dbc.datatype; + /** A type category for all SQL types that store varying-precision * numbers. */ diff --git a/src/library/scala/dbc/datatype/Boolean.scala b/src/library/scala/dbc/datatype/Boolean.scala index 7c68ab9c7d..c4a880885e 100644 --- a/src/library/scala/dbc/datatype/Boolean.scala +++ b/src/library/scala/dbc/datatype/Boolean.scala @@ -1,13 +1,17 @@ /* __ *\ ** ________ ___ / / ___ Scala API ** -** / __/ __// _ | / / / _ | (c) 2003-2005, LAMP/EPFL ** +** / __/ __// _ | / / / _ | (c) 2003-2006, LAMP/EPFL ** ** __\ \/ /__/ __ |/ /__/ __ | ** ** /____/\___/_/ |_/____/_/ | | ** ** |/ ** \* */ +// $Id$ + + package scala.dbc.datatype; + /** The SQL type for a truth value. */ class Boolean extends DataType { @@ -24,4 +28,4 @@ class Boolean extends DataType { /** A SQL-99 compliant string representation of the type. */ override def sqlString: java.lang.String = "BOOLEAN"; -}
\ No newline at end of file +} diff --git a/src/library/scala/dbc/datatype/Character.scala b/src/library/scala/dbc/datatype/Character.scala index ded08c5602..02b4b182e0 100644 --- a/src/library/scala/dbc/datatype/Character.scala +++ b/src/library/scala/dbc/datatype/Character.scala @@ -1,13 +1,17 @@ /* __ *\ -** ________ ___ / / ___ Scala API tests ** -** / __/ __// _ | / / / _ | (c) 2003-2005, LAMP/EPFL ** +** ________ ___ / / ___ Scala API ** +** / __/ __// _ | / / / _ | (c) 2003-2006, LAMP/EPFL ** ** __\ \/ /__/ __ |/ /__/ __ | ** ** /____/\___/_/ |_/____/_/ | | ** ** |/ ** \* */ +// $Id$ + + package scala.dbc.datatype; + /** A SQL type for a string of characters of arbitrary length with * arbitrary character set. */ diff --git a/src/library/scala/dbc/datatype/CharacterLargeObject.scala b/src/library/scala/dbc/datatype/CharacterLargeObject.scala index adbd979f6e..c84bb4bae9 100644 --- a/src/library/scala/dbc/datatype/CharacterLargeObject.scala +++ b/src/library/scala/dbc/datatype/CharacterLargeObject.scala @@ -1,13 +1,17 @@ /* __ *\ ** ________ ___ / / ___ Scala API ** -** / __/ __// _ | / / / _ | (c) 2003-2005, LAMP/EPFL ** +** / __/ __// _ | / / / _ | (c) 2003-2006, LAMP/EPFL ** ** __\ \/ /__/ __ |/ /__/ __ | ** ** /____/\___/_/ |_/____/_/ | | ** ** |/ ** \* */ +// $Id$ + + package scala.dbc.datatype; + /** A SQL type for an unbounded length string of characters with arbitrary * character set. */ class CharacterLargeObject extends CharacterString { @@ -24,4 +28,4 @@ class CharacterLargeObject extends CharacterString { /** A SQL-99 compliant string representation of the type. */ override def sqlString: java.lang.String = "CHARACTER LARGE OBJECT"; -}
\ No newline at end of file +} diff --git a/src/library/scala/dbc/datatype/CharacterString.scala b/src/library/scala/dbc/datatype/CharacterString.scala index e937d10b9e..dae029d600 100644 --- a/src/library/scala/dbc/datatype/CharacterString.scala +++ b/src/library/scala/dbc/datatype/CharacterString.scala @@ -1,13 +1,17 @@ /* __ *\ ** ________ ___ / / ___ Scala API ** -** / __/ __// _ | / / / _ | (c) 2003-2005, LAMP/EPFL ** +** / __/ __// _ | / / / _ | (c) 2003-2006, LAMP/EPFL ** ** __\ \/ /__/ __ |/ /__/ __ | ** ** /____/\___/_/ |_/____/_/ | | ** ** |/ ** \* */ +// $Id$ + + package scala.dbc.datatype; + /** A type category for all SQL types that store strings of characters. */ abstract class CharacterString extends String { @@ -17,4 +21,4 @@ abstract class CharacterString extends String { /** The name of the character set in which the string is encoded. */ def encoding: Option[java.lang.String] = None; -}
\ No newline at end of file +} diff --git a/src/library/scala/dbc/datatype/CharacterVarying.scala b/src/library/scala/dbc/datatype/CharacterVarying.scala index b7f743ce0b..e0cdbc819b 100644 --- a/src/library/scala/dbc/datatype/CharacterVarying.scala +++ b/src/library/scala/dbc/datatype/CharacterVarying.scala @@ -1,13 +1,17 @@ /* __ *\ ** ________ ___ / / ___ Scala API ** -** / __/ __// _ | / / / _ | (c) 2003-2005, LAMP/EPFL ** +** / __/ __// _ | / / / _ | (c) 2003-2006, LAMP/EPFL ** ** __\ \/ /__/ __ |/ /__/ __ | ** ** /____/\___/_/ |_/____/_/ | | ** ** |/ ** \* */ +// $Id$ + + package scala.dbc.datatype; + /** A SQL type for a varying length string of characters with arbitrary * maximal length and arbitrary character set. */ diff --git a/src/library/scala/dbc/datatype/ExactNumeric.scala b/src/library/scala/dbc/datatype/ExactNumeric.scala index 9152a7e928..331cf866e1 100644 --- a/src/library/scala/dbc/datatype/ExactNumeric.scala +++ b/src/library/scala/dbc/datatype/ExactNumeric.scala @@ -1,13 +1,17 @@ /* __ *\ ** ________ ___ / / ___ Scala API ** -** / __/ __// _ | / / / _ | (c) 2003-2005, LAMP/EPFL ** +** / __/ __// _ | / / / _ | (c) 2003-2006, LAMP/EPFL ** ** __\ \/ /__/ __ |/ /__/ __ | ** ** /____/\___/_/ |_/____/_/ | | ** ** |/ ** \* */ +// $Id$ + + package scala.dbc.datatype; + /** A type category for all SQL types that store constant-precision * numbers. */ diff --git a/src/library/scala/dbc/datatype/Factory.scala b/src/library/scala/dbc/datatype/Factory.scala index 13d9cd35e2..a4a9672184 100644 --- a/src/library/scala/dbc/datatype/Factory.scala +++ b/src/library/scala/dbc/datatype/Factory.scala @@ -1,13 +1,17 @@ /* __ *\ ** ________ ___ / / ___ Scala API ** -** / __/ __// _ | / / / _ | (c) 2003-2005, LAMP/EPFL ** +** / __/ __// _ | / / / _ | (c) 2003-2006, LAMP/EPFL ** ** __\ \/ /__/ __ |/ /__/ __ | ** ** /____/\___/_/ |_/____/_/ | | ** ** |/ ** \* */ +// $Id$ + + package scala.dbc.datatype; + import java.sql.Types._; import java.math.BigInteger; import java.math.BigDecimal; diff --git a/src/library/scala/dbc/datatype/Numeric.scala b/src/library/scala/dbc/datatype/Numeric.scala index ef3eee1f32..d086ecdfff 100644 --- a/src/library/scala/dbc/datatype/Numeric.scala +++ b/src/library/scala/dbc/datatype/Numeric.scala @@ -1,13 +1,17 @@ /* __ *\ ** ________ ___ / / ___ Scala API ** -** / __/ __// _ | / / / _ | (c) 2003-2005, LAMP/EPFL ** +** / __/ __// _ | / / / _ | (c) 2003-2006, LAMP/EPFL ** ** __\ \/ /__/ __ |/ /__/ __ | ** ** /____/\___/_/ |_/____/_/ | | ** ** |/ ** \* */ +// $Id$ + + package scala.dbc.datatype; + /** A type category for all SQL types that store numbers. */ abstract class Numeric[Type](_nativeTypeId: DataType.Id) extends DataType { diff --git a/src/library/scala/dbc/datatype/String.scala b/src/library/scala/dbc/datatype/String.scala index 7d409e6c2d..878bea7061 100644 --- a/src/library/scala/dbc/datatype/String.scala +++ b/src/library/scala/dbc/datatype/String.scala @@ -1,13 +1,17 @@ /* __ *\ ** ________ ___ / / ___ Scala API ** -** / __/ __// _ | / / / _ | (c) 2003-2005, LAMP/EPFL ** +** / __/ __// _ | / / / _ | (c) 2003-2006, LAMP/EPFL ** ** __\ \/ /__/ __ |/ /__/ __ | ** ** /____/\___/_/ |_/____/_/ | | ** ** |/ ** \* */ +// $Id$ + + package scala.dbc.datatype; + /** A type category for all SQL types that store strings of elements. */ abstract class String extends DataType { diff --git a/src/library/scala/dbc/datatype/Unknown.scala b/src/library/scala/dbc/datatype/Unknown.scala index 1e7895eb46..4ab1db59f8 100644 --- a/src/library/scala/dbc/datatype/Unknown.scala +++ b/src/library/scala/dbc/datatype/Unknown.scala @@ -1,13 +1,17 @@ /* __ *\ ** ________ ___ / / ___ Scala API ** -** / __/ __// _ | / / / _ | (c) 2003-2005, LAMP/EPFL ** +** / __/ __// _ | / / / _ | (c) 2003-2006, LAMP/EPFL ** ** __\ \/ /__/ __ |/ /__/ __ | ** ** /____/\___/_/ |_/____/_/ | | ** ** |/ ** \* */ +// $Id$ + + package scala.dbc.datatype; + /** The SQL type for a truth value. */ class Unknown extends DataType { diff --git a/src/library/scala/dbc/exception/IncompatibleSchema.scala b/src/library/scala/dbc/exception/IncompatibleSchema.scala index 6095fbec82..bb566ff6f2 100644 --- a/src/library/scala/dbc/exception/IncompatibleSchema.scala +++ b/src/library/scala/dbc/exception/IncompatibleSchema.scala @@ -1,15 +1,19 @@ /* __ *\ ** ________ ___ / / ___ Scala API ** -** / __/ __// _ | / / / _ | (c) 2003-2005, LAMP/EPFL ** +** / __/ __// _ | / / / _ | (c) 2003-2006, LAMP/EPFL ** ** __\ \/ /__/ __ |/ /__/ __ | ** ** /____/\___/_/ |_/____/_/ | | ** ** |/ ** \* */ +// $Id$ + + package scala.dbc.exception; + /** A type category for all SQL types that store constant-precision numbers. */ case class IncompatibleSchema ( expectedSchema: List[DataType], foundSchema: List[DataType] -) extends Exception;
\ No newline at end of file +) extends Exception; diff --git a/src/library/scala/dbc/exception/UnsupportedFeature.scala b/src/library/scala/dbc/exception/UnsupportedFeature.scala index 9fbaed81d7..073bd8ab32 100644 --- a/src/library/scala/dbc/exception/UnsupportedFeature.scala +++ b/src/library/scala/dbc/exception/UnsupportedFeature.scala @@ -1,12 +1,16 @@ /* __ *\ ** ________ ___ / / ___ Scala API ** -** / __/ __// _ | / / / _ | (c) 2003-2005, LAMP/EPFL ** +** / __/ __// _ | / / / _ | (c) 2003-2006, LAMP/EPFL ** ** __\ \/ /__/ __ |/ /__/ __ | ** ** /____/\___/_/ |_/____/_/ | | ** ** |/ ** \* */ +// $Id$ + + package scala.dbc.exception; + /** A type category for all SQL types that store constant-precision numbers. */ -case class UnsupportedFeature (msg: String) extends Exception;
\ No newline at end of file +case class UnsupportedFeature (msg: String) extends Exception; diff --git a/src/library/scala/dbc/result/Field.scala b/src/library/scala/dbc/result/Field.scala index af129d18b7..867523f9cb 100644 --- a/src/library/scala/dbc/result/Field.scala +++ b/src/library/scala/dbc/result/Field.scala @@ -1,13 +1,17 @@ /* __ *\ ** ________ ___ / / ___ Scala API ** -** / __/ __// _ | / / / _ | (c) 2003-2005, LAMP/EPFL ** +** / __/ __// _ | / / / _ | (c) 2003-2006, LAMP/EPFL ** ** __\ \/ /__/ __ |/ /__/ __ | ** ** /____/\___/_/ |_/____/_/ | | ** ** |/ ** \* */ +// $Id$ + + package scala.dbc.result; + import scala.dbc.datatype._; import scala.dbc.value._; diff --git a/src/library/scala/dbc/result/FieldMetadata.scala b/src/library/scala/dbc/result/FieldMetadata.scala index 97c5bdb3a3..a3117a262c 100644 --- a/src/library/scala/dbc/result/FieldMetadata.scala +++ b/src/library/scala/dbc/result/FieldMetadata.scala @@ -1,13 +1,17 @@ /* __ *\ ** ________ ___ / / ___ Scala API ** -** / __/ __// _ | / / / _ | (c) 2003-2005, LAMP/EPFL ** +** / __/ __// _ | / / / _ | (c) 2003-2006, LAMP/EPFL ** ** __\ \/ /__/ __ |/ /__/ __ | ** ** /____/\___/_/ |_/____/_/ | | ** ** |/ ** \* */ +// $Id$ + + package scala.dbc.result; + /** Informations attached to a field about its content and its relationship to the originating database. */ abstract class FieldMetadata { @@ -29,4 +33,4 @@ abstract class FieldMetadata { /** The name of the table in the database from which the field originates */ def table: String; -}
\ No newline at end of file +} diff --git a/src/library/scala/dbc/result/Relation.scala b/src/library/scala/dbc/result/Relation.scala index 006b6dbf07..218f8ff825 100644 --- a/src/library/scala/dbc/result/Relation.scala +++ b/src/library/scala/dbc/result/Relation.scala @@ -1,13 +1,17 @@ /* __ *\ ** ________ ___ / / ___ Scala API ** -** / __/ __// _ | / / / _ | (c) 2003-2005, LAMP/EPFL ** +** / __/ __// _ | / / / _ | (c) 2003-2006, LAMP/EPFL ** ** __\ \/ /__/ __ |/ /__/ __ | ** ** /____/\___/_/ |_/____/_/ | | ** ** |/ ** \* */ +// $Id$ + + package scala.dbc.result; + /** An ISO-9075:2003 (SQL) table. This is equivalent to a relation in the * relational model. */ abstract class Relation extends Object with Iterable[Tuple] { diff --git a/src/library/scala/dbc/result/Status.scala b/src/library/scala/dbc/result/Status.scala index 56d83d4ae6..c8a2370819 100644 --- a/src/library/scala/dbc/result/Status.scala +++ b/src/library/scala/dbc/result/Status.scala @@ -1,13 +1,17 @@ /* __ *\ ** ________ ___ / / ___ Scala API ** -** / __/ __// _ | / / / _ | (c) 2003-2005, LAMP/EPFL ** +** / __/ __// _ | / / / _ | (c) 2003-2006, LAMP/EPFL ** ** __\ \/ /__/ __ |/ /__/ __ | ** ** /____/\___/_/ |_/____/_/ | | ** ** |/ ** \* */ +// $Id$ + + package scala.dbc.result; + import scala.dbc.datatype._; /** An object containing the status of a query */ @@ -21,4 +25,4 @@ abstract class Status[ResultType] { def result: ResultType; -}
\ No newline at end of file +} diff --git a/src/library/scala/dbc/result/Tuple.scala b/src/library/scala/dbc/result/Tuple.scala index 41c2f1f6d1..6ed8955951 100644 --- a/src/library/scala/dbc/result/Tuple.scala +++ b/src/library/scala/dbc/result/Tuple.scala @@ -1,13 +1,17 @@ /* __ *\ ** ________ ___ / / ___ Scala API ** -** / __/ __// _ | / / / _ | (c) 2003-2005, LAMP/EPFL ** +** / __/ __// _ | / / / _ | (c) 2003-2006, LAMP/EPFL ** ** __\ \/ /__/ __ |/ /__/ __ | ** ** /____/\___/_/ |_/____/_/ | | ** ** |/ ** \* */ +// $Id$ + + package scala.dbc.result; + /** An ISO-9075:2003 (SQL) table row. This is equivalent to a tuple in the relational model. */ abstract class Tuple { diff --git a/src/library/scala/dbc/statement/AccessMode.scala b/src/library/scala/dbc/statement/AccessMode.scala index 815f8b3c37..16f778b35e 100644 --- a/src/library/scala/dbc/statement/AccessMode.scala +++ b/src/library/scala/dbc/statement/AccessMode.scala @@ -1,13 +1,17 @@ /* __ *\ ** ________ ___ / / ___ Scala API ** -** / __/ __// _ | / / / _ | (c) 2003-2005, LAMP/EPFL ** +** / __/ __// _ | / / / _ | (c) 2003-2006, LAMP/EPFL ** ** __\ \/ /__/ __ |/ /__/ __ | ** ** /____/\___/_/ |_/____/_/ | | ** ** |/ ** \* */ +// $Id$ + + package scala.dbc.statement; + abstract class AccessMode { def sqlString: String; } @@ -19,4 +23,4 @@ object AccessMode { case object ReadWrite extends AccessMode { def sqlString = "READ WRITE" } -}
\ No newline at end of file +} diff --git a/src/library/scala/dbc/statement/DerivedColumn.scala b/src/library/scala/dbc/statement/DerivedColumn.scala index 020304f979..653ce75698 100644 --- a/src/library/scala/dbc/statement/DerivedColumn.scala +++ b/src/library/scala/dbc/statement/DerivedColumn.scala @@ -1,13 +1,17 @@ /* __ *\ ** ________ ___ / / ___ Scala API ** -** / __/ __// _ | / / / _ | (c) 2003-2005, LAMP/EPFL ** +** / __/ __// _ | / / / _ | (c) 2003-2006, LAMP/EPFL ** ** __\ \/ /__/ __ |/ /__/ __ | ** ** /____/\___/_/ |_/____/_/ | | ** ** |/ ** \* */ +// $Id$ + + package scala.dbc.statement; + abstract class DerivedColumn { /** The value for the column. This value can be of any type but must be diff --git a/src/library/scala/dbc/statement/Expression.scala b/src/library/scala/dbc/statement/Expression.scala index 51cada90bb..6243564311 100644 --- a/src/library/scala/dbc/statement/Expression.scala +++ b/src/library/scala/dbc/statement/Expression.scala @@ -1,13 +1,17 @@ /* __ *\ ** ________ ___ / / ___ Scala API ** -** / __/ __// _ | / / / _ | (c) 2003-2005, LAMP/EPFL ** +** / __/ __// _ | / / / _ | (c) 2003-2006, LAMP/EPFL ** ** __\ \/ /__/ __ |/ /__/ __ | ** ** /____/\___/_/ |_/____/_/ | | ** ** |/ ** \* */ +// $Id$ + + package scala.dbc.statement; + /** An expression that calculates some value from fields. */ abstract class Expression extends Relation { diff --git a/src/library/scala/dbc/statement/Insert.scala b/src/library/scala/dbc/statement/Insert.scala index 23f93ec4a0..19d236d2fb 100644 --- a/src/library/scala/dbc/statement/Insert.scala +++ b/src/library/scala/dbc/statement/Insert.scala @@ -1,13 +1,17 @@ /* __ *\ ** ________ ___ / / ___ Scala API ** -** / __/ __// _ | / / / _ | (c) 2003-2005, LAMP/EPFL ** +** / __/ __// _ | / / / _ | (c) 2003-2006, LAMP/EPFL ** ** __\ \/ /__/ __ |/ /__/ __ | ** ** /____/\___/_/ |_/____/_/ | | ** ** |/ ** \* */ +// $Id$ + + package scala.dbc.statement; + import scala.dbc.statement.expression._; /** An insertion of values into a table. */ diff --git a/src/library/scala/dbc/statement/InsertionData.scala b/src/library/scala/dbc/statement/InsertionData.scala index 2d6f370319..c36dde0fb7 100644 --- a/src/library/scala/dbc/statement/InsertionData.scala +++ b/src/library/scala/dbc/statement/InsertionData.scala @@ -1,13 +1,17 @@ /* __ *\ ** ________ ___ / / ___ Scala API ** -** / __/ __// _ | / / / _ | (c) 2003-2005, LAMP/EPFL ** +** / __/ __// _ | / / / _ | (c) 2003-2006, LAMP/EPFL ** ** __\ \/ /__/ __ |/ /__/ __ | ** ** /____/\___/_/ |_/____/_/ | | ** ** |/ ** \* */ +// $Id$ + + package scala.dbc.statement; + import scala.dbc.statement.expression._; /** Data to be inserted into a table in an <code>Insert</code>. */ diff --git a/src/library/scala/dbc/statement/IsolationLevel.scala b/src/library/scala/dbc/statement/IsolationLevel.scala index f63ebe39e8..4d1d2ef2de 100644 --- a/src/library/scala/dbc/statement/IsolationLevel.scala +++ b/src/library/scala/dbc/statement/IsolationLevel.scala @@ -1,13 +1,17 @@ /* __ *\ ** ________ ___ / / ___ Scala API ** -** / __/ __// _ | / / / _ | (c) 2003-2005, LAMP/EPFL ** +** / __/ __// _ | / / / _ | (c) 2003-2006, LAMP/EPFL ** ** __\ \/ /__/ __ |/ /__/ __ | ** ** /____/\___/_/ |_/____/_/ | | ** ** |/ ** \* */ +// $Id$ + + package scala.dbc.statement; + abstract class IsolationLevel { def sqlString: String; } @@ -25,4 +29,4 @@ object IsolationLevel { case object Serializable extends IsolationLevel { def sqlString = "ISOLATION LEVEL SERIALIZABLE" } -}
\ No newline at end of file +} diff --git a/src/library/scala/dbc/statement/JoinType.scala b/src/library/scala/dbc/statement/JoinType.scala index 60d14cf968..77befa5607 100644 --- a/src/library/scala/dbc/statement/JoinType.scala +++ b/src/library/scala/dbc/statement/JoinType.scala @@ -1,13 +1,17 @@ /* __ *\ ** ________ ___ / / ___ Scala API ** -** / __/ __// _ | / / / _ | (c) 2003-2005, LAMP/EPFL ** +** / __/ __// _ | / / / _ | (c) 2003-2006, LAMP/EPFL ** ** __\ \/ /__/ __ |/ /__/ __ | ** ** /____/\___/_/ |_/____/_/ | | ** ** |/ ** \* */ +// $Id$ + + package scala.dbc.statement; + /** A join behaviour in a <code>Jointure</code>. */ abstract class JoinType { /** A SQL-99 string representation of the join behaviour. */ diff --git a/src/library/scala/dbc/statement/Jointure.scala b/src/library/scala/dbc/statement/Jointure.scala index b2ea55d5c9..471626ab05 100644 --- a/src/library/scala/dbc/statement/Jointure.scala +++ b/src/library/scala/dbc/statement/Jointure.scala @@ -1,13 +1,17 @@ /* __ *\ ** ________ ___ / / ___ Scala API ** -** / __/ __// _ | / / / _ | (c) 2003-2005, LAMP/EPFL ** +** / __/ __// _ | / / / _ | (c) 2003-2006, LAMP/EPFL ** ** __\ \/ /__/ __ |/ /__/ __ | ** ** /____/\___/_/ |_/____/_/ | | ** ** |/ ** \* */ +// $Id$ + + package scala.dbc.statement; + /** A jointure between two relations. */ abstract class Jointure extends Relation { diff --git a/src/library/scala/dbc/statement/Relation.scala b/src/library/scala/dbc/statement/Relation.scala index a6e1a283c9..d6e86b39a5 100644 --- a/src/library/scala/dbc/statement/Relation.scala +++ b/src/library/scala/dbc/statement/Relation.scala @@ -1,13 +1,17 @@ /* __ *\ ** ________ ___ / / ___ Scala API ** -** / __/ __// _ | / / / _ | (c) 2003-2005, LAMP/EPFL ** +** / __/ __// _ | / / / _ | (c) 2003-2006, LAMP/EPFL ** ** __\ \/ /__/ __ |/ /__/ __ | ** ** /____/\___/_/ |_/____/_/ | | ** ** |/ ** \* */ +// $Id$ + + package scala.dbc.statement; + /** A statement that returns a relation. */ abstract class Relation extends Statement { diff --git a/src/library/scala/dbc/statement/Select.scala b/src/library/scala/dbc/statement/Select.scala index 47c449d0e1..4da6b9e571 100644 --- a/src/library/scala/dbc/statement/Select.scala +++ b/src/library/scala/dbc/statement/Select.scala @@ -1,13 +1,17 @@ /* __ *\ ** ________ ___ / / ___ Scala API ** -** / __/ __// _ | / / / _ | (c) 2003-2005, LAMP/EPFL ** +** / __/ __// _ | / / / _ | (c) 2003-2006, LAMP/EPFL ** ** __\ \/ /__/ __ |/ /__/ __ | ** ** /____/\___/_/ |_/____/_/ | | ** ** |/ ** \* */ +// $Id$ + + package scala.dbc.statement; + /** A statement that when executed on a database will return a relation. * The returned relation will be a subset of a table in the database or * a jointure between such subsets. */ diff --git a/src/library/scala/dbc/statement/SetClause.scala b/src/library/scala/dbc/statement/SetClause.scala index 292879d3d0..e6a55ae846 100644 --- a/src/library/scala/dbc/statement/SetClause.scala +++ b/src/library/scala/dbc/statement/SetClause.scala @@ -1,13 +1,17 @@ /* __ *\ ** ________ ___ / / ___ Scala API ** -** / __/ __// _ | / / / _ | (c) 2003-2005, LAMP/EPFL ** +** / __/ __// _ | / / / _ | (c) 2003-2006, LAMP/EPFL ** ** __\ \/ /__/ __ |/ /__/ __ | ** ** /____/\___/_/ |_/____/_/ | | ** ** |/ ** \* */ +// $Id$ + + package scala.dbc.statement; + import scala.dbc.statement.expression._; /** Data to be inserted into a table in an <code>Insert</code>. */ @@ -15,4 +19,4 @@ case class SetClause (name:String, expr:Expression) { val value: Pair[String,Expression] = Pair(name,expr); def sqlString: String = value._1 + " = " + value._2.sqlInnerString; -}
\ No newline at end of file +} diff --git a/src/library/scala/dbc/statement/SetQuantifier.scala b/src/library/scala/dbc/statement/SetQuantifier.scala index a2fbbb854a..ad7c2238c8 100644 --- a/src/library/scala/dbc/statement/SetQuantifier.scala +++ b/src/library/scala/dbc/statement/SetQuantifier.scala @@ -1,13 +1,17 @@ /* __ *\ ** ________ ___ / / ___ Scala API ** -** / __/ __// _ | / / / _ | (c) 2003-2005, LAMP/EPFL ** +** / __/ __// _ | / / / _ | (c) 2003-2006, LAMP/EPFL ** ** __\ \/ /__/ __ |/ /__/ __ | ** ** /____/\___/_/ |_/____/_/ | | ** ** |/ ** \* */ +// $Id$ + + package scala.dbc.statement; + /** A set quantifier that defines the collection type of a relation. */ abstract class SetQuantifier { /** A SQL-99 compliant string representation of the set quantifier. */ @@ -27,4 +31,4 @@ object SetQuantifier { /** A SQL-99 compliant string representation of the set quantifier. */ def sqlString: String = "DISTINCT"; } -}
\ No newline at end of file +} diff --git a/src/library/scala/dbc/statement/Statement.scala b/src/library/scala/dbc/statement/Statement.scala index 64f0967483..5c78b075b7 100644 --- a/src/library/scala/dbc/statement/Statement.scala +++ b/src/library/scala/dbc/statement/Statement.scala @@ -1,13 +1,17 @@ /* __ *\ ** ________ ___ / / ___ Scala API ** -** / __/ __// _ | / / / _ | (c) 2003-2005, LAMP/EPFL ** +** / __/ __// _ | / / / _ | (c) 2003-2006, LAMP/EPFL ** ** __\ \/ /__/ __ |/ /__/ __ | ** ** /____/\___/_/ |_/____/_/ | | ** ** |/ ** \* */ +// $Id$ + + package scala.dbc.statement; + /** An ISO-9075:2003 (SQL) statement. */ abstract class Statement { diff --git a/src/library/scala/dbc/statement/Status.scala b/src/library/scala/dbc/statement/Status.scala index 61ab479199..3065ec5f7a 100644 --- a/src/library/scala/dbc/statement/Status.scala +++ b/src/library/scala/dbc/statement/Status.scala @@ -1,13 +1,17 @@ /* __ *\ ** ________ ___ / / ___ Scala API ** -** / __/ __// _ | / / / _ | (c) 2003-2005, LAMP/EPFL ** +** / __/ __// _ | / / / _ | (c) 2003-2006, LAMP/EPFL ** ** __\ \/ /__/ __ |/ /__/ __ | ** ** /____/\___/_/ |_/____/_/ | | ** ** |/ ** \* */ +// $Id$ + + package scala.dbc.statement; + /** A statement that changes the status of the database. */ abstract class Status extends Statement { @@ -23,4 +27,4 @@ abstract class Status extends Statement { database.executeStatement(this,debug); } -}
\ No newline at end of file +} diff --git a/src/library/scala/dbc/statement/Table.scala b/src/library/scala/dbc/statement/Table.scala index 18a065e221..17015a6c73 100644 --- a/src/library/scala/dbc/statement/Table.scala +++ b/src/library/scala/dbc/statement/Table.scala @@ -1,13 +1,17 @@ /* __ *\ ** ________ ___ / / ___ Scala API ** -** / __/ __// _ | / / / _ | (c) 2003-2005, LAMP/EPFL ** +** / __/ __// _ | / / / _ | (c) 2003-2006, LAMP/EPFL ** ** __\ \/ /__/ __ |/ /__/ __ | ** ** /____/\___/_/ |_/____/_/ | | ** ** |/ ** \* */ +// $Id$ + + package scala.dbc.statement; + /** A reference to a table in the database. * @author Gilles Dubochet * @version 1.0 */ diff --git a/src/library/scala/dbc/statement/Transaction.scala b/src/library/scala/dbc/statement/Transaction.scala index b87c0ccc35..a802aa82fa 100644 --- a/src/library/scala/dbc/statement/Transaction.scala +++ b/src/library/scala/dbc/statement/Transaction.scala @@ -1,13 +1,17 @@ /* __ *\ ** ________ ___ / / ___ Scala API ** -** / __/ __// _ | / / / _ | (c) 2003-2005, LAMP/EPFL ** +** / __/ __// _ | / / / _ | (c) 2003-2006, LAMP/EPFL ** ** __\ \/ /__/ __ |/ /__/ __ | ** ** /____/\___/_/ |_/____/_/ | | ** ** |/ ** \* */ +// $Id$ + + package scala.dbc.statement; + /** A statement that changes the status of the database. */ case class Transaction [ResultType] ( transactionBody: (scala.dbc.Database=>ResultType), diff --git a/src/library/scala/dbc/statement/Update.scala b/src/library/scala/dbc/statement/Update.scala index bc541200c4..cf8a3c9b6f 100644 --- a/src/library/scala/dbc/statement/Update.scala +++ b/src/library/scala/dbc/statement/Update.scala @@ -1,13 +1,17 @@ /* __ *\ ** ________ ___ / / ___ Scala API ** -** / __/ __// _ | / / / _ | (c) 2003-2005, LAMP/EPFL ** +** / __/ __// _ | / / / _ | (c) 2003-2006, LAMP/EPFL ** ** __\ \/ /__/ __ |/ /__/ __ | ** ** /____/\___/_/ |_/____/_/ | | ** ** |/ ** \* */ +// $Id$ + + package scala.dbc.statement; + import scala.dbc.statement.expression._; /** An update of the state of a table. */ diff --git a/src/library/scala/dbc/statement/expression/Aggregate.scala b/src/library/scala/dbc/statement/expression/Aggregate.scala index d0dfd6a133..3a93864475 100644 --- a/src/library/scala/dbc/statement/expression/Aggregate.scala +++ b/src/library/scala/dbc/statement/expression/Aggregate.scala @@ -1,13 +1,17 @@ /* __ *\ ** ________ ___ / / ___ Scala API ** -** / __/ __// _ | / / / _ | (c) 2003-2005, LAMP/EPFL ** +** / __/ __// _ | / / / _ | (c) 2003-2006, LAMP/EPFL ** ** __\ \/ /__/ __ |/ /__/ __ | ** ** /____/\___/_/ |_/____/_/ | | ** ** |/ ** \* */ +// $Id$ + + package scala.dbc.statement.expression; + abstract class Aggregate extends Expression { def aggregateName: String; diff --git a/src/library/scala/dbc/statement/expression/BinaryOperator.scala b/src/library/scala/dbc/statement/expression/BinaryOperator.scala index a0d964a798..3b3ac6f0fe 100644 --- a/src/library/scala/dbc/statement/expression/BinaryOperator.scala +++ b/src/library/scala/dbc/statement/expression/BinaryOperator.scala @@ -1,13 +1,17 @@ /* __ *\ ** ________ ___ / / ___ Scala API ** -** / __/ __// _ | / / / _ | (c) 2003-2005, LAMP/EPFL ** +** / __/ __// _ | / / / _ | (c) 2003-2006, LAMP/EPFL ** ** __\ \/ /__/ __ |/ /__/ __ | ** ** /____/\___/_/ |_/____/_/ | | ** ** |/ ** \* */ +// $Id$ + + package scala.dbc.statement.expression; + abstract class BinaryOperator extends Expression { /** The name of the operator. */ diff --git a/src/library/scala/dbc/statement/expression/Constant.scala b/src/library/scala/dbc/statement/expression/Constant.scala index 12a089ea48..6ee665c97d 100644 --- a/src/library/scala/dbc/statement/expression/Constant.scala +++ b/src/library/scala/dbc/statement/expression/Constant.scala @@ -1,13 +1,17 @@ /* __ *\ ** ________ ___ / / ___ Scala API ** -** / __/ __// _ | / / / _ | (c) 2003-2005, LAMP/EPFL ** +** / __/ __// _ | / / / _ | (c) 2003-2006, LAMP/EPFL ** ** __\ \/ /__/ __ |/ /__/ __ | ** ** /____/\___/_/ |_/____/_/ | | ** ** |/ ** \* */ +// $Id$ + + package scala.dbc.statement.expression; + abstract class Constant extends Expression { /** A SQL-99 compliant string representation of the relation sub- * statement. This only has a meaning inside another statement. */ @@ -15,4 +19,4 @@ abstract class Constant extends Expression { /** The value of the constant. */ def constantValue: Value; -}
\ No newline at end of file +} diff --git a/src/library/scala/dbc/statement/expression/Default.scala b/src/library/scala/dbc/statement/expression/Default.scala index 2b84a6ce4f..7d03872ab5 100644 --- a/src/library/scala/dbc/statement/expression/Default.scala +++ b/src/library/scala/dbc/statement/expression/Default.scala @@ -1,17 +1,21 @@ /* __ *\ ** ________ ___ / / ___ Scala API ** -** / __/ __// _ | / / / _ | (c) 2003-2005, LAMP/EPFL ** +** / __/ __// _ | / / / _ | (c) 2003-2006, LAMP/EPFL ** ** __\ \/ /__/ __ |/ /__/ __ | ** ** /____/\___/_/ |_/____/_/ | | ** ** |/ ** \* */ +// $Id$ + + package scala.dbc.statement.expression; + case object Default extends Expression { /** A SQL-99 compliant string representation of the relation sub- * statement. This only has a meaning inside another statement. */ def sqlInnerString: String = "DEFAULT"; -}
\ No newline at end of file +} diff --git a/src/library/scala/dbc/statement/expression/Field.scala b/src/library/scala/dbc/statement/expression/Field.scala index 55b7c96053..b005f024bd 100644 --- a/src/library/scala/dbc/statement/expression/Field.scala +++ b/src/library/scala/dbc/statement/expression/Field.scala @@ -1,13 +1,17 @@ /* __ *\ ** ________ ___ / / ___ Scala API ** -** / __/ __// _ | / / / _ | (c) 2003-2005, LAMP/EPFL ** +** / __/ __// _ | / / / _ | (c) 2003-2006, LAMP/EPFL ** ** __\ \/ /__/ __ |/ /__/ __ | ** ** /____/\___/_/ |_/____/_/ | | ** ** |/ ** \* */ +// $Id$ + + package scala.dbc.statement.expression; + abstract class Field extends Expression { /** The name of the schema in the database where the field is located. */ diff --git a/src/library/scala/dbc/statement/expression/FunctionCall.scala b/src/library/scala/dbc/statement/expression/FunctionCall.scala index 030b05812b..bfee8701dd 100644 --- a/src/library/scala/dbc/statement/expression/FunctionCall.scala +++ b/src/library/scala/dbc/statement/expression/FunctionCall.scala @@ -1,13 +1,17 @@ /* __ *\ ** ________ ___ / / ___ Scala API ** -** / __/ __// _ | / / / _ | (c) 2003-2005, LAMP/EPFL ** +** / __/ __// _ | / / / _ | (c) 2003-2006, LAMP/EPFL ** ** __\ \/ /__/ __ |/ /__/ __ | ** ** /____/\___/_/ |_/____/_/ | | ** ** |/ ** \* */ +// $Id$ + + package scala.dbc.statement.expression; + case class FunctionCall ( functionName: String, arguments: List[Expression] @@ -25,4 +29,4 @@ case class FunctionCall ( /** A list of all argument expressions to pass to the function, in order. */ //def arguments: List[Expression]; -}
\ No newline at end of file +} diff --git a/src/library/scala/dbc/statement/expression/Select.scala b/src/library/scala/dbc/statement/expression/Select.scala index bce9a5d002..44c14e8474 100644 --- a/src/library/scala/dbc/statement/expression/Select.scala +++ b/src/library/scala/dbc/statement/expression/Select.scala @@ -1,13 +1,17 @@ /* __ *\ ** ________ ___ / / ___ Scala API ** -** / __/ __// _ | / / / _ | (c) 2003-2005, LAMP/EPFL ** +** / __/ __// _ | / / / _ | (c) 2003-2006, LAMP/EPFL ** ** __\ \/ /__/ __ |/ /__/ __ | ** ** /____/\___/_/ |_/____/_/ | | ** ** |/ ** \* */ +// $Id$ + + package scala.dbc.statement.expression; + abstract class Select extends Expression { /** The actual select statement */ diff --git a/src/library/scala/dbc/statement/expression/SetFunction.scala b/src/library/scala/dbc/statement/expression/SetFunction.scala index 6a3ba37d2d..b58850df12 100644 --- a/src/library/scala/dbc/statement/expression/SetFunction.scala +++ b/src/library/scala/dbc/statement/expression/SetFunction.scala @@ -1,13 +1,17 @@ /* __ *\ ** ________ ___ / / ___ Scala API ** -** / __/ __// _ | / / / _ | (c) 2003-2005, LAMP/EPFL ** +** / __/ __// _ | / / / _ | (c) 2003-2006, LAMP/EPFL ** ** __\ \/ /__/ __ |/ /__/ __ | ** ** /____/\___/_/ |_/____/_/ | | ** ** |/ ** \* */ +// $Id$ + + package scala.dbc.statement.expression; + abstract class SetFunction { /** A SQL-99 compliant string representation of the set quantifier. */ def sqlString: String; diff --git a/src/library/scala/dbc/statement/expression/TypeCast.scala b/src/library/scala/dbc/statement/expression/TypeCast.scala index 25d1874381..5c9cbddebe 100644 --- a/src/library/scala/dbc/statement/expression/TypeCast.scala +++ b/src/library/scala/dbc/statement/expression/TypeCast.scala @@ -1,13 +1,17 @@ /* __ *\ ** ________ ___ / / ___ Scala API ** -** / __/ __// _ | / / / _ | (c) 2003-2005, LAMP/EPFL ** +** / __/ __// _ | / / / _ | (c) 2003-2006, LAMP/EPFL ** ** __\ \/ /__/ __ |/ /__/ __ | ** ** /____/\___/_/ |_/____/_/ | | ** ** |/ ** \* */ +// $Id$ + + package scala.dbc.statement.expression; + case class TypeCast ( expression: Expression, castType: DataType @@ -24,4 +28,4 @@ case class TypeCast ( /** The type to which to cast. */ //def castType: scala.dbc.datatype.DataType; -}
\ No newline at end of file +} diff --git a/src/library/scala/dbc/statement/expression/UnaryOperator.scala b/src/library/scala/dbc/statement/expression/UnaryOperator.scala index 1e7ab028f7..9068595f77 100644 --- a/src/library/scala/dbc/statement/expression/UnaryOperator.scala +++ b/src/library/scala/dbc/statement/expression/UnaryOperator.scala @@ -1,13 +1,17 @@ /* __ *\ ** ________ ___ / / ___ Scala API ** -** / __/ __// _ | / / / _ | (c) 2003-2005, LAMP/EPFL ** +** / __/ __// _ | / / / _ | (c) 2003-2006, LAMP/EPFL ** ** __\ \/ /__/ __ |/ /__/ __ | ** ** /____/\___/_/ |_/____/_/ | | ** ** |/ ** \* */ +// $Id$ + + package scala.dbc.statement.expression; + abstract class UnaryOperator extends Expression { /** The name of the operator */ diff --git a/src/library/scala/dbc/syntax/DataTypeUtil.scala b/src/library/scala/dbc/syntax/DataTypeUtil.scala index 1df3d20317..c42efb082f 100644 --- a/src/library/scala/dbc/syntax/DataTypeUtil.scala +++ b/src/library/scala/dbc/syntax/DataTypeUtil.scala @@ -1,13 +1,17 @@ /* __ *\ -** ________ ___ / / ___ Scala API tests ** -** / __/ __// _ | / / / _ | (c) 2003-2005, LAMP/EPFL ** +** ________ ___ / / ___ Scala API ** +** / __/ __// _ | / / / _ | (c) 2003-2006, LAMP/EPFL ** ** __\ \/ /__/ __ |/ /__/ __ | ** ** /____/\___/_/ |_/____/_/ | | ** ** |/ ** \* */ +// $Id$ + + package scala.dbc.syntax; + import java.math.BigDecimal; import java.math.BigInteger; diff --git a/src/library/scala/dbc/syntax/Database.scala b/src/library/scala/dbc/syntax/Database.scala index d819931e95..31a04b1129 100644 --- a/src/library/scala/dbc/syntax/Database.scala +++ b/src/library/scala/dbc/syntax/Database.scala @@ -1,13 +1,17 @@ /* __ *\ -** ________ ___ / / ___ Scala API tests ** -** / __/ __// _ | / / / _ | (c) 2003-2005, LAMP/EPFL ** +** ________ ___ / / ___ Scala API ** +** / __/ __// _ | / / / _ | (c) 2003-2006, LAMP/EPFL ** ** __\ \/ /__/ __ |/ /__/ __ | ** ** /____/\___/_/ |_/____/_/ | | ** ** |/ ** \* */ +// $Id$ + + package scala.dbc.syntax; + import java.net.URI; object Database { diff --git a/src/library/scala/dbc/syntax/Statement.scala b/src/library/scala/dbc/syntax/Statement.scala index c4dd2e7434..82ae56c31d 100644 --- a/src/library/scala/dbc/syntax/Statement.scala +++ b/src/library/scala/dbc/syntax/Statement.scala @@ -1,13 +1,17 @@ /* __ *\ ** ________ ___ / / ___ Scala API ** -** / __/ __// _ | / / / _ | (c) 2003-2005, LAMP/EPFL ** +** / __/ __// _ | / / / _ | (c) 2003-2006, LAMP/EPFL ** ** __\ \/ /__/ __ |/ /__/ __ | ** ** /____/\___/_/ |_/____/_/ | | ** ** |/ ** \* */ +// $Id$ + + package scala.dbc.syntax; + import java.math.BigDecimal; import java.math.BigInteger; diff --git a/src/library/scala/dbc/syntax/StatementExpression.scala b/src/library/scala/dbc/syntax/StatementExpression.scala index e03be2a476..aeb93a6ab9 100644 --- a/src/library/scala/dbc/syntax/StatementExpression.scala +++ b/src/library/scala/dbc/syntax/StatementExpression.scala @@ -1,13 +1,17 @@ /* __ *\ ** ________ ___ / / ___ Scala API ** -** / __/ __// _ | / / / _ | (c) 2003-2005, LAMP/EPFL ** +** / __/ __// _ | / / / _ | (c) 2003-2006, LAMP/EPFL ** ** __\ \/ /__/ __ |/ /__/ __ | ** ** /____/\___/_/ |_/____/_/ | | ** ** |/ ** \* */ +// $Id$ + + package scala.dbc.syntax; + import java.math.BigDecimal; import java.math.BigInteger; diff --git a/src/library/scala/dbc/value/ApproximateNumeric.scala b/src/library/scala/dbc/value/ApproximateNumeric.scala index 4b0c495f54..e3310f6c1f 100644 --- a/src/library/scala/dbc/value/ApproximateNumeric.scala +++ b/src/library/scala/dbc/value/ApproximateNumeric.scala @@ -1,13 +1,17 @@ /* __ *\ ** ________ ___ / / ___ Scala API ** -** / __/ __// _ | / / / _ | (c) 2003-2005, LAMP/EPFL ** +** / __/ __// _ | / / / _ | (c) 2003-2006, LAMP/EPFL ** ** __\ \/ /__/ __ |/ /__/ __ | ** ** /____/\___/_/ |_/____/_/ | | ** ** |/ ** \* */ +// $Id$ + + package scala.dbc.value; + abstract class ApproximateNumeric [Type] extends Value { val dataType: datatype.ApproximateNumeric[Type]; diff --git a/src/library/scala/dbc/value/Boolean.scala b/src/library/scala/dbc/value/Boolean.scala index fa20a066af..57e9625a0f 100644 --- a/src/library/scala/dbc/value/Boolean.scala +++ b/src/library/scala/dbc/value/Boolean.scala @@ -1,13 +1,17 @@ /* __ *\ ** ________ ___ / / ___ Scala API ** -** / __/ __// _ | / / / _ | (c) 2003-2005, LAMP/EPFL ** +** / __/ __// _ | / / / _ | (c) 2003-2006, LAMP/EPFL ** ** __\ \/ /__/ __ |/ /__/ __ | ** ** /____/\___/_/ |_/____/_/ | | ** ** |/ ** \* */ +// $Id$ + + package scala.dbc.value; + abstract class Boolean extends Value { val dataType: datatype.Boolean; @@ -20,4 +24,4 @@ object Boolean { def view (obj:value.Boolean): scala.Boolean = obj.nativeValue; -}
\ No newline at end of file +} diff --git a/src/library/scala/dbc/value/Character.scala b/src/library/scala/dbc/value/Character.scala index 1d5433b991..d8aa2c47f8 100644 --- a/src/library/scala/dbc/value/Character.scala +++ b/src/library/scala/dbc/value/Character.scala @@ -1,13 +1,17 @@ /* __ *\ ** ________ ___ / / ___ Scala API ** -** / __/ __// _ | / / / _ | (c) 2003-2005, LAMP/EPFL ** +** / __/ __// _ | / / / _ | (c) 2003-2006, LAMP/EPFL ** ** __\ \/ /__/ __ |/ /__/ __ | ** ** /____/\___/_/ |_/____/_/ | | ** ** |/ ** \* */ +// $Id$ + + package scala.dbc.value; + /** A SQL-99 value of type character string. */ abstract class Character extends Value { @@ -28,4 +32,4 @@ object Character { /** A character string value as a native string. */ def view (obj:value.Character): String = obj.nativeValue; -}
\ No newline at end of file +} diff --git a/src/library/scala/dbc/value/CharacterLargeObject.scala b/src/library/scala/dbc/value/CharacterLargeObject.scala index c4fb7097e0..5915e101b6 100644 --- a/src/library/scala/dbc/value/CharacterLargeObject.scala +++ b/src/library/scala/dbc/value/CharacterLargeObject.scala @@ -1,13 +1,17 @@ /* __ *\ ** ________ ___ / / ___ Scala API ** -** / __/ __// _ | / / / _ | (c) 2003-2005, LAMP/EPFL ** +** / __/ __// _ | / / / _ | (c) 2003-2006, LAMP/EPFL ** ** __\ \/ /__/ __ |/ /__/ __ | ** ** /____/\___/_/ |_/____/_/ | | ** ** |/ ** \* */ +// $Id$ + + package scala.dbc.value; + /** A SQL-99 value of type character large object. */ abstract class CharacterLargeObject extends Value { @@ -28,4 +32,4 @@ object CharacterLargeObject { /** A character large object value as a native string. */ def view (obj:value.CharacterLargeObject): String = obj.nativeValue; -}
\ No newline at end of file +} diff --git a/src/library/scala/dbc/value/CharacterVarying.scala b/src/library/scala/dbc/value/CharacterVarying.scala index 61142e536c..c6f14b3a8a 100644 --- a/src/library/scala/dbc/value/CharacterVarying.scala +++ b/src/library/scala/dbc/value/CharacterVarying.scala @@ -1,13 +1,17 @@ /* __ *\ ** ________ ___ / / ___ Scala API ** -** / __/ __// _ | / / / _ | (c) 2003-2005, LAMP/EPFL ** +** / __/ __// _ | / / / _ | (c) 2003-2006, LAMP/EPFL ** ** __\ \/ /__/ __ |/ /__/ __ | ** ** /____/\___/_/ |_/____/_/ | | ** ** |/ ** \* */ +// $Id$ + + package scala.dbc.value; + /** A SQL-99 value of type character varying string. */ abstract class CharacterVarying extends Value { @@ -28,4 +32,4 @@ object CharacterVarying { /** A character varying string value as a native string. */ def view (obj:value.CharacterVarying): String = obj.nativeValue; -}
\ No newline at end of file +} diff --git a/src/library/scala/dbc/value/Conversion.scala b/src/library/scala/dbc/value/Conversion.scala index 5c5dda4220..870cb3ddd1 100644 --- a/src/library/scala/dbc/value/Conversion.scala +++ b/src/library/scala/dbc/value/Conversion.scala @@ -1,13 +1,17 @@ /* __ *\ ** ________ ___ / / ___ Scala API ** -** / __/ __// _ | / / / _ | (c) 2003-2005, LAMP/EPFL ** +** / __/ __// _ | / / / _ | (c) 2003-2006, LAMP/EPFL ** ** __\ \/ /__/ __ |/ /__/ __ | ** ** /____/\___/_/ |_/____/_/ | | ** ** |/ ** \* */ +// $Id$ + + package scala.dbc.value; + import java.math._; object Conversion { @@ -150,4 +154,4 @@ object Conversion { case _ => throw new Illegal("Cannot convert value to string") } -}
\ No newline at end of file +} diff --git a/src/library/scala/dbc/value/ExactNumeric.scala b/src/library/scala/dbc/value/ExactNumeric.scala index f3e1a54aac..305a157b53 100644 --- a/src/library/scala/dbc/value/ExactNumeric.scala +++ b/src/library/scala/dbc/value/ExactNumeric.scala @@ -1,13 +1,17 @@ /* __ *\ ** ________ ___ / / ___ Scala API ** -** / __/ __// _ | / / / _ | (c) 2003-2005, LAMP/EPFL ** +** / __/ __// _ | / / / _ | (c) 2003-2006, LAMP/EPFL ** ** __\ \/ /__/ __ |/ /__/ __ | ** ** /____/\___/_/ |_/____/_/ | | ** ** |/ ** \* */ +// $Id$ + + package scala.dbc.value; + import java.math.BigInteger; import java.math.BigDecimal; @@ -28,4 +32,4 @@ object ExactNumeric { def view (obj:value.ExactNumeric[BigInteger]): BigInteger = obj.nativeValue; def view (obj:value.ExactNumeric[BigDecimal]): BigDecimal = obj.nativeValue; -}
\ No newline at end of file +} diff --git a/src/library/scala/dbc/value/Factory.scala b/src/library/scala/dbc/value/Factory.scala index b24f985354..34975937e7 100644 --- a/src/library/scala/dbc/value/Factory.scala +++ b/src/library/scala/dbc/value/Factory.scala @@ -1,13 +1,17 @@ /* __ *\ ** ________ ___ / / ___ Scala API ** -** / __/ __// _ | / / / _ | (c) 2003-2005, LAMP/EPFL ** +** / __/ __// _ | / / / _ | (c) 2003-2006, LAMP/EPFL ** ** __\ \/ /__/ __ |/ /__/ __ | ** ** /____/\___/_/ |_/____/_/ | | ** ** |/ ** \* */ +// $Id$ + + package scala.dbc.value; + import java.math.BigInteger; import java.math.BigDecimal; diff --git a/src/library/scala/dbc/value/Unknown.scala b/src/library/scala/dbc/value/Unknown.scala index b40df69011..b1ba51d064 100644 --- a/src/library/scala/dbc/value/Unknown.scala +++ b/src/library/scala/dbc/value/Unknown.scala @@ -1,13 +1,17 @@ /* __ *\ ** ________ ___ / / ___ Scala API ** -** / __/ __// _ | / / / _ | (c) 2003-2005, LAMP/EPFL ** +** / __/ __// _ | / / / _ | (c) 2003-2006, LAMP/EPFL ** ** __\ \/ /__/ __ |/ /__/ __ | ** ** /____/\___/_/ |_/____/_/ | | ** ** |/ ** \* */ +// $Id$ + + package scala.dbc.value; + abstract class Unknown extends Value { val dataType: datatype.Unknown; @@ -20,4 +24,4 @@ object UnknownType { def view (obj:value.Unknown): Object = obj.nativeValue; -}
\ No newline at end of file +} diff --git a/src/library/scala/dbc/vendor/PostgreSQL.scala b/src/library/scala/dbc/vendor/PostgreSQL.scala index 2653ed714a..f637b32a82 100644 --- a/src/library/scala/dbc/vendor/PostgreSQL.scala +++ b/src/library/scala/dbc/vendor/PostgreSQL.scala @@ -1,13 +1,17 @@ /* __ *\ ** ________ ___ / / ___ Scala API ** -** / __/ __// _ | / / / _ | (c) 2003-2005, LAMP/EPFL ** +** / __/ __// _ | / / / _ | (c) 2003-2006, LAMP/EPFL ** ** __\ \/ /__/ __ |/ /__/ __ | ** ** /____/\___/_/ |_/____/_/ | | ** ** |/ ** \* */ +// $Id$ + + package scala.dbc.vendor; + abstract class PostgreSQL extends Vendor { def uri:java.net.URI; @@ -20,4 +24,4 @@ abstract class PostgreSQL extends Vendor { val urlProtocolString = "jdbc:postgresql:" -}
\ No newline at end of file +} diff --git a/src/library/scala/io/Position.scala b/src/library/scala/io/Position.scala index ef61e01317..74a2b62fe8 100644 --- a/src/library/scala/io/Position.scala +++ b/src/library/scala/io/Position.scala @@ -1,14 +1,17 @@ /* __ *\ ** ________ ___ / / ___ Scala API ** -** / __/ __// _ | / / / _ | (c) 2003-2004, LAMP/EPFL ** +** / __/ __// _ | / / / _ | (c) 2003-2006, LAMP/EPFL ** ** __\ \/ /__/ __ |/ /__/ __ | ** ** /____/\___/_/ |_/____/_/ | | ** ** |/ ** -** $Id$ \* */ +// $Id$ + + package scala.io; + /** convenience methods to encode line and column number in one * single integer. The encode line (column) * numbers range from 0 to LINE_MASK (COLUMN_MASK), where 0 indicates diff --git a/src/library/scala/io/Source.scala b/src/library/scala/io/Source.scala index a22657e4be..fa44200948 100644 --- a/src/library/scala/io/Source.scala +++ b/src/library/scala/io/Source.scala @@ -1,14 +1,17 @@ /* __ *\ ** ________ ___ / / ___ Scala API ** -** / __/ __// _ | / / / _ | (c) 2003-2004, LAMP/EPFL ** +** / __/ __// _ | / / / _ | (c) 2003-2006, LAMP/EPFL ** ** __\ \/ /__/ __ |/ /__/ __ | ** ** /____/\___/_/ |_/____/_/ | | ** ** |/ ** -** $Id$ \* */ +// $Id$ + + package scala.io; + import java.io.{ File, FileInputStream, PrintStream }; /** convenience methods to create an iterable representation of a source diff --git a/src/library/scala/mobile/Code.scala b/src/library/scala/mobile/Code.scala index 1ce9997a3d..e1adffd07e 100644 --- a/src/library/scala/mobile/Code.scala +++ b/src/library/scala/mobile/Code.scala @@ -1,6 +1,6 @@ /* __ *\ ** ________ ___ / / ___ Scala API ** -** / __/ __// _ | / / / _ | (c) 2002-2005, LAMP/EPFL ** +** / __/ __// _ | / / / _ | (c) 2002-2006, LAMP/EPFL ** ** __\ \/ /__/ __ |/ /__/ __ | ** ** /____/\___/_/ |_/____/_/ | | ** ** |/ ** @@ -8,9 +8,11 @@ // $Id$ + package scala.mobile; -import java.lang.reflect.Constructor; + +import java.lang.reflect.Constructor,; import java.lang.reflect.Method; import java.lang.reflect.Modifier; diff --git a/src/library/scala/mobile/Location.scala b/src/library/scala/mobile/Location.scala index c6f7d57648..816edd9dcb 100644 --- a/src/library/scala/mobile/Location.scala +++ b/src/library/scala/mobile/Location.scala @@ -1,14 +1,17 @@ /* __ *\ ** ________ ___ / / ___ Scala API ** -** / __/ __// _ | / / / _ | (c) 2002-2004, LAMP/EPFL ** +** / __/ __// _ | / / / _ | (c) 2002-2006, LAMP/EPFL ** ** __\ \/ /__/ __ |/ /__/ __ | ** ** /____/\___/_/ |_/____/_/ | | ** ** |/ ** -** $Id$ \* */ +// $Id$ + + package scala.mobile; + import java.net._; import scala.collection.mutable._; diff --git a/src/library/scala/runtime/matching/Address.scala b/src/library/scala/runtime/matching/Address.scala index 3f548e402f..470650e312 100644 --- a/src/library/scala/runtime/matching/Address.scala +++ b/src/library/scala/runtime/matching/Address.scala @@ -1,5 +1,17 @@ +/* __ *\ +** ________ ___ / / ___ Scala API ** +** / __/ __// _ | / / / _ | (c) 2003-2006, LAMP/EPFL ** +** __\ \/ /__/ __ |/ /__/ __ | ** +** /____/\___/_/ |_/____/_/ | | ** +** |/ ** +\* */ + +// $Id$ + + package scala.runtime.matching ; + object Address { def empty = new Address(); } diff --git a/src/library/scala/runtime/matching/NonTerm.scala b/src/library/scala/runtime/matching/NonTerm.scala index 35bc0f60ce..b8915ef916 100644 --- a/src/library/scala/runtime/matching/NonTerm.scala +++ b/src/library/scala/runtime/matching/NonTerm.scala @@ -1,5 +1,17 @@ +/* __ *\ +** ________ ___ / / ___ Scala API ** +** / __/ __// _ | / / / _ | (c) 2003-2006, LAMP/EPFL ** +** __\ \/ /__/ __ |/ /__/ __ | ** +** /____/\___/_/ |_/____/_/ | | ** +** |/ ** +\* */ + +// $Id$ + + package scala.runtime.matching ; + import scala.collection.immutable ; abstract class NonTerm { diff --git a/src/library/scala/runtime/matching/PatternTests.scala b/src/library/scala/runtime/matching/PatternTests.scala index ea04481d58..6fefc5e276 100644 --- a/src/library/scala/runtime/matching/PatternTests.scala +++ b/src/library/scala/runtime/matching/PatternTests.scala @@ -1,5 +1,17 @@ +/* __ *\ +** ________ ___ / / ___ Scala API ** +** / __/ __// _ | / / / _ | (c) 2003-2006, LAMP/EPFL ** +** __\ \/ /__/ __ |/ /__/ __ | ** +** /____/\___/_/ |_/____/_/ | | ** +** |/ ** +\* */ + +// $Id$ + + package scala.runtime.matching ; + abstract class PatternTests extends Function2[Int,Any,Boolean]{ def apply(i:Int, inp:Any): Boolean; } diff --git a/src/library/scala/runtime/matching/Rule.scala b/src/library/scala/runtime/matching/Rule.scala index 7bd6d40fd1..148e69735e 100644 --- a/src/library/scala/runtime/matching/Rule.scala +++ b/src/library/scala/runtime/matching/Rule.scala @@ -1,5 +1,17 @@ +/* __ *\ +** ________ ___ / / ___ Scala API ** +** / __/ __// _ | / / / _ | (c) 2003-2006, LAMP/EPFL ** +** __\ \/ /__/ __ |/ /__/ __ | ** +** /____/\___/_/ |_/____/_/ | | ** +** |/ ** +\* */ + +// $Id$ + + package scala.runtime.matching ; + /* hedge grammar rules */ abstract class Rule extends Ordered[Rule] { diff --git a/src/library/scala/runtime/matching/TestAlphabet.scala b/src/library/scala/runtime/matching/TestAlphabet.scala index 41675f3909..39237b4aa5 100644 --- a/src/library/scala/runtime/matching/TestAlphabet.scala +++ b/src/library/scala/runtime/matching/TestAlphabet.scala @@ -1,5 +1,17 @@ +/* __ *\ +** ________ ___ / / ___ Scala API ** +** / __/ __// _ | / / / _ | (c) 2003-2006, LAMP/EPFL ** +** __\ \/ /__/ __ |/ /__/ __ | ** +** /____/\___/_/ |_/____/_/ | | ** +** |/ ** +\* */ + +// $Id$ + + package scala.runtime.matching ; + abstract class TestAlphabet; case class TestLabel(i: Int) extends TestAlphabet ; diff --git a/src/library/scala/util/automata/BaseBerrySethi.scala b/src/library/scala/util/automata/BaseBerrySethi.scala index ec6a37b79f..35dab49a8f 100644 --- a/src/library/scala/util/automata/BaseBerrySethi.scala +++ b/src/library/scala/util/automata/BaseBerrySethi.scala @@ -1,5 +1,17 @@ +/* __ *\ +** ________ ___ / / ___ Scala API ** +** / __/ __// _ | / / / _ | (c) 2003-2006, LAMP/EPFL ** +** __\ \/ /__/ __ |/ /__/ __ | ** +** /____/\___/_/ |_/____/_/ | | ** +** |/ ** +\* */ + +// $Id$ + + package scala.util.automata; + import scala.util.regexp.Base; import scala.collection.mutable; diff --git a/src/library/scala/util/automata/DetWordAutom.scala b/src/library/scala/util/automata/DetWordAutom.scala index 12049e0012..d7f07229ba 100644 --- a/src/library/scala/util/automata/DetWordAutom.scala +++ b/src/library/scala/util/automata/DetWordAutom.scala @@ -1,5 +1,17 @@ +/* __ *\ +** ________ ___ / / ___ Scala API ** +** / __/ __// _ | / / / _ | (c) 2003-2006, LAMP/EPFL ** +** __\ \/ /__/ __ |/ /__/ __ | ** +** /____/\___/_/ |_/____/_/ | | ** +** |/ ** +\* */ + +// $Id$ + + package scala.util.automata ; + import scala.collection.{ Set, Map }; /** A deterministic automaton. States are integers, where diff --git a/src/library/scala/util/automata/Inclusion.scala b/src/library/scala/util/automata/Inclusion.scala index d7d6a039fc..df5ef16368 100644 --- a/src/library/scala/util/automata/Inclusion.scala +++ b/src/library/scala/util/automata/Inclusion.scala @@ -1,5 +1,17 @@ +/* __ *\ +** ________ ___ / / ___ Scala API ** +** / __/ __// _ | / / / _ | (c) 2003-2006, LAMP/EPFL ** +** __\ \/ /__/ __ |/ /__/ __ | ** +** /____/\___/_/ |_/____/_/ | | ** +** |/ ** +\* */ + +// $Id$ + + package scala.util.automata ; + /** a fast test of language inclusion between minimal automata. * inspired by the AMoRE automata library * @author Burak diff --git a/src/library/scala/util/automata/NondetWordAutom.scala b/src/library/scala/util/automata/NondetWordAutom.scala index 8ff99cc369..c359ed672a 100644 --- a/src/library/scala/util/automata/NondetWordAutom.scala +++ b/src/library/scala/util/automata/NondetWordAutom.scala @@ -1,5 +1,17 @@ +/* __ *\ +** ________ ___ / / ___ Scala API ** +** / __/ __// _ | / / / _ | (c) 2003-2006, LAMP/EPFL ** +** __\ \/ /__/ __ |/ /__/ __ | ** +** /____/\___/_/ |_/____/_/ | | ** +** |/ ** +\* */ + +// $Id$ + + package scala.util.automata ; + import scala.collection.{ immutable, mutable, Set, Map }; /** A nondeterministic automaton. States are integers, where diff --git a/src/library/scala/util/automata/SubsetConstruction.scala b/src/library/scala/util/automata/SubsetConstruction.scala index 2c85843731..67b19802cf 100644 --- a/src/library/scala/util/automata/SubsetConstruction.scala +++ b/src/library/scala/util/automata/SubsetConstruction.scala @@ -1,5 +1,17 @@ +/* __ *\ +** ________ ___ / / ___ Scala API ** +** / __/ __// _ | / / / _ | (c) 2003-2006, LAMP/EPFL ** +** __\ \/ /__/ __ |/ /__/ __ | ** +** /____/\___/_/ |_/____/_/ | | ** +** |/ ** +\* */ + +// $Id$ + + package scala.util.automata ; + class SubsetConstruction[T <: AnyRef](val nfa: NondetWordAutom[T]) { //import nfa.{ _labelT, labels }; import nfa.labels ; diff --git a/src/library/scala/util/automata/WordBerrySethi.scala b/src/library/scala/util/automata/WordBerrySethi.scala index fd774cc71c..6a83e428b7 100644 --- a/src/library/scala/util/automata/WordBerrySethi.scala +++ b/src/library/scala/util/automata/WordBerrySethi.scala @@ -1,5 +1,17 @@ +/* __ *\ +** ________ ___ / / ___ Scala API ** +** / __/ __// _ | / / / _ | (c) 2003-2006, LAMP/EPFL ** +** __\ \/ /__/ __ |/ /__/ __ | ** +** /____/\___/_/ |_/____/_/ | | ** +** |/ ** +\* */ + +// $Id$ + + package scala.util.automata ; + import scala.util.regexp.WordExp ; import scala.collection.{immutable, diff --git a/src/library/scala/util/grammar/HedgeRHS.scala b/src/library/scala/util/grammar/HedgeRHS.scala index e435909eb9..5729fc1c5d 100644 --- a/src/library/scala/util/grammar/HedgeRHS.scala +++ b/src/library/scala/util/grammar/HedgeRHS.scala @@ -1,5 +1,17 @@ +/* __ *\ +** ________ ___ / / ___ Scala API ** +** / __/ __// _ | / / / _ | (c) 2003-2006, LAMP/EPFL ** +** __\ \/ /__/ __ |/ /__/ __ | ** +** /____/\___/_/ |_/____/_/ | | ** +** |/ ** +\* */ + +// $Id$ + + package scala.util.grammar; + abstract class HedgeRHS; /** right hand side of a hedge production, deriving a single tree */ diff --git a/src/library/scala/util/grammar/TreeRHS.scala b/src/library/scala/util/grammar/TreeRHS.scala index e4d391e12f..2829fc622e 100644 --- a/src/library/scala/util/grammar/TreeRHS.scala +++ b/src/library/scala/util/grammar/TreeRHS.scala @@ -1,5 +1,17 @@ +/* __ *\ +** ________ ___ / / ___ Scala API ** +** / __/ __// _ | / / / _ | (c) 2003-2006, LAMP/EPFL ** +** __\ \/ /__/ __ |/ /__/ __ | ** +** /____/\___/_/ |_/____/_/ | | ** +** |/ ** +\* */ + +// $Id$ + + package scala.util.grammar; + /** right hand side of a tree production */ abstract class TreeRHS; diff --git a/src/library/scala/util/logging/ConsoleLogger.scala b/src/library/scala/util/logging/ConsoleLogger.scala index 4219630495..b5afc6879e 100644 --- a/src/library/scala/util/logging/ConsoleLogger.scala +++ b/src/library/scala/util/logging/ConsoleLogger.scala @@ -1,6 +1,17 @@ +/* __ *\ +** ________ ___ / / ___ Scala API ** +** / __/ __// _ | / / / _ | (c) 2003-2006, LAMP/EPFL ** +** __\ \/ /__/ __ |/ /__/ __ | ** +** /____/\___/_/ |_/____/_/ | | ** +** |/ ** +\* */ + // $Id$ + package scala.util.logging; + + /** * A ConsoleLogger is mixed into a concrete class who has class Logged * among its base classes. diff --git a/src/library/scala/util/logging/Logged.scala b/src/library/scala/util/logging/Logged.scala index 0bd969665f..e715cdb9c9 100644 --- a/src/library/scala/util/logging/Logged.scala +++ b/src/library/scala/util/logging/Logged.scala @@ -1,7 +1,17 @@ +/* __ *\ +** ________ ___ / / ___ Scala API ** +** / __/ __// _ | / / / _ | (c) 2003-2006, LAMP/EPFL ** +** __\ \/ /__/ __ |/ /__/ __ | ** +** /____/\___/_/ |_/____/_/ | | ** +** |/ ** +\* */ + // $Id$ + package scala.util.logging; + /** * Mixing in the class Logged indicates that a class provides support * for logging. For instance, a developer of a library writes diff --git a/src/library/scala/util/parsing/CharInputStreamIterator.scala b/src/library/scala/util/parsing/CharInputStreamIterator.scala index 16ba724619..b597e86698 100644 --- a/src/library/scala/util/parsing/CharInputStreamIterator.scala +++ b/src/library/scala/util/parsing/CharInputStreamIterator.scala @@ -1,12 +1,17 @@ /* __ *\ ** ________ ___ / / ___ Scala API ** -** / __/ __// _ | / / / _ | (c) 2002, LAMP/EPFL ** +** / __/ __// _ | / / / _ | (c) 2002-2006, LAMP/EPFL ** ** __\ \/ /__/ __ |/ /__/ __ | ** ** /____/\___/_/ |_/____/_/ | | ** ** |/ ** \* */ + +// $Id$ + + package scala.util.parsing; + import java.io._; class CharInputStreamIterator(in: InputStream) extends Iterator[char] { diff --git a/src/library/scala/util/parsing/Parsers.scala b/src/library/scala/util/parsing/Parsers.scala index 6d743045e3..e45e476ae0 100644 --- a/src/library/scala/util/parsing/Parsers.scala +++ b/src/library/scala/util/parsing/Parsers.scala @@ -1,5 +1,17 @@ +/* __ *\ +** ________ ___ / / ___ Scala API ** +** / __/ __// _ | / / / _ | (c) 2003-2006, LAMP/EPFL ** +** __\ \/ /__/ __ |/ /__/ __ | ** +** /____/\___/_/ |_/____/_/ | | ** +** |/ ** +\* */ + +// $Id$ + + package scala.util.parsing; + abstract class Parsers { type inputType; diff --git a/src/library/scala/util/parsing/SimpleTokenizer.scala b/src/library/scala/util/parsing/SimpleTokenizer.scala index 20a23a8492..073ad03365 100644 --- a/src/library/scala/util/parsing/SimpleTokenizer.scala +++ b/src/library/scala/util/parsing/SimpleTokenizer.scala @@ -1,10 +1,22 @@ +/* __ *\ +** ________ ___ / / ___ Scala API ** +** / __/ __// _ | / / / _ | (c) 2003-2006, LAMP/EPFL ** +** __\ \/ /__/ __ |/ /__/ __ | ** +** /____/\___/_/ |_/____/_/ | | ** +** |/ ** +\* */ + +// $Id$ + + package scala.util.parsing; + class SimpleTokenizer(in: Iterator[char], delimiters: String) extends Iterator[String] { - val tracing = false; + import scala.runtime.compat.Math.max; - private def max(x: int, y: char): int = if (x < y) y else x; + val tracing = false; private def delimArray: Array[boolean] = { val ds = List.fromString(delimiters); diff --git a/src/library/scala/util/regexp/Base.scala b/src/library/scala/util/regexp/Base.scala index 5dce70e248..96ca9763c9 100644 --- a/src/library/scala/util/regexp/Base.scala +++ b/src/library/scala/util/regexp/Base.scala @@ -1,7 +1,17 @@ +/* __ *\ +** ________ ___ / / ___ Scala API ** +** / __/ __// _ | / / / _ | (c) 2003-2006, LAMP/EPFL ** +** __\ \/ /__/ __ |/ /__/ __ | ** +** /____/\___/_/ |_/____/_/ | | ** +** |/ ** +\* */ + // $Id$ + package scala.util.regexp ; + /** basic regular expressions */ abstract class Base { diff --git a/src/library/scala/util/regexp/PointedHedgeExp.scala b/src/library/scala/util/regexp/PointedHedgeExp.scala index 4f9f589271..6d6eecd3ec 100644 --- a/src/library/scala/util/regexp/PointedHedgeExp.scala +++ b/src/library/scala/util/regexp/PointedHedgeExp.scala @@ -1,7 +1,17 @@ +/* __ *\ +** ________ ___ / / ___ Scala API ** +** / __/ __// _ | / / / _ | (c) 2003-2006, LAMP/EPFL ** +** __\ \/ /__/ __ |/ /__/ __ | ** +** /____/\___/_/ |_/____/_/ | | ** +** |/ ** +\* */ + // $Id$ + package scala.util.regexp ; + /** pointed regular hedge expressions, a useful subclass of * regular hedge expressions. */ diff --git a/src/library/scala/util/regexp/SyntaxError.scala b/src/library/scala/util/regexp/SyntaxError.scala index c6599df75c..a32048a921 100644 --- a/src/library/scala/util/regexp/SyntaxError.scala +++ b/src/library/scala/util/regexp/SyntaxError.scala @@ -1,5 +1,17 @@ +/* __ *\ +** ________ ___ / / ___ Scala API ** +** / __/ __// _ | / / / _ | (c) 2003-2006, LAMP/EPFL ** +** __\ \/ /__/ __ |/ /__/ __ | ** +** /____/\___/_/ |_/____/_/ | | ** +** |/ ** +\* */ + +// $Id$ + + package scala.util.regexp ; + /** this runtime exception is thrown if an attempt to instantiate a * syntactically incorrect expression is detected */ class SyntaxError(e: String) diff --git a/src/library/scala/util/regexp/WordExp.scala b/src/library/scala/util/regexp/WordExp.scala index b9d0c8c06c..14bcbb3ec1 100644 --- a/src/library/scala/util/regexp/WordExp.scala +++ b/src/library/scala/util/regexp/WordExp.scala @@ -1,7 +1,17 @@ +/* __ *\ +** ________ ___ / / ___ Scala API ** +** / __/ __// _ | / / / _ | (c) 2003-2006, LAMP/EPFL ** +** __\ \/ /__/ __ |/ /__/ __ | ** +** /____/\___/_/ |_/____/_/ | | ** +** |/ ** +\* */ + // $Id$ + package scala.util.regexp ; + /** regular word expressions. */ abstract class WordExp extends Base { diff --git a/src/library/scala/xml/Atom.scala b/src/library/scala/xml/Atom.scala index d37d6dbf56..ca00c38932 100644 --- a/src/library/scala/xml/Atom.scala +++ b/src/library/scala/xml/Atom.scala @@ -1,14 +1,17 @@ /* __ *\ ** ________ ___ / / ___ Scala API ** -** / __/ __// _ | / / / _ | (c) 2003-2004, LAMP/EPFL ** +** / __/ __// _ | / / / _ | (c) 2003-2006, LAMP/EPFL ** ** __\ \/ /__/ __ |/ /__/ __ | ** ** /____/\___/_/ |_/____/_/ | | ** ** |/ ** -** $Id$ \* */ +// $Id$ + + package scala.xml; + /** an XML node for text (PCDATA). Used in both non-bound and bound XML * representations * @author Burak Emir diff --git a/src/library/scala/xml/Comment.scala b/src/library/scala/xml/Comment.scala index 4bf7a267f7..ea015a667e 100644 --- a/src/library/scala/xml/Comment.scala +++ b/src/library/scala/xml/Comment.scala @@ -1,15 +1,16 @@ /* __ *\ ** ________ ___ / / ___ Scala API ** -** / __/ __// _ | / / / _ | (c) 2003-2004, LAMP/EPFL ** +** / __/ __// _ | / / / _ | (c) 2003-2006, LAMP/EPFL ** ** __\ \/ /__/ __ |/ /__/ __ | ** ** /____/\___/_/ |_/____/_/ | | ** ** |/ ** -** $Id$ \* */ +// $Id$ + + package scala.xml; -import scala.collection.immutable ; /** an XML node for comments. * diff --git a/src/library/scala/xml/Document.scala b/src/library/scala/xml/Document.scala index 38503eb834..f1c0fc95cc 100644 --- a/src/library/scala/xml/Document.scala +++ b/src/library/scala/xml/Document.scala @@ -1,6 +1,6 @@ /* __ *\ ** ________ ___ / / ___ Scala API ** -** / __/ __// _ | / / / _ | (c) 2003-2005, LAMP/EPFL ** +** / __/ __// _ | / / / _ | (c) 2003-2006, LAMP/EPFL ** ** __\ \/ /__/ __ |/ /__/ __ | ** ** /____/\___/_/ |_/____/_/ | | ** ** |/ ** @@ -8,8 +8,10 @@ // $Id$ + package scala.xml; + /** A document information item (according to InfoSet spec). The comments * are copied from the Infoset spec, only augmented with some information * on the Scala types for definitions that might have no value. diff --git a/src/library/scala/xml/Elem.scala b/src/library/scala/xml/Elem.scala index 237f941eb8..2b417db90d 100644 --- a/src/library/scala/xml/Elem.scala +++ b/src/library/scala/xml/Elem.scala @@ -1,6 +1,6 @@ /* __ *\ ** ________ ___ / / ___ Scala API ** -** / __/ __// _ | / / / _ | (c) 2002-2005, LAMP/EPFL ** +** / __/ __// _ | / / / _ | (c) 2002-2006, LAMP/EPFL ** ** __\ \/ /__/ __ |/ /__/ __ | ** ** /____/\___/_/ |_/____/_/ | | ** ** |/ ** @@ -8,9 +8,9 @@ // $Id$ + package scala.xml; -import scala.collection.mutable.ArrayBuffer; /** The case class <code>Elem</code> extends the Node class, * providing an immutable data object representing an XML element. diff --git a/src/library/scala/xml/EntityRef.scala b/src/library/scala/xml/EntityRef.scala index 3ae1ef6866..e6b8152aac 100644 --- a/src/library/scala/xml/EntityRef.scala +++ b/src/library/scala/xml/EntityRef.scala @@ -1,14 +1,17 @@ /* __ *\ ** ________ ___ / / ___ Scala API ** -** / __/ __// _ | / / / _ | (c) 2003-2004, LAMP/EPFL ** +** / __/ __// _ | / / / _ | (c) 2003-2006, LAMP/EPFL ** ** __\ \/ /__/ __ |/ /__/ __ | ** ** /____/\___/_/ |_/____/_/ | | ** ** |/ ** -** $Id$ \* */ +// $Id$ + + package scala.xml; + /** an XML node for entity references * * @author buraq diff --git a/src/library/scala/xml/MalformedAttributeException.scala b/src/library/scala/xml/MalformedAttributeException.scala index bcb4c0f393..5d85c88315 100644 --- a/src/library/scala/xml/MalformedAttributeException.scala +++ b/src/library/scala/xml/MalformedAttributeException.scala @@ -1,3 +1,15 @@ +/* __ *\ +** ________ ___ / / ___ Scala API ** +** / __/ __// _ | / / / _ | (c) 2003-2006, LAMP/EPFL ** +** __\ \/ /__/ __ |/ /__/ __ | ** +** /____/\___/_/ |_/____/_/ | | ** +** |/ ** +\* */ + +// $Id$ + + package scala.xml; + case class MalformedAttributeException(msg:String) extends java.lang.RuntimeException(msg); diff --git a/src/library/scala/xml/MetaData.scala b/src/library/scala/xml/MetaData.scala index f9a8f60e91..bff7fddaf1 100644 --- a/src/library/scala/xml/MetaData.scala +++ b/src/library/scala/xml/MetaData.scala @@ -1,6 +1,6 @@ /* __ *\ ** ________ ___ / / ___ Scala API ** -** / __/ __// _ | / / / _ | (c) 2003-2005, LAMP/EPFL ** +** / __/ __// _ | / / / _ | (c) 2003-2006, LAMP/EPFL ** ** __\ \/ /__/ __ |/ /__/ __ | ** ** /____/\___/_/ |_/____/_/ | | ** ** |/ ** @@ -8,8 +8,10 @@ // $Id$ + package scala.xml; + /** Attribute information item, and linked list of attribute information items. * These are triples consisting of prefix,key,value. To obtain the namespace, * getNamespace must be called with the parent. If next is null, this is diff --git a/src/library/scala/xml/Molecule.scala b/src/library/scala/xml/Molecule.scala index d2141d069b..a2a4c6e229 100644 --- a/src/library/scala/xml/Molecule.scala +++ b/src/library/scala/xml/Molecule.scala @@ -1,14 +1,17 @@ /* __ *\ ** ________ ___ / / ___ Scala API ** -** / __/ __// _ | / / / _ | (c) 2003-2004, LAMP/EPFL ** +** / __/ __// _ | / / / _ | (c) 2003-2006, LAMP/EPFL ** ** __\ \/ /__/ __ |/ /__/ __ | ** ** /____/\___/_/ |_/____/_/ | | ** ** |/ ** -** $Id$ \* */ +// $Id$ + + package scala.xml; + /** an XML node for a list of data items. * @author buraq * @param list a list of data items, space separated diff --git a/src/library/scala/xml/NamespaceBinding.scala b/src/library/scala/xml/NamespaceBinding.scala index 22425b37f4..c675cd7194 100644 --- a/src/library/scala/xml/NamespaceBinding.scala +++ b/src/library/scala/xml/NamespaceBinding.scala @@ -1,6 +1,6 @@ /* __ *\ ** ________ ___ / / ___ Scala API ** -** / __/ __// _ | / / / _ | (c) 2002-2005, LAMP/EPFL ** +** / __/ __// _ | / / / _ | (c) 2002-2006, LAMP/EPFL ** ** __\ \/ /__/ __ |/ /__/ __ | ** ** /____/\___/_/ |_/____/_/ | | ** ** |/ ** @@ -8,6 +8,7 @@ // $Id$ + package scala.xml; diff --git a/src/library/scala/xml/Node.scala b/src/library/scala/xml/Node.scala index 2daf643d7a..e02b47886d 100644 --- a/src/library/scala/xml/Node.scala +++ b/src/library/scala/xml/Node.scala @@ -1,6 +1,6 @@ /* __ *\ ** ________ ___ / / ___ Scala API ** -** / __/ __// _ | / / / _ | (c) 2003-2005, LAMP/EPFL ** +** / __/ __// _ | / / / _ | (c) 2003-2006, LAMP/EPFL ** ** __\ \/ /__/ __ |/ /__/ __ | ** ** /____/\___/_/ |_/____/_/ | | ** ** |/ ** @@ -8,9 +8,9 @@ // $Id$ + package scala.xml; -import scala.collection.Map; /** * This object provides methods diff --git a/src/library/scala/xml/NodeBuffer.scala b/src/library/scala/xml/NodeBuffer.scala index b61e24181c..98ac60f77f 100644 --- a/src/library/scala/xml/NodeBuffer.scala +++ b/src/library/scala/xml/NodeBuffer.scala @@ -1,14 +1,17 @@ /* __ *\ ** ________ ___ / / ___ Scala API ** -** / __/ __// _ | / / / _ | (c) 2003-2004, LAMP/EPFL ** +** / __/ __// _ | / / / _ | (c) 2003-2006, LAMP/EPFL ** ** __\ \/ /__/ __ |/ /__/ __ | ** ** /____/\___/_/ |_/____/_/ | | ** ** |/ ** -** $Id$ \* */ +// $Id$ + + package scala.xml; + /** * This class acts as a Buffer for nodes. If it is used as a sequence * of nodes <code>Seq[Node]</code>, it must be ensured that no updates diff --git a/src/library/scala/xml/NodeSeq.scala b/src/library/scala/xml/NodeSeq.scala index bc81e2c26a..198e341cfe 100644 --- a/src/library/scala/xml/NodeSeq.scala +++ b/src/library/scala/xml/NodeSeq.scala @@ -1,13 +1,16 @@ /* __ *\ ** ________ ___ / / ___ Scala API ** -** / __/ __// _ | / / / _ | (c) 2003-2004, LAMP/EPFL ** +** / __/ __// _ | / / / _ | (c) 2003-2006, LAMP/EPFL ** ** __\ \/ /__/ __ |/ /__/ __ | ** ** /____/\___/_/ |_/____/_/ | | ** ** |/ ** -** $Id$ \* */ -package scala.xml ; +// $Id$ + + +package scala.xml; + object NodeSeq { final val Empty = new NodeSeq { def theSeq = Nil; } diff --git a/src/library/scala/xml/NodeTraverser.scala b/src/library/scala/xml/NodeTraverser.scala index 9aaba81d92..f3febb9e2a 100644 --- a/src/library/scala/xml/NodeTraverser.scala +++ b/src/library/scala/xml/NodeTraverser.scala @@ -1,6 +1,6 @@ /* __ *\ ** ________ ___ / / ___ Scala API ** -** / __/ __// _ | / / / _ | (c) 2003-2005, LAMP/EPFL ** +** / __/ __// _ | / / / _ | (c) 2003-2006, LAMP/EPFL ** ** __\ \/ /__/ __ |/ /__/ __ | ** ** /____/\___/_/ |_/____/_/ | | ** ** |/ ** @@ -8,11 +8,11 @@ // $Id$ + package scala.xml; -import parsing.MarkupHandler; -abstract class NodeTraverser extends MarkupHandler { +abstract class NodeTraverser extends parsing.MarkupHandler { def traverse(n: Node): Unit = n match { case x:ProcInstr => procInstr(0, x.target, x.text) diff --git a/src/library/scala/xml/Null.scala b/src/library/scala/xml/Null.scala index 5790a2fdfd..f61c7dfb64 100644 --- a/src/library/scala/xml/Null.scala +++ b/src/library/scala/xml/Null.scala @@ -1,6 +1,6 @@ /* __ *\ ** ________ ___ / / ___ Scala API ** -** / __/ __// _ | / / / _ | (c) 2003-2005, LAMP/EPFL ** +** / __/ __// _ | / / / _ | (c) 2003-2006, LAMP/EPFL ** ** __\ \/ /__/ __ |/ /__/ __ | ** ** /____/\___/_/ |_/____/_/ | | ** ** |/ ** @@ -8,8 +8,10 @@ // $Id$ + package scala.xml; + case object Null extends MetaData { /** appends given MetaData items to this MetaData list */ diff --git a/src/library/scala/xml/Parsing.scala b/src/library/scala/xml/Parsing.scala index bc86d18e62..3dd849883a 100644 --- a/src/library/scala/xml/Parsing.scala +++ b/src/library/scala/xml/Parsing.scala @@ -1,12 +1,16 @@ /* __ *\ ** ________ ___ / / ___ Scala API ** -** / __/ __// _ | / / / _ | (c) 2003-2004, LAMP/EPFL ** +** / __/ __// _ | / / / _ | (c) 2003-2006, LAMP/EPFL ** ** __\ \/ /__/ __ |/ /__/ __ | ** ** /____/\___/_/ |_/____/_/ | | ** ** |/ ** -** $Id$ \* */ -package scala.xml ; + +// $Id$ + + +package scala.xml; + /** DEPRECATED - use either parsing.TokenTests, or Utilty (helper functions * for parsing XML fragments ). diff --git a/src/library/scala/xml/PrefixedAttribute.scala b/src/library/scala/xml/PrefixedAttribute.scala index 4eb947e2c1..e5b57a67ac 100644 --- a/src/library/scala/xml/PrefixedAttribute.scala +++ b/src/library/scala/xml/PrefixedAttribute.scala @@ -1,6 +1,6 @@ /* __ *\ ** ________ ___ / / ___ Scala API ** -** / __/ __// _ | / / / _ | (c) 2003-2005, LAMP/EPFL ** +** / __/ __// _ | / / / _ | (c) 2003-2006, LAMP/EPFL ** ** __\ \/ /__/ __ |/ /__/ __ | ** ** /____/\___/_/ |_/____/_/ | | ** ** |/ ** @@ -8,8 +8,10 @@ // $Id$ + package scala.xml; + /** prefixed attributes always have a non-null namespace */ class PrefixedAttribute(val pre: String, diff --git a/src/library/scala/xml/PrettyPrinter.scala b/src/library/scala/xml/PrettyPrinter.scala index 3410c5dd9a..e51c5efe7a 100644 --- a/src/library/scala/xml/PrettyPrinter.scala +++ b/src/library/scala/xml/PrettyPrinter.scala @@ -1,13 +1,16 @@ /* __ *\ ** ________ ___ / / ___ Scala API ** -** / __/ __// _ | / / / _ | (c) 2003-2004, LAMP/EPFL ** +** / __/ __// _ | / / / _ | (c) 2003-2006, LAMP/EPFL ** ** __\ \/ /__/ __ |/ /__/ __ | ** ** /____/\___/_/ |_/____/_/ | | ** ** |/ ** -** $Id$ \* */ -package scala.xml ; +// $Id$ + + +package scala.xml; + import java.lang.StringBuffer ; /* Java dependency! */ import scala.collection.Map ; diff --git a/src/library/scala/xml/ProcInstr.scala b/src/library/scala/xml/ProcInstr.scala index b4160139e6..11cf53f4d8 100644 --- a/src/library/scala/xml/ProcInstr.scala +++ b/src/library/scala/xml/ProcInstr.scala @@ -1,14 +1,17 @@ /* __ *\ ** ________ ___ / / ___ Scala API ** -** / __/ __// _ | / / / _ | (c) 2003-2004, LAMP/EPFL ** +** / __/ __// _ | / / / _ | (c) 2003-2006, LAMP/EPFL ** ** __\ \/ /__/ __ |/ /__/ __ | ** ** /____/\___/_/ |_/____/_/ | | ** ** |/ ** -** $Id$ \* */ +// $Id$ + + package scala.xml; + /** an XML node for processing instructions (PI) * * @author Burak Emir diff --git a/src/library/scala/xml/SpecialNode.scala b/src/library/scala/xml/SpecialNode.scala index 1162287e2f..6d274587d4 100644 --- a/src/library/scala/xml/SpecialNode.scala +++ b/src/library/scala/xml/SpecialNode.scala @@ -1,14 +1,17 @@ /* __ *\ ** ________ ___ / / ___ Scala API ** -** / __/ __// _ | / / / _ | (c) 2003-2004, LAMP/EPFL ** +** / __/ __// _ | / / / _ | (c) 2003-2006, LAMP/EPFL ** ** __\ \/ /__/ __ |/ /__/ __ | ** ** /____/\___/_/ |_/____/_/ | | ** ** |/ ** -** $Id$ \* */ +// $Id$ + + package scala.xml; + /** a special XML node is either text (PCDATA), a comment, a PI, or * an entity ref **/ diff --git a/src/library/scala/xml/Text.scala b/src/library/scala/xml/Text.scala index 507239cc8b..6bb0019177 100644 --- a/src/library/scala/xml/Text.scala +++ b/src/library/scala/xml/Text.scala @@ -1,14 +1,17 @@ /* __ *\ ** ________ ___ / / ___ Scala API ** -** / __/ __// _ | / / / _ | (c) 2003-2004, LAMP/EPFL ** +** / __/ __// _ | / / / _ | (c) 2003-2006, LAMP/EPFL ** ** __\ \/ /__/ __ |/ /__/ __ | ** ** /____/\___/_/ |_/____/_/ | | ** ** |/ ** -** $Id$ \* */ +// $Id$ + + package scala.xml; + /** an XML node for text (PCDATA). Used in both non-bound and bound XML * representations * @author Burak Emir diff --git a/src/library/scala/xml/TextBuffer.scala b/src/library/scala/xml/TextBuffer.scala index 448fd861d5..a60a6cbbb5 100644 --- a/src/library/scala/xml/TextBuffer.scala +++ b/src/library/scala/xml/TextBuffer.scala @@ -1,12 +1,16 @@ /* __ *\ ** ________ ___ / / ___ Scala API ** -** / __/ __// _ | / / / _ | (c) 2003-2004, LAMP/EPFL ** +** / __/ __// _ | / / / _ | (c) 2003-2006, LAMP/EPFL ** ** __\ \/ /__/ __ |/ /__/ __ | ** ** /____/\___/_/ |_/____/_/ | | ** ** |/ ** -** $Id$ \* */ -package scala.xml ; + +// $Id$ + + +package scala.xml; + object TextBuffer { def fromString(str: String): TextBuffer = { diff --git a/src/library/scala/xml/TopScope.scala b/src/library/scala/xml/TopScope.scala index ff3b3b7cba..abeaab3235 100644 --- a/src/library/scala/xml/TopScope.scala +++ b/src/library/scala/xml/TopScope.scala @@ -1,6 +1,6 @@ /* __ *\ ** ________ ___ / / ___ Scala API ** -** / __/ __// _ | / / / _ | (c) 2002-2005, LAMP/EPFL ** +** / __/ __// _ | / / / _ | (c) 2002-2006, LAMP/EPFL ** ** __\ \/ /__/ __ |/ /__/ __ | ** ** /____/\___/_/ |_/____/_/ | | ** ** |/ ** @@ -8,8 +8,10 @@ // $Id$ + package scala.xml; + case object TopScope extends NamespaceBinding(null, null, null) { /* diff --git a/src/library/scala/xml/TypeSymbol.scala b/src/library/scala/xml/TypeSymbol.scala index e0a3fab6cb..4834139f92 100644 --- a/src/library/scala/xml/TypeSymbol.scala +++ b/src/library/scala/xml/TypeSymbol.scala @@ -1,12 +1,12 @@ /* __ *\ ** ________ ___ / / ___ Scala API ** -** / __/ __// _ | / / / _ | (c) 2002-2005, LAMP/EPFL ** +** / __/ __// _ | / / / _ | (c) 2002-2006, LAMP/EPFL ** ** __\ \/ /__/ __ |/ /__/ __ | ** ** /____/\___/_/ |_/____/_/ | | ** ** |/ ** \* */ -// $id: $ +// $Id$ package scala.xml; diff --git a/src/library/scala/xml/UnprefixedAttribute.scala b/src/library/scala/xml/UnprefixedAttribute.scala index 82d30ac804..9900b1199e 100644 --- a/src/library/scala/xml/UnprefixedAttribute.scala +++ b/src/library/scala/xml/UnprefixedAttribute.scala @@ -1,6 +1,6 @@ /* __ *\ ** ________ ___ / / ___ Scala API ** -** / __/ __// _ | / / / _ | (c) 2002-2005, LAMP/EPFL ** +** / __/ __// _ | / / / _ | (c) 2002-2006, LAMP/EPFL ** ** __\ \/ /__/ __ |/ /__/ __ | ** ** /____/\___/_/ |_/____/_/ | | ** ** |/ ** @@ -8,8 +8,10 @@ // $Id$ + package scala.xml; + /** unprefixed attributes have the null namespace */ class UnprefixedAttribute(val key: String, val value: String, val next: MetaData) extends MetaData { diff --git a/src/library/scala/xml/Utility.scala b/src/library/scala/xml/Utility.scala index 2737e75d58..c887568630 100644 --- a/src/library/scala/xml/Utility.scala +++ b/src/library/scala/xml/Utility.scala @@ -1,14 +1,17 @@ /* __ *\ ** ________ ___ / / ___ Scala API ** -** / __/ __// _ | / / / _ | (c) 2003-2004, LAMP/EPFL ** +** / __/ __// _ | / / / _ | (c) 2003-2006, LAMP/EPFL ** ** __\ \/ /__/ __ |/ /__/ __ | ** ** /____/\___/_/ |_/____/_/ | | ** ** |/ ** -** $Id$ \* */ +// $Id$ + + package scala.xml; + import java.lang.StringBuffer; import scala.collection.mutable; diff --git a/src/library/scala/xml/XML.scala b/src/library/scala/xml/XML.scala index 1fadac7fe8..739eba1f5b 100644 --- a/src/library/scala/xml/XML.scala +++ b/src/library/scala/xml/XML.scala @@ -1,18 +1,20 @@ /* __ *\ ** ________ ___ / / ___ Scala API ** -** / __/ __// _ | / / / _ | (c) 2003-2004, LAMP/EPFL ** +** / __/ __// _ | / / / _ | (c) 2003-2006, LAMP/EPFL ** ** __\ \/ /__/ __ |/ /__/ __ | ** ** /____/\___/_/ |_/____/_/ | | ** ** |/ ** -** $Id$ \* */ -package scala.xml ; + +// $Id$ + + +package scala.xml; + import scala.xml.parsing.NoBindingFactoryAdapter ; import org.xml.sax.InputSource; -// import scala.xml.Utility ; - /** functions to load and save XML elements. use this when data binding is not ** desired, i.e. when XML is handled using Symbol nodes **/ diff --git a/src/library/scala/xml/dtd/ContentModel.scala b/src/library/scala/xml/dtd/ContentModel.scala index 78132dcc4a..72a1ca5e69 100644 --- a/src/library/scala/xml/dtd/ContentModel.scala +++ b/src/library/scala/xml/dtd/ContentModel.scala @@ -1,4 +1,16 @@ -package scala.xml.dtd ; +/* __ *\ +** ________ ___ / / ___ Scala API ** +** / __/ __// _ | / / / _ | (c) 2002-2006, LAMP/EPFL ** +** __\ \/ /__/ __ |/ /__/ __ | ** +** /____/\___/_/ |_/____/_/ | | ** +** |/ ** +\* */ + +// $Id$ + + +package scala.xml.dtd; + import scala.util.regexp.WordExp; import scala.util.automata._; diff --git a/src/library/scala/xml/dtd/ContentModelParser.scala b/src/library/scala/xml/dtd/ContentModelParser.scala index 08232d118d..ee7e04197e 100644 --- a/src/library/scala/xml/dtd/ContentModelParser.scala +++ b/src/library/scala/xml/dtd/ContentModelParser.scala @@ -1,4 +1,16 @@ -package scala.xml.dtd ; +/* __ *\ +** ________ ___ / / ___ Scala API ** +** / __/ __// _ | / / / _ | (c) 2002-2006, LAMP/EPFL ** +** __\ \/ /__/ __ |/ /__/ __ | ** +** /____/\___/_/ |_/____/_/ | | ** +** |/ ** +\* */ + +// $Id$ + + +package scala.xml.dtd; + /** Parser for regexps (content models in DTD element declarations) */ diff --git a/src/library/scala/xml/dtd/DTD.scala b/src/library/scala/xml/dtd/DTD.scala index 9cf55f7077..9f096a737a 100644 --- a/src/library/scala/xml/dtd/DTD.scala +++ b/src/library/scala/xml/dtd/DTD.scala @@ -1,6 +1,17 @@ +/* __ *\ +** ________ ___ / / ___ Scala API ** +** / __/ __// _ | / / / _ | (c) 2002-2006, LAMP/EPFL ** +** __\ \/ /__/ __ |/ /__/ __ | ** +** /____/\___/_/ |_/____/_/ | | ** +** |/ ** +\* */ + +// $Id$ + + package scala.xml.dtd; -import scala.io.Source; + import scala.collection.mutable.{ HashMap, Map } /** a document type declaration */ diff --git a/src/library/scala/xml/dtd/Decl.scala b/src/library/scala/xml/dtd/Decl.scala index 1e151a5c84..c16d984792 100644 --- a/src/library/scala/xml/dtd/Decl.scala +++ b/src/library/scala/xml/dtd/Decl.scala @@ -1,6 +1,6 @@ /* __ *\ ** ________ ___ / / ___ Scala API ** -** / __/ __// _ | / / / _ | (c) 2003-2004, LAMP/EPFL ** +** / __/ __// _ | / / / _ | (c) 2003-2006, LAMP/EPFL ** ** __\ \/ /__/ __ |/ /__/ __ | ** ** /____/\___/_/ |_/____/_/ | | ** ** |/ ** @@ -8,9 +8,11 @@ // $Id$ -package scala.xml.dtd ; -abstract class Decl ; +package scala.xml.dtd; + + +abstract class Decl; abstract class MarkupDecl extends Decl { diff --git a/src/library/scala/xml/dtd/DocType.scala b/src/library/scala/xml/dtd/DocType.scala index 014c7046aa..85065548e0 100644 --- a/src/library/scala/xml/dtd/DocType.scala +++ b/src/library/scala/xml/dtd/DocType.scala @@ -1,14 +1,17 @@ /* __ *\ ** ________ ___ / / ___ Scala API ** -** / __/ __// _ | / / / _ | (c) 2003-2004, LAMP/EPFL ** +** / __/ __// _ | / / / _ | (c) 2003-2006, LAMP/EPFL ** ** __\ \/ /__/ __ |/ /__/ __ | ** ** /____/\___/_/ |_/____/_/ | | ** ** |/ ** -** $Id$ \* */ +// $Id$ + + package scala.xml.dtd; + /** an XML node for document type declaration * * @author Burak Emir diff --git a/src/library/scala/xml/dtd/DtdTypeSymbol.scala b/src/library/scala/xml/dtd/DtdTypeSymbol.scala index a543c937c5..45b5f3663b 100644 --- a/src/library/scala/xml/dtd/DtdTypeSymbol.scala +++ b/src/library/scala/xml/dtd/DtdTypeSymbol.scala @@ -1,3 +1,15 @@ +/* __ *\ +** ________ ___ / / ___ Scala API ** +** / __/ __// _ | / / / _ | (c) 2002-2006, LAMP/EPFL ** +** __\ \/ /__/ __ |/ /__/ __ | ** +** /____/\___/_/ |_/____/_/ | | ** +** |/ ** +\* */ + +// $Id$ + + package scala.xml.dtd; + mixin class DtdTypeSymbol; diff --git a/src/library/scala/xml/dtd/ElementValidator.scala b/src/library/scala/xml/dtd/ElementValidator.scala index c81559a32e..b9e3366147 100644 --- a/src/library/scala/xml/dtd/ElementValidator.scala +++ b/src/library/scala/xml/dtd/ElementValidator.scala @@ -1,5 +1,17 @@ +/* __ *\ +** ________ ___ / / ___ Scala API ** +** / __/ __// _ | / / / _ | (c) 2002-2006, LAMP/EPFL ** +** __\ \/ /__/ __ |/ /__/ __ | ** +** /____/\___/_/ |_/____/_/ | | ** +** |/ ** +\* */ + +// $Id$ + + package scala.xml.dtd; + import ContentModel.ElemName ; import scala.util.automata._ ; diff --git a/src/library/scala/xml/dtd/ExternalID.scala b/src/library/scala/xml/dtd/ExternalID.scala index 965d330a99..b4d54d5292 100644 --- a/src/library/scala/xml/dtd/ExternalID.scala +++ b/src/library/scala/xml/dtd/ExternalID.scala @@ -1,14 +1,17 @@ /* __ *\ ** ________ ___ / / ___ Scala API ** -** / __/ __// _ | / / / _ | (c) 2003-2004, LAMP/EPFL ** +** / __/ __// _ | / / / _ | (c) 2003-2006, LAMP/EPFL ** ** __\ \/ /__/ __ |/ /__/ __ | ** ** /____/\___/_/ |_/____/_/ | | ** ** |/ ** -** $Id$ \* */ +// $Id$ + + package scala.xml.dtd; + /** an ExternalIDs - either PublicID or SystemID * * @author Burak Emir diff --git a/src/library/scala/xml/dtd/Scanner.scala b/src/library/scala/xml/dtd/Scanner.scala index c51ac7cbec..ad6b8888c8 100644 --- a/src/library/scala/xml/dtd/Scanner.scala +++ b/src/library/scala/xml/dtd/Scanner.scala @@ -1,4 +1,16 @@ -package scala.xml.dtd ; +/* __ *\ +** ________ ___ / / ___ Scala API ** +** / __/ __// _ | / / / _ | (c) 2002-2006, LAMP/EPFL ** +** __\ \/ /__/ __ |/ /__/ __ | ** +** /____/\___/_/ |_/____/_/ | | ** +** |/ ** +\* */ + +// $Id$ + + +package scala.xml.dtd; + /** Scanner for regexps (content models in DTD element declarations) * todo: cleanup diff --git a/src/library/scala/xml/dtd/Tokens.scala b/src/library/scala/xml/dtd/Tokens.scala index 27935c1d08..e1903e0bca 100644 --- a/src/library/scala/xml/dtd/Tokens.scala +++ b/src/library/scala/xml/dtd/Tokens.scala @@ -1,4 +1,16 @@ -package scala.xml.dtd ; +/* __ *\ +** ________ ___ / / ___ Scala API ** +** / __/ __// _ | / / / _ | (c) 2002-2006, LAMP/EPFL ** +** __\ \/ /__/ __ |/ /__/ __ | ** +** /____/\___/_/ |_/____/_/ | | ** +** |/ ** +\* */ + +// $Id$ + + +package scala.xml.dtd; + class Tokens { diff --git a/src/library/scala/xml/dtd/ValidationException.scala b/src/library/scala/xml/dtd/ValidationException.scala index 337259ffb1..98e620113d 100644 --- a/src/library/scala/xml/dtd/ValidationException.scala +++ b/src/library/scala/xml/dtd/ValidationException.scala @@ -1,4 +1,16 @@ -package scala.xml.dtd ; +/* __ *\ +** ________ ___ / / ___ Scala API ** +** / __/ __// _ | / / / _ | (c) 2002-2006, LAMP/EPFL ** +** __\ \/ /__/ __ |/ /__/ __ | ** +** /____/\___/_/ |_/____/_/ | | ** +** |/ ** +\* */ + +// $Id$ + + +package scala.xml.dtd; + case class ValidationException( e:String ) extends Exception( e ); diff --git a/src/library/scala/xml/factory/Binder.scala b/src/library/scala/xml/factory/Binder.scala index d387e90139..d6b6b3d08e 100644 --- a/src/library/scala/xml/factory/Binder.scala +++ b/src/library/scala/xml/factory/Binder.scala @@ -1,4 +1,16 @@ -package scala.xml.factory ; +/* __ *\ +** ________ ___ / / ___ Scala API ** +** / __/ __// _ | / / / _ | (c) 2002-2006, LAMP/EPFL ** +** __\ \/ /__/ __ |/ /__/ __ | ** +** /____/\___/_/ |_/____/_/ | | ** +** |/ ** +\* */ + +// $Id$ + + +package scala.xml.factory; + import scala.xml.parsing.ValidatingMarkupHandler; diff --git a/src/library/scala/xml/factory/LoggedNodeFactory.scala b/src/library/scala/xml/factory/LoggedNodeFactory.scala index cb57069ac2..4f472bd488 100644 --- a/src/library/scala/xml/factory/LoggedNodeFactory.scala +++ b/src/library/scala/xml/factory/LoggedNodeFactory.scala @@ -1,5 +1,17 @@ +/* __ *\ +** ________ ___ / / ___ Scala API ** +** / __/ __// _ | / / / _ | (c) 2002-2006, LAMP/EPFL ** +** __\ \/ /__/ __ |/ /__/ __ | ** +** /____/\___/_/ |_/____/_/ | | ** +** |/ ** +\* */ + +// $Id$ + + package scala.xml.factory; + /** This class logs what the nodefactory is actually doing. If you want to see what happens during loading, use it like this: object testLogged with Application { diff --git a/src/library/scala/xml/factory/NodeFactory.scala b/src/library/scala/xml/factory/NodeFactory.scala index 2f9093d0df..512ba35334 100644 --- a/src/library/scala/xml/factory/NodeFactory.scala +++ b/src/library/scala/xml/factory/NodeFactory.scala @@ -1,16 +1,16 @@ /* __ *\ ** ________ ___ / / ___ Scala API ** -** / __/ __// _ | / / / _ | (c) 2003-2004, LAMP/EPFL ** +** / __/ __// _ | / / / _ | (c) 2003-2006, LAMP/EPFL ** ** __\ \/ /__/ __ |/ /__/ __ | ** ** /____/\___/_/ |_/____/_/ | | ** ** |/ ** -** $Id $ \* */ +// $Id$ + + package scala.xml.factory; -import scala.collection.Map ; -import scala.collection.mutable ; mixin class NodeFactory[A <: Node] { @@ -18,7 +18,7 @@ mixin class NodeFactory[A <: Node] { val ignoreProcInstr = false; /* default behaviour is to use hash-consing */ - val cache = new mutable.HashMap[int,List[A]](); + val cache = new collection.mutable.HashMap[int,List[A]](); protected def create(pre: String, name: String, attrs: MetaData, scope: NamespaceBinding, children:Seq[Node]): A; diff --git a/src/library/scala/xml/parsing/ConstructingHandler.scala b/src/library/scala/xml/parsing/ConstructingHandler.scala index fac22b7015..fa90409aa2 100644 --- a/src/library/scala/xml/parsing/ConstructingHandler.scala +++ b/src/library/scala/xml/parsing/ConstructingHandler.scala @@ -1,5 +1,17 @@ +/* __ *\ +** ________ ___ / / ___ Scala API ** +** / __/ __// _ | / / / _ | (c) 2002-2006, LAMP/EPFL ** +** __\ \/ /__/ __ |/ /__/ __ | ** +** /____/\___/_/ |_/____/_/ | | ** +** |/ ** +\* */ + +// $Id$ + + package scala.xml.parsing; + /** implementation of MarkupHandler that constructs nodes */ abstract class ConstructingHandler extends MarkupHandler { diff --git a/src/library/scala/xml/parsing/ConstructingParser.scala b/src/library/scala/xml/parsing/ConstructingParser.scala index fafabc916d..adef5ef1ad 100644 --- a/src/library/scala/xml/parsing/ConstructingParser.scala +++ b/src/library/scala/xml/parsing/ConstructingParser.scala @@ -1,13 +1,16 @@ /* __ *\ ** ________ ___ / / ___ Scala API ** -** / __/ __// _ | / / / _ | (c) 2003-2005, LAMP/EPFL ** +** / __/ __// _ | / / / _ | (c) 2003-2006, LAMP/EPFL ** ** __\ \/ /__/ __ |/ /__/ __ | ** ** /____/\___/_/ |_/____/_/ | | ** ** |/ ** -** $Id$ \* */ -package scala.xml.parsing ; +// $Id$ + + +package scala.xml.parsing; + import scala.io.Source; diff --git a/src/library/scala/xml/parsing/DefaultMarkupHandler.scala b/src/library/scala/xml/parsing/DefaultMarkupHandler.scala index 14fd8ec9a7..d9a175218e 100644 --- a/src/library/scala/xml/parsing/DefaultMarkupHandler.scala +++ b/src/library/scala/xml/parsing/DefaultMarkupHandler.scala @@ -1,5 +1,17 @@ +/* __ *\ +** ________ ___ / / ___ Scala API ** +** / __/ __// _ | / / / _ | (c) 2002-2006, LAMP/EPFL ** +** __\ \/ /__/ __ |/ /__/ __ | ** +** /____/\___/_/ |_/____/_/ | | ** +** |/ ** +\* */ + +// $Id$ + + package scala.xml.parsing; + /** default implemenation of markup handler always returns NodeSeq.Empty */ abstract class DefaultMarkupHandler extends MarkupHandler { diff --git a/src/library/scala/xml/parsing/ExternalSources.scala b/src/library/scala/xml/parsing/ExternalSources.scala index 2aa46da19e..2394d96f5d 100644 --- a/src/library/scala/xml/parsing/ExternalSources.scala +++ b/src/library/scala/xml/parsing/ExternalSources.scala @@ -1,13 +1,16 @@ /* __ *\ ** ________ ___ / / ___ Scala API ** -** / __/ __// _ | / / / _ | (c) 2003-2005, LAMP/EPFL ** +** / __/ __// _ | / / / _ | (c) 2003-2006, LAMP/EPFL ** ** __\ \/ /__/ __ |/ /__/ __ | ** ** /____/\___/_/ |_/____/_/ | | ** ** |/ ** -** $Id$ \* */ -package scala.xml.parsing ; +// $Id$ + + +package scala.xml.parsing; + import scala.io.Source; import java.net._; diff --git a/src/library/scala/xml/parsing/FactoryAdapter.scala b/src/library/scala/xml/parsing/FactoryAdapter.scala index e23032ca70..610f6febc1 100644 --- a/src/library/scala/xml/parsing/FactoryAdapter.scala +++ b/src/library/scala/xml/parsing/FactoryAdapter.scala @@ -1,12 +1,16 @@ /* __ *\ ** ________ ___ / / ___ Scala API ** -** / __/ __// _ | / / / _ | (c) 2003-2004, LAMP/EPFL ** +** / __/ __// _ | / / / _ | (c) 2003-2006, LAMP/EPFL ** ** __\ \/ /__/ __ |/ /__/ __ | ** ** /____/\___/_/ |_/____/_/ | | ** ** |/ ** -** $Id$ \* */ -package scala.xml.parsing ; + +// $Id$ + + +package scala.xml.parsing; + import java.io._ ; import scala.collection.mutable.{HashMap,Stack}; diff --git a/src/library/scala/xml/parsing/FatalError.scala b/src/library/scala/xml/parsing/FatalError.scala index bd007d0df9..2768becb8b 100644 --- a/src/library/scala/xml/parsing/FatalError.scala +++ b/src/library/scala/xml/parsing/FatalError.scala @@ -1,3 +1,15 @@ -package scala.xml.parsing ; +/* __ *\ +** ________ ___ / / ___ Scala API ** +** / __/ __// _ | / / / _ | (c) 2002-2006, LAMP/EPFL ** +** __\ \/ /__/ __ |/ /__/ __ | ** +** /____/\___/_/ |_/____/_/ | | ** +** |/ ** +\* */ + +// $Id$ + + +package scala.xml.parsing; + case class FatalError(msg:String) extends java.lang.RuntimeException(msg); diff --git a/src/library/scala/xml/parsing/MarkupHandler.scala b/src/library/scala/xml/parsing/MarkupHandler.scala index d90dea2752..d4c00a25b6 100644 --- a/src/library/scala/xml/parsing/MarkupHandler.scala +++ b/src/library/scala/xml/parsing/MarkupHandler.scala @@ -1,14 +1,17 @@ /* __ *\ ** ________ ___ / / ___ Scala API ** -** / __/ __// _ | / / / _ | (c) 2003-2005, LAMP/EPFL ** +** / __/ __// _ | / / / _ | (c) 2003-2006, LAMP/EPFL ** ** __\ \/ /__/ __ |/ /__/ __ | ** ** /____/\___/_/ |_/____/_/ | | ** ** |/ ** -** $Id$ \* */ +// $Id$ + + package scala.xml.parsing; + import scala.io.Source; import scala.collection.mutable.{ HashMap, Map } import scala.xml.dtd._ ; diff --git a/src/library/scala/xml/parsing/MarkupParser.scala b/src/library/scala/xml/parsing/MarkupParser.scala index 69f7d02ef9..7b0684731e 100644 --- a/src/library/scala/xml/parsing/MarkupParser.scala +++ b/src/library/scala/xml/parsing/MarkupParser.scala @@ -1,14 +1,17 @@ /* __ *\ ** ________ ___ / / ___ Scala API ** -** / __/ __// _ | / / / _ | (c) 2003-2005, LAMP/EPFL ** +** / __/ __// _ | / / / _ | (c) 2003-2006, LAMP/EPFL ** ** __\ \/ /__/ __ |/ /__/ __ | ** ** /____/\___/_/ |_/____/_/ | | ** ** |/ ** -** $Id$ \* */ +// $Id$ + + package scala.xml.parsing; + import scala.io.Source; import scala.xml.dtd._ ; diff --git a/src/library/scala/xml/parsing/NoBindingFactoryAdapter.scala b/src/library/scala/xml/parsing/NoBindingFactoryAdapter.scala index d2400e33d3..0926ac2699 100644 --- a/src/library/scala/xml/parsing/NoBindingFactoryAdapter.scala +++ b/src/library/scala/xml/parsing/NoBindingFactoryAdapter.scala @@ -1,14 +1,18 @@ /* __ *\ ** ________ ___ / / ___ Scala API ** -** / __/ __// _ | / / / _ | (c) 2003-2004, LAMP/EPFL ** +** / __/ __// _ | / / / _ | (c) 2003-2006, LAMP/EPFL ** ** __\ \/ /__/ __ |/ /__/ __ | ** ** /____/\___/_/ |_/____/_/ | | ** ** |/ ** -** $Id$ \* */ + +// $Id$ + + package scala.xml.parsing; -import scala.xml.factory.NodeFactory ; + +import scala.xml.factory.NodeFactory; import org.xml.sax.InputSource; /** nobinding adaptor providing callbacks to parser to create elements. diff --git a/src/library/scala/xml/parsing/TokenTests.scala b/src/library/scala/xml/parsing/TokenTests.scala index c7ba1f8d1b..b94513f64b 100644 --- a/src/library/scala/xml/parsing/TokenTests.scala +++ b/src/library/scala/xml/parsing/TokenTests.scala @@ -1,14 +1,17 @@ /* __ *\ ** ________ ___ / / ___ Scala API ** -** / __/ __// _ | / / / _ | (c) 2003-2005, LAMP/EPFL ** +** / __/ __// _ | / / / _ | (c) 2003-2006, LAMP/EPFL ** ** __\ \/ /__/ __ |/ /__/ __ | ** ** /____/\___/_/ |_/____/_/ | | ** ** |/ ** -** $Id$ \* */ +// $Id$ + + package scala.xml.parsing; + /** * Helper functions for parsing XML fragments */ diff --git a/src/library/scala/xml/parsing/ValidatingMarkupHandler.scala b/src/library/scala/xml/parsing/ValidatingMarkupHandler.scala index 717ed52d79..bce3720fb1 100644 --- a/src/library/scala/xml/parsing/ValidatingMarkupHandler.scala +++ b/src/library/scala/xml/parsing/ValidatingMarkupHandler.scala @@ -1,4 +1,16 @@ -package scala.xml.parsing ; +/* __ *\ +** ________ ___ / / ___ Scala API ** +** / __/ __// _ | / / / _ | (c) 2002-2006, LAMP/EPFL ** +** __\ \/ /__/ __ |/ /__/ __ | ** +** /____/\___/_/ |_/____/_/ | | ** +** |/ ** +\* */ + +// $Id$ + + +package scala.xml.parsing; + import scala.xml.dtd._ ; import scala.util.logging.Logged ; diff --git a/src/library/scala/xml/path/Expression.scala b/src/library/scala/xml/path/Expression.scala index cf6c6d552f..c9da0bc338 100644 --- a/src/library/scala/xml/path/Expression.scala +++ b/src/library/scala/xml/path/Expression.scala @@ -1,5 +1,17 @@ +/* __ *\ +** ________ ___ / / ___ Scala API ** +** / __/ __// _ | / / / _ | (c) 2002-2006, LAMP/EPFL ** +** __\ \/ /__/ __ |/ /__/ __ | ** +** /____/\___/_/ |_/____/_/ | | ** +** |/ ** +\* */ + +// $Id$ + + package scala.xml.path; + object Expression { final def testFromString(x: String): Test = { diff --git a/src/library/scala/xml/transform/BasicTransformer.scala b/src/library/scala/xml/transform/BasicTransformer.scala index 437f4f1913..cf32b1e472 100644 --- a/src/library/scala/xml/transform/BasicTransformer.scala +++ b/src/library/scala/xml/transform/BasicTransformer.scala @@ -1,4 +1,16 @@ -package scala.xml.transform ; +/* __ *\ +** ________ ___ / / ___ Scala API ** +** / __/ __// _ | / / / _ | (c) 2002-2006, LAMP/EPFL ** +** __\ \/ /__/ __ |/ /__/ __ | ** +** /____/\___/_/ |_/____/_/ | | ** +** |/ ** +\* */ + +// $Id$ + + +package scala.xml.transform; + /** a class for XML transformations */ abstract class BasicTransformer extends Function1[Node,Node] { diff --git a/src/library/scala/xml/transform/RewriteRule.scala b/src/library/scala/xml/transform/RewriteRule.scala index c00d33aa96..33a7e47ea9 100644 --- a/src/library/scala/xml/transform/RewriteRule.scala +++ b/src/library/scala/xml/transform/RewriteRule.scala @@ -1,4 +1,16 @@ -package scala.xml.transform ; +/* __ *\ +** ________ ___ / / ___ Scala API ** +** / __/ __// _ | / / / _ | (c) 2002-2006, LAMP/EPFL ** +** __\ \/ /__/ __ |/ /__/ __ | ** +** /____/\___/_/ |_/____/_/ | | ** +** |/ ** +\* */ + +// $Id$ + + +package scala.xml.transform; + /** a RewriteRule, when applied to a term, yields either * the resulting of rewriting or the term itself it the rule diff --git a/src/library/scala/xml/transform/RuleTransformer.scala b/src/library/scala/xml/transform/RuleTransformer.scala index 6a967105e7..f8d2ecc413 100644 --- a/src/library/scala/xml/transform/RuleTransformer.scala +++ b/src/library/scala/xml/transform/RuleTransformer.scala @@ -1,5 +1,17 @@ +/* __ *\ +** ________ ___ / / ___ Scala API ** +** / __/ __// _ | / / / _ | (c) 2002-2006, LAMP/EPFL ** +** __\ \/ /__/ __ |/ /__/ __ | ** +** /____/\___/_/ |_/____/_/ | | ** +** |/ ** +\* */ + +// $Id$ + + package scala.xml.transform; + class RuleTransformer(rules:RewriteRule*) extends BasicTransformer { override def transform(n:Node): Seq[Node] = { var m: Seq[Node] = super.transform(n); diff --git a/src/library/scala/xml/xsd/ContentModel.scala b/src/library/scala/xml/xsd/ContentModel.scala index 11e513d26d..6e699b4bbc 100644 --- a/src/library/scala/xml/xsd/ContentModel.scala +++ b/src/library/scala/xml/xsd/ContentModel.scala @@ -1,4 +1,16 @@ -package scala.xml.xsd ; +/* __ *\ +** ________ ___ / / ___ Scala API ** +** / __/ __// _ | / / / _ | (c) 2002-2006, LAMP/EPFL ** +** __\ \/ /__/ __ |/ /__/ __ | ** +** /____/\___/_/ |_/____/_/ | | ** +** |/ ** +\* */ + +// $Id$ + + +package scala.xml.xsd; + import scala.util.regexp.WordExp; import scala.util.automata._; diff --git a/src/library/scala/xml/xsd/Decl.scala b/src/library/scala/xml/xsd/Decl.scala index 18a61f3b2b..9d182c2534 100644 --- a/src/library/scala/xml/xsd/Decl.scala +++ b/src/library/scala/xml/xsd/Decl.scala @@ -1,6 +1,6 @@ /* __ *\ ** ________ ___ / / ___ Scala API ** -** / __/ __// _ | / / / _ | (c) 2003-2005, LAMP/EPFL ** +** / __/ __// _ | / / / _ | (c) 2003-2006, LAMP/EPFL ** ** __\ \/ /__/ __ |/ /__/ __ | ** ** /____/\___/_/ |_/____/_/ | | ** ** |/ ** @@ -8,9 +8,11 @@ // $Id$ -package scala.xml.xsd ; -abstract class Decl ; +package scala.xml.xsd; + + +abstract class Decl; /** name - label of the element * typeName - reference to a (possibly generated) type name diff --git a/src/library/scala/xml/xsd/XsTypeSymbol.scala b/src/library/scala/xml/xsd/XsTypeSymbol.scala index a24eb8ad1c..970efe6ac9 100644 --- a/src/library/scala/xml/xsd/XsTypeSymbol.scala +++ b/src/library/scala/xml/xsd/XsTypeSymbol.scala @@ -1,12 +1,12 @@ /* __ *\ ** ________ ___ / / ___ Scala API ** -** / __/ __// _ | / / / _ | (c) 2002-2005, LAMP/EPFL ** +** / __/ __// _ | / / / _ | (c) 2002-2006, LAMP/EPFL ** ** __\ \/ /__/ __ |/ /__/ __ | ** ** /____/\___/_/ |_/____/_/ | | ** ** |/ ** \* */ -// $id: $ +// $Id$ package scala.xml.xsd; |