implement missing methods in 2.13 buffer-wrapper; insertAt -> insert

Author: Sciss

build.sbt

@@ -16,7 +16,7 @@ scalaVersionsByJvm in ThisBuild := Map(
   11 -> List("2.11.12", "2.12.8", "2.13.0-M5").map(_ -> false)
 )
 
-scalaVersion in ThisBuild := "2.13.0-M5"  // for testing
+scalaVersion in ThisBuild := "2.11.12"  // for testing
 
 OsgiKeys.exportPackage := Seq(s"scala.swing.*;version=${version.value}")
 

src/main/scala-2.12/scala/swing/BufferWrapper.scala

@@ -18,28 +18,28 @@ protected[swing] abstract class BufferWrapper[A] extends mutable.Buffer[A] {
 
   def addOne(elem: A): this.type
 
-  protected def insertAt(n: Int, a: A): Unit
+  def insert(idx: Int, elem: A): Unit
 
   // impl
 
-  final def +=(elem: A): this.type = addOne(elem)
+  final override def +=(elem: A): this.type = addOne(elem)
 
-  def clear(): Unit = for (_ <- 0 until length) remove(0)
+  override def clear(): Unit = for (_ <- 0 until length) remove(0)
 
-  def update(n: Int, a: A): Unit = {
+  override def update(n: Int, a: A): Unit = {
     remove(n)
-    insertAt(n, a)
+    insert(n, a)
   }
 
-  def insertAll(n: Int, elems: Traversable[A]): Unit = {
+  override def insertAll(n: Int, elems: Traversable[A]): Unit = {
     var i = n
     for (el <- elems) {
-      insertAt(i, el)
+      insert(i, el)
       i += 1
     }
   }
 
-  def +=:(a: A): this.type = { insertAt(0, a); this }
+  override def +=:(a: A): this.type = { insert(0, a); this }
 
-  def iterator: Iterator[A] = Iterator.range(0,length).map(apply)
+  override def iterator: Iterator[A] = Iterator.range(0,length).map(apply)
 }

src/main/scala-2.13.0-M5/scala/swing/BufferWrapper.scala

@@ -14,36 +14,41 @@ import scala.collection.{Iterator, mutable}
  * Default partial implementation for buffer adapters.
  */
 protected[swing] abstract class BufferWrapper[A] extends mutable.Buffer[A] {
-  def clear(): Unit = for (_ <- 0 until length) remove(0)
+  override def clear(): Unit = for (_ <- 0 until length) remove(0)
 
-  def update(n: Int, a: A): Unit = {
+  override def update(n: Int, a: A): Unit = {
     remove(n)
-    insertAt(n, a)
+    insert(n, a)
   }
 
-  def insertAll(n: Int, elems: Iterable[A]): Unit = {
-    var i = n
-    for (el <- elems) {
-      insertAt(i, el)
+  override def iterator: Iterator[A] = Iterator.range(0, length).map(apply)
+
+  override def prepend(elem: A): this.type = { insert(0, elem); this }
+
+  override def insertAll(idx: Int, elems: IterableOnce[A]): Unit = {
+    var i = idx
+    for (el <- elems.iterator) {
+      insert(i, el)
       i += 1
     }
   }
 
-  protected def insertAt(n: Int, a: A): Unit
-
-// XXX TODO: remove
-//  def +=:(a: A): this.type = { insertAt(0, a); this }
-
-  def iterator: Iterator[A] = Iterator.range(0,length).map(apply)
-
-  // XXX TODO
-  def prepend(elem: A): BufferWrapper.this.type = ???
-
-  def insert(idx: Int, elem: A): Unit = ???
-
-  def insertAll(idx: Int, elems: IterableOnce[A]): Unit = ???
-
-  def remove(idx: Int, count: Int): Unit = ???
+  override def remove(idx: Int, count: Int): Unit = {
+    require(count >= 0)
+    var n = 0
+    while (n < count) {
+      remove(idx + n)
+      n += 1
+    }
+  }
 
-  def patchInPlace(from: Int, patch: collection.Seq[A], replaced: Int): BufferWrapper.this.type = ???
+  override def patchInPlace(from: Int, patch: Seq[A], replaced: Int): this.type = {
+    if (replaced > 0) {
+      remove(from, replaced)
+    }
+    if (patch.nonEmpty) {
+      insertAll(from, patch)
+    }
+    this
+  }
 }

src/main/scala/scala/swing/Container.scala

@@ -30,7 +30,7 @@ object Container {
         UIElement.cachedWrapper[Component](c)
       }
 
-      protected def insertAt(n: Int, c: Component): Unit = peer.add(c.peer, n)
+      override def insert(n: Int, c: Component): Unit = peer.add(c.peer, n)
 
       override def addOne(c: Component): this.type = { peer.add(c.peer) ; this }
 

src/main/scala/scala/swing/TabbedPane.scala

@@ -85,7 +85,8 @@ class TabbedPane extends Component with Publisher {
       //for(i <- n to length) apply(i)._index -= 1
       t
     }
-    protected def insertAt(n: Int, t: Page): Unit = {
+
+    override def insert(n: Int, t: Page): Unit = {
       //for(i <- n to length) apply(i)._index += 1
       t.parent = TabbedPane.this
       peer.insertTab(t.title, null, t.content.peer, t.tip, n)