Merge pull request #3277 from adriaanm/scala-dist-maven

Scala dist maven

5 files changed, 317 insertions, 204 deletions

diff --git a/src/build/maven/maven-deploy.xml b/src/build/maven/maven-deploy.xml
index 412d7caab6..a2c3eefbca 100644
--- a/src/build/maven/maven-deploy.xml
+++ b/src/build/maven/maven-deploy.xml
@@ -1,21 +1,34 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
+<!--
+THIS FILE WILL SOON SELF DESTRUCT; DO NOT USE
+see publish.* targets in /build.xml
+-->
 <project name="sabbus-maven-deploy" xmlns:artifact="urn:maven-artifact-ant">
 
   <description>
     SuperSabbus extension for deploying a distribution to Maven. THIS FILE IS MEANT TO BE RUN STANDALONE IN THE MAVEN "distpack" DIRECTORY
   </description>
 
+
   <macrodef name="deploy-remote">
     <attribute name="jar" default=""/>
     <attribute name="pom"/>
     <element name="artifacts" implicit="true" optional="true"/>
     <sequential>
-      <artifact:deploy file="@{jar}" settingsFile="${settings.file}">
-        <artifact:remoteRepository url="${remote.repository}" id="${repository.credentials.id}" />
-        <artifact:pom refid="@{pom}" />
-        <artifacts/>
-      </artifact:deploy>
+      <if><equals arg1="@{jar}" arg2="true"/><then>
+        <artifact:deploy settingsFile="${settings.file}">
+          <artifact:remoteRepository url="${remote.repository}" id="${repository.credentials.id}" />
+          <artifact:pom refid="@{pom}" />
+          <artifacts/>
+        </artifact:deploy>
+      </then><else>
+        <artifact:deploy file="@{jar}" settingsFile="${settings.file}">
+          <artifact:remoteRepository url="${remote.repository}" id="${repository.credentials.id}" />
+          <artifact:pom refid="@{pom}" />
+          <artifacts/>
+        </artifact:deploy>
+      </else></if>
     </sequential>
   </macrodef>
 
@@ -24,11 +37,19 @@
     <attribute name="pom"/>
     <element name="artifacts" implicit="true" optional="true"/>
     <sequential>
-    <artifact:install file="@{jar}">
-      <artifact:localRepository path="${local.repository}"  id="${repository.credentials.id}" />
-      <artifact:pom refid="@{pom}" />
-      <artifacts/>
-    </artifact:install>
+      <if><equals arg1="@{jar}" arg2="true"/><then>
+        <artifact:install>
+          <artifact:localRepository path="${local.repository}"  id="${repository.credentials.id}" />
+          <artifact:pom refid="@{pom}" />
+          <artifacts/>
+        </artifact:install>
+      </then><else>
+        <artifact:install file="@{jar}">
+          <artifact:localRepository path="${local.repository}"  id="${repository.credentials.id}" />
+          <artifact:pom refid="@{pom}" />
+          <artifacts/>
+        </artifact:install>
+      </else></if>
     </sequential>
   </macrodef>
 
@@ -46,26 +67,25 @@
     </sequential>
   </macrodef>
 
-  <macrodef name="deploy-one">
-    <attribute name="dir" default=""/>
+  <macrodef name="filter-pom">
+    <attribute name="path" />
     <attribute name="name" />
-    <attribute name="local"  default="false"/>
-    <attribute name="signed" default="false"/>
 
     <sequential>
-      <local name="path"/> <property name="path" value="@{dir}@{name}/@{name}"/>
-
-      <echo>Deploying ${path}-[pom.xml|src.jar|docs.jar].</echo>
-
       <copy file="${path}-pom.xml" tofile="${path}-pom-filtered.xml" overwrite="true">
         <filterset>
           <filter token="VERSION"                    value="${maven.version.number}" />
           <filter token="SCALA_BINARY_VERSION"       value="${scala.binary.version}" />
           <filter token="XML_VERSION"                value="${scala-xml.version.number}" />
           <filter token="PARSER_COMBINATORS_VERSION" value="${scala-parser-combinators.version.number}" />
