From 40707e0f49eb991ba1cbc07bdb1bcf65a640006b Mon Sep 17 00:00:00 2001 From: Martin Odersky Date: Fri, 24 Jul 2009 15:28:37 +0000 Subject: switch to unnested packages. --- src/swing/scala/swing/event/ActionEvent.scala | 3 ++- src/swing/scala/swing/event/AdjustingEvent.scala | 3 ++- src/swing/scala/swing/event/BackgroundChanged.scala | 3 ++- src/swing/scala/swing/event/ButtonClicked.scala | 3 ++- src/swing/scala/swing/event/CaretUpdate.scala | 3 ++- src/swing/scala/swing/event/ComponentEvent.scala | 3 ++- src/swing/scala/swing/event/ContainerEvent.scala | 3 ++- src/swing/scala/swing/event/EditDone.scala | 3 ++- src/swing/scala/swing/event/Event.scala | 3 ++- src/swing/scala/swing/event/FocusEvent.scala | 3 ++- src/swing/scala/swing/event/FontChanged.scala | 3 ++- src/swing/scala/swing/event/ForegroundChanged.scala | 3 ++- src/swing/scala/swing/event/InputEvent.scala | 3 ++- src/swing/scala/swing/event/Key.scala | 3 ++- src/swing/scala/swing/event/KeyEvent.scala | 3 ++- src/swing/scala/swing/event/ListEvent.scala | 3 ++- src/swing/scala/swing/event/MouseEvent.scala | 3 ++- src/swing/scala/swing/event/SelectionEvent.scala | 3 ++- src/swing/scala/swing/event/TableEvent.scala | 3 ++- src/swing/scala/swing/event/UIEvent.scala | 3 ++- src/swing/scala/swing/event/ValueChanged.scala | 3 ++- src/swing/scala/swing/event/WindowActivated.scala | 3 ++- src/swing/scala/swing/event/WindowClosed.scala | 3 ++- src/swing/scala/swing/event/WindowClosing.scala | 3 ++- src/swing/scala/swing/event/WindowDeactivated.scala | 3 ++- src/swing/scala/swing/event/WindowDeiconified.scala | 3 ++- src/swing/scala/swing/event/WindowEvent.scala | 3 ++- src/swing/scala/swing/event/WindowIconified.scala | 3 ++- src/swing/scala/swing/event/WindowOpened.scala | 3 ++- src/swing/scala/swing/model/Matrix.scala | 3 ++- src/swing/scala/swing/test/ButtonApp.scala | 3 ++- src/swing/scala/swing/test/CelsiusConverter.scala | 3 ++- src/swing/scala/swing/test/CelsiusConverter2.scala | 3 ++- src/swing/scala/swing/test/ComboBoxes.scala | 3 ++- src/swing/scala/swing/test/CountButton.scala | 3 ++- src/swing/scala/swing/test/Dialogs.scala | 3 ++- src/swing/scala/swing/test/GridBagDemo.scala | 3 ++- src/swing/scala/swing/test/HelloWorld.scala | 3 ++- src/swing/scala/swing/test/LabelTest.scala | 3 ++- src/swing/scala/swing/test/LinePainting.scala | 5 +++-- src/swing/scala/swing/test/SimpleApplet.scala | 3 ++- src/swing/scala/swing/test/SwingApp.scala | 3 ++- src/swing/scala/swing/test/TableSelection.scala | 5 +++-- src/swing/scala/swing/test/UIDemo.scala | 3 ++- 44 files changed, 90 insertions(+), 46 deletions(-) (limited to 'src/swing') diff --git a/src/swing/scala/swing/event/ActionEvent.scala b/src/swing/scala/swing/event/ActionEvent.scala index e451d4ee39..357b78be70 100644 --- a/src/swing/scala/swing/event/ActionEvent.scala +++ b/src/swing/scala/swing/event/ActionEvent.scala @@ -9,6 +9,7 @@ // $Id$ -package scala.swing.event +package scala.swing +package event case class ActionEvent(override val source: Component) extends ComponentEvent diff --git a/src/swing/scala/swing/event/AdjustingEvent.scala b/src/swing/scala/swing/event/AdjustingEvent.scala index 2c8714dc13..3867f9ed79 100644 --- a/src/swing/scala/swing/event/AdjustingEvent.scala +++ b/src/swing/scala/swing/event/AdjustingEvent.scala @@ -9,7 +9,8 @@ // $Id$ -package scala.swing.event +package scala.swing +package event /**

