diff options
| author | Paul Phillips <paulp@improving.org> | 2012-09-15 14:09:46 -0700 |
|---|---|---|
| committer | Paul Phillips <paulp@improving.org> | 2012-09-15 14:56:31 -0700 |
| commit | ea0d891f238082089be037a0752215d9d21893cf (patch) | |
| tree | b166354f6621cf4adec4cf722b62fbdb5a2000d5 /src/swing | |
| parent | 24580ac84242679619d27f20258078dd012c120a (diff) | |
| download | scala-ea0d891f238082089be037a0752215d9d21893cf.tar.gz scala-ea0d891f238082089be037a0752215d9d21893cf.tar.bz2 scala-ea0d891f238082089be037a0752215d9d21893cf.zip | |
More relative path elimination.
Some names I missed in 55b609458fd .
How one might know when one is done:
mkdir scratch && cd scratch
mkdir annotation beans collection compat concurrent io \
math parallel ref reflect runtime scala sys testing \
text tools util xml
scalac $(find ../src/library -name '*.scala')
Until recently that would fail with about a billion errors. When it
compiles, that's when you're done. And that's where this commit
takes us, for src/library at least.
Diffstat (limited to 'src/swing')
| -rw-r--r-- | src/swing/scala/swing/package.scala | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/swing/scala/swing/package.scala b/src/swing/scala/swing/package.scala index 96530e2e94..45497665d7 100644 --- a/src/swing/scala/swing/package.scala +++ b/src/swing/scala/swing/package.scala @@ -14,8 +14,8 @@ package object swing { type Image = java.awt.Image type Font = java.awt.Font - implicit lazy val reflectiveCalls = language.reflectiveCalls - implicit lazy val implicitConversions = language.implicitConversions + implicit lazy val reflectiveCalls = scala.language.reflectiveCalls + implicit lazy val implicitConversions = scala.language.implicitConversions private[swing] def ifNull[A](o: Object, a: A): A = if(o eq null) a else o.asInstanceOf[A] private[swing] def toOption[A](o: Object): Option[A] = if(o eq null) None else Some(o.asInstanceOf[A]) |