+          <filter token="CONTINUATIONS_PLUGIN_VERSION"  value="${scala-continuations-plugin.version.number}" />
+          <filter token="CONTINUATIONS_LIBRARY_VERSION" value="${scala-continuations-library.version.number}" />
+          <filter token="SCALA_SWING_VERSION"           value="${scala-swing.version.number}" />
           <filter token="RELEASE_REPOSITORY"         value="${remote.release.repository}" />
           <filter token="SNAPSHOT_REPOSITORY"        value="${remote.snapshot.repository}" />
           <filter token="JLINE_VERSION"              value="${jline.version}" />
+          <filter token="AKKA_ACTOR_VERSION"         value="${akka-actor.version.number}" />
+          <filter token="ACTORS_MIGRATION_VERSION"   value="${actors-migration.version.number}" />
 
           <!-- TODO modularize compiler.
           <filter token="SCALA_COMPILER_DOC_VERSION" value="${scala-compiler-doc.version.number}" />
@@ -74,6 +94,20 @@
         </filterset>
       </copy>
       <artifact:pom id="@{name}.pom" file="${path}-pom-filtered.xml" />
+    </sequential>
+  </macrodef>
+
+  <macrodef name="deploy-one">
+    <attribute name="name" />
+    <attribute name="local"  default="false"/>
+    <attribute name="signed" default="false"/>
+
+    <sequential>
+      <local name="path"/> <property name="path" value="${dist.maven}/@{name}/@{name}"/>
+
+      <echo>Deploying ${path}-[pom.xml|src.jar|docs.jar].</echo>
+
+      <filter-pom name="@{name}" path="@{path}"/>
 
       <if><equals arg1="@{signed}" arg2="false"/><then>
         <if><isset property="docs.skip"/><then>
@@ -108,26 +142,94 @@
     </sequential>
   </macrodef>
 
+  <macrodef name="deploy-jar">
+    <attribute name="name" />
+    <attribute name="local"  default="false"/>
+    <attribute name="signed" default="false"/>
+
+    <sequential>
+      <local name="path"/> <property name="path" value="${dist.maven}/@{name}/@{name}"/>
+
+      <echo>Deploying ${path}.jar with ${path}-pom.xml.</echo>
+
+      <filter-pom name="@{name}" path="@{path}"/>
+
+      <if><equals arg1="@{signed}" arg2="false"/><then>
+        <deploy-to local="@{local}" jar="${path}.jar" pom="@{name}.pom"/>
+      </then><else>
+        <local name="repo"/>
+        <if><equals arg1="@{local}" arg2="false"/><then>
+          <property name="repo" value="${remote.repository}"/>
+        </then><else>
+          <property name="repo" value="${local.repository}"/>
+        </else></if>
+        <artifact:mvn failonerror="true">
+          <arg value="org.apache.maven.plugins:maven-gpg-plugin:1.3:sign-and-deploy-file" />
+          <arg value="-Durl=${repo}" />
+          <arg value="-DrepositoryId=${repository.credentials.id}" />
+          <arg value="-DpomFile=${path}-pom-filtered.xml" />
+          <arg value=   "-Dfile=${path}.jar" />
+          <arg value="-Pgpg" />
+          <arg value="-Dgpg.useagent=true" />
+        </artifact:mvn>
+      </else></if>
+    </sequential>
+  </macrodef>
+
+  <macrodef name="deploy-pom">
+    <attribute name="name" />
+    <attribute name="local"  default="false"/>
+    <attribute name="signed" default="false"/>
+
+    <sequential>
+      <local name="path"/> <property name="path" value="${dist.maven}/@{name}/@{name}"/>
+
+      <echo>Deploying ${path}-pom.xml.</echo>
+
+      <filter-pom name="@{name}" path="@{path}"/>
+
+      <if><equals arg1="@{signed}" arg2="false"/><then>
+        <deploy-to local="@{local}" pom="@{name}.pom"/>
+      </then><else>
+        <local name="repo"/>
+        <if><equals arg1="@{local}" arg2="false"/><then>
+          <property name="repo" value="${remote.repository}"/>
+        </then><else>
+          <property name="repo" value="${local.repository}"/>
+        </else></if>
+        <artifact:mvn failonerror="true">
+          <arg value="org.apache.maven.plugins:maven-gpg-plugin:1.3:sign-and-deploy-file" />
+          <arg value="-Durl=${repo}" />
+          <arg value="-DrepositoryId=${repository.credentials.id}" />
+          <arg value="-DpomFile=${path}-pom-filtered.xml" />
+          <arg value=   "-Dfile=${path}-pom-filtered.xml" />
+          <arg value="-Pgpg" />
+          <arg value="-Dgpg.useagent=true" />
+        </artifact:mvn>
+      </else></if>
+    </sequential>
+  </macrodef>
+
   <macrodef name="deploy">
