From f3e7e98cc0f47eacb59400b2c56c6bd2cb8b2ebc Mon Sep 17 00:00:00 2001
From: Simon Ochsenreither <simon@ochsenreither.de>
Date: Wed, 7 Dec 2011 21:52:20 +0100
Subject: [PATCH] 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.
---
 build.xml                                           |   4 ----
 .../test => docs/examples/swing}/ButtonApp.scala    |   3 +--
 .../examples/swing}/CelsiusConverter.scala          |   3 +--
 .../examples/swing}/CelsiusConverter2.scala         |   3 +--
 .../test => docs/examples/swing}/ComboBoxes.scala   |   3 +--
 .../test => docs/examples/swing}/CountButton.scala  |   3 +--
 .../test => docs/examples/swing}/Dialogs.scala      |   3 +--
 .../test => docs/examples/swing}/GridBagDemo.scala  |   3 +--
 .../test => docs/examples/swing}/HelloWorld.scala   |   5 ++---
 .../test => docs/examples/swing}/LabelTest.scala    |   3 +--
 .../test => docs/examples/swing}/LinePainting.scala |   3 +--
 .../test => docs/examples/swing}/ListViewDemo.scala |   3 +--
 .../test => docs/examples/swing}/SimpleApplet.scala |   3 +--
 .../test => docs/examples/swing}/SwingApp.scala     |   3 +--
 .../examples/swing}/TableSelection.scala            |   3 +--
 .../swing/test => docs/examples/swing}/UIDemo.scala |   5 ++---
 .../test => docs/examples/swing}/images/banana.jpg  | Bin
 .../examples/swing}/images/margarita1.jpg           | Bin
 .../examples/swing}/images/margarita2.jpg           | Bin
 .../test => docs/examples/swing}/images/rose.jpg    | Bin
 src/library/scala/xml/include/sax/Main.scala        |   2 +-
 21 files changed, 18 insertions(+), 37 deletions(-)
 rename {src/swing/scala/swing/test => docs/examples/swing}/ButtonApp.scala (92%)
 rename {src/swing/scala/swing/test => docs/examples/swing}/CelsiusConverter.scala (97%)
 rename {src/swing/scala/swing/test => docs/examples/swing}/CelsiusConverter2.scala (96%)
 rename {src/swing/scala/swing/test => docs/examples/swing}/ComboBoxes.scala (98%)
 rename {src/swing/scala/swing/test => docs/examples/swing}/CountButton.scala (94%)
 rename {src/swing/scala/swing/test => docs/examples/swing}/Dialogs.scala (99%)
 rename {src/swing/scala/swing/test => docs/examples/swing}/GridBagDemo.scala (97%)
 rename {src/swing/scala/swing/test => docs/examples/swing}/HelloWorld.scala (85%)
 rename {src/swing/scala/swing/test => docs/examples/swing}/LabelTest.scala (91%)
 rename {src/swing/scala/swing/test => docs/examples/swing}/LinePainting.scala (97%)
 rename {src/swing/scala/swing/test => docs/examples/swing}/ListViewDemo.scala (95%)
 rename {src/swing/scala/swing/test => docs/examples/swing}/SimpleApplet.scala (93%)
 rename {src/swing/scala/swing/test => docs/examples/swing}/SwingApp.scala (95%)
 rename {src/swing/scala/swing/test => docs/examples/swing}/TableSelection.scala (99%)
 rename {src/swing/scala/swing/test => docs/examples/swing}/UIDemo.scala (99%)
 rename {src/swing/scala/swing/test => docs/examples/swing}/images/banana.jpg (100%)
 rename {src/swing/scala/swing/test => docs/examples/swing}/images/margarita1.jpg (100%)
 rename {src/swing/scala/swing/test => docs/examples/swing}/images/margarita2.jpg (100%)
 rename {src/swing/scala/swing/test => docs/examples/swing}/images/rose.jpg (100%)

diff --git a/build.xml b/build.xml
index 6a708755a3da..db73f72306f7 100644
--- 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 b/docs/examples/swing/ButtonApp.scala
similarity index 92%
rename from src/swing/scala/swing/test/ButtonApp.scala
rename to docs/examples/swing/ButtonApp.scala
index dcf567d365e7..96799b24f29a 100644
--- a/src/swing/scala/swing/test/ButtonApp.scala
+++ b/docs/examples/swing/ButtonApp.scala
@@ -1,5 +1,4 @@
-package scala.swing
-package test
+package examples.swing
 
 import java.awt.Dimension
 
