diff options
| author | michelou <michelou@epfl.ch> | 2009-07-07 10:18:05 +0000 |
|---|---|---|
| committer | michelou <michelou@epfl.ch> | 2009-07-07 10:18:05 +0000 |
| commit | dbe0e2bc384fdf7eac0312859347aa62a4778390 (patch) | |
| tree | 36e9b3e88aa3c66f390306c082b827b741615116 /src | |
| parent | 5754e85ed09df3722c3ca98e0832656ab8699e74 (diff) | |
| download | scala-dbe0e2bc384fdf7eac0312859347aa62a4778390.tar.gz scala-dbe0e2bc384fdf7eac0312859347aa62a4778390.tar.bz2 scala-dbe0e2bc384fdf7eac0312859347aa62a4778390.zip | |
fixed Scala comments, added svn:keywords
Diffstat (limited to 'src')
115 files changed, 1365 insertions, 300 deletions
diff --git a/src/actors/scala/actors/ReplyReactor.scala b/src/actors/scala/actors/ReplyReactor.scala index 7e8bc0ab37..1fb564f626 100644 --- a/src/actors/scala/actors/ReplyReactor.scala +++ b/src/actors/scala/actors/ReplyReactor.scala @@ -10,14 +10,14 @@ package scala.actors -/** - * The ReplyReactor trait extends the Reactor trait with - * methods to reply to the sender of a message. - * Sending a message to a ReplyReactor implicitly - * passes a reference to the sender together with the - * message. +/** <p> + * The <code>ReplyReactor</code> trait extends the <code>Reactor</code> + * trait with methods to reply to the sender of a message. + * Sending a message to a <code>ReplyReactor</code> implicitly + * passes a reference to the sender together with the message. + * </p> * - * @author Philipp Haller + * @author Philipp Haller */ trait ReplyReactor extends Reactor { diff --git a/src/compiler/scala/tools/nsc/doc/ModelExtractor.scala b/src/compiler/scala/tools/nsc/doc/ModelExtractor.scala index 328f2713af..3e827aa0b1 100644 --- a/src/compiler/scala/tools/nsc/doc/ModelExtractor.scala +++ b/src/compiler/scala/tools/nsc/doc/ModelExtractor.scala @@ -50,7 +50,11 @@ trait ModelExtractor { } protected def decodeComment(comment0: String): Comment = { - val comment = comment0 // .substring("/**".length, comment0.length - "*/".length) + val comment = { // discard outmost comment delimiters if present + val begin = if (comment0 startsWith "/**") 3 else 0 + val end = comment0.length - (if (comment0 endsWith "*/") 2 else 0) + comment0.substring(begin, end) + } val tok = new java.util.StringTokenizer(comment, LINE_SEPARATOR) val buf = new StringBuilder type AttrDescr = (String, String, StringBuilder) @@ -415,7 +419,7 @@ trait ModelExtractor { import java.util.regex.Pattern // patterns for standard tags with 1 and 2 arguments private val pat1 = Pattern.compile( - "[ \t]*@(author|deprecated|pre|return|see|since|todo|version|ex|note)[ \t]*(.*)") + "[ \t]*@(author|deprecated|owner|pre|return|see|since|todo|version|ex|note)[ \t]*(.*)") private val pat2 = Pattern.compile( "[ \t]*@(exception|param|throws)[ \t]+(\\p{Graph}*)[ \t]*(.*)") diff --git a/src/library/scala/annotation/switch.scala b/src/library/scala/annotation/switch.scala index 5ecbf73905..1dfd0af88d 100644 --- a/src/library/scala/annotation/switch.scala +++ b/src/library/scala/annotation/switch.scala @@ -11,7 +11,23 @@ package scala.annotation * An annotation to be applied to a match expression. If present, * the compiler will verify that the match has been compiled to a * tableswitch or lookupswitch, and issue an error if it instead - * compiles into a series of conditional expressions. + * compiles into a series of conditional expressions.<br/> + * Example: * </p> + * <pre> + * <b>def</b> fetchToken() { + * (ch: @switch) <b>match</b> { + * <b>case</b> ' ' | '\t' | CR | LF | FF <b>=></b> + * nextChar() + * fetchToken() + * <b>case</b> 'A' /*..'Z'*/ | '$' | '_' | 'a' /*..'z'*/ <b>=></b> + * putChar(ch) + * nextChar() + * getIdentRest() + * <b>case</b> ',' <b>=></b> + * nextChar(); token = COMMA + * // more cases + * } + * }</pre> */ -final class switch extends StaticAnnotation
\ No newline at end of file +final class switch extends StaticAnnotation diff --git a/src/library/scala/collection/BufferedIterator.scala b/src/library/scala/collection/BufferedIterator.scala index 44dc6925ea..c59d4f50b1 100644 --- a/src/library/scala/collection/BufferedIterator.scala +++ b/src/library/scala/collection/BufferedIterator.scala @@ -11,8 +11,8 @@ package scala.collection -/** Buffered iterators are iterators which provide a method `head` that inspects the next - * element without discarding it. +/** Buffered iterators are iterators which provide a method <code>head</code> + * that inspects the next element without discarding it. * * @author Martin Odersky * @version 2.8 diff --git a/src/library/scala/collection/DefaultMap.scala b/src/library/scala/collection/DefaultMap.scala index bb3a0defa0..8c605f536d 100644 --- a/src/library/scala/collection/DefaultMap.scala +++ b/src/library/scala/collection/DefaultMap.scala @@ -13,16 +13,21 @@ package scala.collection import generic._ -/* A default map which implements the `updated` and `-` methods of maps. - * Instances that inherit from DefaultMap[A, B] still have to define: - * - * def get(key: A): Option[B] - * def iterator: Iterator[(A, B)] - * - * It refers back to the original map. - * - * It might also be advisable to override `foreach` or `size` if efficient - * implementations can be found. +/** <p> + * A default map which implements the <code>updated</code> and <code>-</code> + * methods of maps.<br/> + * Instances that inherit from <code>DefaultMap[A, B]</code> still have to + * define: + * </p><pre> + * <b>def</b> get(key: A): Option[B] + * <b>def</b> iterator: Iterator[(A, B)]</pre> + * <p> + * It refers back to the original map. + * </p> + * <p> + * It might also be advisable to override <code>foreach</code> or + * <code>size</code> if efficient implementations can be found. + * </p> */ trait DefaultMap[A, +B] extends Map[A, B] { self => diff --git a/src/library/scala/collection/Iterable.scala b/src/library/scala/collection/Iterable.scala index 9975e45bec..c3a3082e8a 100644 --- a/src/library/scala/collection/Iterable.scala +++ b/src/library/scala/collection/Iterable.scala @@ -14,19 +14,28 @@ import util.control.Breaks._ // import immutable.Stream import generic._ -/** A template trait for iterable collections. - * - * Collection classes mixing in this trait provide a method - * <code>iterator</code> which returns an iterator over all the - * elements contained in the collection. They also provide a method `newBuilder` - * which creates a builder for collections of the same kind. - * - * This trait implements Traversable's `foreach` method by stepping through - * all elements. Subclasses of `Iterable` should re-implement `foreach` with - * something more efficient, if possible. - * - * This trait adds methods `iterator`, `zip`, `zipAll`, `zipWithIndex`, `sameElements`, - * `takeRight`, `dropRight` to the methods inherited from trait `Traversable`. +/** <p> + * A template trait for iterable collections. + * </p> + * <p> + * Collection classes mixing in this trait provide a method + * <code>iterator</code> which returns an iterator over all the + * elements contained in the collection. They also provide a method + * <code>newBuilder</code> which creates a builder for collections + * of the same kind. + * </p> + * <p> + * This trait implements <code>Traversable</code>'s <code>foreach</code> + * method by stepping through all elements. Subclasses of <code>Iterable</code> + * should re-implement <code>foreach</code> with something more efficient, + * if possible. + * </p> + * <p> + * This trait adds methods <code>iterator</code>, <code>zip</code>, + * <code>zipAll</code>, <code>zipWithIndex</code>, <code>sameElements</code>, + * <code>takeRight</code>, <code>dropRight</code> to the methods inherited + * from trait <code>Traversable</code>. + * </p> * * @author Martin Odersky * @version 2.8 diff --git a/src/library/scala/collection/IterableProxy.scala b/src/library/scala/collection/IterableProxy.scala index 6bb12e84dc..125b470ad7 100644 --- a/src/library/scala/collection/IterableProxy.scala +++ b/src/library/scala/collection/IterableProxy.scala @@ -16,8 +16,10 @@ import generic._ // Methods could be printed by cat Traversibe.scala | egrep '^ (override )?def' -/** This trait implements a proxy for iterable objects. It forwards - * all calls to a different iterable object +/** <p> + * This trait implements a proxy for iterable objects. It forwards + * all calls to a different iterable object. + * </p> * * @author Martin Odersky * @version 2.8 diff --git a/src/library/scala/collection/JavaConversions.scala b/src/library/scala/collection/JavaConversions.scala index b118529f00..d1b4d7ffb7 100644 --- a/src/library/scala/collection/JavaConversions.scala +++ b/src/library/scala/collection/JavaConversions.scala @@ -10,41 +10,44 @@ package scala.collection -/** - * A collection of implicit conversions supporting interoperability between Scala and Java - * collections. - * <p> - * The following conversions are supported, - * <p> - * <ul> - * <li><code>scala.collection.Iterable</code> <=> <code>java.lang.Iterable</code></li> - * <li><code>scala.collection.Iterable</code> <=> <code>java.util.Collection</code></li> - * <li><code>scala.collection.Iterator</code> <=> <code>java.util.{ Iterator, Enumeration }</code></li> - * <li><code>scala.collection.mutable.Buffer</code> <=> <code>java.util.List</code></li> - * <li><code>scala.collection.mutable.Set</code> <=> <code>java.util.Set</code></li> - * <li><code>scala.collection.mutable.Map</code> <=> <code>java.util.Map</code></li> - * <ul> - * <p> - * In all cases, converting from a source type to a target type and back again will return - * the original source object, eg. - * <p> - * <pre> - * import scala.collections.jcl.Conversions._ +/** <p> + * A collection of implicit conversions supporting interoperability between + * Scala and Java collections. + * </p> + * <p> + * The following conversions are supported: + * </p> + * <ul> + * <li><code>scala.collection.Iterable</code> <=> <code>java.lang.Iterable</code></li> + * <li><code>scala.collection.Iterable</code> <=> <code>java.util.Collection</code></li> + * <li><code>scala.collection.Iterator</code> <=> <code>java.util.{ Iterator, Enumeration }</code></li> + * <li><code>scala.collection.mutable.Buffer</code> <=> <code>java.util.List</code></li> + * <li><code>scala.collection.mutable.Set</code> <=> <code>java.util.Set</code></li> + * <li><code>scala.collection.mutable.Map</code> <=> <code>java.util.Map</code></li> + * </ul> + * <p> + * In all cases, converting from a source type to a target type and back + * again will return the original source object, eg. + * </p> + * <pre> + * <b>import</b> scala.collections.jcl.Conversions._ * - * val sl = new scala.collection.mutable.ListBuffer[Int] - * val jl : java.util.List[Int] = sl - * val sl2 : scala.collection.mutable.Buffer[Int] = jl - * assert(sl eq sl2)g - * </pre> + * <b>val</b> sl = <b>new</b> scala.collection.mutable.ListBuffer[Int] + * <b>val</b> jl : java.util.List[Int] = sl + * <b>val</b> sl2 : scala.collection.mutable.Buffer[Int] = jl + * assert(sl eq sl2)g</pre> + * <p> + * Note that no conversion is provided from <code>scala.collection.immutable.List</code> + * to <code>java.util.List</code>. Instead it is convertible to an immutable + * <code>java.util.Collection</code> which provides size and interation + * capabilities, but not access by index as would be provided by + * <code>java.util.List</code>.<br/> + * This is intentional: in combination the implementation of + * <code>scala.collection.immutable.List</code> and the typical usage + * patterns of <code>java.util.List</code> would perform extremely poorly. + * </p> * - * <p> - * Note that no conversion is provided from scala.collection.immutable.List to java.util.List. - * Instead it is convertible to an immutable java.util.Collection which provides size and - * interation capabilities, but not access by index as would be provided by java.util.List. - * This is intentional: in combination the implementation of scala.collection.immutable.List - * and the typical usage patterns of java.util.List would perform extremely poorly. - * - * @author Miles Sabin + * @author Miles Sabin */ object JavaConversions { import java.{ lang => jl, util => ju } diff --git a/src/library/scala/collection/LinearSequence.scala b/src/library/scala/collection/LinearSequence.scala index 676102fe35..0d926fd36f 100644 --- a/src/library/scala/collection/LinearSequence.scala +++ b/src/library/scala/collection/LinearSequence.scala @@ -16,11 +16,14 @@ import mutable.ListBuffer import generic._ import util.control.Breaks._ -/** Class <code>Linear[A]</code> represents linear sequences of elements. - * For such sequences `isEmpty`, `head` and `tail` are guaranteed to be - * efficient constant time (or near so) operations. - * It does not add any methods to Sequence but overrides several - * methods with optimized implementations. +/** <p> + * Class <code>Linear[A]</code> represents linear sequences of elements. + * For such sequences <code>isEmpty</code>, <code>head</code> and + * <code>tail</code> are guaranteed to be efficient constant time (or near so) + * operations.<br/> + * It does not add any methods to <code>Sequence</code> but overrides several + * methods with optimized implementations. + * </p> * * @author Martin Odersky * @author Matthias Zenger diff --git a/src/library/scala/collection/Map.scala b/src/library/scala/collection/Map.scala index 72afa218c2..c7d656052e 100644 --- a/src/library/scala/collection/Map.scala +++ b/src/library/scala/collection/Map.scala @@ -13,27 +13,30 @@ package scala.collection import generic._ -/** A map from keys of type A to values of type B. - * To implement a concrete map, you need to provide implementations of the following methods: - * (where This is the type of the map in question): +/** <p> + * A map from keys of type <code>A</code> to values of type <code>B</code>. + * To implement a concrete map, you need to provide implementations of the + * following methods (where <code>This</code> is the type of the map in question): + * </p><pre> + * <b>def</b> get(key: A): Option[B] + * <b>def</b> iterator: Iterator[(A, B)] + * <b>def</b> + [B1 >: B](kv: (A, B1)): This + * <b>def</b> -(key: A): This</pre> + * <p> + * If you wish that methods like, take, drop, filter return the same kind + * of map, you should also override: + * </p><pre> + * <b>def</b> empty: This</pre> + * <p> + * It might also be a good idea to override methods <code>foreach</code> + * and <code>size</code> for efficiency. + * </p> * - * def get(key: A): Option[B] - * def iterator: Iterator[(A, B)] - * def + [B1 >: B](kv: (A, B1)): This - * def -(key: A): This + * @note If you do not have specific implementations for `add` and `-` in mind, + * you might consider inheriting from <code>DefaultMap</code> instead. * - * If you wish that methods like, take, drop, filter return the same kind of map, you should also - * override: - * - * def empty: This - * - * It might also be a good idea to override methods foreach and size for efficiency. - * - * @note If you do not have speicifc implementations for `add` and `-` in mind, you - * might consider inheriting from `DefaultMap` instead. - * - * @note Of you additions and mutations return the same kind of map as the map you are defining, - * you should inherit from `MapTemplate` as well. + * @note Of you additions and mutations return the same kind of map as the map + * you are defining, you should inherit from <code>MapTemplate</code> as well. */ trait Map[A, +B] extends Iterable[(A, B)] with MapTemplate[A, B, Map[A, B]] { def empty: Map[A, B] = Map.empty diff --git a/src/library/scala/collection/MapProxy.scala b/src/library/scala/collection/MapProxy.scala index 134405bae4..b89b7e7cf6 100644 --- a/src/library/scala/collection/MapProxy.scala +++ b/src/library/scala/collection/MapProxy.scala @@ -1,7 +1,7 @@ /* __ *\ ** ________ ___ / / ___ Scala API ** ** / __/ __// _ | / / / _ | (c) 2003-2009, LAMP/EPFL ** -** __\ \/ /__/ __ |/ /__/ __ | ** +** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ ** ** /____/\___/_/ |_/____/_/ | | ** ** |/ ** \* */ @@ -20,4 +20,4 @@ import generic.MapProxyTemplate * @author Matthias Zenger * @version 1.0, 21/07/2003 */ -trait MapProxy[A, +B] extends Map[A, B] with MapProxyTemplate[A, B, Map[A, B]]
\ No newline at end of file +trait MapProxy[A, +B] extends Map[A, B] with MapProxyTemplate[A, B, Map[A, B]] diff --git a/src/library/scala/collection/Set.scala b/src/library/scala/collection/Set.scala index 8a215a0bf2..05124bf712 100644 --- a/src/library/scala/collection/Set.scala +++ b/src/library/scala/collection/Set.scala @@ -15,7 +15,6 @@ import generic._ /** <p> * A set is a collection that includes at most one of any object. * </p> - * <p> * * @author Matthias Zenger * @author Martin Odersky diff --git a/src/library/scala/collection/SetProxy.scala b/src/library/scala/collection/SetProxy.scala index 1d01dbc9cb..e23a1c0286 100644 --- a/src/library/scala/collection/SetProxy.scala +++ b/src/library/scala/collection/SetProxy.scala @@ -1,7 +1,7 @@ /* __ *\ ** ________ ___ / / ___ Scala API ** ** / __/ __// _ | / / / _ | (c) 2003-2009, LAMP/EPFL ** -** __\ \/ /__/ __ |/ /__/ __ | ** +** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ ** ** /____/\___/_/ |_/____/_/ | | ** ** |/ ** \* */ @@ -23,4 +23,4 @@ import generic.SetProxyTemplate * @version 2.0, 01/01/2007 */ -trait SetProxy[A] extends Set[A] with SetProxyTemplate[A, Set[A]]
\ No newline at end of file +trait SetProxy[A] extends Set[A] with SetProxyTemplate[A, Set[A]] diff --git a/src/library/scala/collection/SortedMap.scala b/src/library/scala/collection/SortedMap.scala index 1c1029da58..b02c9f2866 100644 --- a/src/library/scala/collection/SortedMap.scala +++ b/src/library/scala/collection/SortedMap.scala @@ -1,7 +1,7 @@ /* __ *\ ** ________ ___ / / ___ Scala API ** ** / __/ __// _ | / / / _ | (c) 2006-2009, LAMP/EPFL ** -** __\ \/ /__/ __ |/ /__/ __ | ** +** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ ** ** /____/\___/_/ |_/____/_/ | | ** ** |/ ** \* */ diff --git a/src/library/scala/collection/Traversable.scala b/src/library/scala/collection/Traversable.scala index 2dba27d998..1ae0c3b029 100644 --- a/src/library/scala/collection/Traversable.scala +++ b/src/library/scala/collection/Traversable.scala @@ -14,13 +14,16 @@ import mutable.{Buffer, ArrayBuffer, ListBuffer} import util.control.Breaks import generic._ -/** A template trait for traversable collections. - * - * Collection classes mixing in this trait provide a method - * <code>foreach</code> which traverses all the - * elements contained in the collection, applying a given procedure to each. - * They also provide a method `newBuilder` - * which creates a builder for collections of the same kind. +/** <p> + * A template trait for traversable collections. + * </p> + * <p> + * Collection classes mixing in this trait provide a method + * <code>foreach</code> which traverses all the + * elements contained in the collection, applying a given procedure to each. + * They also provide a method <code>newBuilder</code> + * which creates a builder for collections of the same kind. + * </p> * * @author Martin Odersky * @version 2.8 diff --git a/src/library/scala/collection/Vector.scala b/src/library/scala/collection/Vector.scala index 723fd8c610..b993125947 100644 --- a/src/library/scala/collection/Vector.scala +++ b/src/library/scala/collection/Vector.scala @@ -6,7 +6,7 @@ ** |/ ** \* */ -// $Id: Vector.scala 15437 2008-06-25 16:22:45Z stepancheg $ +// $Id$ package scala.collection diff --git a/src/library/scala/collection/generic/ImmutableMapTemplate.scala b/src/library/scala/collection/generic/ImmutableMapTemplate.scala index d41571dcfc..bf21c26a25 100644 --- a/src/library/scala/collection/generic/ImmutableMapTemplate.scala +++ b/src/library/scala/collection/generic/ImmutableMapTemplate.scala @@ -11,21 +11,31 @@ package scala.collection.generic -/** A generic template for immutable maps from keys of type A to values of type B. - * To implement a concrete map, you need to provide implementations of the following methods: - * (where This is the type of the map in question): +/** <p> + * A generic template for immutable maps from keys of type <code>A</code> + * to values of type <code>B</code>.<br/> + * To implement a concrete map, you need to provide implementations of the + * following methods (where <code>This</code> is the type of the map in + * question): + * </p> + * <pre> + * <b>def</b> get(key: A): Option[B] + * <b>def</b> iterator: Iterator[(A, B)] + * <b>def</b> + [B1 >: B](kv: (A, B)): Map[A, B1] + * <b>def</b> - (key: A): This</pre> + * <p> + * If you wish that methods <code>like</code>, <code>take</code>, <code>drop</code>, + * <code>filter</code> return the same kind of map, you should also override: + * </p> + * <pre> + * <b>def</b> empty: This + * <p> + * It is also good idea to override methods <code>foreach</code> and + * <code>size</code> for efficiency. + * </p> * - * def get(key: A): Option[B] - * def iterator: Iterator[(A, B)] - * def + [B1 >: B](kv: (A, B)): Map[A, B1] - * def - (key: A): This - * - * If you wish that methods like, take, drop, filter return the same kind of map, you should also - * override: - * - * def empty: This - * - * It is also good idea to override methods foreach and size for efficiency. + * @author Martin Odersky + * @version 2.8 */ trait ImmutableMapTemplate[A, +B, +This <: ImmutableMapTemplate[A, B, This] with immutable.Map[A, B]] extends MapTemplate[A, B, This] { diff --git a/src/library/scala/collection/generic/IterableForwarder.scala b/src/library/scala/collection/generic/IterableForwarder.scala index a46e05ee70..9fefd22367 100644 --- a/src/library/scala/collection/generic/IterableForwarder.scala +++ b/src/library/scala/collection/generic/IterableForwarder.scala @@ -13,14 +13,20 @@ package scala.collection.generic import collection.mutable.Buffer -/** This trait implements a forwarder for iterable objects. It forwards - * all calls to a different iterable object, except for - * - * - toString, hashCode, equals, stringPrefix - * - newBuilder, view - * - all calls creating a new iterable objetc of the same kind - * - * The above methods are forwarded by subclass IterableProxy +/** <p> + * This trait implements a forwarder for iterable objects. It forwards + * all calls to a different iterable object, except for + * </p> + * <ul> + * <li><code>toString</code>, <code>hashCode</code>, <code>equals</code>, + * <code>stringPrefix</code></li> + * <li><code>newBuilder</code>, <code>view</code></li> + * <li>all calls creating a new iterable objetc of the same kind</li> + * </ul> + * <p> + * The above methods are forwarded by subclass <a href="../IterableProxy.html" + * target="ContentFrame"><code>IterableProxy</code></a>. + * </p> * * @author Martin Odersky * @version 2.8 diff --git a/src/library/scala/collection/generic/IterableTemplate.scala b/src/library/scala/collection/generic/IterableTemplate.scala index 8ce21e1661..442043a14e 100644 --- a/src/library/scala/collection/generic/IterableTemplate.scala +++ b/src/library/scala/collection/generic/IterableTemplate.scala @@ -13,19 +13,28 @@ package scala.collection.generic import util.control.Breaks._ // import immutable.Stream // !!! -/** A template trait for iterable collections. - * - * Collection classes mixing in this trait provide a method - * <code>iterator</code> which returns an iterator over all the - * elements contained in the collection. They also provide a method `newBuilder` - * which creates a builder for collections of the same kind. - * - * This trait implements Traversable's `foreach` method by stepping through - * all elements. Subclasses of `Iterable` should re-implement `foreach` with - * something more efficient, if possible. - * - * This trait adds methods `iterator`, `sameElements`, - * `takeRight`, `dropRight` to the methods inherited from trait `Traversable`. +/** <p> + * A template trait for iterable collections. + * </p> + * <p> + * Collection classes mixing in this trait provide a method + * <code>iterator</code> which returns an iterator over all the + * elements contained in the collection. They also provide a method + * <code>newBuilder</code> which creates a builder for collections of the + * same kind. + * </p> + * <p> + * This trait implements <code>Traversable</code>'s <code>foreach</code> + * method by stepping through all elements. Subclasses of <code>Iterable</code> + * should re-implement <code>foreach</code> with something more efficient, + * if possible. + * </p> + * <p> + * This trait adds methods <code>iterator</code>, <code>sameElements</code>, + * <code>takeRight</code>, <code>dropRight</code> to the methods inherited + * from trait <a href="../Traversable.html" target="ContentFrame"> + * <code>Traversable</code></a>. + * </p> * * @author Martin Odersky * @version 2.8 diff --git a/src/library/scala/collection/generic/IterableView.scala b/src/library/scala/collection/generic/IterableView.scala index 841a19f49c..f63eb4930b 100644 --- a/src/library/scala/collection/generic/IterableView.scala +++ b/src/library/scala/collection/generic/IterableView.scala @@ -14,6 +14,7 @@ package scala.collection.generic import TraversableView.NoBuilder /** A base class for views of Iterables. + * * @author Martin Odersky * @version 2.8 */ diff --git a/src/library/scala/collection/generic/IterableViewTemplate.scala b/src/library/scala/collection/generic/IterableViewTemplate.scala index 9f6e703ff8..674ad9c30c 100644 --- a/src/library/scala/collection/generic/IterableViewTemplate.scala +++ b/src/library/scala/collection/generic/IterableViewTemplate.scala @@ -14,6 +14,7 @@ package scala.collection.generic import TraversableView.NoBuilder /** A base class for views of Iterables. + * * @author Martin Odersky * @version 2.8 */ diff --git a/src/library/scala/collection/generic/MapTemplate.scala b/src/library/scala/collection/generic/MapTemplate.scala index 64a93aba07..651eb2bd81 100644 --- a/src/library/scala/collection/generic/MapTemplate.scala +++ b/src/library/scala/collection/generic/MapTemplate.scala @@ -11,21 +11,31 @@ package scala.collection.generic -/** A generic template for maps from keys of type A to values of type B. - * To implement a concrete map, you need to provide implementations of the - * following methods (where `This` is the type of the map in question):<pre> +/** <p> + * A generic template for maps from keys of type <code>A</code> to values + * of type <code>B</code>.<br/> + * To implement a concrete map, you need to provide implementations of the + * following methods (where <code>This</code> is the type of the map in + * question): + * </p> + * <pre> + * <b>def</b> get(key: A): Option[B] + * <b>def</b> iterator: Iterator[(A, B)] + * <b>def</b> + [B1 >: B](kv: (A, B1)): This + * <b>def</b> -(key: A): This</pre> + * <p> + * If you wish that methods <code>like</code>, <code>take</code>, <code>drop</code>, + * <code>filter</code> return the same kind of map, you should also override: + * </p> + * <pre> + * <b>def</b> empty: This</pre> + * <p> + * It is also good idea to override methods <code>foreach</code> and + * <code>size</code> for efficiency. + * </p> * - * def get(key: A): Option[B] - * def iterator: Iterator[(A, B)] - * def + [B1 >: B](kv: (A, B1)): This - * def -(key: A): This</pre> - * - * If you wish that methods like, take, drop, filter return the same kind of - * map, you should also override:<pre> - * - * def empty: This</pre> - * - * It is also good idea to override methods foreach and size for efficiency. + * @author Martin Odersky + * @version 2.8 */ trait MapTemplate[A, +B, +This <: MapTemplate[A, B, This] with Map[A, B]] extends PartialFunction[A, B] diff --git a/src/library/scala/collection/generic/SetTemplate.scala b/src/library/scala/collection/generic/SetTemplate.scala index e5a479454d..4b2e457ae0 100644 --- a/src/library/scala/collection/generic/SetTemplate.scala +++ b/src/library/scala/collection/generic/SetTemplate.scala @@ -10,21 +10,31 @@ package scala.collection.generic -/** A generic template for sets of type A. - * To implement a concrete set, you need to provide implementations of the following methods: - * (where `This` is the type of the set in question): +/** <p> + * A generic template for sets of type <code>A</code>.<br/> + * To implement a concrete set, you need to provide implementations of the + * following methods (where <code>This</code> is the type of the set in + * question): + * </p> + * <pre> + * <b>def</b> contains(key: A): Boolean + * <b>def</b> iterator: Iterator[A] + * <b>def</b> +(elem: A): This + * <b>def</b> -(elem: A): This</pre> + * </pre> + * <p> + * If you wish that methods <code>like</code>, <code>take</code>, <code>drop</code>, + * <code>filter</code> return the same kind of set, you should also override: + * </p> + * <pre> + * <b>def</b> empty: This</pre> + * <p> + * It is also good idea to override methods <code>foreach</code> and + * <code>size</code> for efficiency. + * </p> * - * def contains(key: A): Boolean - * def iterator: Iterator[A] - * def +(elem: A): This - * def -(elem: A): This - * - * If you wish that methods like, take, drop, filter return the same kind of set, you should also - * override: - * - * def empty: This - * - * It is also good idea to override methods foreach and size for efficiency. + * @author Martin Odersky + * @version 2.8 */ trait SetTemplate[A, +This <: SetTemplate[A, This] with Set[A]] extends IterableTemplate[A, This] with Addable[A, This] with Subtractable[A, This] { self => diff --git a/src/library/scala/collection/generic/TraversableForwarder.scala b/src/library/scala/collection/generic/TraversableForwarder.scala index 1ec60da2a3..68e420b7c7 100644 --- a/src/library/scala/collection/generic/TraversableForwarder.scala +++ b/src/library/scala/collection/generic/TraversableForwarder.scala @@ -14,14 +14,22 @@ package scala.collection.generic import mutable.Buffer // import immutable.{List, Nil, ::, Stream} -/** This trait implements a forwarder for traversable objects. It forwards - * all calls to a different iterable object, except for - * - * - toString, hashCode, equals, stringPrefix - * - newBuilder, view - * - all calls creating a new iterable object of the same kind - * - * The above methods are forwarded by subclass TraversableProxy +/** <p> + * This trait implements a forwarder for traversable objects. It forwards + * all calls to a different iterable object, except for + * </p> + * <ul> + * <li><code>toString</code>, <code>hashCode</code>, <code>equals</code>, + * <code>stringPrefix</code> + * </li> + * <li><code>newBuilder</code>, <code>view</code></li> + * <li>all calls creating a new iterable object of the same kind</li> + * </ul> + * <p> + * The above methods are forwarded by subclass + * <a href="TraversableProxy.html" target="ContentFrame"> + * <code>TraversableProxy</code></a>. + * </p> * * @author Martin Odersky * @version 2.8 diff --git a/src/library/scala/collection/generic/TraversableTemplate.scala b/src/library/scala/collection/generic/TraversableTemplate.scala index e053ab4cb4..96aca0530a 100644 --- a/src/library/scala/collection/generic/TraversableTemplate.scala +++ b/src/library/scala/collection/generic/TraversableTemplate.scala @@ -15,37 +15,47 @@ package scala.collection.generic import mutable.{Buffer, ArrayBuffer, ListBuffer} import annotation.experimental -/** A template trait for traversable collections. - * This is a base trait of all kinds of Scala collections. It implements - * the behavior common to all collections, in terms of a method - * <code>foreach</code> with signature:<pre> - * - * def foreach[U](f: Elem => U): Unit</pre> - * - * Collection classes mixing in this trait provide a concrete - * <code>foreach</code> method which traverses all the - * elements contained in the collection, applying a given function to each. - * They also need to provide a method `newBuilder` - * which creates a builder for collections of the same kind. - * - * A traversable class might or might not have two properties: strictness and orderedness. - * Neither is represented as a type. - * - * The instances of a strict collection class have all their elements computed before - * they can be used as values. By contrast, instances of a non-strict collection class - * may defer computation of some of their elements until after the instance is available as a value. - * A typical example of a non-strict collection class is a scala.immutable.Stream. - * A more general class of examples are TraversableViews. - * - * If a collection is an instance of an ordered collection class, traversing its elements - * with `foreach` will always visit elements in the same order, even for different - * runs of the program. If the class is not ordered, `foreach` can visit elements - * in different orders for different runs (but it will keep the same order in the same run). - * A typical example of a collection class which is not ordered is a `HashMap` of objects. - * The traversal order for hash maps will depend on the hash codes of its elements, and - * these hash codes might differ from one run to the next. By contrast, a `LinkedHashMap` - * is odered because it's `foreach` method visits elements in the order they were inserted - * into the `HashMap`. +/** <p> + * A template trait for traversable collections. + * This is a base trait of all kinds of Scala collections. It implements + * the behavior common to all collections, in terms of a method + * <code>foreach</code> with signature: + * </p><pre> + * <b>def</b> foreach[U](f: Elem => U): Unit</pre> + * <p> + * Collection classes mixing in this trait provide a concrete + * <code>foreach</code> method which traverses all the + * elements contained in the collection, applying a given function to each. + * They also need to provide a method <code>newBuilder</code> + * which creates a builder for collections of the same kind. + * </p> + * <p> + * A traversable class might or might not have two properties: strictness + * and orderedness. Neither is represented as a type. + * </p> + * <p> + * The instances of a strict collection class have all their elements + * computed before they can be used as values. By contrast, instances of + * a non-strict collection class may defer computation of some of their + * elements until after the instance is available as a value. + * A typical example of a non-strict collection class is a + * <a href="../immutable/Stream.html" target="ContentFrame"> + * <code>scala.collection.immutable.Stream</code></a>. + * A more general class of examples are <code>TraversableViews</code>. + * </p> + * <p> + * If a collection is an instance of an ordered collection class, traversing + * its elements with <code>foreach</code> will always visit elements in the + * same order, even for different runs of the program. If the class is not + * ordered, <code>foreach</code> can visit elements in different orders for + * different runs (but it will keep the same order in the same run).<br/> + * A typical example of a collection class which is not ordered is a + * <code>HashMap</code> of objects. The traversal order for hash maps will + * depend on the hash codes of its elements, and these hash codes might + * differ from one run to the next. By contrast, a <code>LinkedHashMap</code> + * is odered because it's <code>foreach</code> method visits elements in the + * order they were inserted into the <code>HashMap</code>. + * </p> * * @author Martin Odersky * @version 2.8 @@ -55,21 +65,31 @@ self => import Traversable.breaks._ - /** The proper way to do this would be to make `self` of type `This`. But unfortunately this - * makes `this` to be of type `Traversable[A]`. Since `Traversable` is a subtype of - * `TraversableTemplate`, all methods of `this` are taken from `Traversable`. In particular - * the `newBuilder` method is taken from `Traversable`, which means it yields a `Traversable[A]` - * instyead of a `This`. - * - * The right way out of this is to change Scala's member selection rules, so that - * always the most specific type will be selected, no matter whether a member is abstract - * or concrete. I tried to fake this by having a method `thisTemplate` which - * returns this at the Template type. But unfortunately that does not work, because - * we need to call `newBuilder` on this at the Template type (so that we get back a `This`) - * and `newBuilder` has to be a proctected[this] because of variance. - * The less appealing alternative is implemented now: Forget the self type and - * introduce a `thisCollection` which is this seen as an instance of `This`. - * We should go back to this once we have ameliorated Scala's member selection rules. + /** <p> + * The proper way to do this would be to make <code>self</code> of type + * <code>This</code>. But unfortunately this makes <b><code>this</code></b> + * to be of type <code>Traversable[A]</code>. Since <code>Traversable</code> + * is a subtype of <code>TraversableTemplate</code>, all methods of + * <b><code>this</code></b> are taken from <code>Traversable</code>. In + * particular the <code>newBuilder</code> method is taken from + * <code>Traversable</code>, which means it yields a <code>Traversable[A]</code> + * instead of a <code>This</code>. + * </p> + * <p> + * The right way out of this is to change Scala's member selection rules, + * so that always the most specific type will be selected, no matter + * whether a member is abstract or concrete. I tried to fake this by + * having a method <code>thisTemplate</code> which returns this at the + * <code>Template</code> type. But unfortunately that does not work, + * because we need to call <code>newBuilder</code> on this at the + * <code>Template</code> type (so that we get back a <code>This</code>) + * and <code>newBuilder</code> has to be a <b><code>protected[this]</code></b> + * because of variance.<br/> + * The less appealing alternative is implemented now: Forget the self type + * and introduce a <code>thisCollection</code> which is this seen as an + * instance of <code>This</code>. We should go back to this once we have + * ameliorated Scala's member selection rules. + * </p> */ protected def thisCollection: This = this.asInstanceOf[This] diff --git a/src/library/scala/collection/generic/TraversableView.scala b/src/library/scala/collection/generic/TraversableView.scala index 282ff0fdc0..78e70bdb04 100644 --- a/src/library/scala/collection/generic/TraversableView.scala +++ b/src/library/scala/collection/generic/TraversableView.scala @@ -13,8 +13,11 @@ package scala.collection.generic import TraversableView.NoBuilder -/** A base class for views of Traversable. - * Every subclass has to implenment the foreach method +/** <p> + * A base class for views of <a href="../Traversable.html" + * target="ContentFrame"><code>Traversable<code></a>.<br/> + * Every subclass has to implenment the <code>foreach</code> method. + * </p> * * @author Martin Odersky * @version 2.8 diff --git a/src/library/scala/collection/generic/TraversableView.scala.1 b/src/library/scala/collection/generic/TraversableView.scala.1 index 69f1682339..5a21034ed4 100755 --- a/src/library/scala/collection/generic/TraversableView.scala.1 +++ b/src/library/scala/collection/generic/TraversableView.scala.1 @@ -10,8 +10,12 @@ package scalay.collection.generic import Math.MAX_INT import TraversableView.NoBuilder -/** A base class for views of Traversable. - * Every subclass has to implenment the foreach method +/** <p> + * A base class for views of <code>Traversable</code>. + * </p> + * <p> + * Every subclass has to implement the <code>foreach</code> method. + * </p> */ abstract class TraversableView[+A, +Coll <: Traversable[_]] extends Traversable[A] { self => diff --git a/src/library/scala/collection/generic/TraversableViewTemplate.scala b/src/library/scala/collection/generic/TraversableViewTemplate.scala index 49c49e513e..9ea1f6d2fc 100644 --- a/src/library/scala/collection/generic/TraversableViewTemplate.scala +++ b/src/library/scala/collection/generic/TraversableViewTemplate.scala @@ -14,8 +14,11 @@ package scala.collection.generic import Math.MAX_INT import TraversableView.NoBuilder -/** A base class for views of <code>Traversable</code>. - * Every subclass has to implenment the foreach method +/** <p> + * A base class for views of <a href="../Traversable.html" + * target="contentFrame"><code>Traversable</code></a>.<br/> + * Every subclass has to implement the <code>foreach</code> method. + * </p> * * @author Martin Odersky * @version 2.8 diff --git a/src/library/scala/collection/immutable/Set.scala b/src/library/scala/collection/immutable/Set.scala index be7c67ec69..9135306038 100644 --- a/src/library/scala/collection/immutable/Set.scala +++ b/src/library/scala/collection/immutable/Set.scala @@ -13,15 +13,18 @@ package scala.collection.immutable import generic._ -/** A generic trait for immutable sets. Concrete set implementations - * have to provide functionality for the abstract methods in Set: - * - * def contains(elem: A): Boolean - * def iterator: Iterator[A] - * def + (elem: A): This - * def - (elem: A): This - * - * where `This` is the type of the set +/** <p> + * A generic trait for immutable sets. Concrete set implementations have + * to provide functionality for the abstract methods in <code>Set</code>: + * </p> + * <pre> + * <b>def</b> contains(elem: A): Boolean + * <b>def</b> iterator: Iterator[A] + * <b>def</b> + (elem: A): This + * <b>def</b> - (elem: A): This</pre> + * <p> + * where <code>This</code> is the type of the set. + * </p> * * @author Matthias Zenger * @author Martin Odersky diff --git a/src/library/scala/collection/mutable/Iterable.scala b/src/library/scala/collection/mutable/Iterable.scala index 66c678adb9..41a88af7f8 100644 --- a/src/library/scala/collection/mutable/Iterable.scala +++ b/src/library/scala/collection/mutable/Iterable.scala @@ -9,8 +9,11 @@ package scala.collection.mutable import generic._ -/** A subtrait of collection.Iterable which represents iterables - * that can be mutated. +/** <p> + * A subtrait of <a href="../Iterable.html" target="contentFrame"> + * <code>collection.Iterable</code></a> which represents iterables + * that can be mutated. + * </p> * * @author Martin Odersky * @version 2.8 @@ -22,7 +25,14 @@ trait Iterable[A] extends Traversable[A] override def companion: Companion[Iterable] = Iterable } -/* A factory object for the trait `Iterable` */ +/** <p> + * A factory object for the trait <a href="Iterable.html" + * target="contentFrame"><code>Iterable</code></a>. + * </p> + * + * @author Martin Odersky + * @version 2.8 + */ object Iterable extends TraversableFactory[Iterable] { implicit def builderFactory[A]: BuilderFactory[A, Iterable[A], Coll] = new VirtualBuilderFactory[A] def newBuilder[A]: Builder[A, Iterable[A]] = new ArrayBuffer diff --git a/src/library/scala/collection/script/Location.scala b/src/library/scala/collection/script/Location.scala index fcd283e8b6..f582d1e923 100644 --- a/src/library/scala/collection/script/Location.scala +++ b/src/library/scala/collection/script/Location.scala @@ -1,7 +1,7 @@ /* __ *\ ** ________ ___ / / ___ Scala API ** ** / __/ __// _ | / / / _ | (c) 2003-2009, LAMP/EPFL ** -** __\ \/ /__/ __ |/ /__/ __ | ** +** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ ** ** /____/\___/_/ |_/____/_/ | | ** ** |/ ** \* */ @@ -12,8 +12,8 @@ package scala.collection.script -/** Class <code>Location</code> describes locations in messages implemented - * by class <code>Message</code>. +/** Class <code>Location</code> describes locations in messages implemented by + * class <a href="Message.html" target="contentFrame"><code>Message</code></a>. * * @author Matthias Zenger * @version 1.0, 10/05/2004 diff --git a/src/library/scala/reflect/OptManifest.scala b/src/library/scala/reflect/OptManifest.scala index ebbeb18282..c79671020e 100755 --- a/src/library/scala/reflect/OptManifest.scala +++ b/src/library/scala/reflect/OptManifest.scala @@ -12,8 +12,12 @@ package scala.reflect /** <p> - * A <code>OptManifest[T]</code> is an optional @see Manifest. - * It is either a Manifest or the value NoManifest - */ + * A <code>OptManifest[T]</code> is an optional <a href="Manifest.html" + * target="ContentFrame"><code>Manifest</code></a>.<br/> + * It is either a <code>Manifest</code> or the value <code>NoManifest</code>. + * </p> + * + * @author Martin Odersky + */ @serializable trait OptManifest[+T] diff --git a/src/library/scala/util/Marshal.scala b/src/library/scala/util/Marshal.scala index a382265d6f..b590dddc80 100644 --- a/src/library/scala/util/Marshal.scala +++ b/src/library/scala/util/Marshal.scala @@ -30,17 +30,22 @@ object Marshal { ba.toByteArray() } + @throws(classOf[IOException]) @throws(classOf[ClassCastException]) + @throws(classOf[ClassNotFoundException]) def load[A](buffer: Array[Byte])(implicit expected: Manifest[A]): A = { val in = new ObjectInputStream(new ByteArrayInputStream(buffer)) val found = in.readObject.asInstanceOf[Manifest[_]] - if (! (found <:< expected)) + if (found <:< expected) { + val o = in.readObject.asInstanceOf[A] + in.close() + o + } else { + in.close() throw new ClassCastException("type mismatch;"+ "\n found : "+found+ "\n required: "+expected) - val o = in.readObject.asInstanceOf[A] - in.close() - o + } } } diff --git a/src/swing/scala/swing/AbstractButton.scala b/src/swing/scala/swing/AbstractButton.scala index 8cc9062b84..c3258b4fc6 100644 --- a/src/swing/scala/swing/AbstractButton.scala +++ b/src/swing/scala/swing/AbstractButton.scala @@ -1,3 +1,14 @@ +/* __ *\ +** ________ ___ / / ___ Scala API ** +** / __/ __// _ | / / / _ | (c) 2007-2009, LAMP/EPFL ** +** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ ** +** /____/\___/_/ |_/____/_/ | | ** +** |/ ** +\* */ + +// $Id$ + + package scala.swing import java.awt.{Dimension, Insets} diff --git a/src/swing/scala/swing/Action.scala b/src/swing/scala/swing/Action.scala index 4b56f7ce51..61ce4a5276 100644 --- a/src/swing/scala/swing/Action.scala +++ b/src/swing/scala/swing/Action.scala @@ -1,3 +1,14 @@ +/* __ *\ +** ________ ___ / / ___ Scala API ** +** / __/ __// _ | / / / _ | (c) 2007-2009, LAMP/EPFL ** +** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ ** +** /____/\___/_/ |_/____/_/ | | ** +** |/ ** +\* */ + +// $Id$ + + package scala.swing import javax.swing.{KeyStroke, Icon} diff --git a/src/swing/scala/swing/Alignment.scala b/src/swing/scala/swing/Alignment.scala index e4875904c8..32ae4e08d1 100644 --- a/src/swing/scala/swing/Alignment.scala +++ b/src/swing/scala/swing/Alignment.scala @@ -1,3 +1,14 @@ +/* __ *\ +** ________ ___ / / ___ Scala API ** +** / __/ __// _ | / / / _ | (c) 2007-2009, LAMP/EPFL ** +** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ ** +** /____/\___/_/ |_/____/_/ | | ** +** |/ ** +\* */ + +// $Id$ + + package scala.swing import javax.swing.SwingConstants._ diff --git a/src/swing/scala/swing/Applet.scala b/src/swing/scala/swing/Applet.scala index 7eb1d37120..a3569c2a71 100644 --- a/src/swing/scala/swing/Applet.scala +++ b/src/swing/scala/swing/Applet.scala @@ -1,15 +1,29 @@ +/* __ *\ +** ________ ___ / / ___ Scala API ** +** / __/ __// _ | / / / _ | (c) 2007-2009, LAMP/EPFL ** +** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ ** +** /____/\___/_/ |_/____/_/ | | ** +** |/ ** +\* */ + +// $Id$ + + package scala.swing import javax.swing.JApplet -/** - * Clients should implement the ui field. See the SimpleApplet demo for an example. - * - * Note: <code>Applet</code> extends <code>javax.swing.JApplet</code> to satisfy - * Java's applet loading mechanism. The usual component wrapping scheme doesn't - * work here. +/** <p> + * Clients should implement the ui field. See the <code>SimpleApplet</code> + * demo for an example. + * </p> + * <p> + * <b>Note</b>: <code>Applet</code> extends <code>javax.swing.JApplet</code> + * to satisfy Java's applet loading mechanism. The usual component wrapping + * scheme doesn't work here. + * </p> * - * @see javax.swing.JApplet + * @see javax.swing.JApplet */ abstract class Applet extends JApplet { outer => val ui: UI diff --git a/src/swing/scala/swing/BorderPanel.scala b/src/swing/scala/swing/BorderPanel.scala index 4b614272e3..42f6f1b40e 100644 --- a/src/swing/scala/swing/BorderPanel.scala +++ b/src/swing/scala/swing/BorderPanel.scala @@ -1,3 +1,14 @@ +/* __ *\ +** ________ ___ / / ___ Scala API ** +** / __/ __// _ | / / / _ | (c) 2007-2009, LAMP/EPFL ** +** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ ** +** /____/\___/_/ |_/____/_/ | | ** +** |/ ** +\* */ + +// $Id$ + + package scala.swing import java.awt.BorderLayout diff --git a/src/swing/scala/swing/BoxPanel.scala b/src/swing/scala/swing/BoxPanel.scala index 285f245167..8c5ce9b098 100644 --- a/src/swing/scala/swing/BoxPanel.scala +++ b/src/swing/scala/swing/BoxPanel.scala @@ -1,3 +1,14 @@ +/* __ *\ +** ________ ___ / / ___ Scala API ** +** / __/ __// _ | / / / _ | (c) 2007-2009, LAMP/EPFL ** +** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ ** +** /____/\___/_/ |_/____/_/ | | ** +** |/ ** +\* */ + +// $Id$ + + package scala.swing /** diff --git a/src/swing/scala/swing/BufferWrapper.scala b/src/swing/scala/swing/BufferWrapper.scala index 6704bfc0f9..f7c144a93c 100644 --- a/src/swing/scala/swing/BufferWrapper.scala +++ b/src/swing/scala/swing/BufferWrapper.scala @@ -1,3 +1,14 @@ +/* __ *\ +** ________ ___ / / ___ Scala API ** +** / __/ __// _ | / / / _ | (c) 2007-2009, LAMP/EPFL ** +** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ ** +** /____/\___/_/ |_/____/_/ | | ** +** |/ ** +\* */ + +// $Id$ + + package scala.swing import scala.collection.mutable.Buffer diff --git a/src/swing/scala/swing/Button.scala b/src/swing/scala/swing/Button.scala index 673ccd9629..698924b18d 100644 --- a/src/swing/scala/swing/Button.scala +++ b/src/swing/scala/swing/Button.scala @@ -1,3 +1,14 @@ +/* __ *\ +** ________ ___ / / ___ Scala API ** +** / __/ __// _ | / / / _ | (c) 2007-2009, LAMP/EPFL ** +** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ ** +** /____/\___/_/ |_/____/_/ | | ** +** |/ ** +\* */ + +// $Id$ + + package scala.swing import javax.swing._ diff --git a/src/swing/scala/swing/ButtonGroup.scala b/src/swing/scala/swing/ButtonGroup.scala index 3756a91364..4bf2cb21ff 100644 --- a/src/swing/scala/swing/ButtonGroup.scala +++ b/src/swing/scala/swing/ButtonGroup.scala @@ -1,3 +1,14 @@ +/* __ *\ +** ________ ___ / / ___ Scala API ** +** / __/ __// _ | / / / _ | (c) 2007-2009, LAMP/EPFL ** +** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ ** +** /____/\___/_/ |_/____/_/ | | ** +** |/ ** +\* */ + +// $Id$ + + package scala.swing import javax.swing.{AbstractButton => JAbstractButton,Icon} diff --git a/src/swing/scala/swing/CheckBox.scala b/src/swing/scala/swing/CheckBox.scala index 8fb1e2bb5f..8c909b34d1 100644 --- a/src/swing/scala/swing/CheckBox.scala +++ b/src/swing/scala/swing/CheckBox.scala @@ -1,3 +1,14 @@ +/* __ *\ +** ________ ___ / / ___ Scala API ** +** / __/ __// _ | / / / _ | (c) 2007-2009, LAMP/EPFL ** +** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ ** +** /____/\___/_/ |_/____/_/ | | ** +** |/ ** +\* */ + +// $Id$ + + package scala.swing import javax.swing._ diff --git a/src/swing/scala/swing/ComboBox.scala b/src/swing/scala/swing/ComboBox.scala index 44919f077a..c1d793cecd 100644 --- a/src/swing/scala/swing/ComboBox.scala +++ b/src/swing/scala/swing/ComboBox.scala @@ -1,3 +1,14 @@ +/* __ *\ +** ________ ___ / / ___ Scala API ** +** / __/ __// _ | / / / _ | (c) 2007-2009, LAMP/EPFL ** +** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ ** +** /____/\___/_/ |_/____/_/ | | ** +** |/ ** +\* */ + +// $Id$ + + package scala.swing import event._ @@ -198,4 +209,4 @@ class ComboBox[A](items: Seq[A]) extends Component with Publisher { def prototypeDisplayValue_=(v: Option[A]) { peer.setPrototypeDisplayValue(Swing.toNull(v.map(_.asInstanceOf[AnyRef]))) } -}
\ No newline at end of file +} diff --git a/src/swing/scala/swing/Component.scala b/src/swing/scala/swing/Component.scala index 8113fa22e9..ed975897b7 100644 --- a/src/swing/scala/swing/Component.scala +++ b/src/swing/scala/swing/Component.scala @@ -1,3 +1,14 @@ +/* __ *\ +** ________ ___ / / ___ Scala API ** +** / __/ __// _ | / / / _ | (c) 2007-2009, LAMP/EPFL ** +** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ ** +** /____/\___/_/ |_/____/_/ | | ** +** |/ ** +\* */ + +// $Id$ + + package scala.swing import event._ diff --git a/src/swing/scala/swing/Container.scala b/src/swing/scala/swing/Container.scala index 6434d73ae1..c540353948 100644 --- a/src/swing/scala/swing/Container.scala +++ b/src/swing/scala/swing/Container.scala @@ -1,3 +1,14 @@ +/* __ *\ +** ________ ___ / / ___ Scala API ** +** / __/ __// _ | / / / _ | (c) 2007-2009, LAMP/EPFL ** +** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ ** +** /____/\___/_/ |_/____/_/ | | ** +** |/ ** +\* */ + +// $Id$ + + package scala.swing import event._ diff --git a/src/swing/scala/swing/FileChooser.scala b/src/swing/scala/swing/FileChooser.scala index d52e69a282..44d6e65ae5 100644 --- a/src/swing/scala/swing/FileChooser.scala +++ b/src/swing/scala/swing/FileChooser.scala @@ -1,3 +1,14 @@ +/* __ *\ +** ________ ___ / / ___ Scala API ** +** / __/ __// _ | / / / _ | (c) 2007-2009, LAMP/EPFL ** +** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ ** +** /____/\___/_/ |_/____/_/ | | ** +** |/ ** +\* */ + +// $Id$ + + package scala.swing import java.io.File diff --git a/src/swing/scala/swing/FlowPanel.scala b/src/swing/scala/swing/FlowPanel.scala index f8eb00a71e..0778d7bca9 100644 --- a/src/swing/scala/swing/FlowPanel.scala +++ b/src/swing/scala/swing/FlowPanel.scala @@ -1,3 +1,14 @@ +/* __ *\ +** ________ ___ / / ___ Scala API ** +** / __/ __// _ | / / / _ | (c) 2007-2009, LAMP/EPFL ** +** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ ** +** /____/\___/_/ |_/____/_/ | | ** +** |/ ** +\* */ + +// $Id$ + + package scala.swing import java.awt.FlowLayout diff --git a/src/swing/scala/swing/FormattedTextField.scala b/src/swing/scala/swing/FormattedTextField.scala index 4be61b6cb1..6397de2621 100644 --- a/src/swing/scala/swing/FormattedTextField.scala +++ b/src/swing/scala/swing/FormattedTextField.scala @@ -1,3 +1,14 @@ +/* __ *\ +** ________ ___ / / ___ Scala API ** +** / __/ __// _ | / / / _ | (c) 2007-2009, LAMP/EPFL ** +** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ ** +** /____/\___/_/ |_/____/_/ | | ** +** |/ ** +\* */ + +// $Id$ + + package scala.swing import javax.swing._ @@ -31,4 +42,4 @@ class FormattedTextField(format: java.text.Format) extends TextComponent { def focusLostBehavior: FocusLostBehavior.Value = FocusLostBehavior(peer.getFocusLostBehavior) def focusLostBehavior_=(b: FocusLostBehavior.Value) { peer.setFocusLostBehavior(b.id) } -}
\ No newline at end of file +} diff --git a/src/swing/scala/swing/GUIApplication.scala b/src/swing/scala/swing/GUIApplication.scala index 04133788eb..0cce2cb176 100644 --- a/src/swing/scala/swing/GUIApplication.scala +++ b/src/swing/scala/swing/GUIApplication.scala @@ -1,3 +1,14 @@ +/* __ *\ +** ________ ___ / / ___ Scala API ** +** / __/ __// _ | / / / _ | (c) 2007-2009, LAMP/EPFL ** +** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ ** +** /____/\___/_/ |_/____/_/ | | ** +** |/ ** +\* */ + +// $Id$ + + package scala.swing import javax.swing._ diff --git a/src/swing/scala/swing/GridBagPanel.scala b/src/swing/scala/swing/GridBagPanel.scala index 50d9b4b548..c81ebeb8fa 100644 --- a/src/swing/scala/swing/GridBagPanel.scala +++ b/src/swing/scala/swing/GridBagPanel.scala @@ -1,3 +1,14 @@ +/* __ *\ +** ________ ___ / / ___ Scala API ** +** / __/ __// _ | / / / _ | (c) 2007-2009, LAMP/EPFL ** +** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ ** +** /____/\___/_/ |_/____/_/ | | ** +** |/ ** +\* */ + +// $Id$ + + package scala.swing import java.awt.{Insets, GridBagConstraints} diff --git a/src/swing/scala/swing/GridPanel.scala b/src/swing/scala/swing/GridPanel.scala index 1a1de23d2a..fbb680b864 100644 --- a/src/swing/scala/swing/GridPanel.scala +++ b/src/swing/scala/swing/GridPanel.scala @@ -1,3 +1,14 @@ +/* __ *\ +** ________ ___ / / ___ Scala API ** +** / __/ __// _ | / / / _ | (c) 2007-2009, LAMP/EPFL ** +** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ ** +** /____/\___/_/ |_/____/_/ | | ** +** |/ ** +\* */ + +// $Id$ + + package scala.swing object GridPanel { diff --git a/src/swing/scala/swing/Label.scala b/src/swing/scala/swing/Label.scala index defa45fa01..5bc9989ffb 100644 --- a/src/swing/scala/swing/Label.scala +++ b/src/swing/scala/swing/Label.scala @@ -1,3 +1,14 @@ +/* __ *\ +** ________ ___ / / ___ Scala API ** +** / __/ __// _ | / / / _ | (c) 2007-2009, LAMP/EPFL ** +** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ ** +** /____/\___/_/ |_/____/_/ | | ** +** |/ ** +\* */ + +// $Id$ + + package scala.swing import javax.swing._ diff --git a/src/swing/scala/swing/LayoutContainer.scala b/src/swing/scala/swing/LayoutContainer.scala index 7594edd8e1..3b323e59d4 100644 --- a/src/swing/scala/swing/LayoutContainer.scala +++ b/src/swing/scala/swing/LayoutContainer.scala @@ -1,16 +1,28 @@ +/* __ *\ +** ________ ___ / / ___ Scala API ** +** / __/ __// _ | / / / _ | (c) 2007-2009, LAMP/EPFL ** +** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ ** +** /____/\___/_/ |_/____/_/ | | ** +** |/ ** +\* */ + +// $Id$ + + package scala.swing import javax.swing.JComponent import scala.collection.mutable.Map -/** - * A container that associates layout constraints of member type Constraints - * with its children. See GridBagPanel for an example container with custom - * constraints. +/** <p> + * A container that associates layout constraints of member type + * <code>Constraints</code> with its children. See <code>GridBagPanel</code> + * for an example container with custom constraints. + * </p> * - * @note [Java Swing] In scala.swing, panels and layout managers are - * combined into subclasses of this base class. This approach allows for typed - * component constraints. + * @note [Java Swing] In scala.swing, panels and layout managers are + * combined into subclasses of this base class. This approach allows for typed + * component constraints. */ trait LayoutContainer extends Container.Wrapper { /** diff --git a/src/swing/scala/swing/ListView.scala b/src/swing/scala/swing/ListView.scala index 61313aea5a..8c84ac5514 100644 --- a/src/swing/scala/swing/ListView.scala +++ b/src/swing/scala/swing/ListView.scala @@ -1,3 +1,14 @@ +/* __ *\ +** ________ ___ / / ___ Scala API ** +** / __/ __// _ | / / / _ | (c) 2007-2009, LAMP/EPFL ** +** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ ** +** /____/\___/_/ |_/____/_/ | | ** +** |/ ** +\* */ + +// $Id$ + + package scala.swing import javax.swing._ diff --git a/src/swing/scala/swing/MainFrame.scala b/src/swing/scala/swing/MainFrame.scala index 725c88dd7c..86b0eb5901 100644 --- a/src/swing/scala/swing/MainFrame.scala +++ b/src/swing/scala/swing/MainFrame.scala @@ -1,3 +1,14 @@ +/* __ *\ +** ________ ___ / / ___ Scala API ** +** / __/ __// _ | / / / _ | (c) 2007-2009, LAMP/EPFL ** +** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ ** +** /____/\___/_/ |_/____/_/ | | ** +** |/ ** +\* */ + +// $Id$ + + package scala.swing import event._ diff --git a/src/swing/scala/swing/Menu.scala b/src/swing/scala/swing/Menu.scala index 3d7c71a8a0..360d77826c 100644 --- a/src/swing/scala/swing/Menu.scala +++ b/src/swing/scala/swing/Menu.scala @@ -1,3 +1,14 @@ +/* __ *\ +** ________ ___ / / ___ Scala API ** +** / __/ __// _ | / / / _ | (c) 2007-2009, LAMP/EPFL ** +** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ ** +** /____/\___/_/ |_/____/_/ | | ** +** |/ ** +\* */ + +// $Id$ + + package scala.swing import scala.collection.mutable._ diff --git a/src/swing/scala/swing/Orientable.scala b/src/swing/scala/swing/Orientable.scala index c350b7a002..79eaf362bb 100644 --- a/src/swing/scala/swing/Orientable.scala +++ b/src/swing/scala/swing/Orientable.scala @@ -1,3 +1,14 @@ +/* __ *\ +** ________ ___ / / ___ Scala API ** +** / __/ __// _ | / / / _ | (c) 2007-2009, LAMP/EPFL ** +** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ ** +** /____/\___/_/ |_/____/_/ | | ** +** |/ ** +\* */ + +// $Id$ + + package scala.swing /** diff --git a/src/swing/scala/swing/Orientation.scala b/src/swing/scala/swing/Orientation.scala index 6657155340..77e14bf3a6 100644 --- a/src/swing/scala/swing/Orientation.scala +++ b/src/swing/scala/swing/Orientation.scala @@ -1,3 +1,14 @@ +/* __ *\ +** ________ ___ / / ___ Scala API ** +** / __/ __// _ | / / / _ | (c) 2007-2009, LAMP/EPFL ** +** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ ** +** /____/\___/_/ |_/____/_/ | | ** +** |/ ** +\* */ + +// $Id$ + + package scala.swing import javax.swing.SwingConstants._ diff --git a/src/swing/scala/swing/Oriented.scala b/src/swing/scala/swing/Oriented.scala index 4403b06810..da16b1d58e 100644 --- a/src/swing/scala/swing/Oriented.scala +++ b/src/swing/scala/swing/Oriented.scala @@ -1,3 +1,14 @@ +/* __ *\ +** ________ ___ / / ___ Scala API ** +** / __/ __// _ | / / / _ | (c) 2007-2009, LAMP/EPFL ** +** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ ** +** /____/\___/_/ |_/____/_/ | | ** +** |/ ** +\* */ + +// $Id$ + + package scala.swing /** diff --git a/src/swing/scala/swing/Panel.scala b/src/swing/scala/swing/Panel.scala index 12ad54ab4f..bce28c97a1 100644 --- a/src/swing/scala/swing/Panel.scala +++ b/src/swing/scala/swing/Panel.scala @@ -1,3 +1,14 @@ +/* __ *\ +** ________ ___ / / ___ Scala API ** +** / __/ __// _ | / / / _ | (c) 2007-2009, LAMP/EPFL ** +** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ ** +** /____/\___/_/ |_/____/_/ | | ** +** |/ ** +\* */ + +// $Id$ + + package scala.swing /** diff --git a/src/swing/scala/swing/PasswordField.scala b/src/swing/scala/swing/PasswordField.scala index 4769759a0c..0a77ff6f38 100644 --- a/src/swing/scala/swing/PasswordField.scala +++ b/src/swing/scala/swing/PasswordField.scala @@ -1,3 +1,14 @@ +/* __ *\ +** ________ ___ / / ___ Scala API ** +** / __/ __// _ | / / / _ | (c) 2007-2009, LAMP/EPFL ** +** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ ** +** /____/\___/_/ |_/____/_/ | | ** +** |/ ** +\* */ + +// $Id$ + + package scala.swing import javax.swing._ diff --git a/src/swing/scala/swing/ProgressBar.scala b/src/swing/scala/swing/ProgressBar.scala index 1dd7f547be..da8cb7edcc 100644 --- a/src/swing/scala/swing/ProgressBar.scala +++ b/src/swing/scala/swing/ProgressBar.scala @@ -1,3 +1,14 @@ +/* __ *\ +** ________ ___ / / ___ Scala API ** +** / __/ __// _ | / / / _ | (c) 2007-2009, LAMP/EPFL ** +** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ ** +** /____/\___/_/ |_/____/_/ | | ** +** |/ ** +\* */ + +// $Id$ + + package scala.swing import event._ @@ -31,4 +42,4 @@ class ProgressBar extends Component with Orientable { def paintBorder: Boolean = peer.isBorderPainted def paintBorder(v: Boolean) { peer.setBorderPainted(v) } -}
\ No newline at end of file +} diff --git a/src/swing/scala/swing/Publisher.scala b/src/swing/scala/swing/Publisher.scala index ec15616a30..c1ee7afec6 100644 --- a/src/swing/scala/swing/Publisher.scala +++ b/src/swing/scala/swing/Publisher.scala @@ -1,20 +1,33 @@ +/* __ *\ +** ________ ___ / / ___ Scala API ** +** / __/ __// _ | / / / _ | (c) 2007-2009, LAMP/EPFL ** +** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ ** +** /____/\___/_/ |_/____/_/ | | ** +** |/ ** +\* */ + +// $Id$ + + package scala.swing import scala.collection._ import scala.collection.mutable.{Buffer, HashSet, Set} import event.Event -/** - * Notifies registered reactions when an event is published. Publishers are also - * reactors and listen to themselves per default as a convenience. - * - * In order to reduce memory leaks, reactions are weakly referenced by default, - * unless they implement <code>Reactions.StronglyReferenced</code>. That way, - * the lifetime of reactions are more easily bound to the registering object, - * which are reactors in common client code and hold strong references to their - * reactions. As a result, reactors can be garbage collected even though they - * still have reactions registered at some publisher, but not vice versa - * since reactors (strongly) reference publishers they are interested in. +/** <p> + * Notifies registered reactions when an event is published. Publishers are + * also reactors and listen to themselves per default as a convenience. + * </p> + * <p> + * In order to reduce memory leaks, reactions are weakly referenced by default, + * unless they implement <code>Reactions.StronglyReferenced</code>. That way, + * the lifetime of reactions are more easily bound to the registering object, + * which are reactors in common client code and hold strong references to their + * reactions. As a result, reactors can be garbage collected even though they + * still have reactions registered at some publisher, but not vice versa + * since reactors (strongly) reference publishers they are interested in. + * </p> */ trait Publisher extends Reactor { import Reactions._ diff --git a/src/swing/scala/swing/RadioButton.scala b/src/swing/scala/swing/RadioButton.scala index 307051a1b0..f15ec81a4e 100644 --- a/src/swing/scala/swing/RadioButton.scala +++ b/src/swing/scala/swing/RadioButton.scala @@ -1,3 +1,14 @@ +/* __ *\ +** ________ ___ / / ___ Scala API ** +** / __/ __// _ | / / / _ | (c) 2007-2009, LAMP/EPFL ** +** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ ** +** /____/\___/_/ |_/____/_/ | | ** +** |/ ** +\* */ + +// $Id$ + + package scala.swing import javax.swing._ @@ -12,4 +23,4 @@ import javax.swing._ class RadioButton(text0: String) extends ToggleButton { override lazy val peer: JRadioButton = new JRadioButton(text0) def this() = this("") -}
\ No newline at end of file +} diff --git a/src/swing/scala/swing/Reactions.scala b/src/swing/scala/swing/Reactions.scala index 1220a5d862..dc7cb2d2f1 100644 --- a/src/swing/scala/swing/Reactions.scala +++ b/src/swing/scala/swing/Reactions.scala @@ -1,3 +1,14 @@ +/* __ *\ +** ________ ___ / / ___ Scala API ** +** / __/ __// _ | / / / _ | (c) 2007-2009, LAMP/EPFL ** +** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ ** +** /____/\___/_/ |_/____/_/ | | ** +** |/ ** +\* */ + +// $Id$ + + package scala.swing import event.Event diff --git a/src/swing/scala/swing/Reactor.scala b/src/swing/scala/swing/Reactor.scala index 9f13e3f6a3..8a3fbd2f00 100644 --- a/src/swing/scala/swing/Reactor.scala +++ b/src/swing/scala/swing/Reactor.scala @@ -1,3 +1,14 @@ +/* __ *\ +** ________ ___ / / ___ Scala API ** +** / __/ __// _ | / / / _ | (c) 2007-2009, LAMP/EPFL ** +** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ ** +** /____/\___/_/ |_/____/_/ | | ** +** |/ ** +\* */ + +// $Id$ + + package scala.swing /** diff --git a/src/swing/scala/swing/RichWindows.scala b/src/swing/scala/swing/RichWindows.scala index 25a99db700..cdcf918cc5 100644 --- a/src/swing/scala/swing/RichWindows.scala +++ b/src/swing/scala/swing/RichWindows.scala @@ -1,3 +1,14 @@ +/* __ *\ +** ________ ___ / / ___ Scala API ** +** / __/ __// _ | / / / _ | (c) 2007-2009, LAMP/EPFL ** +** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ ** +** /____/\___/_/ |_/____/_/ | | ** +** |/ ** +\* */ + +// $Id$ + + package scala.swing import java.awt.{Image, Window => AWTWindow, Frame => AWTFrame} diff --git a/src/swing/scala/swing/RootPanel.scala b/src/swing/scala/swing/RootPanel.scala index 6e0d51d71b..40d0860d4c 100644 --- a/src/swing/scala/swing/RootPanel.scala +++ b/src/swing/scala/swing/RootPanel.scala @@ -1,3 +1,14 @@ +/* __ *\ +** ________ ___ / / ___ Scala API ** +** / __/ __// _ | / / / _ | (c) 2007-2009, LAMP/EPFL ** +** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ ** +** /____/\___/_/ |_/____/_/ | | ** +** |/ ** +\* */ + +// $Id$ + + package scala.swing /** diff --git a/src/swing/scala/swing/ScrollPane.scala b/src/swing/scala/swing/ScrollPane.scala index c8fa7dc489..e7a64324f9 100644 --- a/src/swing/scala/swing/ScrollPane.scala +++ b/src/swing/scala/swing/ScrollPane.scala @@ -1,3 +1,14 @@ +/* __ *\ +** ________ ___ / / ___ Scala API ** +** / __/ __// _ | / / / _ | (c) 2007-2009, LAMP/EPFL ** +** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ ** +** /____/\___/_/ |_/____/_/ | | ** +** |/ ** +\* */ + +// $Id$ + + package scala.swing import javax.swing.{JScrollPane, ScrollPaneConstants} @@ -70,4 +81,4 @@ class ScrollPane extends Component with Container { def horizontalScrollBarPolicy = BarPolicy.wrap(peer.getHorizontalScrollBarPolicy) def horizontalScrollBarPolicy_=(p: BarPolicy.Value) = peer.setHorizontalScrollBarPolicy(p.horizontalPeer) -}
\ No newline at end of file +} diff --git a/src/swing/scala/swing/Scrollable.scala b/src/swing/scala/swing/Scrollable.scala index 06c283ce42..0a4bc48e1c 100644 --- a/src/swing/scala/swing/Scrollable.scala +++ b/src/swing/scala/swing/Scrollable.scala @@ -1,3 +1,14 @@ +/* __ *\ +** ________ ___ / / ___ Scala API ** +** / __/ __// _ | / / / _ | (c) 2007-2009, LAMP/EPFL ** +** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ ** +** /____/\___/_/ |_/____/_/ | | ** +** |/ ** +\* */ + +// $Id$ + + package scala.swing import java.awt.Rectangle diff --git a/src/swing/scala/swing/Separator.scala b/src/swing/scala/swing/Separator.scala index a76bc3dcfa..dd98b35915 100644 --- a/src/swing/scala/swing/Separator.scala +++ b/src/swing/scala/swing/Separator.scala @@ -1,3 +1,14 @@ +/* __ *\ +** ________ ___ / / ___ Scala API ** +** / __/ __// _ | / / / _ | (c) 2007-2009, LAMP/EPFL ** +** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ ** +** /____/\___/_/ |_/____/_/ | | ** +** |/ ** +\* */ + +// $Id$ + + package scala.swing import javax.swing._ diff --git a/src/swing/scala/swing/SequentialContainer.scala b/src/swing/scala/swing/SequentialContainer.scala index c4146eaabe..84a664ed9d 100644 --- a/src/swing/scala/swing/SequentialContainer.scala +++ b/src/swing/scala/swing/SequentialContainer.scala @@ -1,3 +1,14 @@ +/* __ *\ +** ________ ___ / / ___ Scala API ** +** / __/ __// _ | / / / _ | (c) 2007-2009, LAMP/EPFL ** +** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ ** +** /____/\___/_/ |_/____/_/ | | ** +** |/ ** +\* */ + +// $Id$ + + package scala.swing import scala.collection.mutable.Buffer diff --git a/src/swing/scala/swing/SimpleGUIApplication.scala b/src/swing/scala/swing/SimpleGUIApplication.scala index 878ff459fb..ff6204049c 100644 --- a/src/swing/scala/swing/SimpleGUIApplication.scala +++ b/src/swing/scala/swing/SimpleGUIApplication.scala @@ -1,3 +1,14 @@ +/* __ *\ +** ________ ___ / / ___ Scala API ** +** / __/ __// _ | / / / _ | (c) 2007-2009, LAMP/EPFL ** +** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ ** +** /____/\___/_/ |_/____/_/ | | ** +** |/ ** +\* */ + +// $Id$ + + package scala.swing import javax.swing._ diff --git a/src/swing/scala/swing/Slider.scala b/src/swing/scala/swing/Slider.scala index 17522aca39..e18850f908 100644 --- a/src/swing/scala/swing/Slider.scala +++ b/src/swing/scala/swing/Slider.scala @@ -1,3 +1,14 @@ +/* __ *\ +** ________ ___ / / ___ Scala API ** +** / __/ __// _ | / / / _ | (c) 2007-2009, LAMP/EPFL ** +** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ ** +** /____/\___/_/ |_/____/_/ | | ** +** |/ ** +\* */ + +// $Id$ + + package scala.swing import javax.swing.{JSlider, JLabel} diff --git a/src/swing/scala/swing/SplitPane.scala b/src/swing/scala/swing/SplitPane.scala index 9ff9ba9854..7d821afb75 100644 --- a/src/swing/scala/swing/SplitPane.scala +++ b/src/swing/scala/swing/SplitPane.scala @@ -1,3 +1,14 @@ +/* __ *\ +** ________ ___ / / ___ Scala API ** +** / __/ __// _ | / / / _ | (c) 2007-2009, LAMP/EPFL ** +** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ ** +** /____/\___/_/ |_/____/_/ | | ** +** |/ ** +\* */ + +// $Id$ + + package scala.swing import event._ @@ -51,4 +62,4 @@ class SplitPane(o: Orientation.Value, left: Component, right: Component) extends def oneTouchExpandable_=(b: Boolean) { peer.setOneTouchExpandable(b) } def continuousLayout: Boolean = peer.isContinuousLayout def continuousLayout_=(b: Boolean) { peer.setContinuousLayout(b) } -}
\ No newline at end of file +} diff --git a/src/swing/scala/swing/Swing.scala b/src/swing/scala/swing/Swing.scala index 636c5d2841..ce14a0f8fd 100644 --- a/src/swing/scala/swing/Swing.scala +++ b/src/swing/scala/swing/Swing.scala @@ -1,3 +1,14 @@ +/* __ *\ +** ________ ___ / / ___ Scala API ** +** / __/ __// _ | / / / _ | (c) 2007-2009, LAMP/EPFL ** +** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ ** +** /____/\___/_/ |_/____/_/ | | ** +** |/ ** +\* */ + +// $Id$ + + package scala.swing import java.awt.event._ diff --git a/src/swing/scala/swing/SwingActor.scala b/src/swing/scala/swing/SwingActor.scala index 7477825df5..e8282ad2b2 100644 --- a/src/swing/scala/swing/SwingActor.scala +++ b/src/swing/scala/swing/SwingActor.scala @@ -1,3 +1,14 @@ +/* __ *\ +** ________ ___ / / ___ Scala API ** +** / __/ __// _ | / / / _ | (c) 2007-2009, LAMP/EPFL ** +** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ ** +** /____/\___/_/ |_/____/_/ | | ** +** |/ ** +\* */ + +// $Id$ + + package scala.swing import scala.actors._ diff --git a/src/swing/scala/swing/TabbedPane.scala b/src/swing/scala/swing/TabbedPane.scala index ad2cbb81a4..5d634c7082 100644 --- a/src/swing/scala/swing/TabbedPane.scala +++ b/src/swing/scala/swing/TabbedPane.scala @@ -1,3 +1,14 @@ +/* __ *\ +** ________ ___ / / ___ Scala API ** +** / __/ __// _ | / / / _ | (c) 2007-2009, LAMP/EPFL ** +** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ ** +** /____/\___/_/ |_/____/_/ | | ** +** |/ ** +\* */ + +// $Id$ + + package scala.swing import event._ diff --git a/src/swing/scala/swing/Table.scala b/src/swing/scala/swing/Table.scala index 91db9fcb55..9796b6b58f 100644 --- a/src/swing/scala/swing/Table.scala +++ b/src/swing/scala/swing/Table.scala @@ -1,3 +1,14 @@ +/* __ *\ +** ________ ___ / / ___ Scala API ** +** / __/ __// _ | / / / _ | (c) 2007-2009, LAMP/EPFL ** +** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ ** +** /____/\___/_/ |_/____/_/ | | ** +** |/ ** +\* */ + +// $Id$ + + package scala.swing import javax.swing._ diff --git a/src/swing/scala/swing/TextArea.scala b/src/swing/scala/swing/TextArea.scala index 50e1767080..08540845b6 100644 --- a/src/swing/scala/swing/TextArea.scala +++ b/src/swing/scala/swing/TextArea.scala @@ -1,3 +1,14 @@ +/* __ *\ +** ________ ___ / / ___ Scala API ** +** / __/ __// _ | / / / _ | (c) 2007-2009, LAMP/EPFL ** +** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ ** +** /____/\___/_/ |_/____/_/ | | ** +** |/ ** +\* */ + +// $Id$ + + package scala.swing import javax.swing._ @@ -33,4 +44,4 @@ class TextArea(text0: String, rows0: Int, columns0: Int) extends TextComponent w def wordWrap_=(w: Boolean) = peer.setWrapStyleWord(w) def charWrap: Boolean = !peer.getWrapStyleWord def charWrap_=(w: Boolean) = peer.setWrapStyleWord(!w) -}
\ No newline at end of file +} diff --git a/src/swing/scala/swing/TextComponent.scala b/src/swing/scala/swing/TextComponent.scala index 3be31809d7..f65749220a 100644 --- a/src/swing/scala/swing/TextComponent.scala +++ b/src/swing/scala/swing/TextComponent.scala @@ -1,3 +1,14 @@ +/* __ *\ +** ________ ___ / / ___ Scala API ** +** / __/ __// _ | / / / _ | (c) 2007-2009, LAMP/EPFL ** +** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ ** +** /____/\___/_/ |_/____/_/ | | ** +** |/ ** +\* */ + +// $Id$ + + package scala.swing import javax.swing._ @@ -60,4 +71,4 @@ class TextComponent extends Component with Publisher { def insertUpdate(e:DocumentEvent) { publish(ValueChanged(TextComponent.this)) } def removeUpdate(e:DocumentEvent) { publish(ValueChanged(TextComponent.this)) } }) -}
\ No newline at end of file +} diff --git a/src/swing/scala/swing/TextField.scala b/src/swing/scala/swing/TextField.scala index 07ce1b0b5d..3d068bb7f7 100644 --- a/src/swing/scala/swing/TextField.scala +++ b/src/swing/scala/swing/TextField.scala @@ -1,3 +1,14 @@ +/* __ *\ +** ________ ___ / / ___ Scala API ** +** / __/ __// _ | / / / _ | (c) 2007-2009, LAMP/EPFL ** +** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ ** +** /____/\___/_/ |_/____/_/ | | ** +** |/ ** +\* */ + +// $Id$ + + package scala.swing import javax.swing._ diff --git a/src/swing/scala/swing/ToggleButton.scala b/src/swing/scala/swing/ToggleButton.scala index cc7827ddb7..26958c94f8 100644 --- a/src/swing/scala/swing/ToggleButton.scala +++ b/src/swing/scala/swing/ToggleButton.scala @@ -1,3 +1,14 @@ +/* __ *\ +** ________ ___ / / ___ Scala API ** +** / __/ __// _ | / / / _ | (c) 2007-2009, LAMP/EPFL ** +** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ ** +** /____/\___/_/ |_/____/_/ | | ** +** |/ ** +\* */ + +// $Id$ + + package scala.swing import javax.swing._ diff --git a/src/swing/scala/swing/UIElement.scala b/src/swing/scala/swing/UIElement.scala index 8e496ecf46..42ee4da39e 100644 --- a/src/swing/scala/swing/UIElement.scala +++ b/src/swing/scala/swing/UIElement.scala @@ -1,3 +1,14 @@ +/* __ *\ +** ________ ___ / / ___ Scala API ** +** / __/ __// _ | / / / _ | (c) 2007-2009, LAMP/EPFL ** +** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ ** +** /____/\___/_/ |_/____/_/ | | ** +** |/ ** +\* */ + +// $Id$ + + package scala.swing import java.awt.{Color, Cursor, Font, Dimension, Rectangle} @@ -113,4 +124,4 @@ trait UIElement extends Proxy with LazyPublisher { }) } def onLastUnsubscribe {} -}
\ No newline at end of file +} diff --git a/src/swing/scala/swing/Window.scala b/src/swing/scala/swing/Window.scala index a2d88845c6..e9fdfff7ca 100644 --- a/src/swing/scala/swing/Window.scala +++ b/src/swing/scala/swing/Window.scala @@ -1,3 +1,14 @@ +/* __ *\ +** ________ ___ / / ___ Scala API ** +** / __/ __// _ | / / / _ | (c) 2007-2009, LAMP/EPFL ** +** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ ** +** /____/\___/_/ |_/____/_/ | | ** +** |/ ** +\* */ + +// $Id$ + + package scala.swing import java.awt.{Image, Point, Window => AWTWindow} @@ -61,4 +72,4 @@ abstract class Window extends UIElement with RootPanel with Publisher { outer => def windowIconified(e: java.awt.event.WindowEvent) { publish(WindowIconified(outer)) } def windowOpened(e: java.awt.event.WindowEvent) { publish(WindowOpened(outer)) } }) -}
\ No newline at end of file +} diff --git a/src/swing/scala/swing/event/ActionEvent.scala b/src/swing/scala/swing/event/ActionEvent.scala index c800f20a69..e451d4ee39 100644 --- a/src/swing/scala/swing/event/ActionEvent.scala +++ b/src/swing/scala/swing/event/ActionEvent.scala @@ -1,3 +1,14 @@ +/* __ *\ +** ________ ___ / / ___ Scala API ** +** / __/ __// _ | / / / _ | (c) 2007-2009, LAMP/EPFL ** +** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ ** +** /____/\___/_/ |_/____/_/ | | ** +** |/ ** +\* */ + +// $Id$ + + package scala.swing.event case class ActionEvent(override val source: Component) extends ComponentEvent diff --git a/src/swing/scala/swing/event/AdjustingEvent.scala b/src/swing/scala/swing/event/AdjustingEvent.scala index e06256ea4f..2c8714dc13 100644 --- a/src/swing/scala/swing/event/AdjustingEvent.scala +++ b/src/swing/scala/swing/event/AdjustingEvent.scala @@ -1,11 +1,25 @@ +/* __ *\ +** ________ ___ / / ___ Scala API ** +** / __/ __// _ | / / / _ | (c) 2007-2009, LAMP/EPFL ** +** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ ** +** /____/\___/_/ |_/____/_/ | | ** +** |/ ** +\* */ + +// $Id$ + + package scala.swing.event -/** - * An event that indicates some editing operation that can be still in progress. - * Example: dragging a slider creates a number of AdjustmentEvents with - * adjusting == true until the user finally releases the mouse button. +/** <p> + * An event that indicates some editing operation that can be still in + * progress.<br/> + * Example: dragging a slider creates a number of <code>AdjustmentEvents</code> + * with <code>adjusting == true</code> until the user finally releases the + * mouse button. + * </p> */ trait AdjustingEvent extends ComponentEvent { def adjusting: Boolean def committed: Boolean = !adjusting -}
\ No newline at end of file +} diff --git a/src/swing/scala/swing/event/BackgroundChanged.scala b/src/swing/scala/swing/event/BackgroundChanged.scala index 6673ec47c1..046e8a0269 100644 --- a/src/swing/scala/swing/event/BackgroundChanged.scala +++ b/src/swing/scala/swing/event/BackgroundChanged.scala @@ -1,3 +1,14 @@ +/* __ *\ +** ________ ___ / / ___ Scala API ** +** / __/ __// _ | / / / _ | (c) 2007-2009, LAMP/EPFL ** +** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ ** +** /____/\___/_/ |_/____/_/ | | ** +** |/ ** +\* */ + +// $Id$ + + package scala.swing.event case class BackgroundChanged(override val source: Component) extends ComponentEvent diff --git a/src/swing/scala/swing/event/ButtonClicked.scala b/src/swing/scala/swing/event/ButtonClicked.scala index 1f9049a03f..591cba0ed6 100644 --- a/src/swing/scala/swing/event/ButtonClicked.scala +++ b/src/swing/scala/swing/event/ButtonClicked.scala @@ -1,3 +1,14 @@ +/* __ *\ +** ________ ___ / / ___ Scala API ** +** / __/ __// _ | / / / _ | (c) 2007-2009, LAMP/EPFL ** +** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ ** +** /____/\___/_/ |_/____/_/ | | ** +** |/ ** +\* */ + +// $Id$ + + package scala.swing.event case class ButtonClicked(override val source: AbstractButton) extends ActionEvent(source) diff --git a/src/swing/scala/swing/event/CaretUpdate.scala b/src/swing/scala/swing/event/CaretUpdate.scala index f5cd1702ab..3f8bf8ff4f 100644 --- a/src/swing/scala/swing/event/CaretUpdate.scala +++ b/src/swing/scala/swing/event/CaretUpdate.scala @@ -1,3 +1,14 @@ +/* __ *\ +** ________ ___ / / ___ Scala API ** +** / __/ __// _ | / / / _ | (c) 2007-2009, LAMP/EPFL ** +** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ ** +** /____/\___/_/ |_/____/_/ | | ** +** |/ ** +\* */ + +// $Id$ + + package scala.swing.event case class CaretUpdate(override val source: TextComponent) extends ComponentEvent diff --git a/src/swing/scala/swing/event/ComponentEvent.scala b/src/swing/scala/swing/event/ComponentEvent.scala index 7a37bd66f7..a3b0c6f98a 100644 --- a/src/swing/scala/swing/event/ComponentEvent.scala +++ b/src/swing/scala/swing/event/ComponentEvent.scala @@ -1,3 +1,14 @@ +/* __ *\ +** ________ ___ / / ___ Scala API ** +** / __/ __// _ | / / / _ | (c) 2007-2009, LAMP/EPFL ** +** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ ** +** /____/\___/_/ |_/____/_/ | | ** +** |/ ** +\* */ + +// $Id$ + + package scala.swing.event trait ComponentEvent extends UIEvent { diff --git a/src/swing/scala/swing/event/ContainerEvent.scala b/src/swing/scala/swing/event/ContainerEvent.scala index d15b0703cf..39ff292962 100644 --- a/src/swing/scala/swing/event/ContainerEvent.scala +++ b/src/swing/scala/swing/event/ContainerEvent.scala @@ -1,3 +1,14 @@ +/* __ *\ +** ________ ___ / / ___ Scala API ** +** / __/ __// _ | / / / _ | (c) 2007-2009, LAMP/EPFL ** +** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ ** +** /____/\___/_/ |_/____/_/ | | ** +** |/ ** +\* */ + +// $Id$ + + package scala.swing.event abstract class ContainerEvent(override val source: Container) extends UIEvent diff --git a/src/swing/scala/swing/event/EditDone.scala b/src/swing/scala/swing/event/EditDone.scala index b802a1a981..b92b5e6203 100644 --- a/src/swing/scala/swing/event/EditDone.scala +++ b/src/swing/scala/swing/event/EditDone.scala @@ -1,3 +1,14 @@ +/* __ *\ +** ________ ___ / / ___ Scala API ** +** / __/ __// _ | / / / _ | (c) 2007-2009, LAMP/EPFL ** +** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ ** +** /____/\___/_/ |_/____/_/ | | ** +** |/ ** +\* */ + +// $Id$ + + package scala.swing.event case class EditDone(override val source: TextField) extends ValueChanged(source) diff --git a/src/swing/scala/swing/event/Event.scala b/src/swing/scala/swing/event/Event.scala index 4de5930e09..1d610acbf6 100644 --- a/src/swing/scala/swing/event/Event.scala +++ b/src/swing/scala/swing/event/Event.scala @@ -1,3 +1,14 @@ +/* __ *\ +** ________ ___ / / ___ Scala API ** +** / __/ __// _ | / / / _ | (c) 2007-2009, LAMP/EPFL ** +** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ ** +** /____/\___/_/ |_/____/_/ | | ** +** |/ ** +\* */ + +// $Id$ + + package scala.swing.event trait Event diff --git a/src/swing/scala/swing/event/FocusEvent.scala b/src/swing/scala/swing/event/FocusEvent.scala index 75b3bb0a5a..995a5effa3 100644 --- a/src/swing/scala/swing/event/FocusEvent.scala +++ b/src/swing/scala/swing/event/FocusEvent.scala @@ -1,3 +1,14 @@ +/* __ *\ +** ________ ___ / / ___ Scala API ** +** / __/ __// _ | / / / _ | (c) 2007-2009, LAMP/EPFL ** +** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ ** +** /____/\___/_/ |_/____/_/ | | ** +** |/ ** +\* */ + +// $Id$ + + package scala.swing.event /** @@ -9,4 +20,4 @@ case class FocusGained(override val source: Component, override val other: Optio extends FocusEvent(source, other, temporary) case class FocusLost(override val source: Component, override val other: Option[Component], override val temporary: Boolean) - extends FocusEvent(source, other, temporary)
\ No newline at end of file + extends FocusEvent(source, other, temporary) diff --git a/src/swing/scala/swing/event/FontChanged.scala b/src/swing/scala/swing/event/FontChanged.scala index b2e09024d4..6535cec052 100644 --- a/src/swing/scala/swing/event/FontChanged.scala +++ b/src/swing/scala/swing/event/FontChanged.scala @@ -1,3 +1,14 @@ +/* __ *\ +** ________ ___ / / ___ Scala API ** +** / __/ __// _ | / / / _ | (c) 2007-2009, LAMP/EPFL ** +** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ ** +** /____/\___/_/ |_/____/_/ | | ** +** |/ ** +\* */ + +// $Id$ + + package scala.swing.event case class FontChanged(override val source: Component) extends ComponentEvent diff --git a/src/swing/scala/swing/event/ForegroundChanged.scala b/src/swing/scala/swing/event/ForegroundChanged.scala index 94a1a8a25d..39486562dc 100644 --- a/src/swing/scala/swing/event/ForegroundChanged.scala +++ b/src/swing/scala/swing/event/ForegroundChanged.scala @@ -1,3 +1,14 @@ +/* __ *\ +** ________ ___ / / ___ Scala API ** +** / __/ __// _ | / / / _ | (c) 2007-2009, LAMP/EPFL ** +** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ ** +** /____/\___/_/ |_/____/_/ | | ** +** |/ ** +\* */ + +// $Id$ + + package scala.swing.event case class ForegroundChanged(override val source: Component) extends ComponentEvent diff --git a/src/swing/scala/swing/event/InputEvent.scala b/src/swing/scala/swing/event/InputEvent.scala index 6cfffb9442..e29d04d954 100644 --- a/src/swing/scala/swing/event/InputEvent.scala +++ b/src/swing/scala/swing/event/InputEvent.scala @@ -1,3 +1,14 @@ +/* __ *\ +** ________ ___ / / ___ Scala API ** +** / __/ __// _ | / / / _ | (c) 2007-2009, LAMP/EPFL ** +** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ ** +** /____/\___/_/ |_/____/_/ | | ** +** |/ ** +\* */ + +// $Id$ + + package scala.swing.event trait InputEvent extends ComponentEvent { diff --git a/src/swing/scala/swing/event/Key.scala b/src/swing/scala/swing/event/Key.scala index c19186ff81..e0880409e2 100644 --- a/src/swing/scala/swing/event/Key.scala +++ b/src/swing/scala/swing/event/Key.scala @@ -1,3 +1,14 @@ +/* __ *\ +** ________ ___ / / ___ Scala API ** +** / __/ __// _ | / / / _ | (c) 2007-2009, LAMP/EPFL ** +** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ ** +** /____/\___/_/ |_/____/_/ | | ** +** |/ ** +\* */ + +// $Id$ + + package scala.swing.event object Key extends Enumeration { diff --git a/src/swing/scala/swing/event/KeyEvent.scala b/src/swing/scala/swing/event/KeyEvent.scala index 3a379608b5..ddb8d57997 100644 --- a/src/swing/scala/swing/event/KeyEvent.scala +++ b/src/swing/scala/swing/event/KeyEvent.scala @@ -1,3 +1,14 @@ +/* __ *\ +** ________ ___ / / ___ Scala API ** +** / __/ __// _ | / / / _ | (c) 2007-2009, LAMP/EPFL ** +** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ ** +** /____/\___/_/ |_/____/_/ | | ** +** |/ ** +\* */ + +// $Id$ + + package scala.swing.event import javax.swing.JComponent diff --git a/src/swing/scala/swing/event/ListEvent.scala b/src/swing/scala/swing/event/ListEvent.scala index 1768d84955..86c62708f2 100644 --- a/src/swing/scala/swing/event/ListEvent.scala +++ b/src/swing/scala/swing/event/ListEvent.scala @@ -1,3 +1,14 @@ +/* __ *\ +** ________ ___ / / ___ Scala API ** +** / __/ __// _ | / / / _ | (c) 2007-2009, LAMP/EPFL ** +** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ ** +** /____/\___/_/ |_/____/_/ | | ** +** |/ ** +\* */ + +// $Id$ + + package scala.swing.event trait ListEvent[A] extends ComponentEvent { @@ -29,4 +40,4 @@ object ListElementsRemoved { def apply[A](source: ListView[A], range: Range) = new ListElementsRemoved(source, range) } class ListElementsRemoved[A](override val source: ListView[A], val range: Range) - extends ListChange(source)
\ No newline at end of file + extends ListChange(source) diff --git a/src/swing/scala/swing/event/MouseEvent.scala b/src/swing/scala/swing/event/MouseEvent.scala index f7a6ec2fee..51af9ba304 100644 --- a/src/swing/scala/swing/event/MouseEvent.scala +++ b/src/swing/scala/swing/event/MouseEvent.scala @@ -1,3 +1,14 @@ +/* __ *\ +** ________ ___ / / ___ Scala API ** +** / __/ __// _ | / / / _ | (c) 2007-2009, LAMP/EPFL ** +** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ ** +** /____/\___/_/ |_/____/_/ | | ** +** |/ ** +\* */ + +// $Id$ + + package scala.swing.event import java.awt.Point @@ -57,4 +68,4 @@ case class MouseWheelMoved(val source: Component, point: Point, val modifiers: I extends MouseEvent { def this(e: java.awt.event.MouseWheelEvent) = this(UIElement.cachedWrapper(e.getSource.asInstanceOf[JComponent]), e.getPoint, e.getModifiersEx, e.getWheelRotation)(e) -}
\ No newline at end of file +} diff --git a/src/swing/scala/swing/event/SelectionEvent.scala b/src/swing/scala/swing/event/SelectionEvent.scala index 7c597934c8..41f149f146 100644 --- a/src/swing/scala/swing/event/SelectionEvent.scala +++ b/src/swing/scala/swing/event/SelectionEvent.scala @@ -1,3 +1,14 @@ +/* __ *\ +** ________ ___ / / ___ Scala API ** +** / __/ __// _ | / / / _ | (c) 2007-2009, LAMP/EPFL ** +** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ ** +** /____/\___/_/ |_/____/_/ | | ** +** |/ ** +\* */ + +// $Id$ + + package scala.swing.event trait SelectionEvent extends ComponentEvent @@ -8,4 +19,4 @@ trait ListSelectionEvent extends SelectionEvent { case class SelectionChanged(override val source: Component) extends ComponentEvent with SelectionEvent case class ListSelectionChanged[A](override val source: ListView[A], range: Range, live: Boolean) - extends SelectionChanged(source) with ListEvent[A]
\ No newline at end of file + extends SelectionChanged(source) with ListEvent[A] diff --git a/src/swing/scala/swing/event/TableEvent.scala b/src/swing/scala/swing/event/TableEvent.scala index 390ae211d8..b3e95ee751 100644 --- a/src/swing/scala/swing/event/TableEvent.scala +++ b/src/swing/scala/swing/event/TableEvent.scala @@ -1,3 +1,14 @@ +/* __ *\ +** ________ ___ / / ___ Scala API ** +** / __/ __// _ | / / / _ | (c) 2007-2009, LAMP/EPFL ** +** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ ** +** /____/\___/_/ |_/____/_/ | | ** +** |/ ** +\* */ + +// $Id$ + + package scala.swing.event abstract class TableEvent(override val source: Table) extends ComponentEvent @@ -32,4 +43,4 @@ case class TableRowsRemoved(override val source: Table, range: Range) extends Ta case class TableColumnsSelected(override val source: Table, range: Range, adjusting: Boolean) extends TableEvent(source) with AdjustingEvent with ListSelectionEvent case class TableRowsSelected(override val source: Table, range: Range, adjusting: Boolean) - extends TableEvent(source) with AdjustingEvent with ListSelectionEvent
\ No newline at end of file + extends TableEvent(source) with AdjustingEvent with ListSelectionEvent diff --git a/src/swing/scala/swing/event/UIEvent.scala b/src/swing/scala/swing/event/UIEvent.scala index d7407bb6ce..0669d63bec 100644 --- a/src/swing/scala/swing/event/UIEvent.scala +++ b/src/swing/scala/swing/event/UIEvent.scala @@ -1,3 +1,14 @@ +/* __ *\ +** ________ ___ / / ___ Scala API ** +** / __/ __// _ | / / / _ | (c) 2007-2009, LAMP/EPFL ** +** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ ** +** /____/\___/_/ |_/____/_/ | | ** +** |/ ** +\* */ + +// $Id$ + + package scala.swing.event trait UIEvent extends Event { @@ -7,4 +18,4 @@ trait UIEvent extends Event { case class UIElementMoved(source: UIElement) extends UIEvent case class UIElementResized(source: UIElement) extends UIEvent case class UIElementShown(source: UIElement) extends UIEvent -case class UIElementHidden(source: UIElement) extends UIEvent
\ No newline at end of file +case class UIElementHidden(source: UIElement) extends UIEvent diff --git a/src/swing/scala/swing/event/ValueChanged.scala b/src/swing/scala/swing/event/ValueChanged.scala index 1097a52da2..dda1a6d2aa 100644 --- a/src/swing/scala/swing/event/ValueChanged.scala +++ b/src/swing/scala/swing/event/ValueChanged.scala @@ -1,3 +1,14 @@ +/* __ *\ +** ________ ___ / / ___ Scala API ** +** / __/ __// _ | / / / _ | (c) 2007-2009, LAMP/EPFL ** +** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ ** +** /____/\___/_/ |_/____/_/ | | ** +** |/ ** +\* */ + +// $Id$ + + package scala.swing.event case class ValueChanged(override val source: Component) extends ComponentEvent diff --git a/src/swing/scala/swing/event/WindowActivated.scala b/src/swing/scala/swing/event/WindowActivated.scala index dfed4f1a99..0b45a4fc00 100644 --- a/src/swing/scala/swing/event/WindowActivated.scala +++ b/src/swing/scala/swing/event/WindowActivated.scala @@ -1,3 +1,14 @@ +/* __ *\ +** ________ ___ / / ___ Scala API ** +** / __/ __// _ | / / / _ | (c) 2007-2009, LAMP/EPFL ** +** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ ** +** /____/\___/_/ |_/____/_/ | | ** +** |/ ** +\* */ + +// $Id$ + + package scala.swing.event case class WindowActivated(override val source: Window) extends WindowEvent(source) diff --git a/src/swing/scala/swing/event/WindowClosing.scala b/src/swing/scala/swing/event/WindowClosing.scala index 3fb8087c23..eeb6819540 100644 --- a/src/swing/scala/swing/event/WindowClosing.scala +++ b/src/swing/scala/swing/event/WindowClosing.scala @@ -1,3 +1,14 @@ +/* __ *\ +** ________ ___ / / ___ Scala API ** +** / __/ __// _ | / / / _ | (c) 2007-2009, LAMP/EPFL ** +** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ ** +** /____/\___/_/ |_/____/_/ | | ** +** |/ ** +\* */ + +// $Id$ + + package scala.swing.event case class WindowClosing(override val source: Window) extends WindowEvent(source) diff --git a/src/swing/scala/swing/event/WindowDeactivated.scala b/src/swing/scala/swing/event/WindowDeactivated.scala index 5d15f9fcfe..cd8f22bb2a 100644 --- a/src/swing/scala/swing/event/WindowDeactivated.scala +++ b/src/swing/scala/swing/event/WindowDeactivated.scala @@ -1,3 +1,14 @@ +/* __ *\ +** ________ ___ / / ___ Scala API ** +** / __/ __// _ | / / / _ | (c) 2007-2009, LAMP/EPFL ** +** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ ** +** /____/\___/_/ |_/____/_/ | | ** +** |/ ** +\* */ + +// $Id$ + + package scala.swing.event case class WindowDeactivated(override val source: Window) extends WindowEvent(source) diff --git a/src/swing/scala/swing/event/WindowDeiconified.scala b/src/swing/scala/swing/event/WindowDeiconified.scala index 1eac0c7f22..90f10e0750 100644 --- a/src/swing/scala/swing/event/WindowDeiconified.scala +++ b/src/swing/scala/swing/event/WindowDeiconified.scala @@ -1,3 +1,14 @@ +/* __ *\ +** ________ ___ / / ___ Scala API ** +** / __/ __// _ | / / / _ | (c) 2007-2009, LAMP/EPFL ** +** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ ** +** /____/\___/_/ |_/____/_/ | | ** +** |/ ** +\* */ + +// $Id$ + + package scala.swing.event case class WindowDeiconified(override val source: Window) extends WindowEvent(source) diff --git a/src/swing/scala/swing/event/WindowEvent.scala b/src/swing/scala/swing/event/WindowEvent.scala index 1e648f958d..801ab7dca4 100644 --- a/src/swing/scala/swing/event/WindowEvent.scala +++ b/src/swing/scala/swing/event/WindowEvent.scala @@ -1,3 +1,14 @@ +/* __ *\ +** ________ ___ / / ___ Scala API ** +** / __/ __// _ | / / / _ | (c) 2007-2009, LAMP/EPFL ** +** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ ** +** /____/\___/_/ |_/____/_/ | | ** +** |/ ** +\* */ + +// $Id$ + + package scala.swing.event abstract class WindowEvent(override val source: Window) extends UIEvent diff --git a/src/swing/scala/swing/event/WindowIconified.scala b/src/swing/scala/swing/event/WindowIconified.scala index b150840768..dc7b5ab513 100644 --- a/src/swing/scala/swing/event/WindowIconified.scala +++ b/src/swing/scala/swing/event/WindowIconified.scala @@ -1,3 +1,14 @@ +/* __ *\ +** ________ ___ / / ___ Scala API ** +** / __/ __// _ | / / / _ | (c) 2007-2009, LAMP/EPFL ** +** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ ** +** /____/\___/_/ |_/____/_/ | | ** +** |/ ** +\* */ + +// $Id$ + + package scala.swing.event case class WindowIconified(override val source: Window) extends WindowEvent(source) diff --git a/src/swing/scala/swing/event/WindowOpened.scala b/src/swing/scala/swing/event/WindowOpened.scala index 4e93fee9ae..2a9eb162c4 100644 --- a/src/swing/scala/swing/event/WindowOpened.scala +++ b/src/swing/scala/swing/event/WindowOpened.scala @@ -1,3 +1,14 @@ +/* __ *\ +** ________ ___ / / ___ Scala API ** +** / __/ __// _ | / / / _ | (c) 2007-2009, LAMP/EPFL ** +** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ ** +** /____/\___/_/ |_/____/_/ | | ** +** |/ ** +\* */ + +// $Id$ + + package scala.swing.event case class WindowOpened(override val source: Window) extends WindowEvent(source) diff --git a/src/swing/scala/swing/model/Matrix.scala b/src/swing/scala/swing/model/Matrix.scala index 40f7e4c6f7..975d880a5a 100644 --- a/src/swing/scala/swing/model/Matrix.scala +++ b/src/swing/scala/swing/model/Matrix.scala @@ -1,3 +1,14 @@ +/* __ *\ +** ________ ___ / / ___ Scala API ** +** / __/ __// _ | / / / _ | (c) 2007-2009, LAMP/EPFL ** +** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ ** +** /____/\___/_/ |_/____/_/ | | ** +** |/ ** +\* */ + +// $Id$ + + package scala.swing.model /*trait Matrix[A] extends Function2[Int, Int, A] { |