-    <attribute name="dir"    default=""/>
     <attribute name="local"  default="false"/>
     <attribute name="signed" default="false"/>
 
     <sequential>
-      <deploy-one dir="@{dir}"          name="scala-library"     local="@{local}" signed="@{signed}"/>
-      <deploy-one dir="@{dir}"          name="scala-reflect"     local="@{local}" signed="@{signed}"/>
-      <deploy-one dir="@{dir}"          name="scala-compiler"    local="@{local}" signed="@{signed}"/>
+      <deploy-one name="scala-library"     local="@{local}" signed="@{signed}"/>
+      <deploy-one name="scala-reflect"     local="@{local}" signed="@{signed}"/>
+      <deploy-one name="scala-compiler"    local="@{local}" signed="@{signed}"/>
 
       <!-- TODO modularize compiler.
-      <deploy-one dir="@{dir}"          name="scala-compiler-doc"         local="@{local}" signed="@{signed}"/>
-      <deploy-one dir="@{dir}"          name="scala-compiler-interactive" local="@{local}" signed="@{signed}"/>
+      <deploy-one name="scala-compiler-doc"         local="@{local}" signed="@{signed}"/>
+      <deploy-one name="scala-compiler-interactive" local="@{local}" signed="@{signed}"/>
       -->
 
-      <deploy-one dir="@{dir}"          name="scala-actors"      local="@{local}" signed="@{signed}"/>
-      <deploy-one dir="@{dir}"          name="scalap"            local="@{local}" signed="@{signed}"/>
+      <deploy-one name="scala-actors"      local="@{local}" signed="@{signed}"/>
+      <deploy-one name="scalap"            local="@{local}" signed="@{signed}"/>
     </sequential>
   </macrodef>
 
+
   <target name="boot.maven">
     <!-- Pull in properties from build -->
     <property file="build.properties" />
@@ -162,7 +264,18 @@
     </echo>
   </target>
 
-  <target name="deploy"        depends="init.maven" description="Deploys unsigned artifacts to the maven repo.">       <deploy/> </target>
-  <target name="deploy.local"  depends="init.maven" description="Deploys unsigned artifacts to the local maven repo."> <deploy local="true"/> </target>
-  <target name="deploy.signed" depends="init.maven" description="Deploys signed artifacts to the remote maven repo.">  <deploy signed="true"/> </target>
+  <target name="deploy"        depends="init.maven" description="Deploys unsigned artifacts to the maven repo.">
+    <echo message="WARNING!1! THIS TARGET HAS BEEN DEPRECATED -- CALL `ant publish` FROM /build.xml"/>
+    <deploy/>
+  </target>
+
+  <target name="deploy.local"  depends="init.maven" description="Deploys unsigned artifacts to the local maven repo.">
+    <echo message="WARNING!1! THIS TARGET HAS BEEN DEPRECATED -- CALL `ant publish.local` FROM /build.xml"/>
+    <deploy local="true"/>
+  </target>
+
+  <target name="deploy.signed" depends="init.maven" description="Deploys signed artifacts to the remote maven repo.">
+    <echo message="WARNING!1! THIS TARGET HAS BEEN DEPRECATED -- CALL `ant publish.signed` FROM /build.xml"/>
+    <deploy signed="true"/>
+  </target>
 </project>
