groovy-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sun...@apache.org
Subject [1/3] groovy git commit: Optimize imports
Date Thu, 30 Nov 2017 09:35:53 GMT
Repository: groovy
Updated Branches:
  refs/heads/GROOVY_2_5_X b3a83b963 -> 9e823116b


http://git-wip-us.apache.org/repos/asf/groovy/blob/9e823116/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/BindFactory.groovy
----------------------------------------------------------------------
diff --git a/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/BindFactory.groovy b/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/BindFactory.groovy
index d9fa322..bc7b623 100644
--- a/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/BindFactory.groovy
+++ b/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/BindFactory.groovy
@@ -19,18 +19,28 @@
 package groovy.swing.factory
 
 import groovy.swing.SwingBuilder
-
-import java.util.Map.Entry
-import org.codehaus.groovy.binding.*
+import groovy.swing.binding.AbstractButtonProperties
+import groovy.swing.binding.JComboBoxProperties
 import groovy.swing.binding.JComponentProperties
-import groovy.swing.binding.JSliderProperties
-import groovy.swing.binding.JTextComponentProperties
-import groovy.swing.binding.JTableProperties
 import groovy.swing.binding.JListProperties
-import groovy.swing.binding.AbstractButtonProperties
 import groovy.swing.binding.JScrollBarProperties
-import groovy.swing.binding.JComboBoxProperties
+import groovy.swing.binding.JSliderProperties
 import groovy.swing.binding.JSpinnerProperties
+import groovy.swing.binding.JTableProperties
+import groovy.swing.binding.JTextComponentProperties
+import org.codehaus.groovy.binding.AggregateBinding
+import org.codehaus.groovy.binding.BindingUpdatable
+import org.codehaus.groovy.binding.ClosureSourceBinding
+import org.codehaus.groovy.binding.ClosureTriggerBinding
+import org.codehaus.groovy.binding.EventTriggerBinding
+import org.codehaus.groovy.binding.FullBinding
+import org.codehaus.groovy.binding.MutualPropertyBinding
+import org.codehaus.groovy.binding.PropertyBinding
+import org.codehaus.groovy.binding.SourceBinding
+import org.codehaus.groovy.binding.TargetBinding
+import org.codehaus.groovy.binding.TriggerBinding
+
+import java.util.Map.Entry
 
 /**
  * @author <a href="mailto:shemnon@yahoo.com">Danno Ferrin</a>

http://git-wip-us.apache.org/repos/asf/groovy/blob/9e823116/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/BoxFactory.groovy
----------------------------------------------------------------------
diff --git a/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/BoxFactory.groovy b/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/BoxFactory.groovy
index 2841902..d58a6e8 100644
--- a/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/BoxFactory.groovy
+++ b/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/BoxFactory.groovy
@@ -18,9 +18,8 @@
  */
 package groovy.swing.factory
 