diff --git a/src/swing/scala/swing/test/CelsiusConverter.scala b/docs/examples/swing/CelsiusConverter.scala
similarity index 97%
rename from src/swing/scala/swing/test/CelsiusConverter.scala
rename to docs/examples/swing/CelsiusConverter.scala
index 4ead632d7aa3..b4a62fb366ff 100644
--- a/src/swing/scala/swing/test/CelsiusConverter.scala
+++ b/docs/examples/swing/CelsiusConverter.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/CelsiusConverter2.scala b/docs/examples/swing/CelsiusConverter2.scala
similarity index 96%
rename from src/swing/scala/swing/test/CelsiusConverter2.scala
rename to docs/examples/swing/CelsiusConverter2.scala
index 5ce1b157fe41..3630d61b61dd 100644
--- a/src/swing/scala/swing/test/CelsiusConverter2.scala
+++ b/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 b/docs/examples/swing/ComboBoxes.scala
similarity index 98%
rename from src/swing/scala/swing/test/ComboBoxes.scala
rename to docs/examples/swing/ComboBoxes.scala
index cf1a70d97bc0..c6ee19013af5 100644
--- a/src/swing/scala/swing/test/ComboBoxes.scala
+++ b/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 b/docs/examples/swing/CountButton.scala
similarity index 94%
rename from src/swing/scala/swing/test/CountButton.scala
rename to docs/examples/swing/CountButton.scala
index 373db785ba56..5fb14681d610 100644
--- a/src/swing/scala/swing/test/CountButton.scala
+++ b/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 b/docs/examples/swing/Dialogs.scala
similarity index 99%
rename from src/swing/scala/swing/test/Dialogs.scala
rename to docs/examples/swing/Dialogs.scala
index 14fa2febf235..0b4ac258cf24 100644
--- a/src/swing/scala/swing/test/Dialogs.scala
+++ b/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 b/docs/examples/swing/GridBagDemo.scala
similarity index 97%
rename from src/swing/scala/swing/test/GridBagDemo.scala
rename to docs/examples/swing/GridBagDemo.scala
index ebb538f1c0c6..60cfc13acb76 100644
--- a/src/swing/scala/swing/test/GridBagDemo.scala
+++ b/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 b/docs/examples/swing/HelloWorld.scala
similarity index 85%
rename from src/swing/scala/swing/test/HelloWorld.scala
rename to docs/examples/swing/HelloWorld.scala
index 6014a14b2d8a..e89bfedd8ae2 100644
--- a/src/swing/scala/swing/test/HelloWorld.scala
+++ b/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!")
   }
-}
\ No newline at end of file
+}
diff --git a/src/swing/scala/swing/test/LabelTest.scala b/docs/examples/swing/LabelTest.scala
similarity index 91%
rename from src/swing/scala/swing/test/LabelTest.scala
rename to docs/examples/swing/LabelTest.scala
index 47eedb84ac5f..edd7a14634cc 100644
--- a/src/swing/scala/swing/test/LabelTest.scala
+++ b/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/src/swing/scala/swing/test/LinePainting.scala b/docs/examples/swing/LinePainting.scala
similarity index 97%
rename from src/swing/scala/swing/test/LinePainting.scala
rename to docs/examples/swing/LinePainting.scala
index 8588665ddcd5..f72f8701ed44 100644
--- a/src/swing/scala/swing/test/LinePainting.scala
+++ b/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/src/swing/scala/swing/test/ListViewDemo.scala b/docs/examples/swing/ListViewDemo.scala
similarity index 95%
rename from src/swing/scala/swing/test/ListViewDemo.scala
rename to docs/examples/swing/ListViewDemo.scala
index 2b8c8c071922..5630f2871d63 100644
--- a/src/swing/scala/swing/test/ListViewDemo.scala
+++ b/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/src/swing/scala/swing/test/SimpleApplet.scala b/docs/examples/swing/SimpleApplet.scala
similarity index 93%
rename from src/swing/scala/swing/test/SimpleApplet.scala
rename to docs/examples/swing/SimpleApplet.scala
index d5f17f8a4045..502de537a3c3 100644
--- a/src/swing/scala/swing/test/SimpleApplet.scala
+++ b/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 b/docs/examples/swing/SwingApp.scala
similarity index 95%
rename from src/swing/scala/swing/test/SwingApp.scala
rename to docs/examples/swing/SwingApp.scala
index b47d778d3a0d..b3fe7447efb8 100644
--- a/src/swing/scala/swing/test/SwingApp.scala
+++ b/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/src/swing/scala/swing/test/TableSelection.scala b/docs/examples/swing/TableSelection.scala
similarity index 99%
rename from src/swing/scala/swing/test/TableSelection.scala
rename to docs/examples/swing/TableSelection.scala
index bbfef80277aa..8c8ea4ffcc34 100644
--- a/src/swing/scala/swing/test/TableSelection.scala
+++ b/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 b/docs/examples/swing/UIDemo.scala
similarity index 99%
rename from src/swing/scala/swing/test/UIDemo.scala
rename to docs/examples/swing/UIDemo.scala
index 9207c8294887..6d77c049e0fa 100644
--- a/src/swing/scala/swing/test/UIDemo.scala
+++ b/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 {
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/src/swing/scala/swing/test/images/banana.jpg b/docs/examples/swing/images/banana.jpg
similarity index 100%
rename from src/swing/scala/swing/test/images/banana.jpg
rename to docs/examples/swing/images/banana.jpg
diff --git a/src/swing/scala/swing/test/images/margarita1.jpg b/docs/examples/swing/images/margarita1.jpg
similarity index 100%
rename from src/swing/scala/swing/test/images/margarita1.jpg
rename to docs/examples/swing/images/margarita1.jpg
diff --git a/src/swing/scala/swing/test/images/margarita2.jpg b/docs/examples/swing/images/margarita2.jpg
similarity index 100%
rename from src/swing/scala/swing/test/images/margarita2.jpg
rename to docs/examples/swing/images/margarita2.jpg
diff --git a/src/swing/scala/swing/test/images/rose.jpg b/docs/examples/swing/images/rose.jpg
similarity index 100%
rename from src/swing/scala/swing/test/images/rose.jpg
rename to 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
index 6b6f6c159366..f58097bcb953 100644
--- 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"