diff --git a/src/build/maven/scala-compiler-pom.xml b/src/build/maven/scala-compiler-pom.xml
index a16fe22343..4a000b27a1 100644
--- a/src/build/maven/scala-compiler-pom.xml
+++ b/src/build/maven/scala-compiler-pom.xml
@@ -50,7 +50,7 @@
       <artifactId>scala-parser-combinators_@SCALA_BINARY_VERSION@</artifactId>
       <version>@PARSER_COMBINATORS_VERSION@</version>
     </dependency>
-    <dependency> <!-- for scala-compiler-repl-->
+    <dependency> <!-- for scala-compiler-repl; once it moves there, make it required -->
       <groupId>jline</groupId>
       <artifactId>jline</artifactId>
       <version>@JLINE_VERSION@</version>
diff --git a/src/build/maven/scala-dist-pom.xml b/src/build/maven/scala-dist-pom.xml
new file mode 100644
index 0000000000..413da928bb
--- /dev/null
+++ b/src/build/maven/scala-dist-pom.xml
@@ -0,0 +1,75 @@
+<?xml version="1.0"?>
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.scala-lang</groupId>
+  <artifactId>scala-dist</artifactId>
+  <packaging>jar</packaging>
+  <version>@VERSION@</version>
+  <name>Scala Distribution Artifacts</name>
+  <description>The Artifacts Distributed with Scala</description>
+  <url>http://www.scala-lang.org/</url>
+  <inceptionYear>2002</inceptionYear>
+  <organization>
+    <name>LAMP/EPFL</name>
+    <url>http://lamp.epfl.ch/</url>
+  </organization>
+  <licenses>
+    <license>
+      <name>BSD 3-Clause</name>
+      <url>http://www.scala-lang.org/license.html</url>
+      <distribution>repo</distribution>
+    </license>
+  </licenses>
+  <scm>
+    <connection>scm:git:git://github.com/scala/scala.git</connection>
+    <url>https://github.com/scala/scala.git</url>
+  </scm>
+  <issueManagement>
+    <system>JIRA</system>
+    <url>https://issues.scala-lang.org/</url>
+  </issueManagement>
+  <dependencies>
+    <dependency>
+      <groupId>org.scala-lang</groupId>
+      <artifactId>scala-library-all</artifactId>
+      <version>@VERSION@</version>
+    </dependency>
+    <dependency>
+      <groupId>org.scala-lang</groupId>
+      <artifactId>scala-compiler</artifactId>
+      <version>@VERSION@</version>
+    </dependency>
+    <!-- duplicated from scala-compiler, where it's optional,
+    so that resolving scala-dist's transitive dependencies does not include jline,
+    even though we need to include it in the dist, but macros depending on the compiler
+    shouldn't have to require jline...
+    another reason to modularize and move the dependency to scala-compiler-repl
+    TODO: remove duplication once we have the scala-compiler-repl module -->
+    <dependency>
+      <groupId>jline</groupId>
+      <artifactId>jline</artifactId>
+      <version>@JLINE_VERSION@</version>
+    </dependency>
+  </dependencies>
+  <distributionManagement>
+    <repository>
+      <id>scala-tools.org</id>
+      <url>@RELEASE_REPOSITORY@</url>
+    </repository>
+    <snapshotRepository>
+      <id>scala-tools.org</id>
+      <url>@SNAPSHOT_REPOSITORY@</url>
+      <uniqueVersion>false</uniqueVersion>
+    </snapshotRepository>
+  </distributionManagement>
+  <developers>
+    <developer>
+      <id>lamp</id>
+      <name>EPFL LAMP</name>
+    </developer>
+    <developer>
+      <id>Typesafe</id>
+      <name>Typesafe, Inc.</name>
+    </developer>
+  </developers>
+</project>
diff --git a/src/build/maven/scala-library-all-pom.xml b/src/build/maven/scala-library-all-pom.xml
new file mode 100644
index 0000000000..f34a28e79a
--- /dev/null
+++ b/src/build/maven/scala-library-all-pom.xml
@@ -0,0 +1,99 @@
+<?xml version="1.0"?>
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.scala-lang</groupId>
+  <artifactId>scala-library-all</artifactId>
+  <packaging>pom</packaging>
+  <version>@VERSION@</version>
+  <name>Scala Library Powerpack</name>
+  <description>The Scala Standard Library and Official Modules</description>
+  <url>http://www.scala-lang.org/</url>
+  <inceptionYear>2002</inceptionYear>
+  <organization>
+    <name>LAMP/EPFL</name>
+    <url>http://lamp.epfl.ch/</url>
+  </organization>
+  <licenses>
+    <license>
+      <name>BSD 3-Clause</name>
+      <url>http://www.scala-lang.org/license.html</url>
+      <distribution>repo</distribution>
+    </license>
+  </licenses>
+  <scm>
+    <connection>scm:git:git://github.com/scala/scala.git</connection>
+    <url>https://github.com/scala/scala.git</url>
+  </scm>
+  <issueManagement>
+    <system>JIRA</system>
+    <url>https://issues.scala-lang.org/</url>
+  </issueManagement>
+  <dependencies>
+    <dependency>
+      <groupId>org.scala-lang</groupId>
+      <artifactId>scala-library</artifactId>
+      <version>@VERSION@</version>
+    </dependency>
+    <dependency>
+      <groupId>org.scala-lang</groupId>
+      <artifactId>scala-reflect</artifactId>
+      <version>@VERSION@</version>
+    </dependency>
+    <dependency>
+      <groupId>org.scala-lang.modules</groupId>
+      <artifactId>scala-xml_@SCALA_BINARY_VERSION@</artifactId>
+      <version>@XML_VERSION@</version>
+    </dependency>
+    <dependency>
+      <groupId>org.scala-lang.modules</groupId>
+      <artifactId>scala-parser-combinators_@SCALA_BINARY_VERSION@</artifactId>
+      <version>@PARSER_COMBINATORS_VERSION@</version>
+    </dependency>
+    <dependency>
+      <groupId>org.scala-lang.plugins</groupId>
+      <artifactId>scala-continuations-plugin_@SCALA_BINARY_VERSION@</artifactId>
+      <version>@CONTINUATIONS_PLUGIN_VERSION@</version>
+    </dependency>
+    <dependency>
+      <groupId>org.scala-lang.plugins</groupId>
+      <artifactId>scala-continuations-library_@SCALA_BINARY_VERSION@</artifactId>
+      <version>@CONTINUATIONS_LIBRARY_VERSION@</version>
+    </dependency>
+    <dependency>
+      <groupId>org.scala-lang.modules</groupId>
+      <artifactId>scala-swing_@SCALA_BINARY_VERSION@</artifactId>
+      <version>@SCALA_SWING_VERSION@</version>
+    </dependency>
+    <dependency>
+      <groupId>com.typesafe.akka</groupId>
+      <artifactId>akka-actor_@SCALA_BINARY_VERSION@</artifactId>
+      <version>@AKKA_ACTOR_VERSION@</version>
+    </dependency>
+    <dependency>
+      <groupId>org.scala-lang</groupId>
+      <artifactId>scala-actors-migration_@SCALA_BINARY_VERSION@</artifactId>
+      <version>@ACTORS_MIGRATION_VERSION@</version>
+    </dependency>
+  </dependencies>
+  <distributionManagement>
+    <repository>
+      <id>scala-tools.org</id>
+      <url>@RELEASE_REPOSITORY@</url>
+    </repository>
+    <snapshotRepository>
+      <id>scala-tools.org</id>
+      <url>@SNAPSHOT_REPOSITORY@</url>
+      <uniqueVersion>false</uniqueVersion>
+    </snapshotRepository>
+  </distributionManagement>
+  <developers>
+    <developer>
+      <id>lamp</id>
+      <name>EPFL LAMP</name>
+    </developer>
+    <developer>
+      <id>Typesafe</id>
+      <name>Typesafe, Inc.</name>
+    </developer>
+  </developers>
+</project>
diff --git a/src/swing/scala/swing/Publisher.scala b/src/swing/scala/swing/Publisher.scala
deleted file mode 100644
index 578ef71e09..0000000000
--- a/src/swing/scala/swing/Publisher.scala
+++ /dev/null
@@ -1,174 +0,0 @@
-/*                     __                                               *\
-**     ________ ___   / /  ___     Scala API                            **
-**    / __/ __// _ | / /  / _ |    (c) 2007-2013, LAMP/EPFL             **
-**  __\ \/ /__/ __ |/ /__/ __ |    http://scala-lang.org/               **
-** /____/\___/_/ |_/____/_/ | |                                         **
-**                          |/                                          **
-\*                                                                      */
-
-package scala.swing
-
-import scala.collection.mutable
-import mutable.Buffer
-import event.Event
-
-/** <p>
- *    Notifies registered reactions when an event is published. Publishers are
- *    also reactors and listen to themselves per default as a convenience.
- *  </p>
- *  <p>
- *    In order to reduce memory leaks, reactions are weakly referenced by default,
- *    unless they implement <code>Reactions.StronglyReferenced</code>. That way,
- *    the lifetime of reactions are more easily bound to the registering object,
- *    which are reactors in common client code and hold strong references to their
- *    reactions. As a result, reactors can be garbage collected even though they
- *    still have reactions registered at some publisher, but not vice versa
- *    since reactors (strongly) reference publishers they are interested in.
- *  </p>
- */
-trait Publisher extends Reactor {
-  import Reactions._
-
-  protected val listeners = new RefSet[Reaction] {
-    import scala.ref._
-    val underlying = new mutable.HashSet[Reference[Reaction]]
-    protected def Ref(a: Reaction) = a match {
-      case a: StronglyReferenced => new StrongReference[Reaction](a) with super.Ref[Reaction]
-      case _ => new WeakReference[Reaction](a, referenceQueue) with super.Ref[Reaction]
-    }
-  }
-
-  private[swing] def subscribe(listener: Reaction) { listeners += listener }
-  private[swing] def unsubscribe(listener: Reaction) { listeners -= listener }
-
-  /**
-   * Notify all registered reactions.
-   */
-  def publish(e: Event) { for (l <- listeners) if (l.isDefinedAt(e)) l(e) }
-
-  listenTo(this)
-}
-
-/**
- * A publisher that subscribes itself to an underlying event source not before the first
- * reaction is installed. Can unsubscribe itself when the last reaction is uninstalled.
- */
-private[swing] trait LazyPublisher extends Publisher {
-  import Reactions._
-
-  protected def onFirstSubscribe()
-  protected def onLastUnsubscribe()
-
-  override def subscribe(listener: Reaction) {
-    if(listeners.size == 1) onFirstSubscribe()
-    super.subscribe(listener)
-  }
-  override def unsubscribe(listener: Reaction) {
-    super.unsubscribe(listener)
-    if(listeners.size == 1) onLastUnsubscribe()
-  }
-}
-
-
-
-import scala.ref._
-
-private[swing] trait SingleRefCollection[+A <: AnyRef] extends Iterable[A] { self =>
-
-  trait Ref[+A <: AnyRef] extends Reference[A] {
-    override def hashCode() = get match {
-      case Some(x)  => x.##
-      case _        => 0
-    }
-    override def equals(that: Any) = that match {
-      case that: ReferenceWrapper[_] =>
-        val v1 = this.get
-        val v2 = that.get
-        v1 == v2
-      case _ => false
-    }
-  }
-
-  //type Ref <: Reference[A] // TODO: could use higher kinded types, but currently crashes
-  protected[this] def Ref(a: A): Ref[A]
-  protected[this] val referenceQueue = new ReferenceQueue[A]
-
-  protected val underlying: Iterable[Reference[A]]
-
-  def purgeReferences() {
-    var ref = referenceQueue.poll
-    while (ref != None) {
-      removeReference(ref.get.asInstanceOf[Reference[A]])
-      ref = referenceQueue.poll
-    }
-  }
-
-  protected[this] def removeReference(ref: Reference[A])
-
-  def iterator = new Iterator[A] {
-    private val elems = self.underlying.iterator
-    private var hd: A = _
-    private var ahead: Boolean = false
-    private def skip(): Unit =
-      while (!ahead && elems.hasNext) {
-        // make sure we have a reference to the next element,
-        // otherwise it might be garbage collected
-        val next = elems.next.get
-        ahead = next != None
-        if (ahead) hd = next.get
-      }
-    def hasNext: Boolean = { skip; ahead }
-    def next(): A =
-      if (hasNext) { ahead = false; hd }
-      else throw new NoSuchElementException("next on empty iterator")
-  }
-}
-
-private[swing] class StrongReference[+T <: AnyRef](value: T) extends Reference[T] {
-    private[this] var ref: Option[T] = Some(value)
-    def isValid: Boolean = ref != None
-    def apply(): T = ref.get
-    def get : Option[T] = ref
-    override def toString = get.map(_.toString).getOrElse("<deleted>")
-    def clear() { ref = None }
-    def enqueue(): Boolean = false
-    def isEnqueued(): Boolean = false
-  }
-
-abstract class RefBuffer[A <: AnyRef] extends Buffer[A] with SingleRefCollection[A] { self =>
-  protected val underlying: Buffer[Reference[A]]
-
-  def +=(el: A): this.type = { purgeReferences(); underlying += Ref(el); this }
-  def +=:(el: A) = { purgeReferences(); Ref(el) +=: underlying; this }
-  def remove(el: A) { underlying -= Ref(el); purgeReferences(); }
-  def remove(n: Int) = { val el = apply(n); remove(el); el }
-  def insertAll(n: Int, iter: Iterable[A]) {
-    purgeReferences()
-    underlying.insertAll(n, iter.view.map(Ref(_)))
-  }
-  def update(n: Int, el: A) { purgeReferences(); underlying(n) = Ref(el) }
-  def apply(n: Int) = {
-    purgeReferences()
-    var el = underlying(n).get
-    while (el == None) {
-      purgeReferences(); el = underlying(n).get
-    }
-    el.get
-  }
-
-  def length = { purgeReferences(); underlying.length }
-  def clear() { underlying.clear(); purgeReferences() }
-
-  protected[this] def removeReference(ref: Reference[A]) { underlying -= ref }
-}
-
-private[swing] abstract class RefSet[A <: AnyRef] extends mutable.Set[A] with SingleRefCollection[A] { self =>
-  protected val underlying: mutable.Set[Reference[A]]
-
-  def -=(el: A): this.type = { underlying -= Ref(el); purgeReferences(); this }
-  def +=(el: A): this.type = { purgeReferences(); underlying += Ref(el); this }
-  def contains(el: A): Boolean = { purgeReferences(); underlying.contains(Ref(el)) }
-  override def size = { purgeReferences(); underlying.size }
-
-  protected[this] def removeReference(ref: Reference[A]) { underlying -= ref }
-}