diff options
author | Jason Zaugg <jzaugg@gmail.com> | 2013-04-28 15:05:07 +0200 |
---|---|---|
committer | Jason Zaugg <jzaugg@gmail.com> | 2013-04-28 15:09:16 +0200 |
commit | 2e5c7b96fa836b0a716a86a377e9ece3bdf5068c (patch) | |
tree | c68094fd83b5ae7399f28bb87548cf9aee58c053 /src/swing | |
parent | 464c9fedd2e3339d3f858213067b07a5b9a28b93 (diff) | |
download | scala-2e5c7b96fa836b0a716a86a377e9ece3bdf5068c.tar.gz scala-2e5c7b96fa836b0a716a86a377e9ece3bdf5068c.tar.bz2 scala-2e5c7b96fa836b0a716a86a377e9ece3bdf5068c.zip |
SI-6784 Localize feature imports in scala.swing.
These were inadvertantly added to the public API in f15dc74 for anyone
importing scala.swing._, which unintentionally enabled reflectiveCalls
and implicitConversions for clients of the API.
This change breaks the source compatibiliy poilicy, rather than
deprecating these, based on the extremely low chance that someone is
using these in something like:
import scala.swing._; println(implicitConversions)
Diffstat (limited to 'src/swing')
-rw-r--r-- | src/swing/scala/swing/Action.scala | 7 | ||||
-rw-r--r-- | src/swing/scala/swing/ComboBox.scala | 1 | ||||
-rw-r--r-- | src/swing/scala/swing/GridBagPanel.scala | 1 | ||||
-rw-r--r-- | src/swing/scala/swing/Orientable.scala | 5 | ||||
-rw-r--r-- | src/swing/scala/swing/Oriented.scala | 1 | ||||
-rw-r--r-- | src/swing/scala/swing/Swing.scala | 1 | ||||
-rw-r--r-- | src/swing/scala/swing/package.scala | 3 |
7 files changed, 14 insertions, 5 deletions
diff --git a/src/swing/scala/swing/Action.scala b/src/swing/scala/swing/Action.scala index 8740f63e98..98b9fee2ee 100644 --- a/src/swing/scala/swing/Action.scala +++ b/src/swing/scala/swing/Action.scala @@ -35,7 +35,12 @@ object Action { // TODO: we need an action cache private var _action: Action = Action.NoAction def action: Action = _action - def action_=(a: Action) { _action = a; peer.setAction(a.peer) } + def action_=(a: Action) { + _action = a; + + import scala.language.reflectiveCalls + peer.setAction(a.peer) + } //1.6: def hideActionText: Boolean = peer.getHideActionText //def hideActionText_=(b: Boolean) = peer.setHideActionText(b) diff --git a/src/swing/scala/swing/ComboBox.scala b/src/swing/scala/swing/ComboBox.scala index ce2b3ba6fb..a075d22a7e 100644 --- a/src/swing/scala/swing/ComboBox.scala +++ b/src/swing/scala/swing/ComboBox.scala @@ -11,6 +11,7 @@ package scala.swing import event._ import javax.swing.{JList, JComponent, JComboBox, JTextField, ComboBoxModel, AbstractListModel, ListCellRenderer} import java.awt.event.ActionListener +import scala.language.implicitConversions object ComboBox { /** diff --git a/src/swing/scala/swing/GridBagPanel.scala b/src/swing/scala/swing/GridBagPanel.scala index 7d181af4d8..c58d398737 100644 --- a/src/swing/scala/swing/GridBagPanel.scala +++ b/src/swing/scala/swing/GridBagPanel.scala @@ -9,6 +9,7 @@ package scala.swing import java.awt.{GridBagConstraints, GridBagLayout} +import scala.language.implicitConversions object GridBagPanel { object Fill extends Enumeration { diff --git a/src/swing/scala/swing/Orientable.scala b/src/swing/scala/swing/Orientable.scala index a73bafb9d3..db7cf09f27 100644 --- a/src/swing/scala/swing/Orientable.scala +++ b/src/swing/scala/swing/Orientable.scala @@ -12,7 +12,10 @@ package scala.swing object Orientable { trait Wrapper extends Oriented.Wrapper with Orientable { - def orientation_=(o: Orientation.Value) { peer.setOrientation(o.id) } + def orientation_=(o: Orientation.Value) { + import scala.language.reflectiveCalls + peer.setOrientation(o.id) + } } } diff --git a/src/swing/scala/swing/Oriented.scala b/src/swing/scala/swing/Oriented.scala index 7996d21898..72d7d574e2 100644 --- a/src/swing/scala/swing/Oriented.scala +++ b/src/swing/scala/swing/Oriented.scala @@ -22,6 +22,7 @@ object Oriented { def getOrientation(): Int def setOrientation(n: Int) } + import scala.language.reflectiveCalls def orientation: Orientation.Value = Orientation(peer.getOrientation) } } diff --git a/src/swing/scala/swing/Swing.scala b/src/swing/scala/swing/Swing.scala index cd5bbf2c4f..e2c8479354 100644 --- a/src/swing/scala/swing/Swing.scala +++ b/src/swing/scala/swing/Swing.scala @@ -14,6 +14,7 @@ import java.awt.event._ import javax.swing.event._ import javax.swing.border._ import javax.swing.{JComponent, Icon, BorderFactory, SwingUtilities} +import scala.language.implicitConversions /** diff --git a/src/swing/scala/swing/package.scala b/src/swing/scala/swing/package.scala index 45497665d7..d5095f021b 100644 --- a/src/swing/scala/swing/package.scala +++ b/src/swing/scala/swing/package.scala @@ -14,9 +14,6 @@ package object swing { type Image = java.awt.Image type Font = java.awt.Font - 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]) private[swing] def toAnyRef(x: Any): AnyRef = x.asInstanceOf[AnyRef] |