diff options
| author | Paul Phillips <paulp@improving.org> | 2011-03-06 21:33:18 +0000 |
|---|---|---|
| committer | Paul Phillips <paulp@improving.org> | 2011-03-06 21:33:18 +0000 |
| commit | 603c3dae0f74ccb9d9b34c9c004713ca3d0e8847 (patch) | |
| tree | a02a7bd8b39879a328dfcdd7b148870b37ada6f9 /src/swing | |
| parent | 64660068dd89813c7c7a09db1e783177ac31f158 (diff) | |
| download | scala-603c3dae0f74ccb9d9b34c9c004713ca3d0e8847.tar.gz scala-603c3dae0f74ccb9d9b34c9c004713ca3d0e8847.tar.bz2 scala-603c3dae0f74ccb9d9b34c9c004713ca3d0e8847.zip | |
And extempore's original plan carries the day: ...
And extempore's original plan carries the day: null.## no longer throws
an NPE. Took advantage of feature to simplify a bunch of sharp-sharp
calculations. Closes #4311, no review.
Diffstat (limited to 'src/swing')
| -rw-r--r-- | src/swing/scala/swing/Publisher.scala | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/swing/scala/swing/Publisher.scala b/src/swing/scala/swing/Publisher.scala index 6042dce943..ebab00463a 100644 --- a/src/swing/scala/swing/Publisher.scala +++ b/src/swing/scala/swing/Publisher.scala @@ -78,9 +78,9 @@ import scala.ref._ private[swing] trait SingleRefCollection[+A <: AnyRef] extends Iterable[A] { self => trait Ref[+A <: AnyRef] extends Reference[A] { - override def hashCode() = { - val v = get - if (v == None) 0 else v.get.## + override def hashCode() = get match { + case Some(x) => x.## + case _ => 0 } override def equals(that: Any) = that match { case that: ReferenceWrapper[_] => |