diff options
| author | Antonio Cunei <antonio.cunei@epfl.ch> | 2009-12-18 15:22:51 +0000 |
|---|---|---|
| committer | Antonio Cunei <antonio.cunei@epfl.ch> | 2009-12-18 15:22:51 +0000 |
| commit | 2ab456d13df1ac50539e4620f62f6e234f3c8446 (patch) | |
| tree | 865acb3c7eb91100b232aa73214687f53e6dd1c9 /src/swing | |
| parent | a861322f83c23ef1801a0dcb963020b20f8a1b37 (diff) | |
| download | scala-2ab456d13df1ac50539e4620f62f6e234f3c8446.tar.gz scala-2ab456d13df1ac50539e4620f62f6e234f3c8446.tar.bz2 scala-2ab456d13df1ac50539e4620f62f6e234f3c8446.zip | |
Merged revisions 20229-20233 via svnmerge from
https://lampsvn.epfl.ch/svn-repos/scala/scala/trunk
........
r20229 | odersky | 2009-12-18 16:16:51 +0100 (Fri, 18 Dec 2009) | 1 line
Closed #1492. review by extempore
........
r20230 | odersky | 2009-12-18 16:18:44 +0100 (Fri, 18 Dec 2009) | 1 line
Closed #2779. review by community.
........
r20231 | odersky | 2009-12-18 16:20:56 +0100 (Fri, 18 Dec 2009) | 1 line
added test case for #2775 and commented the handling code in Implicits
better. Gilles already had a look so noreview. ........ r20232 |
dubochet | 2009-12-18 16:21:44 +0100 (Fri, 18 Dec 2009) | 1 line
[scaladoc] Added option "-doc-version" to Scaladoc tool (and
"docversion" attribute to ant task). Both "-doc-version" and
"-doc-title" can be set, but are not yet used in the output. No review.
........ r20233 | odersky | 2009-12-18 16:22:11 +0100 (Fri, 18 Dec 2009)
| 1 line
Closed #2801. Had to update a couple of files that already exploited
the missing test. ........
Diffstat (limited to 'src/swing')
| -rw-r--r-- | src/swing/scala/swing/UIElement.scala | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/swing/scala/swing/UIElement.scala b/src/swing/scala/swing/UIElement.scala index bff294d641..8a661626f4 100644 --- a/src/swing/scala/swing/UIElement.scala +++ b/src/swing/scala/swing/UIElement.scala @@ -32,7 +32,7 @@ object UIElement { * it will return that wrapper. Otherwise it returns `null`. This * method never throws an exception. */ - private[swing] def cachedWrapper[C<:UIElement](c: java.awt.Component): C = { + private[swing] def cachedWrapper[C>:Null<:UIElement](c: java.awt.Component): C = { val w = c match { case c: javax.swing.JComponent => c.getClientProperty(ClientKey) case _ => wrapperCache.get(c) |