Fixed #2494, plus some reorganization of swing ...

Fixed #2494, plus some reorganization of swing imports

15 files changed, 15 insertions, 15 deletions

diff --git a/src/swing/scala/swing/AbstractButton.scala b/src/swing/scala/swing/AbstractButton.scala
index c3258b4fc6..991d82fb55 100644
--- a/src/swing/scala/swing/AbstractButton.scala
+++ b/src/swing/scala/swing/AbstractButton.scala
@@ -11,9 +11,9 @@
 
 package scala.swing
 
+import event._
 import java.awt.{Dimension, Insets}
 import javax.swing.{AbstractButton => JAbstractButton, Icon}
-import event._
 
 /**
  * Base class of all button-like widgets, such as push buttons,
diff --git a/src/swing/scala/swing/Button.scala b/src/swing/scala/swing/Button.scala
index 698924b18d..e3387ef271 100644
--- a/src/swing/scala/swing/Button.scala
+++ b/src/swing/scala/swing/Button.scala
@@ -11,8 +11,8 @@
 
 package scala.swing
 
-import javax.swing._
 import event._
+import javax.swing._
 
 object Button {
   def apply(text0: String)(op: => Unit) = new Button(Action(text0)(op))
diff --git a/src/swing/scala/swing/ButtonGroup.scala b/src/swing/scala/swing/ButtonGroup.scala
index 4bf2cb21ff..8af67cdb3c 100644
--- a/src/swing/scala/swing/ButtonGroup.scala
+++ b/src/swing/scala/swing/ButtonGroup.scala
@@ -11,8 +11,8 @@
 
 package scala.swing
 
-import javax.swing.{AbstractButton => JAbstractButton,Icon}
 import event._
+import javax.swing.{AbstractButton => JAbstractButton,Icon}
 import scala.collection._
 import scala.collection.mutable.Buffer
 
diff --git a/src/swing/scala/swing/EditorPane.scala b/src/swing/scala/swing/EditorPane.scala
index 7b93e2cdff..a258865508 100644
--- a/src/swing/scala/swing/EditorPane.scala
+++ b/src/swing/scala/swing/EditorPane.scala
@@ -10,11 +10,11 @@
 
 package scala.swing
 
+import event._
 import javax.swing._
 import javax.swing.text._
 import java.awt.Color
 import java.awt.event._
-import event._
 
 /**
  * A text component that allows multiline text input and display.
diff --git a/src/swing/scala/swing/FormattedTextField.scala b/src/swing/scala/swing/FormattedTextField.scala
index 6397de2621..623764dc76 100644
--- a/src/swing/scala/swing/FormattedTextField.scala
+++ b/src/swing/scala/swing/FormattedTextField.scala
@@ -11,9 +11,9 @@
 
 package scala.swing
 
+import event._
 import javax.swing._
 import java.awt.event._
-import event._
 
 object FormattedTextField {
   /**
diff --git a/src/swing/scala/swing/GUIApplication.scala b/src/swing/scala/swing/GUIApplication.scala
index 0cce2cb176..a3965fcec8 100644
--- a/src/swing/scala/swing/GUIApplication.scala
+++ b/src/swing/scala/swing/GUIApplication.scala
@@ -11,8 +11,8 @@
 
 package scala.swing
 
-import javax.swing._
 import event.Event
+import javax.swing._
 
 /**
  * Convenience class with utility methods for GUI applications.
diff --git a/src/swing/scala/swing/ListView.scala b/src/swing/scala/swing/ListView.scala
index 49b69396fe..0712f78d57 100644
--- a/src/swing/scala/swing/ListView.scala
+++ b/src/swing/scala/swing/ListView.scala
@@ -11,9 +11,9 @@
 
 package scala.swing
 
+import event._
 import javax.swing._
 import javax.swing.event._
-import event._
 import java.awt.Color
 
 object ListView {
diff --git a/src/swing/scala/swing/PasswordField.scala b/src/swing/scala/swing/PasswordField.scala
index 0a77ff6f38..4fcc761be5 100644
--- a/src/swing/scala/swing/PasswordField.scala
+++ b/src/swing/scala/swing/PasswordField.scala
@@ -11,9 +11,9 @@
 
 package scala.swing
 
+import event._
 import javax.swing._
 import java.awt.event._
-import event._
 
 /**
  * A password field, that displays a replacement character for each character in the password.
diff --git a/src/swing/scala/swing/Table.scala b/src/swing/scala/swing/Table.scala
index 2cedbd1050..88f19f5f02 100644
--- a/src/swing/scala/swing/Table.scala
+++ b/src/swing/scala/swing/Table.scala
@@ -11,11 +11,11 @@
 
 package scala.swing
 
+import event._
 import javax.swing._
 import javax.swing.table._
 import javax.swing.event._
 import java.awt.{Dimension, Color}
-import event._
 import scala.collection.mutable.{Set, IndexedSeq}
 
 object Table {
diff --git a/src/swing/scala/swing/TextArea.scala b/src/swing/scala/swing/TextArea.scala
index 08540845b6..4ff0a666da 100644
--- a/src/swing/scala/swing/TextArea.scala
+++ b/src/swing/scala/swing/TextArea.scala
@@ -11,9 +11,9 @@
 
 package scala.swing
 
+import event._
 import javax.swing._
 import java.awt.event._
-import event._
 
 /**
  * A text component that allows multiline text input and display.
diff --git a/src/swing/scala/swing/TextComponent.scala b/src/swing/scala/swing/TextComponent.scala
index 70d6d8055c..3b81b567bb 100644
--- a/src/swing/scala/swing/TextComponent.scala
+++ b/src/swing/scala/swing/TextComponent.scala
@@ -11,11 +11,11 @@
 
 package scala.swing
 
+import event._
 import javax.swing._
 import javax.swing.text._
 import javax.swing.event._
 import java.awt.Color
-import event._
 
 object TextComponent {
   trait HasColumns extends TextComponent {
diff --git a/src/swing/scala/swing/TextField.scala b/src/swing/scala/swing/TextField.scala
index 201a97b724..acb34b9a1b 100644
--- a/src/swing/scala/swing/TextField.scala
+++ b/src/swing/scala/swing/TextField.scala
@@ -11,9 +11,9 @@
 
 package scala.swing
 
+import event._
 import javax.swing._
 import java.awt.event._
-import event._
 
 
 /*object TextField {
diff --git a/src/swing/scala/swing/ToggleButton.scala b/src/swing/scala/swing/ToggleButton.scala
index 26958c94f8..608f2c02b7 100644
--- a/src/swing/scala/swing/ToggleButton.scala
+++ b/src/swing/scala/swing/ToggleButton.scala
@@ -11,8 +11,8 @@
 
 package scala.swing
 
-import javax.swing._
 import event._
+import javax.swing._
 
 /**
  * A two state button with a push button like user interface.
diff --git a/src/swing/scala/swing/UIElement.scala b/src/swing/scala/swing/UIElement.scala
index a557535627..f8f050b3d6 100644
--- a/src/swing/scala/swing/UIElement.scala
+++ b/src/swing/scala/swing/UIElement.scala
@@ -11,11 +11,11 @@
 
 package scala.swing
 
+import event._
 import java.awt.{Color, Cursor, Font, Dimension, Rectangle}
 import scala.collection.mutable.HashMap
 import scala.ref._
 import java.util.WeakHashMap
-import event._
 
 object UIElement {
   private val ClientKey = "scala.swingWrapper"
diff --git a/src/swing/scala/swing/Window.scala b/src/swing/scala/swing/Window.scala
index e9fdfff7ca..bc333db9ca 100644
--- a/src/swing/scala/swing/Window.scala
+++ b/src/swing/scala/swing/Window.scala
@@ -11,9 +11,9 @@
 
 package scala.swing
 
+import event._
 import java.awt.{Image, Point, Window => AWTWindow}
 import javax.swing._
-import event._
 
 /**
  * A window with decoration such as a title, border, and action buttons.