* An event that indicates some editing operation that can be still in diff --git a/src/swing/scala/swing/event/BackgroundChanged.scala b/src/swing/scala/swing/event/BackgroundChanged.scala index 046e8a0269..6eac04a655 100644 --- a/src/swing/scala/swing/event/BackgroundChanged.scala +++ b/src/swing/scala/swing/event/BackgroundChanged.scala @@ -9,6 +9,7 @@ // $Id$ -package scala.swing.event +package scala.swing +package event case class BackgroundChanged(override val source: Component) extends ComponentEvent diff --git a/src/swing/scala/swing/event/ButtonClicked.scala b/src/swing/scala/swing/event/ButtonClicked.scala index 591cba0ed6..578ab41876 100644 --- a/src/swing/scala/swing/event/ButtonClicked.scala +++ b/src/swing/scala/swing/event/ButtonClicked.scala @@ -9,7 +9,8 @@ // $Id$ -package scala.swing.event +package scala.swing +package event case class ButtonClicked(override val source: AbstractButton) extends ActionEvent(source) diff --git a/src/swing/scala/swing/event/CaretUpdate.scala b/src/swing/scala/swing/event/CaretUpdate.scala index 3f8bf8ff4f..c476049781 100644 --- a/src/swing/scala/swing/event/CaretUpdate.scala +++ b/src/swing/scala/swing/event/CaretUpdate.scala @@ -9,6 +9,7 @@ // $Id$ -package scala.swing.event +package scala.swing +package event case class CaretUpdate(override val source: TextComponent) extends ComponentEvent diff --git a/src/swing/scala/swing/event/ComponentEvent.scala b/src/swing/scala/swing/event/ComponentEvent.scala index a3b0c6f98a..0ee06228ab 100644 --- a/src/swing/scala/swing/event/ComponentEvent.scala +++ b/src/swing/scala/swing/event/ComponentEvent.scala @@ -9,7 +9,8 @@ // $Id$ -package scala.swing.event +package scala.swing +package event trait ComponentEvent extends UIEvent { override val source: Component diff --git a/src/swing/scala/swing/event/ContainerEvent.scala b/src/swing/scala/swing/event/ContainerEvent.scala index 39ff292962..9f2bb837c3 100644 --- a/src/swing/scala/swing/event/ContainerEvent.scala +++ b/src/swing/scala/swing/event/ContainerEvent.scala @@ -9,7 +9,8 @@ // $Id$ -package scala.swing.event +package scala.swing +package event abstract class ContainerEvent(override val source: Container) extends UIEvent diff --git a/src/swing/scala/swing/event/EditDone.scala b/src/swing/scala/swing/event/EditDone.scala index b92b5e6203..9d648214e9 100644 --- a/src/swing/scala/swing/event/EditDone.scala +++ b/src/swing/scala/swing/event/EditDone.scala @@ -9,6 +9,7 @@ // $Id$ -package scala.swing.event +package scala.swing +package event case class EditDone(override val source: TextField) extends ValueChanged(source) diff --git a/src/swing/scala/swing/event/Event.scala b/src/swing/scala/swing/event/Event.scala index 1d610acbf6..443351cc65 100644 --- a/src/swing/scala/swing/event/Event.scala +++ b/src/swing/scala/swing/event/Event.scala @@ -9,6 +9,7 @@ // $Id$ -package scala.swing.event +package scala.swing +package event trait Event diff --git a/src/swing/scala/swing/event/FocusEvent.scala b/src/swing/scala/swing/event/FocusEvent.scala index 995a5effa3..7c60490656 100644 --- a/src/swing/scala/swing/event/FocusEvent.scala +++ b/src/swing/scala/swing/event/FocusEvent.scala @@ -9,7 +9,8 @@ // $Id$ -package scala.swing.event +package scala.swing +package event /** * The other component is None if it is a non Swing, i.e., AWT or native, component. diff --git a/src/swing/scala/swing/event/FontChanged.scala b/src/swing/scala/swing/event/FontChanged.scala index 6535cec052..b2202627a8 100644 --- a/src/swing/scala/swing/event/FontChanged.scala +++ b/src/swing/scala/swing/event/FontChanged.scala @@ -9,6 +9,7 @@ // $Id$ -package scala.swing.event +package scala.swing +package event case class FontChanged(override val source: Component) extends ComponentEvent diff --git a/src/swing/scala/swing/event/ForegroundChanged.scala b/src/swing/scala/swing/event/ForegroundChanged.scala index 39486562dc..5091c0fc85 100644 --- a/src/swing/scala/swing/event/ForegroundChanged.scala +++ b/src/swing/scala/swing/event/ForegroundChanged.scala @@ -9,6 +9,7 @@ // $Id$ -package scala.swing.event +package scala.swing +package event case class ForegroundChanged(override val source: Component) extends ComponentEvent diff --git a/src/swing/scala/swing/event/InputEvent.scala b/src/swing/scala/swing/event/InputEvent.scala index 561518a9a1..8030be38cd 100644 --- a/src/swing/scala/swing/event/InputEvent.scala +++ b/src/swing/scala/swing/event/InputEvent.scala @@ -9,7 +9,8 @@ // $Id$ -package scala.swing.event +package scala.swing +package event trait InputEvent extends ComponentEvent { def peer: java.awt.event.InputEvent diff --git a/src/swing/scala/swing/event/Key.scala b/src/swing/scala/swing/event/Key.scala index c2e8ef3515..dfe5e89111 100644 --- a/src/swing/scala/swing/event/Key.scala +++ b/src/swing/scala/swing/event/Key.scala @@ -9,7 +9,8 @@ // $Id$ -package scala.swing.event +package scala.swing +package event /** * Enumeration of key codes used by key events. diff --git a/src/swing/scala/swing/event/KeyEvent.scala b/src/swing/scala/swing/event/KeyEvent.scala index 5745a4f7d1..277731bb59 100644 --- a/src/swing/scala/swing/event/KeyEvent.scala +++ b/src/swing/scala/swing/event/KeyEvent.scala @@ -9,7 +9,8 @@ // $Id$ -package scala.swing.event +package scala.swing +package event import javax.swing.JComponent diff --git a/src/swing/scala/swing/event/ListEvent.scala b/src/swing/scala/swing/event/ListEvent.scala index 86c62708f2..7a35f95011 100644 --- a/src/swing/scala/swing/event/ListEvent.scala +++ b/src/swing/scala/swing/event/ListEvent.scala @@ -9,7 +9,8 @@ // $Id$ -package scala.swing.event +package scala.swing +package event trait ListEvent[A] extends ComponentEvent { override val source: ListView[A] diff --git a/src/swing/scala/swing/event/MouseEvent.scala b/src/swing/scala/swing/event/MouseEvent.scala index a41e5a92ae..44201c194f 100644 --- a/src/swing/scala/swing/event/MouseEvent.scala +++ b/src/swing/scala/swing/event/MouseEvent.scala @@ -9,7 +9,8 @@ // $Id$ -package scala.swing.event +package scala.swing +package event import java.awt.Point import javax.swing.JComponent diff --git a/src/swing/scala/swing/event/SelectionEvent.scala b/src/swing/scala/swing/event/SelectionEvent.scala index 48ee31b4ed..c5aad07f7f 100644 --- a/src/swing/scala/swing/event/SelectionEvent.scala +++ b/src/swing/scala/swing/event/SelectionEvent.scala @@ -9,7 +9,8 @@ // $Id$ -package scala.swing.event +package scala.swing +package event /** * An event that indicates a change in a selection such as in a list view or a table. diff --git a/src/swing/scala/swing/event/TableEvent.scala b/src/swing/scala/swing/event/TableEvent.scala index b3e95ee751..3c684c483f 100644 --- a/src/swing/scala/swing/event/TableEvent.scala +++ b/src/swing/scala/swing/event/TableEvent.scala @@ -9,7 +9,8 @@ // $Id$ -package scala.swing.event +package scala.swing +package event abstract class TableEvent(override val source: Table) extends ComponentEvent diff --git a/src/swing/scala/swing/event/UIEvent.scala b/src/swing/scala/swing/event/UIEvent.scala index 0669d63bec..f4764b6c76 100644 --- a/src/swing/scala/swing/event/UIEvent.scala +++ b/src/swing/scala/swing/event/UIEvent.scala @@ -9,7 +9,8 @@ // $Id$ -package scala.swing.event +package scala.swing +package event trait UIEvent extends Event { val source: UIElement diff --git a/src/swing/scala/swing/event/ValueChanged.scala b/src/swing/scala/swing/event/ValueChanged.scala index dda1a6d2aa..0c6689eeef 100644 --- a/src/swing/scala/swing/event/ValueChanged.scala +++ b/src/swing/scala/swing/event/ValueChanged.scala @@ -9,6 +9,7 @@ // $Id$ -package scala.swing.event +package scala.swing +package event case class ValueChanged(override val source: Component) extends ComponentEvent diff --git a/src/swing/scala/swing/event/WindowActivated.scala b/src/swing/scala/swing/event/WindowActivated.scala index 0b45a4fc00..e00de4dda3 100644 --- a/src/swing/scala/swing/event/WindowActivated.scala +++ b/src/swing/scala/swing/event/WindowActivated.scala @@ -9,6 +9,7 @@ // $Id$ -package scala.swing.event +package scala.swing +package event case class WindowActivated(override val source: Window) extends WindowEvent(source) diff --git a/src/swing/scala/swing/event/WindowClosed.scala b/src/swing/scala/swing/event/WindowClosed.scala index 3f5f9a33e2..80afe1a99f 100644 --- a/src/swing/scala/swing/event/WindowClosed.scala +++ b/src/swing/scala/swing/event/WindowClosed.scala @@ -1,3 +1,4 @@ -package scala.swing.event +package scala.swing +package event case class WindowClosed(override val source: Window) extends WindowEvent(source) diff --git a/src/swing/scala/swing/event/WindowClosing.scala b/src/swing/scala/swing/event/WindowClosing.scala index eeb6819540..39347542a8 100644 --- a/src/swing/scala/swing/event/WindowClosing.scala +++ b/src/swing/scala/swing/event/WindowClosing.scala @@ -9,6 +9,7 @@ // $Id$ -package scala.swing.event +package scala.swing +package event case class WindowClosing(override val source: Window) extends WindowEvent(source) diff --git a/src/swing/scala/swing/event/WindowDeactivated.scala b/src/swing/scala/swing/event/WindowDeactivated.scala index cd8f22bb2a..cd5b03b785 100644 --- a/src/swing/scala/swing/event/WindowDeactivated.scala +++ b/src/swing/scala/swing/event/WindowDeactivated.scala @@ -9,6 +9,7 @@ // $Id$ -package scala.swing.event +package scala.swing +package event case class WindowDeactivated(override val source: Window) extends WindowEvent(source) diff --git a/src/swing/scala/swing/event/WindowDeiconified.scala b/src/swing/scala/swing/event/WindowDeiconified.scala index 90f10e0750..5dfeb1e22b 100644 --- a/src/swing/scala/swing/event/WindowDeiconified.scala +++ b/src/swing/scala/swing/event/WindowDeiconified.scala @@ -9,6 +9,7 @@ // $Id$ -package scala.swing.event +package scala.swing +package event case class WindowDeiconified(override val source: Window) extends WindowEvent(source) diff --git a/src/swing/scala/swing/event/WindowEvent.scala b/src/swing/scala/swing/event/WindowEvent.scala index 801ab7dca4..11eb19d238 100644 --- a/src/swing/scala/swing/event/WindowEvent.scala +++ b/src/swing/scala/swing/event/WindowEvent.scala @@ -9,6 +9,7 @@ // $Id$ -package scala.swing.event +package scala.swing +package event abstract class WindowEvent(override val source: Window) extends UIEvent diff --git a/src/swing/scala/swing/event/WindowIconified.scala b/src/swing/scala/swing/event/WindowIconified.scala index dc7b5ab513..52c80caa6a 100644 --- a/src/swing/scala/swing/event/WindowIconified.scala +++ b/src/swing/scala/swing/event/WindowIconified.scala @@ -9,6 +9,7 @@ // $Id$ -package scala.swing.event +package scala.swing +package event case class WindowIconified(override val source: Window) extends WindowEvent(source) diff --git a/src/swing/scala/swing/event/WindowOpened.scala b/src/swing/scala/swing/event/WindowOpened.scala index 2a9eb162c4..95029fb63d 100644 --- a/src/swing/scala/swing/event/WindowOpened.scala +++ b/src/swing/scala/swing/event/WindowOpened.scala @@ -9,6 +9,7 @@ // $Id$ -package scala.swing.event +package scala.swing +package event case class WindowOpened(override val source: Window) extends WindowEvent(source) diff --git a/src/swing/scala/swing/model/Matrix.scala b/src/swing/scala/swing/model/Matrix.scala index 975d880a5a..1de8cfbf6e 100644 --- a/src/swing/scala/swing/model/Matrix.scala +++ b/src/swing/scala/swing/model/Matrix.scala @@ -9,7 +9,8 @@ // $Id$ -package scala.swing.model +package scala.swing +package model /*trait Matrix[A] extends Function2[Int, Int, A] { diff --git a/src/swing/scala/swing/test/ButtonApp.scala b/src/swing/scala/swing/test/ButtonApp.scala index 855b094d77..163da63612 100755 --- a/src/swing/scala/swing/test/ButtonApp.scala +++ b/src/swing/scala/swing/test/ButtonApp.scala @@ -1,4 +1,5 @@ -package scala.swing.test +package scala.swing +package test import java.awt.Dimension diff --git a/src/swing/scala/swing/test/CelsiusConverter.scala b/src/swing/scala/swing/test/CelsiusConverter.scala index fc5c1e4553..00a65e2a65 100644 --- a/src/swing/scala/swing/test/CelsiusConverter.scala +++ b/src/swing/scala/swing/test/CelsiusConverter.scala @@ -1,4 +1,5 @@ -package scala.swing.test +package scala.swing +package test import swing._ import event._ diff --git a/src/swing/scala/swing/test/CelsiusConverter2.scala b/src/swing/scala/swing/test/CelsiusConverter2.scala index 96565d78c1..9ec0550f66 100644 --- a/src/swing/scala/swing/test/CelsiusConverter2.scala +++ b/src/swing/scala/swing/test/CelsiusConverter2.scala @@ -1,4 +1,5 @@ -package scala.swing.test +package scala.swing +package test import swing._ import event._ diff --git a/src/swing/scala/swing/test/ComboBoxes.scala b/src/swing/scala/swing/test/ComboBoxes.scala index 1dcdad4238..1241955304 100644 --- a/src/swing/scala/swing/test/ComboBoxes.scala +++ b/src/swing/scala/swing/test/ComboBoxes.scala @@ -1,4 +1,5 @@ -package scala.swing.test +package scala.swing +package test import swing._ import event._ diff --git a/src/swing/scala/swing/test/CountButton.scala b/src/swing/scala/swing/test/CountButton.scala index d211bbe15e..88464def2c 100644 --- a/src/swing/scala/swing/test/CountButton.scala +++ b/src/swing/scala/swing/test/CountButton.scala @@ -1,4 +1,5 @@ -package scala.swing.test +package scala.swing +package test import scala.swing._ import scala.swing.event._ diff --git a/src/swing/scala/swing/test/Dialogs.scala b/src/swing/scala/swing/test/Dialogs.scala index 601c78e71d..f9a7ad4c88 100644 --- a/src/swing/scala/swing/test/Dialogs.scala +++ b/src/swing/scala/swing/test/Dialogs.scala @@ -1,4 +1,5 @@ -package scala.swing.test +package scala.swing +package test import swing._ import swing.event._ diff --git a/src/swing/scala/swing/test/GridBagDemo.scala b/src/swing/scala/swing/test/GridBagDemo.scala index 2b6b6b73ad..8f05ddacc2 100644 --- a/src/swing/scala/swing/test/GridBagDemo.scala +++ b/src/swing/scala/swing/test/GridBagDemo.scala @@ -1,4 +1,5 @@ -package scala.swing.test +package scala.swing +package test import swing._ import swing.event._ diff --git a/src/swing/scala/swing/test/HelloWorld.scala b/src/swing/scala/swing/test/HelloWorld.scala index d4219f72ca..c1bad84782 100644 --- a/src/swing/scala/swing/test/HelloWorld.scala +++ b/src/swing/scala/swing/test/HelloWorld.scala @@ -1,4 +1,5 @@ -package scala.swing.test +package scala.swing +package test import swing._ diff --git a/src/swing/scala/swing/test/LabelTest.scala b/src/swing/scala/swing/test/LabelTest.scala index f4702aa6d0..d2c9745c94 100644 --- a/src/swing/scala/swing/test/LabelTest.scala +++ b/src/swing/scala/swing/test/LabelTest.scala @@ -1,4 +1,5 @@ -package scala.swing.test +package scala.swing +package test import scala.swing._ import scala.swing.event._ diff --git a/src/swing/scala/swing/test/LinePainting.scala b/src/swing/scala/swing/test/LinePainting.scala index fdccb226a7..a5f8475c99 100644 --- a/src/swing/scala/swing/test/LinePainting.scala +++ b/src/swing/scala/swing/test/LinePainting.scala @@ -1,4 +1,5 @@ -package scala.swing.test +package scala.swing +package test import scala.swing.Swing._ import scala.swing.{MainFrame, Panel, SimpleGUIApplication} import scala.swing.event._ @@ -49,4 +50,4 @@ object LinePainting extends SimpleGUIApplication { title = "Simple Line Painting Demo" contents = ui } -} \ No newline at end of file +} diff --git a/src/swing/scala/swing/test/SimpleApplet.scala b/src/swing/scala/swing/test/SimpleApplet.scala index 3382e5c2e8..090f4cde8d 100644 --- a/src/swing/scala/swing/test/SimpleApplet.scala +++ b/src/swing/scala/swing/test/SimpleApplet.scala @@ -1,4 +1,5 @@ -package scala.swing.test +package scala.swing +package test import event._ diff --git a/src/swing/scala/swing/test/SwingApp.scala b/src/swing/scala/swing/test/SwingApp.scala index b6f4e53771..fe14360ef4 100644 --- a/src/swing/scala/swing/test/SwingApp.scala +++ b/src/swing/scala/swing/test/SwingApp.scala @@ -1,4 +1,5 @@ -package scala.swing.test +package scala.swing +package test import swing._ import swing.event._ diff --git a/src/swing/scala/swing/test/TableSelection.scala b/src/swing/scala/swing/test/TableSelection.scala index 828f772085..75a07876a6 100644 --- a/src/swing/scala/swing/test/TableSelection.scala +++ b/src/swing/scala/swing/test/TableSelection.scala @@ -1,4 +1,5 @@ -package scala.swing.test +package scala.swing +package test import java.awt.Dimension import swing._ @@ -94,4 +95,4 @@ object TableSelection extends SimpleGUIApplication { title = "Table Selection" contents = ui } -} \ No newline at end of file +} diff --git a/src/swing/scala/swing/test/UIDemo.scala b/src/swing/scala/swing/test/UIDemo.scala index 5382db8281..072fe0ecd2 100644 --- a/src/swing/scala/swing/test/UIDemo.scala +++ b/src/swing/scala/swing/test/UIDemo.scala @@ -1,4 +1,5 @@ -package scala.swing.test +package scala.swing +package test import swing._ import event._ -- cgit v1.2.3