diff options
| -rw-r--r-- | src/library/scala/collection/Iterator.scala | 1 | ||||
| -rw-r--r-- | src/swing/scala/swing/ComboBox.scala | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/src/library/scala/collection/Iterator.scala b/src/library/scala/collection/Iterator.scala index 81582b7f78..4e349cb423 100644 --- a/src/library/scala/collection/Iterator.scala +++ b/src/library/scala/collection/Iterator.scala @@ -12,7 +12,6 @@ package scala.collection import mutable.ArrayBuffer import annotation.{ tailrec, migration } -import parallel.ParIterable /** The `Iterator` object provides various functions for * creating specialized iterators. diff --git a/src/swing/scala/swing/ComboBox.scala b/src/swing/scala/swing/ComboBox.scala index 69cfa6988f..75f981064b 100644 --- a/src/swing/scala/swing/ComboBox.scala +++ b/src/swing/scala/swing/ComboBox.scala @@ -122,7 +122,7 @@ object ComboBox { def newConstantModel[A](items: Seq[A]): ComboBoxModel = { new AbstractListModel with ComboBoxModel { - private var selected = items(0) + private var selected: A = if (items.isEmpty) null.asInstanceOf[A] else items(0) def getSelectedItem: AnyRef = selected.asInstanceOf[AnyRef] def setSelectedItem(a: Any) { if ((selected != null && selected != a) || |