Clean up standard/swing library by deprecating/moving code examples

Deprecate scala/xml/include/sax/Main.scala. Move scala/swing/test/* to docs/examples. Saves 160KB in scala-swing.jar. Fixes SI-4627.
scala · Dec 7, 2011 · f3e7e98 · f3e7e98
1 parent 332fec9
commit f3e7e98
Show file tree

Hide file tree

Showing 21 changed files with 18 additions and 37 deletions.
diff --git a/build.xml b/build.xml
@@ -851,9 +851,6 @@ PACKED QUICK BUILD (PACK)
       <fileset dir="${build-quick.dir}/classes/library">
         <include name="scala/swing/**"/>
       </fileset>
-      <fileset dir="${src.dir}/swing">
-        <include name="scala/swing/test/images/**"/>
-      </fileset>
     </jar>
   </target>
 
@@ -1453,7 +1450,6 @@ DOCUMENTATION
       <exclude name="runtime/*$.scala"/>
       <exclude name="runtime/ScalaRunTime.scala"/>
       <exclude name="runtime/StringAdd.scala"/>
-      <exclude name="scala/swing/test/**"/>
     </scaladoc>
     <touch file="${build-docs.dir}/library.complete" verbose="no"/>
     <stopwatch name="docs.lib.timer" action="total"/>

diff --git a/src/swing/scala/swing/test/ButtonApp.scala → docs/examples/swing/ButtonApp.scala b/src/swing/scala/swing/test/ButtonApp.scala → docs/examples/swing/ButtonApp.scala
@@ -1,5 +1,4 @@
-package scala.swing
-package test
+package examples.swing
 
 import java.awt.Dimension
 

diff --git a/...g/scala/swing/test/CelsiusConverter.scala → docs/examples/swing/CelsiusConverter.scala b/...g/scala/swing/test/CelsiusConverter.scala → docs/examples/swing/CelsiusConverter.scala
@@ -1,5 +1,4 @@
-package scala.swing
-package test
+package examples.swing
 
 import swing._
 import event._

diff --git a/.../scala/swing/test/CelsiusConverter2.scala → docs/examples/swing/CelsiusConverter2.scala b/.../scala/swing/test/CelsiusConverter2.scala → docs/examples/swing/CelsiusConverter2.scala
@@ -1,5 +1,4 @@
-package scala.swing
-package test
+package examples.swing
 
 import swing._
 import event._

diff --git a/src/swing/scala/swing/test/ComboBoxes.scala → docs/examples/swing/ComboBoxes.scala b/src/swing/scala/swing/test/ComboBoxes.scala → docs/examples/swing/ComboBoxes.scala
@@ -1,5 +1,4 @@
-package scala.swing
-package test
+package examples.swing
 
 import swing._
 import event._

diff --git a/src/swing/scala/swing/test/CountButton.scala → docs/examples/swing/CountButton.scala b/src/swing/scala/swing/test/CountButton.scala → docs/examples/swing/CountButton.scala
@@ -1,5 +1,4 @@
-package scala.swing
-package test
+package examples.swing
 
 import scala.swing._
 import scala.swing.event._

diff --git a/src/swing/scala/swing/test/Dialogs.scala → docs/examples/swing/Dialogs.scala b/src/swing/scala/swing/test/Dialogs.scala → docs/examples/swing/Dialogs.scala
@@ -1,5 +1,4 @@
-package scala.swing
-package test
+package examples.swing
 
 import swing._
 import swing.event._

diff --git a/src/swing/scala/swing/test/GridBagDemo.scala → docs/examples/swing/GridBagDemo.scala b/src/swing/scala/swing/test/GridBagDemo.scala → docs/examples/swing/GridBagDemo.scala
@@ -1,5 +1,4 @@
-package scala.swing
-package test
+package examples.swing
 
 import swing._
 import swing.event._

diff --git a/src/swing/scala/swing/test/HelloWorld.scala → docs/examples/swing/HelloWorld.scala b/src/swing/scala/swing/test/HelloWorld.scala → docs/examples/swing/HelloWorld.scala
@@ -1,5 +1,4 @@
-package scala.swing
-package test
+package examples.swing
 
 import swing._
 
@@ -11,4 +10,4 @@ object HelloWorld extends SimpleSwingApplication {
     title = "Hello, World!"
     contents = new Button("Click Me!")
   }
-}
+}
diff --git a/src/swing/scala/swing/test/LabelTest.scala → docs/examples/swing/LabelTest.scala b/src/swing/scala/swing/test/LabelTest.scala → docs/examples/swing/LabelTest.scala
@@ -1,5 +1,4 @@
-package scala.swing
-package test
+package examples.swing
 
 import scala.swing._
 import scala.swing.event._

diff --git a/...swing/scala/swing/test/LinePainting.scala → docs/examples/swing/LinePainting.scala b/...swing/scala/swing/test/LinePainting.scala → docs/examples/swing/LinePainting.scala
@@ -1,5 +1,4 @@
-package scala.swing
-package test
+package examples.swing
 
 import scala.swing.Swing._
 import scala.swing.{MainFrame, Panel}

diff --git a/...swing/scala/swing/test/ListViewDemo.scala → docs/examples/swing/ListViewDemo.scala b/...swing/scala/swing/test/ListViewDemo.scala → docs/examples/swing/ListViewDemo.scala
@@ -1,5 +1,4 @@
-package scala.swing
-package test
+package examples.swing
 
 object ListViewDemo extends SimpleSwingApplication {
   def top = new MainFrame {

diff --git a/...swing/scala/swing/test/SimpleApplet.scala → docs/examples/swing/SimpleApplet.scala b/...swing/scala/swing/test/SimpleApplet.scala → docs/examples/swing/SimpleApplet.scala
@@ -1,5 +1,4 @@
-package scala.swing
-package test
+package examples.swing
 
 import event._
 

diff --git a/src/swing/scala/swing/test/SwingApp.scala → docs/examples/swing/SwingApp.scala b/src/swing/scala/swing/test/SwingApp.scala → docs/examples/swing/SwingApp.scala
@@ -1,5 +1,4 @@
-package scala.swing
-package test
+package examples.swing
 
 import swing._
 import swing.event._

diff --git a/...ing/scala/swing/test/TableSelection.scala → docs/examples/swing/TableSelection.scala b/...ing/scala/swing/test/TableSelection.scala → docs/examples/swing/TableSelection.scala
@@ -1,5 +1,4 @@
-package scala.swing
-package test
+package examples.swing
 
 import java.awt.Dimension
 import swing.event._

diff --git a/src/swing/scala/swing/test/UIDemo.scala → docs/examples/swing/UIDemo.scala b/src/swing/scala/swing/test/UIDemo.scala → docs/examples/swing/UIDemo.scala
@@ -1,5 +1,4 @@
-package scala.swing
-package test
+package examples.swing
 
 import swing._
 import event._
@@ -145,4 +144,4 @@ object UIDemo extends SimpleSwingApplication {
       }
     }
   }
-}
+}
diff --git a/src/swing/scala/swing/test/images/banana.jpg → docs/examples/swing/images/banana.jpg b/src/swing/scala/swing/test/images/banana.jpg → docs/examples/swing/images/banana.jpg
diff --git a/...ng/scala/swing/test/images/margarita1.jpg → docs/examples/swing/images/margarita1.jpg b/...ng/scala/swing/test/images/margarita1.jpg → docs/examples/swing/images/margarita1.jpg
diff --git a/...ng/scala/swing/test/images/margarita2.jpg → docs/examples/swing/images/margarita2.jpg b/...ng/scala/swing/test/images/margarita2.jpg → docs/examples/swing/images/margarita2.jpg
diff --git a/src/swing/scala/swing/test/images/rose.jpg → docs/examples/swing/images/rose.jpg b/src/swing/scala/swing/test/images/rose.jpg → docs/examples/swing/images/rose.jpg
diff --git a/src/library/scala/xml/include/sax/Main.scala b/src/library/scala/xml/include/sax/Main.scala
@@ -10,11 +10,11 @@
 package scala.xml
 package include.sax
 
-import scala.xml.include._
 import scala.util.control.Exception.{ catching, ignoring }
 import org.xml.sax.XMLReader
 import org.xml.sax.helpers.XMLReaderFactory
 
+@deprecated("Code example will be moved to documentation.", "2.10.0")
 object Main {
   private val namespacePrefixes = "http://xml.org/sax/features/namespace-prefixes"
   private val lexicalHandler = "http://xml.org/sax/properties/lexical-handler"