summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Ochsenreither <simon@ochsenreither.de>2011-12-07 21:52:20 +0100
committerSimon Ochsenreither <simon@ochsenreither.de>2011-12-07 22:09:04 +0100
commitf3e7e98cc0f47eacb59400b2c56c6bd2cb8b2ebc (patch)
tree6d77a6dbbb3de69bc38a7e2d55a37596960675a0
parent332fec96e31840878bed41dd7b5314b97d8da7c2 (diff)
downloadscala-f3e7e98cc0f47eacb59400b2c56c6bd2cb8b2ebc.tar.gz
scala-f3e7e98cc0f47eacb59400b2c56c6bd2cb8b2ebc.tar.bz2
scala-f3e7e98cc0f47eacb59400b2c56c6bd2cb8b2ebc.zip
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.
-rw-r--r--build.xml4
-rw-r--r--docs/examples/swing/ButtonApp.scala (renamed from src/swing/scala/swing/test/ButtonApp.scala)3
-rw-r--r--docs/examples/swing/CelsiusConverter.scala (renamed from src/swing/scala/swing/test/CelsiusConverter.scala)3
-rw-r--r--docs/examples/swing/CelsiusConverter2.scala (renamed from src/swing/scala/swing/test/CelsiusConverter2.scala)3
-rw-r--r--docs/examples/swing/ComboBoxes.scala (renamed from src/swing/scala/swing/test/ComboBoxes.scala)3
-rw-r--r--docs/examples/swing/CountButton.scala (renamed from src/swing/scala/swing/test/CountButton.scala)3
-rw-r--r--docs/examples/swing/Dialogs.scala (renamed from src/swing/scala/swing/test/Dialogs.scala)3
-rw-r--r--docs/examples/swing/GridBagDemo.scala (renamed from src/swing/scala/swing/test/GridBagDemo.scala)3
-rw-r--r--docs/examples/swing/HelloWorld.scala (renamed from src/swing/scala/swing/test/HelloWorld.scala)5
-rw-r--r--docs/examples/swing/LabelTest.scala (renamed from src/swing/scala/swing/test/LabelTest.scala)3
-rw-r--r--docs/examples/swing/LinePainting.scala (renamed from src/swing/scala/swing/test/LinePainting.scala)3
-rw-r--r--docs/examples/swing/ListViewDemo.scala (renamed from src/swing/scala/swing/test/ListViewDemo.scala)3
-rw-r--r--docs/examples/swing/SimpleApplet.scala (renamed from src/swing/scala/swing/test/SimpleApplet.scala)3
-rw-r--r--docs/examples/swing/SwingApp.scala (renamed from src/swing/scala/swing/test/SwingApp.scala)3
-rw-r--r--docs/examples/swing/TableSelection.scala (renamed from src/swing/scala/swing/test/TableSelection.scala)3
-rw-r--r--docs/examples/swing/UIDemo.scala (renamed from src/swing/scala/swing/test/UIDemo.scala)5
-rw-r--r--docs/examples/swing/images/banana.jpg (renamed from src/swing/scala/swing/test/images/banana.jpg)bin6000 -> 6000 bytes
-rw-r--r--docs/examples/swing/images/margarita1.jpg (renamed from src/swing/scala/swing/test/images/margarita1.jpg)bin14770 -> 14770 bytes
-rw-r--r--docs/examples/swing/images/margarita2.jpg (renamed from src/swing/scala/swing/test/images/margarita2.jpg)bin17310 -> 17310 bytes
-rw-r--r--docs/examples/swing/images/rose.jpg (renamed from src/swing/scala/swing/test/images/rose.jpg)bin13808 -> 13808 bytes
-rw-r--r--src/library/scala/xml/include/sax/Main.scala2
21 files changed, 18 insertions, 37 deletions
diff --git a/build.xml b/build.xml
index 6a708755a3..db73f72306 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
index dcf567d365..96799b24f2 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
index 4ead632d7a..b4a62fb366 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
index 5ce1b157fe..3630d61b61 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
index cf1a70d97b..c6ee19013a 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
index 373db785ba..5fb14681d6 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
index 14fa2febf2..0b4ac258cf 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
index ebb538f1c0..60cfc13acb 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
index 6014a14b2d..e89bfedd8a 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
index 47eedb84ac..edd7a14634 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
index 8588665ddc..f72f8701ed 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
index 2b8c8c0719..5630f2871d 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
index d5f17f8a40..502de537a3 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
index b47d778d3a..b3fe7447ef 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
index bbfef80277..8c8ea4ffcc 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
index 9207c82948..6d77c049e0 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
index 62267a4325..62267a4325 100644
--- a/src/swing/scala/swing/test/images/banana.jpg
+++ b/docs/examples/swing/images/banana.jpg
Binary files differ
diff --git a/src/swing/scala/swing/test/images/margarita1.jpg b/docs/examples/swing/images/margarita1.jpg
index d315f7c79f..d315f7c79f 100644
--- a/src/swing/scala/swing/test/images/margarita1.jpg
+++ b/docs/examples/swing/images/margarita1.jpg
Binary files differ
diff --git a/src/swing/scala/swing/test/images/margarita2.jpg b/docs/examples/swing/images/margarita2.jpg
index c8b076e5f9..c8b076e5f9 100644
--- a/src/swing/scala/swing/test/images/margarita2.jpg
+++ b/docs/examples/swing/images/margarita2.jpg
Binary files differ
diff --git a/src/swing/scala/swing/test/images/rose.jpg b/docs/examples/swing/images/rose.jpg
index d4a2b58062..d4a2b58062 100644
--- a/src/swing/scala/swing/test/images/rose.jpg
+++ b/docs/examples/swing/images/rose.jpg
Binary files differ
diff --git a/src/library/scala/xml/include/sax/Main.scala b/src/library/scala/xml/include/sax/Main.scala
index 6b6f6c1593..f58097bcb9 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"