-import java.awt.Dimension
-import javax.swing.Box
-import javax.swing.BoxLayout
+import javax.swing.*
+import java.awt.*
 
 public class BoxFactory extends ComponentFactory {
 

http://git-wip-us.apache.org/repos/asf/groovy/blob/9e823116/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/BoxLayoutFactory.groovy
----------------------------------------------------------------------
diff --git a/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/BoxLayoutFactory.groovy b/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/BoxLayoutFactory.groovy
index a32add0..55b15b2 100644
--- a/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/BoxLayoutFactory.groovy
+++ b/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/BoxLayoutFactory.groovy
@@ -18,10 +18,11 @@
  */
 package groovy.swing.factory
 
-import java.awt.Container
-import javax.swing.BoxLayout
 import org.codehaus.groovy.runtime.InvokerHelper
 
+import javax.swing.*
+import java.awt.*
+
 public class BoxLayoutFactory extends AbstractFactory {
 
     public Object newInstance(FactoryBuilderSupport builder, Object name, Object value, Map attributes) throws InstantiationException, IllegalAccessException {

http://git-wip-us.apache.org/repos/asf/groovy/blob/9e823116/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/ButtonGroupFactory.groovy
----------------------------------------------------------------------
diff --git a/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/ButtonGroupFactory.groovy b/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/ButtonGroupFactory.groovy
index 6d41e36..e62be80 100644
--- a/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/ButtonGroupFactory.groovy
+++ b/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/ButtonGroupFactory.groovy
@@ -18,8 +18,7 @@
  */
 package groovy.swing.factory
 
-import javax.swing.AbstractButton
-import javax.swing.ButtonGroup
+import javax.swing.*
 
 class ButtonGroupFactory extends BeanFactory {
 

http://git-wip-us.apache.org/repos/asf/groovy/blob/9e823116/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/CellEditorFactory.groovy
----------------------------------------------------------------------
diff --git a/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/CellEditorFactory.groovy b/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/CellEditorFactory.groovy
index b4fdd72..1a3c996 100644
--- a/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/CellEditorFactory.groovy
+++ b/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/CellEditorFactory.groovy
@@ -19,7 +19,8 @@
 package groovy.swing.factory
 
 import groovy.swing.impl.ClosureCellEditor
-import java.awt.Component
+
+import java.awt.*
 
 /**
 * @author Alexander Klein

http://git-wip-us.apache.org/repos/asf/groovy/blob/9e823116/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/ColumnFactory.groovy
----------------------------------------------------------------------
diff --git a/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/ColumnFactory.groovy b/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/ColumnFactory.groovy
index 4fe7169..d4d0c88 100644
--- a/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/ColumnFactory.groovy
+++ b/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/ColumnFactory.groovy
@@ -18,10 +18,11 @@
  */
 package groovy.swing.factory
 
+import groovy.util.logging.Log
+
 import javax.swing.table.TableCellRenderer
 import javax.swing.table.TableColumn
 import javax.swing.table.TableColumnModel
-import groovy.util.logging.Log
 
 /**
  * @author Alexander Klein

http://git-wip-us.apache.org/repos/asf/groovy/blob/9e823116/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/ColumnModelFactory.groovy
----------------------------------------------------------------------
diff --git a/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/ColumnModelFactory.groovy b/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/ColumnModelFactory.groovy
index c5f79d9..e44f4e0 100644
--- a/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/ColumnModelFactory.groovy
+++ b/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/ColumnModelFactory.groovy
@@ -18,10 +18,11 @@
  */
 package groovy.swing.factory
 
-import javax.swing.JTable
-import javax.swing.table.TableColumnModel
 import groovy.util.logging.Log
 
+import javax.swing.*
+import javax.swing.table.TableColumnModel
+
 /**
  * @author Alexander Klein
  * @author Hamlet D'Arcy

http://git-wip-us.apache.org/repos/asf/groovy/blob/9e823116/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/ComboBoxFactory.groovy
----------------------------------------------------------------------
diff --git a/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/ComboBoxFactory.groovy b/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/ComboBoxFactory.groovy
index e24a860..fa406bd 100644
--- a/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/ComboBoxFactory.groovy
+++ b/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/ComboBoxFactory.groovy
@@ -18,10 +18,10 @@
  */
 package groovy.swing.factory
 
-import javax.swing.JComboBox
-
 import groovy.swing.binding.JComboBoxMetaMethods
 
+import javax.swing.*
+
 public class ComboBoxFactory extends AbstractFactory {
     
     public Object newInstance(FactoryBuilderSupport builder, Object name, Object value, Map attributes) throws InstantiationException, IllegalAccessException {

http://git-wip-us.apache.org/repos/asf/groovy/blob/9e823116/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/ComponentFactory.groovy
----------------------------------------------------------------------
diff --git a/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/ComponentFactory.groovy b/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/ComponentFactory.groovy
index 03e1db6..6e692cd 100644
--- a/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/ComponentFactory.groovy
+++ b/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/ComponentFactory.groovy
@@ -18,9 +18,9 @@
  */
 package groovy.swing.factory
 
-import java.awt.Component
-import java.awt.Window
-import javax.swing.JComponent
+import javax.swing.*
+import java.awt.*
+
 import static groovy.swing.factory.LayoutFactory.DEFAULT_DELEGATE_PROPERTY_CONSTRAINT
 
 class ComponentFactory extends BeanFactory {

http://git-wip-us.apache.org/repos/asf/groovy/blob/9e823116/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/DialogFactory.groovy
----------------------------------------------------------------------
diff --git a/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/DialogFactory.groovy b/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/DialogFactory.groovy
index fa8e27c..ffe7c4f 100644
--- a/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/DialogFactory.groovy
+++ b/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/DialogFactory.groovy
@@ -18,9 +18,8 @@
  */
 package groovy.swing.factory
 
-import java.awt.Dialog
-import java.awt.Frame
-import javax.swing.JDialog
+import javax.swing.*
+import java.awt.*
 
 public class DialogFactory extends groovy.swing.factory.RootPaneContainerFactory {
 

http://git-wip-us.apache.org/repos/asf/groovy/blob/9e823116/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/EmptyBorderFactory.groovy
----------------------------------------------------------------------
diff --git a/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/EmptyBorderFactory.groovy b/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/EmptyBorderFactory.groovy
index 3967632..111e97f 100644
--- a/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/EmptyBorderFactory.groovy
+++ b/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/EmptyBorderFactory.groovy
@@ -18,7 +18,7 @@
  */
 package groovy.swing.factory
 
-import javax.swing.BorderFactory
+import javax.swing.*
 
 /**
  * accepts values in lieu of attributes:

http://git-wip-us.apache.org/repos/asf/groovy/blob/9e823116/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/EtchedBorderFactory.groovy
----------------------------------------------------------------------
diff --git a/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/EtchedBorderFactory.groovy b/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/EtchedBorderFactory.groovy
index 20c9802..64cc954 100644
--- a/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/EtchedBorderFactory.groovy
+++ b/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/EtchedBorderFactory.groovy
@@ -18,8 +18,8 @@
  */
 package groovy.swing.factory
 
-import java.awt.Color
-import javax.swing.BorderFactory
+import javax.swing.*
+import java.awt.*
 
 class EtchedBorderFactory extends SwingBorderFactory {
 

http://git-wip-us.apache.org/repos/asf/groovy/blob/9e823116/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/FormattedTextFactory.groovy
----------------------------------------------------------------------
diff --git a/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/FormattedTextFactory.groovy b/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/FormattedTextFactory.groovy
index 5d90c62..97789f9 100644
--- a/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/FormattedTextFactory.groovy
+++ b/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/FormattedTextFactory.groovy
@@ -18,8 +18,8 @@
  */
 package groovy.swing.factory
 
+import javax.swing.*
 import java.text.Format
-import javax.swing.JFormattedTextField
 
 public class FormattedTextFactory extends AbstractFactory {
     

http://git-wip-us.apache.org/repos/asf/groovy/blob/9e823116/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/FrameFactory.groovy
----------------------------------------------------------------------
diff --git a/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/FrameFactory.groovy b/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/FrameFactory.groovy
index 3b4a414..54a6295 100644
--- a/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/FrameFactory.groovy
+++ b/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/FrameFactory.groovy
@@ -18,8 +18,7 @@
  */
 package groovy.swing.factory
 
-import javax.swing.JFrame
-import javax.swing.JMenuBar
+import javax.swing.*
 
 public class FrameFactory extends RootPaneContainerFactory {
 

http://git-wip-us.apache.org/repos/asf/groovy/blob/9e823116/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/GridBagFactory.groovy
----------------------------------------------------------------------
diff --git a/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/GridBagFactory.groovy b/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/GridBagFactory.groovy
index 1906aad..a711e8d 100644
--- a/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/GridBagFactory.groovy
+++ b/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/GridBagFactory.groovy
@@ -18,13 +18,8 @@
  */
 package groovy.swing.factory
 
-import javax.swing.RootPaneContainer
-
-import java.awt.Insets
-import java.awt.GridBagConstraints
-import java.awt.Container
-import java.awt.GridBagLayout
-import java.awt.Component
+import javax.swing.*
+import java.awt.*
 
 public class GridBagFactory extends LayoutFactory {
 

http://git-wip-us.apache.org/repos/asf/groovy/blob/9e823116/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/ImageIconFactory.groovy
----------------------------------------------------------------------
diff --git a/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/ImageIconFactory.groovy b/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/ImageIconFactory.groovy
index f0b2c12..654e03a 100644
--- a/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/ImageIconFactory.groovy
+++ b/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/ImageIconFactory.groovy
@@ -18,8 +18,8 @@
  */
 package groovy.swing.factory
 
-import java.awt.Image
-import javax.swing.ImageIcon
+import javax.swing.*
+import java.awt.*
 
 class ImageIconFactory extends AbstractFactory {
 

http://git-wip-us.apache.org/repos/asf/groovy/blob/9e823116/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/InternalFrameFactory.groovy
----------------------------------------------------------------------
diff --git a/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/InternalFrameFactory.groovy b/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/InternalFrameFactory.groovy
index bc78590..dea3a21 100644
--- a/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/InternalFrameFactory.groovy
+++ b/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/InternalFrameFactory.groovy
@@ -18,7 +18,7 @@
  */
 package groovy.swing.factory
 
-import javax.swing.JInternalFrame
+import javax.swing.*
 
 class InternalFrameFactory extends groovy.swing.factory.RootPaneContainerFactory {
 

http://git-wip-us.apache.org/repos/asf/groovy/blob/9e823116/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/LayoutFactory.groovy
----------------------------------------------------------------------
diff --git a/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/LayoutFactory.groovy b/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/LayoutFactory.groovy
index 889e7e9..b11c452 100644
--- a/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/LayoutFactory.groovy
+++ b/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/LayoutFactory.groovy
@@ -18,8 +18,8 @@
  */
 package groovy.swing.factory
 
-import java.awt.Container
-import javax.swing.RootPaneContainer
+import javax.swing.*
+import java.awt.*
 
 class LayoutFactory extends groovy.swing.factory.BeanFactory {
 

http://git-wip-us.apache.org/repos/asf/groovy/blob/9e823116/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/ListFactory.groovy
----------------------------------------------------------------------
diff --git a/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/ListFactory.groovy b/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/ListFactory.groovy
index a0b5f4a..565710e 100644
--- a/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/ListFactory.groovy
+++ b/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/ListFactory.groovy
@@ -18,10 +18,11 @@
  */
 package groovy.swing.factory
 
-import javax.swing.JList
 import groovy.swing.binding.JListMetaMethods
 import groovy.swing.impl.ListWrapperListModel
 
+import javax.swing.*
+
 /**
  * Create a JList, and handle the optional items attribute.
  *

http://git-wip-us.apache.org/repos/asf/groovy/blob/9e823116/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/MatteBorderFactory.groovy
----------------------------------------------------------------------
diff --git a/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/MatteBorderFactory.groovy b/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/MatteBorderFactory.groovy
index 8441450..cac8266 100644
--- a/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/MatteBorderFactory.groovy
+++ b/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/MatteBorderFactory.groovy
@@ -18,7 +18,7 @@
  */
 package groovy.swing.factory
 
-import javax.swing.BorderFactory
+import javax.swing.*
 
 /**
  * matteBorder requires essentially two parameter, a mat definition and a

http://git-wip-us.apache.org/repos/asf/groovy/blob/9e823116/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/RendererFactory.groovy
----------------------------------------------------------------------
diff --git a/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/RendererFactory.groovy b/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/RendererFactory.groovy
index f9c2b56..1227893 100644
--- a/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/RendererFactory.groovy
+++ b/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/RendererFactory.groovy
@@ -18,11 +18,11 @@
  */
 package groovy.swing.factory
 
-import java.awt.Component
-import javax.swing.JList
-import javax.swing.JTree
 import groovy.swing.impl.ClosureRenderer
 
+import javax.swing.*
+import java.awt.*
+
 /**
  * @author Danno Ferrin
  */

http://git-wip-us.apache.org/repos/asf/groovy/blob/9e823116/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/RichActionWidgetFactory.groovy
----------------------------------------------------------------------
diff --git a/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/RichActionWidgetFactory.groovy b/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/RichActionWidgetFactory.groovy
index ef66079..e1a6300 100644
--- a/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/RichActionWidgetFactory.groovy
+++ b/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/RichActionWidgetFactory.groovy
@@ -18,12 +18,11 @@
  */
 package groovy.swing.factory
 
+import javax.swing.*
 import java.lang.reflect.Constructor
 import java.lang.reflect.InvocationTargetException
 import java.util.logging.Level
 import java.util.logging.Logger
-import javax.swing.Action
-import javax.swing.Icon
 
 /**
  *

http://git-wip-us.apache.org/repos/asf/groovy/blob/9e823116/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/RootPaneContainerFactory.groovy
----------------------------------------------------------------------
diff --git a/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/RootPaneContainerFactory.groovy b/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/RootPaneContainerFactory.groovy
index 38d1da6..5c4b213 100644
--- a/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/RootPaneContainerFactory.groovy
+++ b/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/RootPaneContainerFactory.groovy
@@ -18,10 +18,9 @@
  */
 package groovy.swing.factory
 
-import java.awt.Component
-import java.awt.Window
-import javax.swing.JComponent
-import javax.swing.JButton
+import javax.swing.*
+import java.awt.*
+
 import static groovy.swing.factory.LayoutFactory.DEFAULT_DELEGATE_PROPERTY_CONSTRAINT
 
 abstract class RootPaneContainerFactory extends AbstractFactory {

http://git-wip-us.apache.org/repos/asf/groovy/blob/9e823116/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/ScrollPaneFactory.groovy
----------------------------------------------------------------------
diff --git a/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/ScrollPaneFactory.groovy b/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/ScrollPaneFactory.groovy
index 3e91b41..972ddd2 100644
--- a/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/ScrollPaneFactory.groovy
+++ b/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/ScrollPaneFactory.groovy
@@ -18,10 +18,8 @@
  */
 package groovy.swing.factory
 
-import java.awt.Component
-import java.awt.Window
-import javax.swing.JScrollPane
-import javax.swing.JViewport
+import javax.swing.*
+import java.awt.*
 
 class ScrollPaneFactory extends groovy.swing.factory.BeanFactory {
 

http://git-wip-us.apache.org/repos/asf/groovy/blob/9e823116/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/SeparatorFactory.groovy
----------------------------------------------------------------------
diff --git a/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/SeparatorFactory.groovy b/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/SeparatorFactory.groovy
index 34410c9..4a98217 100644
--- a/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/SeparatorFactory.groovy
+++ b/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/SeparatorFactory.groovy
@@ -18,10 +18,8 @@
  */
 package groovy.swing.factory
 
-import javax.swing.JMenu
+import javax.swing.*
 import javax.swing.JPopupMenu.Separator as JPopupMenu_Separator
-import javax.swing.JSeparator
-import javax.swing.JToolBar
 import javax.swing.JToolBar.Separator as JToolBar_Separator
 
 // JetGroovy bug

http://git-wip-us.apache.org/repos/asf/groovy/blob/9e823116/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/SplitPaneFactory.groovy
----------------------------------------------------------------------
diff --git a/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/SplitPaneFactory.groovy b/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/SplitPaneFactory.groovy
index 356753c..8e6856d 100644
--- a/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/SplitPaneFactory.groovy
+++ b/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/SplitPaneFactory.groovy
@@ -18,9 +18,8 @@
  */
 package groovy.swing.factory
 
-import java.awt.Component
-import java.awt.Window
-import javax.swing.JSplitPane
+import javax.swing.*
+import java.awt.*
 
 public class SplitPaneFactory extends AbstractFactory {
     

http://git-wip-us.apache.org/repos/asf/groovy/blob/9e823116/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/SwingBorderFactory.groovy
----------------------------------------------------------------------
diff --git a/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/SwingBorderFactory.groovy b/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/SwingBorderFactory.groovy
index 1800ceb..1a3f70a 100644
--- a/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/SwingBorderFactory.groovy
+++ b/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/SwingBorderFactory.groovy
@@ -18,8 +18,7 @@
  */
 package groovy.swing.factory
 
-import javax.swing.JComponent
-import javax.swing.RootPaneContainer
+import javax.swing.*
 
 abstract class SwingBorderFactory extends AbstractFactory {
 

http://git-wip-us.apache.org/repos/asf/groovy/blob/9e823116/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/TabbedPaneFactory.groovy
----------------------------------------------------------------------
diff --git a/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/TabbedPaneFactory.groovy b/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/TabbedPaneFactory.groovy
index 4d5d6e2..65b28a4 100644
--- a/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/TabbedPaneFactory.groovy
+++ b/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/TabbedPaneFactory.groovy
@@ -18,8 +18,7 @@
  */
 package groovy.swing.factory
 
-import java.awt.Component
-import java.awt.Window
+import java.awt.*
 
 class TabbedPaneFactory extends BeanFactory {
 

http://git-wip-us.apache.org/repos/asf/groovy/blob/9e823116/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/TableFactory.groovy
----------------------------------------------------------------------
diff --git a/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/TableFactory.groovy b/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/TableFactory.groovy
index f0ee07a..1519ebd 100644
--- a/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/TableFactory.groovy
+++ b/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/TableFactory.groovy
@@ -19,7 +19,8 @@
 package groovy.swing.factory
 
 import groovy.swing.binding.JTableMetaMethods
-import javax.swing.JTable
+
+import javax.swing.*
 import javax.swing.table.TableColumn
 import javax.swing.table.TableModel
 

http://git-wip-us.apache.org/repos/asf/groovy/blob/9e823116/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/TableLayoutFactory.groovy
----------------------------------------------------------------------
diff --git a/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/TableLayoutFactory.groovy b/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/TableLayoutFactory.groovy
index c762625..6f80486 100644
--- a/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/TableLayoutFactory.groovy
+++ b/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/TableLayoutFactory.groovy
@@ -18,13 +18,12 @@
  */
 package groovy.swing.factory
 
-import groovy.swing.impl.TableLayoutCell
-
-import java.awt.Component
-import java.awt.Window
 import groovy.swing.impl.TableLayout
+import groovy.swing.impl.TableLayoutCell
 import groovy.swing.impl.TableLayoutRow
 
+import java.awt.*
+
 public class TableLayoutFactory extends AbstractFactory {
     
     public Object newInstance(FactoryBuilderSupport builder, Object name, Object value, Map attributes) throws InstantiationException, IllegalAccessException {

http://git-wip-us.apache.org/repos/asf/groovy/blob/9e823116/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/TableModelFactory.groovy
----------------------------------------------------------------------
diff --git a/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/TableModelFactory.groovy b/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/TableModelFactory.groovy
index 8521cb7..c088eff 100644
--- a/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/TableModelFactory.groovy
+++ b/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/TableModelFactory.groovy
@@ -21,10 +21,11 @@ package groovy.swing.factory
 import groovy.model.DefaultTableModel
 import groovy.model.ValueHolder
 import groovy.model.ValueModel
-import java.beans.PropertyChangeListener
-import java.beans.PropertyChangeEvent
-import javax.swing.JTable
+
+import javax.swing.*
 import javax.swing.table.TableModel
+import java.beans.PropertyChangeEvent
+import java.beans.PropertyChangeListener
 
 public class TableModelFactory extends AbstractFactory {
     

http://git-wip-us.apache.org/repos/asf/groovy/blob/9e823116/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/TitledBorderFactory.groovy
----------------------------------------------------------------------
diff --git a/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/TitledBorderFactory.groovy b/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/TitledBorderFactory.groovy
index bfb558e..150b7d5 100644
--- a/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/TitledBorderFactory.groovy
+++ b/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/TitledBorderFactory.groovy
@@ -18,10 +18,9 @@
  */
 package groovy.swing.factory
 
-import java.awt.Color
-import java.awt.Font
 import javax.swing.border.Border
 import javax.swing.border.TitledBorder
+import java.awt.*
 
 /**
  * The node must be called with either a value argument or a title: attribute. <br>

http://git-wip-us.apache.org/repos/asf/groovy/blob/9e823116/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/WidgetFactory.groovy
----------------------------------------------------------------------
diff --git a/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/WidgetFactory.groovy b/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/WidgetFactory.groovy
index 3998650..fa3efe7 100644
--- a/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/WidgetFactory.groovy
+++ b/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/WidgetFactory.groovy
@@ -18,9 +18,9 @@
  */
 package groovy.swing.factory
 
-import java.awt.Component
-import java.awt.Window
-import javax.swing.JComponent
+import javax.swing.*
+import java.awt.*
+
 import static groovy.swing.factory.LayoutFactory.DEFAULT_DELEGATE_PROPERTY_CONSTRAINT
 
 public class WidgetFactory extends AbstractFactory {

http://git-wip-us.apache.org/repos/asf/groovy/blob/9e823116/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/WindowFactory.groovy
----------------------------------------------------------------------
diff --git a/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/WindowFactory.groovy b/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/WindowFactory.groovy
index d758a6f..b5188a6 100644
--- a/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/WindowFactory.groovy
+++ b/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/WindowFactory.groovy
@@ -18,7 +18,7 @@
  */
 package groovy.swing.factory
 
-import javax.swing.JWindow
+import javax.swing.*
 
 public class WindowFactory extends RootPaneContainerFactory {
     

http://git-wip-us.apache.org/repos/asf/groovy/blob/9e823116/subprojects/groovy-swing/src/main/groovy/groovy/swing/impl/ClosureCellEditor.groovy
----------------------------------------------------------------------
diff --git a/subprojects/groovy-swing/src/main/groovy/groovy/swing/impl/ClosureCellEditor.groovy b/subprojects/groovy-swing/src/main/groovy/groovy/swing/impl/ClosureCellEditor.groovy
index 32e55b5..9b8098e 100644
--- a/subprojects/groovy-swing/src/main/groovy/groovy/swing/impl/ClosureCellEditor.groovy
+++ b/subprojects/groovy-swing/src/main/groovy/groovy/swing/impl/ClosureCellEditor.groovy
@@ -18,10 +18,11 @@
  */
 package groovy.swing.impl
 
-import java.awt.Component
+import javax.swing.*
 import javax.swing.table.TableCellEditor
 import javax.swing.tree.TreeCellEditor
-import javax.swing.*
+import java.awt.*
+import java.util.List
 
 /**
  * @author Alexander Klein

http://git-wip-us.apache.org/repos/asf/groovy/blob/9e823116/subprojects/groovy-swing/src/main/groovy/groovy/swing/impl/DefaultAction.java
----------------------------------------------------------------------
diff --git a/subprojects/groovy-swing/src/main/groovy/groovy/swing/impl/DefaultAction.java b/subprojects/groovy-swing/src/main/groovy/groovy/swing/impl/DefaultAction.java
index f3ef6df..a595efd 100644
--- a/subprojects/groovy-swing/src/main/groovy/groovy/swing/impl/DefaultAction.java
+++ b/subprojects/groovy-swing/src/main/groovy/groovy/swing/impl/DefaultAction.java
@@ -20,10 +20,9 @@ package groovy.swing.impl;
 
 import groovy.lang.Closure;
 
+import javax.swing.*;
 import java.awt.event.ActionEvent;
 
-import javax.swing.AbstractAction;
-
 /** 
  * A default action implementation
  *

http://git-wip-us.apache.org/repos/asf/groovy/blob/9e823116/subprojects/groovy-swing/src/main/groovy/groovy/swing/impl/TableLayout.java
----------------------------------------------------------------------
diff --git a/subprojects/groovy-swing/src/main/groovy/groovy/swing/impl/TableLayout.java b/subprojects/groovy-swing/src/main/groovy/groovy/swing/impl/TableLayout.java
index 03e4de4..ace204c 100644
--- a/subprojects/groovy-swing/src/main/groovy/groovy/swing/impl/TableLayout.java
+++ b/subprojects/groovy-swing/src/main/groovy/groovy/swing/impl/TableLayout.java
@@ -18,11 +18,8 @@
  */
 package groovy.swing.impl;
 
-import java.awt.GridBagConstraints;
-import java.awt.GridBagLayout;
-import java.awt.Insets;
-
-import javax.swing.JPanel;
+import javax.swing.*;
+import java.awt.*;
 
 /** 
  * Represents a HTML style table layout

http://git-wip-us.apache.org/repos/asf/groovy/blob/9e823116/subprojects/groovy-swing/src/main/groovy/groovy/swing/impl/TableLayoutCell.java
----------------------------------------------------------------------
diff --git a/subprojects/groovy-swing/src/main/groovy/groovy/swing/impl/TableLayoutCell.java b/subprojects/groovy-swing/src/main/groovy/groovy/swing/impl/TableLayoutCell.java
index afb9384..3350fcc 100644
--- a/subprojects/groovy-swing/src/main/groovy/groovy/swing/impl/TableLayoutCell.java
+++ b/subprojects/groovy-swing/src/main/groovy/groovy/swing/impl/TableLayoutCell.java
@@ -18,8 +18,7 @@
  */
 package groovy.swing.impl;
 
-import java.awt.Component;
-import java.awt.GridBagConstraints;
+import java.awt.*;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 

http://git-wip-us.apache.org/repos/asf/groovy/blob/9e823116/subprojects/groovy-swing/src/main/groovy/groovy/swing/impl/TableLayoutRow.java
----------------------------------------------------------------------
diff --git a/subprojects/groovy-swing/src/main/groovy/groovy/swing/impl/TableLayoutRow.java b/subprojects/groovy-swing/src/main/groovy/groovy/swing/impl/TableLayoutRow.java
index ff43bec..65c4adf 100644
--- a/subprojects/groovy-swing/src/main/groovy/groovy/swing/impl/TableLayoutRow.java
+++ b/subprojects/groovy-swing/src/main/groovy/groovy/swing/impl/TableLayoutRow.java
@@ -18,7 +18,7 @@
  */
 package groovy.swing.impl;
 
-import java.awt.GridBagConstraints;
+import java.awt.*;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;

http://git-wip-us.apache.org/repos/asf/groovy/blob/9e823116/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/BindPath.java
----------------------------------------------------------------------
diff --git a/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/BindPath.java b/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/BindPath.java
index 1e3bc9f..ceb740a 100644
--- a/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/BindPath.java
+++ b/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/BindPath.java
@@ -18,17 +18,16 @@
  */
 package org.codehaus.groovy.binding;
 
+import groovy.lang.MetaClass;
+import groovy.lang.MissingPropertyException;
+import groovy.lang.Reference;
 import org.codehaus.groovy.runtime.InvokerHelper;
 
 import java.beans.PropertyChangeListener;
-import java.util.Set;
 import java.util.Map;
+import java.util.Set;
 import java.util.TreeMap;
 
-import groovy.lang.MetaClass;
-import groovy.lang.MissingPropertyException;
-import groovy.lang.Reference;
-
 /**
  * The bind path object.  This class represents one "step" in the bind path.
  */

http://git-wip-us.apache.org/repos/asf/groovy/blob/9e823116/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/PropertyBinding.java
----------------------------------------------------------------------
diff --git a/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/PropertyBinding.java b/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/PropertyBinding.java
index 1c9f942..f8c051b 100644
--- a/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/PropertyBinding.java
+++ b/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/PropertyBinding.java
@@ -27,8 +27,8 @@ import org.codehaus.groovy.runtime.InvokerInvocationException;
 import org.codehaus.groovy.runtime.ResourceGroovyMethods;
 import org.codehaus.groovy.runtime.typehandling.DefaultTypeTransformation;
 
-import javax.swing.SwingUtilities;
-import java.awt.Component;
+import javax.swing.*;
+import java.awt.*;
 import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
 import java.beans.PropertyVetoException;

http://git-wip-us.apache.org/repos/asf/groovy/blob/9e823116/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/PropertyChangeProxyTargetBinding.java
----------------------------------------------------------------------
diff --git a/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/PropertyChangeProxyTargetBinding.java b/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/PropertyChangeProxyTargetBinding.java
index 49bb64d..0751b0e 100644
--- a/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/PropertyChangeProxyTargetBinding.java
+++ b/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/PropertyChangeProxyTargetBinding.java
@@ -20,8 +20,8 @@ package org.codehaus.groovy.binding;
 
 import org.codehaus.groovy.runtime.InvokerHelper;
 
-import java.beans.PropertyChangeListener;
 import java.beans.PropertyChangeEvent;
+import java.beans.PropertyChangeListener;
 
 public class PropertyChangeProxyTargetBinding implements TargetBinding {
     Object proxyObject;

http://git-wip-us.apache.org/repos/asf/groovy/blob/9e823116/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/PropertyPathFullBinding.java
----------------------------------------------------------------------
diff --git a/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/PropertyPathFullBinding.java b/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/PropertyPathFullBinding.java
index f30ccc9..0de2a51 100644
--- a/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/PropertyPathFullBinding.java
+++ b/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/PropertyPathFullBinding.java
@@ -18,10 +18,10 @@
  */
 package org.codehaus.groovy.binding;
 
-import java.beans.PropertyChangeListener;
 import java.beans.PropertyChangeEvent;
-import java.util.Set;
+import java.beans.PropertyChangeListener;
 import java.util.HashSet;
+import java.util.Set;
 
 /**
  * A property path full binding

http://git-wip-us.apache.org/repos/asf/groovy/blob/9e823116/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/SwingTimerTriggerBinding.java
----------------------------------------------------------------------
diff --git a/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/SwingTimerTriggerBinding.java b/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/SwingTimerTriggerBinding.java
index fe3c796..1111cdb 100644
--- a/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/SwingTimerTriggerBinding.java
+++ b/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/SwingTimerTriggerBinding.java
@@ -18,9 +18,9 @@
  */
 package org.codehaus.groovy.binding;
 
-import javax.swing.Timer;
-import java.awt.event.ActionListener;
+import javax.swing.*;
 import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
 
 /**
  * @author <a href="mailto:shemnon@yahoo.com">Danno Ferrin</a>

http://git-wip-us.apache.org/repos/asf/groovy/blob/9e823116/subprojects/groovy-templates/src/main/groovy/groovy/text/GStringTemplateEngine.java
----------------------------------------------------------------------
diff --git a/subprojects/groovy-templates/src/main/groovy/groovy/text/GStringTemplateEngine.java b/subprojects/groovy-templates/src/main/groovy/groovy/text/GStringTemplateEngine.java
index 9b2c4a1..a4a99d1 100644
--- a/subprojects/groovy-templates/src/main/groovy/groovy/text/GStringTemplateEngine.java
+++ b/subprojects/groovy-templates/src/main/groovy/groovy/text/GStringTemplateEngine.java
@@ -18,7 +18,14 @@
  */
 package groovy.text;
 
-import groovy.lang.*;
+import groovy.lang.Binding;
+import groovy.lang.Closure;
+import groovy.lang.GroovyClassLoader;
+import groovy.lang.GroovyCodeSource;
+import groovy.lang.GroovyObject;
+import groovy.lang.GroovyRuntimeException;
+import groovy.lang.Writable;
+import org.codehaus.groovy.control.CompilationFailedException;
 
 import java.io.IOException;
 import java.io.Reader;
@@ -27,8 +34,6 @@ import java.security.PrivilegedAction;
 import java.util.Map;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import org.codehaus.groovy.control.CompilationFailedException;
-
 /**
  * Processes template source files substituting variables and expressions into
  * placeholders in a template source text to produce the desired output using

http://git-wip-us.apache.org/repos/asf/groovy/blob/9e823116/subprojects/groovy-templates/src/main/groovy/groovy/text/SimpleTemplateEngine.java
----------------------------------------------------------------------
diff --git a/subprojects/groovy-templates/src/main/groovy/groovy/text/SimpleTemplateEngine.java b/subprojects/groovy-templates/src/main/groovy/groovy/text/SimpleTemplateEngine.java
index 415f346..f9dd80c 100644
--- a/subprojects/groovy-templates/src/main/groovy/groovy/text/SimpleTemplateEngine.java
+++ b/subprojects/groovy-templates/src/main/groovy/groovy/text/SimpleTemplateEngine.java
@@ -18,7 +18,13 @@
  */
 package groovy.text;
 
-import groovy.lang.*;
+import groovy.lang.Binding;
+import groovy.lang.GroovyRuntimeException;
+import groovy.lang.GroovyShell;
+import groovy.lang.Script;
+import groovy.lang.Writable;
+import org.codehaus.groovy.control.CompilationFailedException;
+import org.codehaus.groovy.runtime.InvokerHelper;
 
 import java.io.BufferedReader;
 import java.io.IOException;
@@ -28,9 +34,6 @@ import java.io.StringWriter;
 import java.io.Writer;
 import java.util.Map;
 
-import org.codehaus.groovy.control.CompilationFailedException;
-import org.codehaus.groovy.runtime.InvokerHelper;
-
 /**
  * Processes template source files substituting variables and expressions into
  * placeholders in a template source text to produce the desired output.

http://git-wip-us.apache.org/repos/asf/groovy/blob/9e823116/subprojects/groovy-templates/src/main/groovy/groovy/text/StreamingTemplateEngine.java
----------------------------------------------------------------------
diff --git a/subprojects/groovy-templates/src/main/groovy/groovy/text/StreamingTemplateEngine.java b/subprojects/groovy-templates/src/main/groovy/groovy/text/StreamingTemplateEngine.java
index 8a02d43..6d1640e 100644
--- a/subprojects/groovy-templates/src/main/groovy/groovy/text/StreamingTemplateEngine.java
+++ b/subprojects/groovy-templates/src/main/groovy/groovy/text/StreamingTemplateEngine.java
@@ -18,8 +18,12 @@
  */
 package groovy.text;
 
-import groovy.lang.*;
-
+import groovy.lang.Closure;
+import groovy.lang.GroovyClassLoader;
+import groovy.lang.GroovyCodeSource;
+import groovy.lang.GroovyObject;
+import groovy.lang.GroovyRuntimeException;
+import groovy.lang.Writable;
 import org.codehaus.groovy.control.CompilationFailedException;
 import org.codehaus.groovy.control.ErrorCollector;
 import org.codehaus.groovy.control.MultipleCompilationErrorsException;

http://git-wip-us.apache.org/repos/asf/groovy/blob/9e823116/subprojects/groovy-templates/src/main/groovy/groovy/text/TemplateEngine.java
----------------------------------------------------------------------
diff --git a/subprojects/groovy-templates/src/main/groovy/groovy/text/TemplateEngine.java b/subprojects/groovy-templates/src/main/groovy/groovy/text/TemplateEngine.java
index d4d2384..4761e83 100644
--- a/subprojects/groovy-templates/src/main/groovy/groovy/text/TemplateEngine.java
+++ b/subprojects/groovy-templates/src/main/groovy/groovy/text/TemplateEngine.java
@@ -18,6 +18,9 @@
  */
 package groovy.text;
 
+import org.codehaus.groovy.control.CompilationFailedException;
+import org.codehaus.groovy.runtime.DefaultGroovyMethodsSupport;
+
 import java.io.File;
 import java.io.FileReader;
 import java.io.IOException;
@@ -26,9 +29,6 @@ import java.io.Reader;
 import java.io.StringReader;
 import java.net.URL;
 
-import org.codehaus.groovy.control.CompilationFailedException;
-import org.codehaus.groovy.runtime.DefaultGroovyMethodsSupport;
-
 /**
  * Represents an API to any template engine which is basically a factory of Template instances from a given text input.
  * 

http://git-wip-us.apache.org/repos/asf/groovy/blob/9e823116/subprojects/groovy-templates/src/main/groovy/groovy/text/markup/MarkupBuilderCodeTransformer.java
----------------------------------------------------------------------
diff --git a/subprojects/groovy-templates/src/main/groovy/groovy/text/markup/MarkupBuilderCodeTransformer.java b/subprojects/groovy-templates/src/main/groovy/groovy/text/markup/MarkupBuilderCodeTransformer.java
index b7537b6..87e67e1 100644
--- a/subprojects/groovy-templates/src/main/groovy/groovy/text/markup/MarkupBuilderCodeTransformer.java
+++ b/subprojects/groovy-templates/src/main/groovy/groovy/text/markup/MarkupBuilderCodeTransformer.java
@@ -32,7 +32,6 @@ import org.codehaus.groovy.ast.expr.ConstantExpression;
 import org.codehaus.groovy.ast.expr.DeclarationExpression;
 import org.codehaus.groovy.ast.expr.EmptyExpression;
 import org.codehaus.groovy.ast.expr.Expression;
-import org.codehaus.groovy.ast.expr.GStringExpression;
 import org.codehaus.groovy.ast.expr.MapEntryExpression;
 import org.codehaus.groovy.ast.expr.MapExpression;
 import org.codehaus.groovy.ast.expr.MethodCallExpression;
@@ -44,7 +43,6 @@ import org.codehaus.groovy.ast.stmt.Statement;
 import org.codehaus.groovy.control.SourceUnit;
 import org.codehaus.groovy.syntax.Types;
 
-import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;

http://git-wip-us.apache.org/repos/asf/groovy/blob/9e823116/subprojects/groovy-templates/src/main/groovy/groovy/text/markup/MarkupTemplateEngine.java
----------------------------------------------------------------------
diff --git a/subprojects/groovy-templates/src/main/groovy/groovy/text/markup/MarkupTemplateEngine.java b/subprojects/groovy-templates/src/main/groovy/groovy/text/markup/MarkupTemplateEngine.java
index 60ed446..422ea20 100644
--- a/subprojects/groovy-templates/src/main/groovy/groovy/text/markup/MarkupTemplateEngine.java
+++ b/subprojects/groovy-templates/src/main/groovy/groovy/text/markup/MarkupTemplateEngine.java
@@ -27,6 +27,7 @@ import groovy.transform.CompileStatic;
 import org.codehaus.groovy.ast.ClassHelper;
 import org.codehaus.groovy.ast.ClassNode;
 import org.codehaus.groovy.classgen.GeneratorContext;
+import org.codehaus.groovy.classgen.asm.BytecodeDumper;
 import org.codehaus.groovy.control.CompilationFailedException;
 import org.codehaus.groovy.control.CompilePhase;
 import org.codehaus.groovy.control.CompilerConfiguration;
@@ -34,7 +35,6 @@ import org.codehaus.groovy.control.SourceUnit;
 import org.codehaus.groovy.control.customizers.ASTTransformationCustomizer;
 import org.codehaus.groovy.control.customizers.CompilationCustomizer;
 import org.codehaus.groovy.runtime.DefaultGroovyMethods;
-import org.codehaus.groovy.classgen.asm.BytecodeDumper;
 
 import java.io.File;
 import java.io.IOException;

http://git-wip-us.apache.org/repos/asf/groovy/blob/9e823116/subprojects/groovy-templates/src/main/groovy/groovy/text/markup/MarkupTemplateTypeCheckingExtension.groovy
----------------------------------------------------------------------
diff --git a/subprojects/groovy-templates/src/main/groovy/groovy/text/markup/MarkupTemplateTypeCheckingExtension.groovy b/subprojects/groovy-templates/src/main/groovy/groovy/text/markup/MarkupTemplateTypeCheckingExtension.groovy
index db66f29..0d4acec 100644
--- a/subprojects/groovy-templates/src/main/groovy/groovy/text/markup/MarkupTemplateTypeCheckingExtension.groovy
+++ b/subprojects/groovy-templates/src/main/groovy/groovy/text/markup/MarkupTemplateTypeCheckingExtension.groovy
@@ -22,8 +22,22 @@ import groovy.transform.CompileStatic
 import org.codehaus.groovy.antlr.AntlrParserPlugin
 import org.codehaus.groovy.antlr.parser.GroovyLexer
 import org.codehaus.groovy.antlr.parser.GroovyRecognizer
-import org.codehaus.groovy.ast.*
-import org.codehaus.groovy.ast.expr.*
+import org.codehaus.groovy.ast.ASTNode
+import org.codehaus.groovy.ast.ClassCodeExpressionTransformer
+import org.codehaus.groovy.ast.ClassHelper
+import org.codehaus.groovy.ast.ClassNode
+import org.codehaus.groovy.ast.MethodNode
+import org.codehaus.groovy.ast.ModuleNode
+import org.codehaus.groovy.ast.Parameter
+import org.codehaus.groovy.ast.expr.ArgumentListExpression
+import org.codehaus.groovy.ast.expr.ArrayExpression
+import org.codehaus.groovy.ast.expr.BinaryExpression
+import org.codehaus.groovy.ast.expr.ClosureExpression
+import org.codehaus.groovy.ast.expr.ConstantExpression
+import org.codehaus.groovy.ast.expr.Expression
+import org.codehaus.groovy.ast.expr.MethodCallExpression
+import org.codehaus.groovy.ast.expr.TupleExpression
+import org.codehaus.groovy.ast.expr.VariableExpression
 import org.codehaus.groovy.ast.stmt.EmptyStatement
 import org.codehaus.groovy.control.ResolveVisitor
 import org.codehaus.groovy.control.SourceUnit

http://git-wip-us.apache.org/repos/asf/groovy/blob/9e823116/subprojects/groovy-test/src/main/groovy/groovy/lang/GroovyLogTestCase.groovy
----------------------------------------------------------------------
diff --git a/subprojects/groovy-test/src/main/groovy/groovy/lang/GroovyLogTestCase.groovy b/subprojects/groovy-test/src/main/groovy/groovy/lang/GroovyLogTestCase.groovy
index 5b6f327..0fa406e 100644
--- a/subprojects/groovy-test/src/main/groovy/groovy/lang/GroovyLogTestCase.groovy
+++ b/subprojects/groovy-test/src/main/groovy/groovy/lang/GroovyLogTestCase.groovy
@@ -18,7 +18,11 @@
  */
 package groovy.lang
 
-import java.util.logging.*
+import java.util.logging.Handler
+import java.util.logging.Level
+import java.util.logging.Logger
+import java.util.logging.SimpleFormatter
+import java.util.logging.StreamHandler
 
 /**
 Helper class to spoof log entries as produced by calling arbitrary code.

http://git-wip-us.apache.org/repos/asf/groovy/blob/9e823116/subprojects/groovy-test/src/main/groovy/groovy/util/JavadocAssertionTestSuite.groovy
----------------------------------------------------------------------
diff --git a/subprojects/groovy-test/src/main/groovy/groovy/util/JavadocAssertionTestSuite.groovy b/subprojects/groovy-test/src/main/groovy/groovy/util/JavadocAssertionTestSuite.groovy
index 32c4c5f..e3cc5a7 100644
--- a/subprojects/groovy-test/src/main/groovy/groovy/util/JavadocAssertionTestSuite.groovy
+++ b/subprojects/groovy-test/src/main/groovy/groovy/util/JavadocAssertionTestSuite.groovy
@@ -18,8 +18,8 @@
  */
 package groovy.util
 
-import junit.framework.TestSuite
 import junit.framework.Test
+import junit.framework.TestSuite
 import junit.textui.TestRunner
 
 /**

http://git-wip-us.apache.org/repos/asf/groovy/blob/9e823116/subprojects/groovy-test/src/main/java/groovy/mock/interceptor/MockProxyMetaClass.java
----------------------------------------------------------------------
diff --git a/subprojects/groovy-test/src/main/java/groovy/mock/interceptor/MockProxyMetaClass.java b/subprojects/groovy-test/src/main/java/groovy/mock/interceptor/MockProxyMetaClass.java
index 99b7a37..61ec117 100644
--- a/subprojects/groovy-test/src/main/java/groovy/mock/interceptor/MockProxyMetaClass.java
+++ b/subprojects/groovy-test/src/main/java/groovy/mock/interceptor/MockProxyMetaClass.java
@@ -18,7 +18,14 @@
  */
 package groovy.mock.interceptor;
 
-import groovy.lang.*;
+import groovy.lang.Closure;
+import groovy.lang.GroovyObject;
+import groovy.lang.GroovySystem;
+import groovy.lang.Interceptor;
+import groovy.lang.MetaClass;
+import groovy.lang.MetaClassRegistry;
+import groovy.lang.PropertyAccessInterceptor;
+import groovy.lang.ProxyMetaClass;
 
 /**
  * The ProxyMetaClass for the MockInterceptor.

http://git-wip-us.apache.org/repos/asf/groovy/blob/9e823116/subprojects/groovy-xml/src/main/groovy/groovy/xml/StreamingDOMBuilder.groovy
----------------------------------------------------------------------
diff --git a/subprojects/groovy-xml/src/main/groovy/groovy/xml/StreamingDOMBuilder.groovy b/subprojects/groovy-xml/src/main/groovy/groovy/xml/StreamingDOMBuilder.groovy
index f0408cd..8f61ec2 100644
--- a/subprojects/groovy-xml/src/main/groovy/groovy/xml/StreamingDOMBuilder.groovy
+++ b/subprojects/groovy-xml/src/main/groovy/groovy/xml/StreamingDOMBuilder.groovy
@@ -18,11 +18,11 @@
  */
 package groovy.xml
 
-import javax.xml.parsers.DocumentBuilderFactory
-import org.w3c.dom.Node
-
 import groovy.xml.streamingmarkupsupport.AbstractStreamingBuilder
 import groovy.xml.streamingmarkupsupport.BaseMarkupBuilder
+import org.w3c.dom.Node
+
+import javax.xml.parsers.DocumentBuilderFactory
 
 class StreamingDOMBuilder extends AbstractStreamingBuilder {
     def pendingStack = []

http://git-wip-us.apache.org/repos/asf/groovy/blob/9e823116/subprojects/groovy-xml/src/main/groovy/groovy/xml/StreamingMarkupBuilder.groovy
----------------------------------------------------------------------
diff --git a/subprojects/groovy-xml/src/main/groovy/groovy/xml/StreamingMarkupBuilder.groovy b/subprojects/groovy-xml/src/main/groovy/groovy/xml/StreamingMarkupBuilder.groovy
index a9cec9d..b5e0a2e 100644
--- a/subprojects/groovy-xml/src/main/groovy/groovy/xml/StreamingMarkupBuilder.groovy
+++ b/subprojects/groovy-xml/src/main/groovy/groovy/xml/StreamingMarkupBuilder.groovy
@@ -19,8 +19,8 @@
 package groovy.xml
 
 import groovy.xml.streamingmarkupsupport.AbstractStreamingBuilder
-import groovy.xml.streamingmarkupsupport.StreamingMarkupWriter
 import groovy.xml.streamingmarkupsupport.BaseMarkupBuilder
+import groovy.xml.streamingmarkupsupport.StreamingMarkupWriter
 
 /**
  * A builder class for creating XML markup.  This implementation uses a

http://git-wip-us.apache.org/repos/asf/groovy/blob/9e823116/subprojects/groovy-xml/src/main/groovy/groovy/xml/StreamingSAXBuilder.groovy
----------------------------------------------------------------------
diff --git a/subprojects/groovy-xml/src/main/groovy/groovy/xml/StreamingSAXBuilder.groovy b/subprojects/groovy-xml/src/main/groovy/groovy/xml/StreamingSAXBuilder.groovy
index 4d7605e..05faf23 100644
--- a/subprojects/groovy-xml/src/main/groovy/groovy/xml/StreamingSAXBuilder.groovy
+++ b/subprojects/groovy-xml/src/main/groovy/groovy/xml/StreamingSAXBuilder.groovy
@@ -20,8 +20,8 @@ package groovy.xml
 
 import groovy.xml.streamingmarkupsupport.AbstractStreamingBuilder
 import groovy.xml.streamingmarkupsupport.BaseMarkupBuilder
-import org.xml.sax.helpers.AttributesImpl
 import org.xml.sax.ext.LexicalHandler
+import org.xml.sax.helpers.AttributesImpl
 
 class StreamingSAXBuilder extends AbstractStreamingBuilder {
     def pendingStack = []

http://git-wip-us.apache.org/repos/asf/groovy/blob/9e823116/subprojects/groovy-xml/src/main/java/groovy/util/XmlSlurper.java
----------------------------------------------------------------------
diff --git a/subprojects/groovy-xml/src/main/java/groovy/util/XmlSlurper.java b/subprojects/groovy-xml/src/main/java/groovy/util/XmlSlurper.java
index 256b299..852bd3f 100644
--- a/subprojects/groovy-xml/src/main/java/groovy/util/XmlSlurper.java
+++ b/subprojects/groovy-xml/src/main/java/groovy/util/XmlSlurper.java
@@ -19,11 +19,26 @@
 package groovy.util;
 
 import groovy.util.slurpersupport.GPathResult;
+import groovy.util.slurpersupport.NamespaceAwareHashMap;
 import groovy.util.slurpersupport.Node;
 import groovy.util.slurpersupport.NodeChild;
-import groovy.util.slurpersupport.NamespaceAwareHashMap;
 import groovy.xml.FactorySupport;
+import groovy.xml.QName;
+import org.xml.sax.Attributes;
+import org.xml.sax.DTDHandler;
+import org.xml.sax.EntityResolver;
+import org.xml.sax.ErrorHandler;
+import org.xml.sax.InputSource;
+import org.xml.sax.SAXException;
+import org.xml.sax.SAXNotRecognizedException;
+import org.xml.sax.SAXNotSupportedException;
+import org.xml.sax.XMLReader;
+import org.xml.sax.helpers.DefaultHandler;
 
+import javax.xml.XMLConstants;
+import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.parsers.SAXParser;
+import javax.xml.parsers.SAXParserFactory;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
@@ -36,23 +51,6 @@ import java.util.Hashtable;
 import java.util.Map;
 import java.util.Stack;
 
-import javax.xml.XMLConstants;
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.parsers.SAXParser;
-import javax.xml.parsers.SAXParserFactory;
-
-import groovy.xml.QName;
-import org.xml.sax.Attributes;
-import org.xml.sax.DTDHandler;
-import org.xml.sax.EntityResolver;
-import org.xml.sax.ErrorHandler;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
-import org.xml.sax.SAXNotRecognizedException;
-import org.xml.sax.SAXNotSupportedException;
-import org.xml.sax.XMLReader;
-import org.xml.sax.helpers.DefaultHandler;
-
 /**
  * Parse XML into a document tree that may be traversed similar to XPath
  * expressions.  For example:

http://git-wip-us.apache.org/repos/asf/groovy/blob/9e823116/subprojects/groovy-xml/src/main/java/groovy/util/slurpersupport/Attribute.java
----------------------------------------------------------------------
diff --git a/subprojects/groovy-xml/src/main/java/groovy/util/slurpersupport/Attribute.java b/subprojects/groovy-xml/src/main/java/groovy/util/slurpersupport/Attribute.java
index d5c5b4b..9f5f15a 100644
--- a/subprojects/groovy-xml/src/main/java/groovy/util/slurpersupport/Attribute.java
+++ b/subprojects/groovy-xml/src/main/java/groovy/util/slurpersupport/Attribute.java
@@ -21,14 +21,13 @@ package groovy.util.slurpersupport;
 import groovy.lang.Closure;
 import groovy.lang.GroovyObject;
 import groovy.lang.GroovyRuntimeException;
+import org.codehaus.groovy.runtime.typehandling.DefaultTypeTransformation;
 
 import java.io.IOException;
 import java.io.Writer;
 import java.util.Iterator;
 import java.util.Map;
 
-import org.codehaus.groovy.runtime.typehandling.DefaultTypeTransformation;
-
 /**
  * Lazy evaluated representation of a node attribute.
  *

http://git-wip-us.apache.org/repos/asf/groovy/blob/9e823116/subprojects/groovy-xml/src/main/java/groovy/util/slurpersupport/Attributes.java
----------------------------------------------------------------------
diff --git a/subprojects/groovy-xml/src/main/java/groovy/util/slurpersupport/Attributes.java b/subprojects/groovy-xml/src/main/java/groovy/util/slurpersupport/Attributes.java
index 2a4be09..d4fa5d4 100644
--- a/subprojects/groovy-xml/src/main/java/groovy/util/slurpersupport/Attributes.java
+++ b/subprojects/groovy-xml/src/main/java/groovy/util/slurpersupport/Attributes.java
@@ -25,10 +25,10 @@ import groovy.xml.QName;
 
 import java.io.IOException;
 import java.io.Writer;
-import java.util.Map;
+import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
-import java.util.ArrayList;
+import java.util.Map;
 
 /**
  * Lazy evaluated representation of a node's attributes.

http://git-wip-us.apache.org/repos/asf/groovy/blob/9e823116/subprojects/groovy-xml/src/main/java/groovy/util/slurpersupport/FilteredAttributes.java
----------------------------------------------------------------------
diff --git a/subprojects/groovy-xml/src/main/java/groovy/util/slurpersupport/FilteredAttributes.java b/subprojects/groovy-xml/src/main/java/groovy/util/slurpersupport/FilteredAttributes.java
index 776e10a..b920970 100644
--- a/subprojects/groovy-xml/src/main/java/groovy/util/slurpersupport/FilteredAttributes.java
+++ b/subprojects/groovy-xml/src/main/java/groovy/util/slurpersupport/FilteredAttributes.java
@@ -18,12 +18,11 @@
  */
 package groovy.util.slurpersupport;
 
-import java.util.Iterator;
-import java.util.Map;
-
+import groovy.lang.Closure;
 import org.codehaus.groovy.runtime.typehandling.DefaultTypeTransformation;
 
-import groovy.lang.Closure;
+import java.util.Iterator;
+import java.util.Map;
 
 /**
  * Lazy evaluated representation of a node's attributes filtered by a Closure.

http://git-wip-us.apache.org/repos/asf/groovy/blob/9e823116/subprojects/groovy-xml/src/main/java/groovy/util/slurpersupport/FilteredNodeChildren.java
----------------------------------------------------------------------
diff --git a/subprojects/groovy-xml/src/main/java/groovy/util/slurpersupport/FilteredNodeChildren.java b/subprojects/groovy-xml/src/main/java/groovy/util/slurpersupport/FilteredNodeChildren.java
index 4566113..b6c4590 100644
--- a/subprojects/groovy-xml/src/main/java/groovy/util/slurpersupport/FilteredNodeChildren.java
+++ b/subprojects/groovy-xml/src/main/java/groovy/util/slurpersupport/FilteredNodeChildren.java
@@ -18,12 +18,11 @@
  */
 package groovy.util.slurpersupport;
 
-import java.util.Iterator;
-import java.util.Map;
-
+import groovy.lang.Closure;
 import org.codehaus.groovy.runtime.typehandling.DefaultTypeTransformation;
 
-import groovy.lang.Closure;
+import java.util.Iterator;
+import java.util.Map;
 
 /**
  * Lazy evaluated representation of child nodes filtered by a Closure.

http://git-wip-us.apache.org/repos/asf/groovy/blob/9e823116/subprojects/groovy-xml/src/main/java/groovy/util/slurpersupport/NodeChild.java
----------------------------------------------------------------------
diff --git a/subprojects/groovy-xml/src/main/java/groovy/util/slurpersupport/NodeChild.java b/subprojects/groovy-xml/src/main/java/groovy/util/slurpersupport/NodeChild.java
index 3ad67f8..76617ea 100644
--- a/subprojects/groovy-xml/src/main/java/groovy/util/slurpersupport/NodeChild.java
+++ b/subprojects/groovy-xml/src/main/java/groovy/util/slurpersupport/NodeChild.java
@@ -21,6 +21,7 @@ package groovy.util.slurpersupport;
 import groovy.lang.Closure;
 import groovy.lang.GroovyObject;
 import groovy.lang.GroovyRuntimeException;
+import org.codehaus.groovy.runtime.typehandling.DefaultTypeTransformation;
 
 import java.io.IOException;
 import java.io.Writer;
@@ -28,8 +29,6 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 
-import org.codehaus.groovy.runtime.typehandling.DefaultTypeTransformation;
-
 /**
  * Lazy evaluated representation of a child node.
  *

http://git-wip-us.apache.org/repos/asf/groovy/blob/9e823116/subprojects/groovy-xml/src/main/java/groovy/util/slurpersupport/NodeChildren.java
----------------------------------------------------------------------
diff --git a/subprojects/groovy-xml/src/main/java/groovy/util/slurpersupport/NodeChildren.java b/subprojects/groovy-xml/src/main/java/groovy/util/slurpersupport/NodeChildren.java
index c77c275..f6ea038 100644
--- a/subprojects/groovy-xml/src/main/java/groovy/util/slurpersupport/NodeChildren.java
+++ b/subprojects/groovy-xml/src/main/java/groovy/util/slurpersupport/NodeChildren.java
@@ -22,14 +22,13 @@ import groovy.lang.Buildable;
 import groovy.lang.Closure;
 import groovy.lang.GroovyObject;
 import groovy.lang.GroovyRuntimeException;
+import org.codehaus.groovy.runtime.typehandling.DefaultTypeTransformation;
 
 import java.io.IOException;
 import java.io.Writer;
 import java.util.Iterator;
 import java.util.Map;
 
-import org.codehaus.groovy.runtime.typehandling.DefaultTypeTransformation;
-
 /**
  * Lazy evaluated representation of child nodes.
  *

http://git-wip-us.apache.org/repos/asf/groovy/blob/9e823116/subprojects/groovy-xml/src/main/java/groovy/xml/DOMBuilder.java
----------------------------------------------------------------------
diff --git a/subprojects/groovy-xml/src/main/java/groovy/xml/DOMBuilder.java b/subprojects/groovy-xml/src/main/java/groovy/xml/DOMBuilder.java
index 06d105b..9c910cf 100644
--- a/subprojects/groovy-xml/src/main/java/groovy/xml/DOMBuilder.java
+++ b/subprojects/groovy-xml/src/main/java/groovy/xml/DOMBuilder.java
@@ -19,24 +19,22 @@
 package groovy.xml;
 
 import groovy.util.BuilderSupport;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.xml.sax.InputSource;
+import org.xml.sax.SAXException;
 
+import javax.xml.XMLConstants;
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
 import java.io.IOException;
 import java.io.Reader;
 import java.io.StringReader;
 import java.util.Iterator;
 import java.util.Map;
 
-import javax.xml.XMLConstants;
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
-
 /**
  * A helper class for creating a W3C DOM tree
  *

http://git-wip-us.apache.org/repos/asf/groovy/blob/9e823116/subprojects/groovy-xml/src/main/java/groovy/xml/FactorySupport.java
----------------------------------------------------------------------
diff --git a/subprojects/groovy-xml/src/main/java/groovy/xml/FactorySupport.java b/subprojects/groovy-xml/src/main/java/groovy/xml/FactorySupport.java
index 1dd2ede..c2385c5 100644
--- a/subprojects/groovy-xml/src/main/java/groovy/xml/FactorySupport.java
+++ b/subprojects/groovy-xml/src/main/java/groovy/xml/FactorySupport.java
@@ -18,12 +18,12 @@
  */
 package groovy.xml;
 
-import javax.xml.parsers.ParserConfigurationException;
 import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
 import javax.xml.parsers.SAXParserFactory;
-import java.security.PrivilegedExceptionAction;
 import java.security.AccessController;
 import java.security.PrivilegedActionException;
+import java.security.PrivilegedExceptionAction;
 
 /**
  * Support class for creating XML Factories

http://git-wip-us.apache.org/repos/asf/groovy/blob/9e823116/subprojects/groovy-xml/src/main/java/groovy/xml/MarkupBuilder.java
----------------------------------------------------------------------
diff --git a/subprojects/groovy-xml/src/main/java/groovy/xml/MarkupBuilder.java b/subprojects/groovy-xml/src/main/java/groovy/xml/MarkupBuilder.java
index db964eb..2190088 100644
--- a/subprojects/groovy-xml/src/main/java/groovy/xml/MarkupBuilder.java
+++ b/subprojects/groovy-xml/src/main/java/groovy/xml/MarkupBuilder.java
@@ -25,8 +25,8 @@ import org.codehaus.groovy.runtime.StringGroovyMethods;
 
 import java.io.PrintWriter;
 import java.io.Writer;
-import java.util.Map;
 import java.util.Iterator;
+import java.util.Map;
 
 /**
  * A helper class for creating XML or HTML markup.

http://git-wip-us.apache.org/repos/asf/groovy/blob/9e823116/subprojects/groovy-xml/src/main/java/groovy/xml/NamespaceBuilderSupport.java
----------------------------------------------------------------------
diff --git a/subprojects/groovy-xml/src/main/java/groovy/xml/NamespaceBuilderSupport.java b/subprojects/groovy-xml/src/main/java/groovy/xml/NamespaceBuilderSupport.java
index b8f2cd1..51129c7 100644
--- a/subprojects/groovy-xml/src/main/java/groovy/xml/NamespaceBuilderSupport.java
+++ b/subprojects/groovy-xml/src/main/java/groovy/xml/NamespaceBuilderSupport.java
@@ -20,7 +20,6 @@ package groovy.xml;
 
 import groovy.util.BuilderSupport;
 import groovy.util.NodeBuilder;
-
 import org.codehaus.groovy.runtime.InvokerHelper;
 
 import java.util.Collections;

http://git-wip-us.apache.org/repos/asf/groovy/blob/9e823116/subprojects/groovy-xml/src/main/java/groovy/xml/SAXBuilder.java
----------------------------------------------------------------------
diff --git a/subprojects/groovy-xml/src/main/java/groovy/xml/SAXBuilder.java b/subprojects/groovy-xml/src/main/java/groovy/xml/SAXBuilder.java
index a349d56..70dcc96 100644
--- a/subprojects/groovy-xml/src/main/java/groovy/xml/SAXBuilder.java
+++ b/subprojects/groovy-xml/src/main/java/groovy/xml/SAXBuilder.java
@@ -19,15 +19,14 @@
 package groovy.xml;
 
 import groovy.util.BuilderSupport;
-
-import java.util.Iterator;
-import java.util.Map;
-
 import org.xml.sax.Attributes;
 import org.xml.sax.ContentHandler;
 import org.xml.sax.SAXException;
 import org.xml.sax.helpers.AttributesImpl;
 
+import java.util.Iterator;
+import java.util.Map;
+
 /**
  * A builder for generating W3C SAX events.  Use similar to MarkupBuilder.
  * 

http://git-wip-us.apache.org/repos/asf/groovy/blob/9e823116/subprojects/groovy-xml/src/main/java/groovy/xml/XmlUtil.java
----------------------------------------------------------------------
diff --git a/subprojects/groovy-xml/src/main/java/groovy/xml/XmlUtil.java b/subprojects/groovy-xml/src/main/java/groovy/xml/XmlUtil.java
index ab7f10b..4867f51 100644
--- a/subprojects/groovy-xml/src/main/java/groovy/xml/XmlUtil.java
+++ b/subprojects/groovy-xml/src/main/java/groovy/xml/XmlUtil.java
@@ -32,13 +32,25 @@ import org.xml.sax.SAXException;
 import javax.xml.parsers.ParserConfigurationException;
 import javax.xml.parsers.SAXParser;
 import javax.xml.parsers.SAXParserFactory;
-import javax.xml.transform.*;
+import javax.xml.transform.OutputKeys;
+import javax.xml.transform.Source;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerException;
+import javax.xml.transform.TransformerFactory;
 import javax.xml.transform.dom.DOMSource;
 import javax.xml.transform.stream.StreamResult;
 import javax.xml.transform.stream.StreamSource;
 import javax.xml.validation.Schema;
 import javax.xml.validation.SchemaFactory;
-import java.io.*;
+import java.io.File;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.io.OutputStreamWriter;
+import java.io.PrintWriter;
+import java.io.StringReader;
+import java.io.StringWriter;
+import java.io.UnsupportedEncodingException;
+import java.io.Writer;
 import java.net.URL;
 
 /**

http://git-wip-us.apache.org/repos/asf/groovy/blob/9e823116/subprojects/groovy-xml/src/main/java/org/codehaus/groovy/tools/xml/DomToGroovy.java
----------------------------------------------------------------------
diff --git a/subprojects/groovy-xml/src/main/java/org/codehaus/groovy/tools/xml/DomToGroovy.java b/subprojects/groovy-xml/src/main/java/org/codehaus/groovy/tools/xml/DomToGroovy.java
index 907d8ea..4411ae9 100644
--- a/subprojects/groovy-xml/src/main/java/org/codehaus/groovy/tools/xml/DomToGroovy.java
+++ b/subprojects/groovy-xml/src/main/java/org/codehaus/groovy/tools/xml/DomToGroovy.java
@@ -19,23 +19,31 @@
 package org.codehaus.groovy.tools.xml;
 
 import groovy.util.IndentPrinter;
-import org.w3c.dom.*;
 import org.codehaus.groovy.syntax.Types;
+import org.w3c.dom.Attr;
+import org.w3c.dom.Comment;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.NamedNodeMap;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+import org.w3c.dom.ProcessingInstruction;
+import org.w3c.dom.Text;
 import org.xml.sax.InputSource;
 
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
+import java.io.BufferedReader;
 import java.io.File;
+import java.io.FileReader;
 import java.io.FileWriter;
 import java.io.IOException;
+import java.io.InputStream;
 import java.io.PrintWriter;
 import java.io.Reader;
-import java.io.InputStream;
-import java.io.FileReader;
-import java.io.BufferedReader;
+import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;
-import java.util.Collection;
 
 /**
  * A SAX handler for turning XML into Groovy scripts


Mime
View raw message