You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@groovy.apache.org by su...@apache.org on 2017/11/30 09:34:09 UTC
[2/3] groovy git commit: Optimize imports

http://git-wip-us.apache.org/repos/asf/groovy/blob/276594ae/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/completion/GroovySyntaxCompletor.groovy
----------------------------------------------------------------------
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/completion/GroovySyntaxCompletor.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/completion/GroovySyntaxCompletor.groovy
index 8269763..3afe91a 100644
--- a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/completion/GroovySyntaxCompletor.groovy
+++ b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/completion/GroovySyntaxCompletor.groovy
@@ -30,7 +30,34 @@ import org.codehaus.groovy.tools.shell.CommandRegistry
 import org.codehaus.groovy.tools.shell.Groovysh
 import org.codehaus.groovy.tools.shell.util.Logger
 
-import static org.codehaus.groovy.antlr.parser.GroovyTokenTypes.*
+import static org.codehaus.groovy.antlr.parser.GroovyTokenTypes.DOT
+import static org.codehaus.groovy.antlr.parser.GroovyTokenTypes.EOF
+import static org.codehaus.groovy.antlr.parser.GroovyTokenTypes.IDENT
+import static org.codehaus.groovy.antlr.parser.GroovyTokenTypes.LITERAL_as
+import static org.codehaus.groovy.antlr.parser.GroovyTokenTypes.LITERAL_boolean
+import static org.codehaus.groovy.antlr.parser.GroovyTokenTypes.LITERAL_byte
+import static org.codehaus.groovy.antlr.parser.GroovyTokenTypes.LITERAL_catch
+import static org.codehaus.groovy.antlr.parser.GroovyTokenTypes.LITERAL_char
+import static org.codehaus.groovy.antlr.parser.GroovyTokenTypes.LITERAL_class
+import static org.codehaus.groovy.antlr.parser.GroovyTokenTypes.LITERAL_def
+import static org.codehaus.groovy.antlr.parser.GroovyTokenTypes.LITERAL_double
+import static org.codehaus.groovy.antlr.parser.GroovyTokenTypes.LITERAL_enum
+import static org.codehaus.groovy.antlr.parser.GroovyTokenTypes.LITERAL_false
+import static org.codehaus.groovy.antlr.parser.GroovyTokenTypes.LITERAL_finally
+import static org.codehaus.groovy.antlr.parser.GroovyTokenTypes.LITERAL_float
+import static org.codehaus.groovy.antlr.parser.GroovyTokenTypes.LITERAL_import
+import static org.codehaus.groovy.antlr.parser.GroovyTokenTypes.LITERAL_instanceof
+import static org.codehaus.groovy.antlr.parser.GroovyTokenTypes.LITERAL_int
+import static org.codehaus.groovy.antlr.parser.GroovyTokenTypes.LITERAL_interface
+import static org.codehaus.groovy.antlr.parser.GroovyTokenTypes.LITERAL_long
+import static org.codehaus.groovy.antlr.parser.GroovyTokenTypes.LITERAL_package
+import static org.codehaus.groovy.antlr.parser.GroovyTokenTypes.LITERAL_short
+import static org.codehaus.groovy.antlr.parser.GroovyTokenTypes.LITERAL_this
+import static org.codehaus.groovy.antlr.parser.GroovyTokenTypes.LITERAL_true
+import static org.codehaus.groovy.antlr.parser.GroovyTokenTypes.LITERAL_try
+import static org.codehaus.groovy.antlr.parser.GroovyTokenTypes.LITERAL_void
+import static org.codehaus.groovy.antlr.parser.GroovyTokenTypes.OPTIONAL_DOT
+import static org.codehaus.groovy.antlr.parser.GroovyTokenTypes.SPREAD_DOT
 
 /**
  * Implements the Completor interface to provide competions for

http://git-wip-us.apache.org/repos/asf/groovy/blob/276594ae/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/completion/ReflectionCompletor.groovy
----------------------------------------------------------------------
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/completion/ReflectionCompletor.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/completion/ReflectionCompletor.groovy
index effaf19..ef013df 100644
--- a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/completion/ReflectionCompletor.groovy
+++ b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/completion/ReflectionCompletor.groovy
@@ -31,7 +31,59 @@ import java.lang.reflect.Method
 import java.lang.reflect.Modifier
 import java.util.regex.Pattern
 
-import static org.codehaus.groovy.antlr.parser.GroovyTokenTypes.*
+import static org.codehaus.groovy.antlr.parser.GroovyTokenTypes.ASSIGN
+import static org.codehaus.groovy.antlr.parser.GroovyTokenTypes.BAND
+import static org.codehaus.groovy.antlr.parser.GroovyTokenTypes.BAND_ASSIGN
+import static org.codehaus.groovy.antlr.parser.GroovyTokenTypes.BNOT
+import static org.codehaus.groovy.antlr.parser.GroovyTokenTypes.BOR
+import static org.codehaus.groovy.antlr.parser.GroovyTokenTypes.BOR_ASSIGN
+import static org.codehaus.groovy.antlr.parser.GroovyTokenTypes.BXOR
+import static org.codehaus.groovy.antlr.parser.GroovyTokenTypes.BXOR_ASSIGN
+import static org.codehaus.groovy.antlr.parser.GroovyTokenTypes.COLON
+import static org.codehaus.groovy.antlr.parser.GroovyTokenTypes.COMMA
+import static org.codehaus.groovy.antlr.parser.GroovyTokenTypes.COMPARE_TO
+import static org.codehaus.groovy.antlr.parser.GroovyTokenTypes.DIV
+import static org.codehaus.groovy.antlr.parser.GroovyTokenTypes.DIV_ASSIGN
+import static org.codehaus.groovy.antlr.parser.GroovyTokenTypes.DOT
+import static org.codehaus.groovy.antlr.parser.GroovyTokenTypes.EQUAL
+import static org.codehaus.groovy.antlr.parser.GroovyTokenTypes.GE
+import static org.codehaus.groovy.antlr.parser.GroovyTokenTypes.GT
+import static org.codehaus.groovy.antlr.parser.GroovyTokenTypes.IDENT
+import static org.codehaus.groovy.antlr.parser.GroovyTokenTypes.LAND
+import static org.codehaus.groovy.antlr.parser.GroovyTokenTypes.LBRACK
+import static org.codehaus.groovy.antlr.parser.GroovyTokenTypes.LCURLY
+import static org.codehaus.groovy.antlr.parser.GroovyTokenTypes.LE
+import static org.codehaus.groovy.antlr.parser.GroovyTokenTypes.LITERAL_false
+import static org.codehaus.groovy.antlr.parser.GroovyTokenTypes.LITERAL_in
+import static org.codehaus.groovy.antlr.parser.GroovyTokenTypes.LITERAL_instanceof
+import static org.codehaus.groovy.antlr.parser.GroovyTokenTypes.LITERAL_true
+import static org.codehaus.groovy.antlr.parser.GroovyTokenTypes.LNOT
+import static org.codehaus.groovy.antlr.parser.GroovyTokenTypes.LOR
+import static org.codehaus.groovy.antlr.parser.GroovyTokenTypes.LPAREN
+import static org.codehaus.groovy.antlr.parser.GroovyTokenTypes.LT
+import static org.codehaus.groovy.antlr.parser.GroovyTokenTypes.MEMBER_POINTER
+import static org.codehaus.groovy.antlr.parser.GroovyTokenTypes.MINUS
+import static org.codehaus.groovy.antlr.parser.GroovyTokenTypes.MINUS_ASSIGN
+import static org.codehaus.groovy.antlr.parser.GroovyTokenTypes.NOT_EQUAL
+import static org.codehaus.groovy.antlr.parser.GroovyTokenTypes.NUM_BIG_DECIMAL
+import static org.codehaus.groovy.antlr.parser.GroovyTokenTypes.NUM_BIG_INT
+import static org.codehaus.groovy.antlr.parser.GroovyTokenTypes.NUM_DOUBLE
+import static org.codehaus.groovy.antlr.parser.GroovyTokenTypes.NUM_FLOAT
+import static org.codehaus.groovy.antlr.parser.GroovyTokenTypes.NUM_INT
+import static org.codehaus.groovy.antlr.parser.GroovyTokenTypes.NUM_LONG
+import static org.codehaus.groovy.antlr.parser.GroovyTokenTypes.OPTIONAL_DOT
+import static org.codehaus.groovy.antlr.parser.GroovyTokenTypes.PLUS
+import static org.codehaus.groovy.antlr.parser.GroovyTokenTypes.PLUS_ASSIGN
+import static org.codehaus.groovy.antlr.parser.GroovyTokenTypes.RANGE_EXCLUSIVE
+import static org.codehaus.groovy.antlr.parser.GroovyTokenTypes.RANGE_INCLUSIVE
+import static org.codehaus.groovy.antlr.parser.GroovyTokenTypes.RBRACK
+import static org.codehaus.groovy.antlr.parser.GroovyTokenTypes.RPAREN
+import static org.codehaus.groovy.antlr.parser.GroovyTokenTypes.SEMI
+import static org.codehaus.groovy.antlr.parser.GroovyTokenTypes.SPREAD_DOT
+import static org.codehaus.groovy.antlr.parser.GroovyTokenTypes.STAR
+import static org.codehaus.groovy.antlr.parser.GroovyTokenTypes.STAR_ASSIGN
+import static org.codehaus.groovy.antlr.parser.GroovyTokenTypes.STRING_CTOR_START
+import static org.codehaus.groovy.antlr.parser.GroovyTokenTypes.STRING_LITERAL
 
 /**
  * Completes fields and methods of Classes or instances.

http://git-wip-us.apache.org/repos/asf/groovy/blob/276594ae/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/completion/StricterArgumentCompleter.groovy
----------------------------------------------------------------------
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/completion/StricterArgumentCompleter.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/completion/StricterArgumentCompleter.groovy
index 7acffee..291be54 100644
--- a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/completion/StricterArgumentCompleter.groovy
+++ b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/completion/StricterArgumentCompleter.groovy
@@ -20,8 +20,6 @@ package org.codehaus.groovy.tools.shell.completion
 
 import groovy.transform.CompileStatic
 import jline.console.completer.ArgumentCompleter
-import jline.console.completer.ArgumentCompleter.ArgumentDelimiter
-import jline.console.completer.ArgumentCompleter.ArgumentList
 import jline.console.completer.Completer
 import jline.internal.Log
 

http://git-wip-us.apache.org/repos/asf/groovy/blob/276594ae/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/util/ScriptVariableAnalyzer.groovy
----------------------------------------------------------------------
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/util/ScriptVariableAnalyzer.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/util/ScriptVariableAnalyzer.groovy
index ed3bab4..cfe2545 100644
--- a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/util/ScriptVariableAnalyzer.groovy
+++ b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/util/ScriptVariableAnalyzer.groovy
@@ -25,7 +25,11 @@ import org.codehaus.groovy.ast.DynamicVariable
 import org.codehaus.groovy.ast.GroovyClassVisitor
 import org.codehaus.groovy.ast.expr.VariableExpression
 import org.codehaus.groovy.classgen.GeneratorContext
-import org.codehaus.groovy.control.*
+import org.codehaus.groovy.control.CompilationFailedException
+import org.codehaus.groovy.control.CompilationUnit
+import org.codehaus.groovy.control.CompilerConfiguration
+import org.codehaus.groovy.control.Phases
+import org.codehaus.groovy.control.SourceUnit
 
 import java.security.CodeSource
 

http://git-wip-us.apache.org/repos/asf/groovy/blob/276594ae/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/util/XmlCommandRegistrar.groovy
----------------------------------------------------------------------
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/util/XmlCommandRegistrar.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/util/XmlCommandRegistrar.groovy
index 0b8fedf..0c1f9e2 100644
--- a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/util/XmlCommandRegistrar.groovy
+++ b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/util/XmlCommandRegistrar.groovy
@@ -18,8 +18,8 @@
  */
 package org.codehaus.groovy.tools.shell.util
 
-import org.codehaus.groovy.tools.shell.Shell
 import org.codehaus.groovy.tools.shell.Command
+import org.codehaus.groovy.tools.shell.Shell
 
 /**
  * Registers {@link Command} classes from an XML file like:

http://git-wip-us.apache.org/repos/asf/groovy/blob/276594ae/subprojects/groovy-jmx/src/main/groovy/groovy/jmx/builder/JmxBuilderTools.groovy
----------------------------------------------------------------------
diff --git a/subprojects/groovy-jmx/src/main/groovy/groovy/jmx/builder/JmxBuilderTools.groovy b/subprojects/groovy-jmx/src/main/groovy/groovy/jmx/builder/JmxBuilderTools.groovy
index 8bf5afb..85906dc 100644
--- a/subprojects/groovy-jmx/src/main/groovy/groovy/jmx/builder/JmxBuilderTools.groovy
+++ b/subprojects/groovy-jmx/src/main/groovy/groovy/jmx/builder/JmxBuilderTools.groovy
@@ -18,11 +18,11 @@
  */
 package groovy.jmx.builder
 
-import java.lang.management.ManagementFactory
 import javax.management.DynamicMBean
 import javax.management.MBeanServerConnection
 import javax.management.MBeanServerFactory
 import javax.management.ObjectName
+import java.lang.management.ManagementFactory
 
 /**
  * This is a utility class used as a helper for JmxBuilder.

http://git-wip-us.apache.org/repos/asf/groovy/blob/276594ae/subprojects/groovy-jmx/src/main/groovy/groovy/jmx/builder/JmxMetaMapBuilder.groovy
----------------------------------------------------------------------
diff --git a/subprojects/groovy-jmx/src/main/groovy/groovy/jmx/builder/JmxMetaMapBuilder.groovy b/subprojects/groovy-jmx/src/main/groovy/groovy/jmx/builder/JmxMetaMapBuilder.groovy
index 3ddc7f3..0886f64 100644
--- a/subprojects/groovy-jmx/src/main/groovy/groovy/jmx/builder/JmxMetaMapBuilder.groovy
+++ b/subprojects/groovy-jmx/src/main/groovy/groovy/jmx/builder/JmxMetaMapBuilder.groovy
@@ -18,8 +18,8 @@
  */
 package groovy.jmx.builder
 
-import java.lang.reflect.Constructor
 import javax.management.ObjectName
+import java.lang.reflect.Constructor
 
 /**
  * The JmxMetaMapBuilder class is used to collect meta data passed in JmxBuilder nodes.  Once collected,

http://git-wip-us.apache.org/repos/asf/groovy/blob/276594ae/subprojects/groovy-jmx/src/main/java/groovy/jmx/builder/JmxBuilderModelMBean.java
----------------------------------------------------------------------
diff --git a/subprojects/groovy-jmx/src/main/java/groovy/jmx/builder/JmxBuilderModelMBean.java b/subprojects/groovy-jmx/src/main/java/groovy/jmx/builder/JmxBuilderModelMBean.java
index 05c461e..656012e 100644
--- a/subprojects/groovy-jmx/src/main/java/groovy/jmx/builder/JmxBuilderModelMBean.java
+++ b/subprojects/groovy-jmx/src/main/java/groovy/jmx/builder/JmxBuilderModelMBean.java
@@ -20,7 +20,16 @@ package groovy.jmx.builder;
 
 import groovy.lang.Closure;
 
-import javax.management.*;
+import javax.management.AttributeChangeNotification;
+import javax.management.InstanceNotFoundException;
+import javax.management.MBeanException;
+import javax.management.MBeanServer;
+import javax.management.Notification;
+import javax.management.NotificationFilterSupport;
+import javax.management.NotificationListener;
+import javax.management.ObjectName;
+import javax.management.ReflectionException;
+import javax.management.RuntimeOperationsException;
 import javax.management.modelmbean.InvalidTargetObjectTypeException;
 import javax.management.modelmbean.ModelMBeanInfo;
 import javax.management.modelmbean.RequiredModelMBean;

http://git-wip-us.apache.org/repos/asf/groovy/blob/276594ae/subprojects/groovy-jmx/src/main/java/groovy/util/GroovyMBean.java
----------------------------------------------------------------------
diff --git a/subprojects/groovy-jmx/src/main/java/groovy/util/GroovyMBean.java b/subprojects/groovy-jmx/src/main/java/groovy/util/GroovyMBean.java
index b7e3e37..2be091f 100644
--- a/subprojects/groovy-jmx/src/main/java/groovy/util/GroovyMBean.java
+++ b/subprojects/groovy-jmx/src/main/java/groovy/util/GroovyMBean.java
@@ -21,9 +21,21 @@ package groovy.util;
 import groovy.lang.GroovyObjectSupport;
 import groovy.lang.GroovyRuntimeException;
 
-import javax.management.*;
+import javax.management.Attribute;
+import javax.management.JMException;
+import javax.management.MBeanAttributeInfo;
+import javax.management.MBeanException;
+import javax.management.MBeanInfo;
+import javax.management.MBeanOperationInfo;
+import javax.management.MBeanParameterInfo;
+import javax.management.MBeanServerConnection;
+import javax.management.ObjectName;
 import java.io.IOException;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 /**
  * A GroovyObject facade for an underlying MBean which acts like a normal

http://git-wip-us.apache.org/repos/asf/groovy/blob/276594ae/subprojects/groovy-json/src/main/java/groovy/json/JsonBuilder.java
----------------------------------------------------------------------
diff --git a/subprojects/groovy-json/src/main/java/groovy/json/JsonBuilder.java b/subprojects/groovy-json/src/main/java/groovy/json/JsonBuilder.java
index 2c53446..939570e 100644
--- a/subprojects/groovy-json/src/main/java/groovy/json/JsonBuilder.java
+++ b/subprojects/groovy-json/src/main/java/groovy/json/JsonBuilder.java
@@ -24,7 +24,13 @@ import groovy.lang.Writable;
 
 import java.io.IOException;
 import java.io.Writer;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
 
 /**
  * A builder for creating JSON payloads.

http://git-wip-us.apache.org/repos/asf/groovy/blob/276594ae/subprojects/groovy-json/src/main/java/groovy/json/JsonDelegate.java
----------------------------------------------------------------------
diff --git a/subprojects/groovy-json/src/main/java/groovy/json/JsonDelegate.java b/subprojects/groovy-json/src/main/java/groovy/json/JsonDelegate.java
index ed73e14..58d16b3 100644
--- a/subprojects/groovy-json/src/main/java/groovy/json/JsonDelegate.java
+++ b/subprojects/groovy-json/src/main/java/groovy/json/JsonDelegate.java
@@ -21,7 +21,12 @@ package groovy.json;
 import groovy.lang.Closure;
 import groovy.lang.GroovyObjectSupport;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
 
 /**
  * Utility class used as delegate of closures representing JSON objects.

http://git-wip-us.apache.org/repos/asf/groovy/blob/276594ae/subprojects/groovy-json/src/main/java/groovy/json/JsonLexer.java
----------------------------------------------------------------------
diff --git a/subprojects/groovy-json/src/main/java/groovy/json/JsonLexer.java b/subprojects/groovy-json/src/main/java/groovy/json/JsonLexer.java
index 73ceeeb..19df178 100644
--- a/subprojects/groovy-json/src/main/java/groovy/json/JsonLexer.java
+++ b/subprojects/groovy-json/src/main/java/groovy/json/JsonLexer.java
@@ -18,14 +18,18 @@
  */
 package groovy.json;
 
-import static groovy.json.JsonTokenType.*;
-
 import groovy.io.LineColumnReader;
 
 import java.io.IOException;
 import java.io.Reader;
 import java.util.Iterator;
 
+import static groovy.json.JsonTokenType.FALSE;
+import static groovy.json.JsonTokenType.NUMBER;
+import static groovy.json.JsonTokenType.OPEN_CURLY;
+import static groovy.json.JsonTokenType.STRING;
+import static groovy.json.JsonTokenType.startingWith;
+
 /**
  * The lexer reads JSON tokens in a streaming fashion from the underlying reader.
  *

http://git-wip-us.apache.org/repos/asf/groovy/blob/276594ae/subprojects/groovy-json/src/main/java/groovy/json/JsonOutput.java
----------------------------------------------------------------------
diff --git a/subprojects/groovy-json/src/main/java/groovy/json/JsonOutput.java b/subprojects/groovy-json/src/main/java/groovy/json/JsonOutput.java
index aa95b07..63bbf1d 100644
--- a/subprojects/groovy-json/src/main/java/groovy/json/JsonOutput.java
+++ b/subprojects/groovy-json/src/main/java/groovy/json/JsonOutput.java
@@ -25,7 +25,12 @@ import groovy.util.Expando;
 
 import java.io.StringReader;
 import java.net.URL;
-import java.util.*;
+import java.util.Arrays;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.UUID;
 
 /**
  * Class responsible for the actual String serialization of the possible values of a JSON structure.

http://git-wip-us.apache.org/repos/asf/groovy/blob/276594ae/subprojects/groovy-json/src/main/java/groovy/json/JsonSlurper.java
----------------------------------------------------------------------
diff --git a/subprojects/groovy-json/src/main/java/groovy/json/JsonSlurper.java b/subprojects/groovy-json/src/main/java/groovy/json/JsonSlurper.java
index 959d3b4..8808a05 100644
--- a/subprojects/groovy-json/src/main/java/groovy/json/JsonSlurper.java
+++ b/subprojects/groovy-json/src/main/java/groovy/json/JsonSlurper.java
@@ -30,7 +30,7 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.Reader;
 import java.net.URL;
-import java.util.*;
+import java.util.Map;
 
 /**
  * This has the same interface as the original JsonSlurper written for version 1.8.0, but its

http://git-wip-us.apache.org/repos/asf/groovy/blob/276594ae/subprojects/groovy-json/src/main/java/groovy/json/JsonToken.java
----------------------------------------------------------------------
diff --git a/subprojects/groovy-json/src/main/java/groovy/json/JsonToken.java b/subprojects/groovy-json/src/main/java/groovy/json/JsonToken.java
index 70c669d..a126825 100644
--- a/subprojects/groovy-json/src/main/java/groovy/json/JsonToken.java
+++ b/subprojects/groovy-json/src/main/java/groovy/json/JsonToken.java
@@ -21,7 +21,11 @@ package groovy.json;
 import java.math.BigDecimal;
 import java.math.BigInteger;
 
-import static groovy.json.JsonTokenType.*;
+import static groovy.json.JsonTokenType.FALSE;
+import static groovy.json.JsonTokenType.NULL;
+import static groovy.json.JsonTokenType.NUMBER;
+import static groovy.json.JsonTokenType.STRING;
+import static groovy.json.JsonTokenType.TRUE;
 
 /**
  * A JSON token, with a type, line / column information, and the text of that token.

http://git-wip-us.apache.org/repos/asf/groovy/blob/276594ae/subprojects/groovy-json/src/main/java/groovy/json/StreamingJsonBuilder.java
----------------------------------------------------------------------
diff --git a/subprojects/groovy-json/src/main/java/groovy/json/StreamingJsonBuilder.java b/subprojects/groovy-json/src/main/java/groovy/json/StreamingJsonBuilder.java
index f74789b..9a2a305 100644
--- a/subprojects/groovy-json/src/main/java/groovy/json/StreamingJsonBuilder.java
+++ b/subprojects/groovy-json/src/main/java/groovy/json/StreamingJsonBuilder.java
@@ -18,11 +18,19 @@
  */
 package groovy.json;
 
-import groovy.lang.*;
+import groovy.lang.Closure;
+import groovy.lang.DelegatesTo;
+import groovy.lang.GString;
+import groovy.lang.GroovyObjectSupport;
+import groovy.lang.Writable;
 
 import java.io.IOException;
 import java.io.Writer;
-import java.util.*;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
 
 /**
  * A builder for creating JSON payloads.

http://git-wip-us.apache.org/repos/asf/groovy/blob/276594ae/subprojects/groovy-json/src/main/java/groovy/json/internal/BaseJsonParser.java
----------------------------------------------------------------------
diff --git a/subprojects/groovy-json/src/main/java/groovy/json/internal/BaseJsonParser.java b/subprojects/groovy-json/src/main/java/groovy/json/internal/BaseJsonParser.java
index 699b1b8..10facaf 100644
--- a/subprojects/groovy-json/src/main/java/groovy/json/internal/BaseJsonParser.java
+++ b/subprojects/groovy-json/src/main/java/groovy/json/internal/BaseJsonParser.java
@@ -23,7 +23,12 @@ import groovy.json.JsonParser;
 import org.codehaus.groovy.runtime.DefaultGroovyMethodsSupport;
 import org.codehaus.groovy.runtime.ResourceGroovyMethods;
 
-import java.io.*;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.Reader;
+import java.io.UnsupportedEncodingException;
 import java.nio.charset.Charset;
 import java.util.concurrent.ConcurrentHashMap;
 

http://git-wip-us.apache.org/repos/asf/groovy/blob/276594ae/subprojects/groovy-json/src/main/java/groovy/json/internal/CharSequenceValue.java
----------------------------------------------------------------------
diff --git a/subprojects/groovy-json/src/main/java/groovy/json/internal/CharSequenceValue.java b/subprojects/groovy-json/src/main/java/groovy/json/internal/CharSequenceValue.java
index 9d76cd6..6b0477f 100644
--- a/subprojects/groovy-json/src/main/java/groovy/json/internal/CharSequenceValue.java
+++ b/subprojects/groovy-json/src/main/java/groovy/json/internal/CharSequenceValue.java
@@ -25,7 +25,9 @@ import java.math.BigInteger;
 import java.util.Arrays;
 import java.util.Date;
 
-import static groovy.json.internal.CharScanner.*;
+import static groovy.json.internal.CharScanner.isInteger;
+import static groovy.json.internal.CharScanner.parseIntFromTo;
+import static groovy.json.internal.CharScanner.parseLongFromTo;
 import static groovy.json.internal.Exceptions.die;
 
 /**

http://git-wip-us.apache.org/repos/asf/groovy/blob/276594ae/subprojects/groovy-json/src/main/java/groovy/json/internal/LazyMap.java
----------------------------------------------------------------------
diff --git a/subprojects/groovy-json/src/main/java/groovy/json/internal/LazyMap.java b/subprojects/groovy-json/src/main/java/groovy/json/internal/LazyMap.java
index 1b9fe9d..6d14ed1 100644
--- a/subprojects/groovy-json/src/main/java/groovy/json/internal/LazyMap.java
+++ b/subprojects/groovy-json/src/main/java/groovy/json/internal/LazyMap.java
@@ -19,7 +19,12 @@
 package groovy.json.internal;
 
 import java.lang.reflect.Array;
-import java.util.*;
+import java.util.AbstractMap;
+import java.util.Collection;
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.Set;
+import java.util.TreeMap;
 
 /**
  * This maps only builds once you ask for a key for the first time.

http://git-wip-us.apache.org/repos/asf/groovy/blob/276594ae/subprojects/groovy-json/src/main/java/groovy/json/internal/LazyValueMap.java
----------------------------------------------------------------------
diff --git a/subprojects/groovy-json/src/main/java/groovy/json/internal/LazyValueMap.java b/subprojects/groovy-json/src/main/java/groovy/json/internal/LazyValueMap.java
index 99f7460..364a76e 100644
--- a/subprojects/groovy-json/src/main/java/groovy/json/internal/LazyValueMap.java
+++ b/subprojects/groovy-json/src/main/java/groovy/json/internal/LazyValueMap.java
@@ -18,7 +18,12 @@
  */
 package groovy.json.internal;
 
-import java.util.*;
+import java.util.AbstractMap;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Set;
+import java.util.TreeMap;
 
 import static groovy.json.internal.Exceptions.die;
 

http://git-wip-us.apache.org/repos/asf/groovy/blob/276594ae/subprojects/groovy-json/src/main/java/groovy/json/internal/NumberValue.java
----------------------------------------------------------------------
diff --git a/subprojects/groovy-json/src/main/java/groovy/json/internal/NumberValue.java b/subprojects/groovy-json/src/main/java/groovy/json/internal/NumberValue.java
index f6e415c..800431a 100644
--- a/subprojects/groovy-json/src/main/java/groovy/json/internal/NumberValue.java
+++ b/subprojects/groovy-json/src/main/java/groovy/json/internal/NumberValue.java
@@ -25,7 +25,9 @@ import java.math.BigInteger;
 import java.util.Arrays;
 import java.util.Date;
 
-import static groovy.json.internal.CharScanner.*;
+import static groovy.json.internal.CharScanner.isInteger;
+import static groovy.json.internal.CharScanner.parseIntFromTo;
+import static groovy.json.internal.CharScanner.parseLongFromTo;
 import static groovy.json.internal.Exceptions.die;
 import static groovy.json.internal.Exceptions.sputs;
 

http://git-wip-us.apache.org/repos/asf/groovy/blob/276594ae/subprojects/groovy-json/src/main/java/groovy/json/internal/ValueMapImpl.java
----------------------------------------------------------------------
diff --git a/subprojects/groovy-json/src/main/java/groovy/json/internal/ValueMapImpl.java b/subprojects/groovy-json/src/main/java/groovy/json/internal/ValueMapImpl.java
index b2a7cfa..31a7b2c 100644
--- a/subprojects/groovy-json/src/main/java/groovy/json/internal/ValueMapImpl.java
+++ b/subprojects/groovy-json/src/main/java/groovy/json/internal/ValueMapImpl.java
@@ -18,7 +18,11 @@
  */
 package groovy.json.internal;
 
-import java.util.*;
+import java.util.AbstractMap;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Set;
 
 import static groovy.json.internal.Exceptions.die;
 

http://git-wip-us.apache.org/repos/asf/groovy/blob/276594ae/subprojects/groovy-jsr223/src/main/java/org/codehaus/groovy/jsr223/GroovyScriptEngineFactory.java
----------------------------------------------------------------------
diff --git a/subprojects/groovy-jsr223/src/main/java/org/codehaus/groovy/jsr223/GroovyScriptEngineFactory.java b/subprojects/groovy-jsr223/src/main/java/org/codehaus/groovy/jsr223/GroovyScriptEngineFactory.java
index 759ced7..c8deabf 100644
--- a/subprojects/groovy-jsr223/src/main/java/org/codehaus/groovy/jsr223/GroovyScriptEngineFactory.java
+++ b/subprojects/groovy-jsr223/src/main/java/org/codehaus/groovy/jsr223/GroovyScriptEngineFactory.java
@@ -50,7 +50,6 @@ import groovy.lang.GroovySystem;
 
 import javax.script.ScriptEngine;
 import javax.script.ScriptEngineFactory;
-
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;

http://git-wip-us.apache.org/repos/asf/groovy/blob/276594ae/subprojects/groovy-jsr223/src/main/java/org/codehaus/groovy/jsr223/GroovyScriptEngineImpl.java
----------------------------------------------------------------------
diff --git a/subprojects/groovy-jsr223/src/main/java/org/codehaus/groovy/jsr223/GroovyScriptEngineImpl.java b/subprojects/groovy-jsr223/src/main/java/org/codehaus/groovy/jsr223/GroovyScriptEngineImpl.java
index 8fe62a5..651f2fa 100644
--- a/subprojects/groovy-jsr223/src/main/java/org/codehaus/groovy/jsr223/GroovyScriptEngineImpl.java
+++ b/subprojects/groovy-jsr223/src/main/java/org/codehaus/groovy/jsr223/GroovyScriptEngineImpl.java
@@ -55,14 +55,13 @@ import groovy.lang.MissingMethodException;
 import groovy.lang.MissingPropertyException;
 import groovy.lang.Script;
 import groovy.lang.Tuple;
-
 import org.codehaus.groovy.control.CompilationFailedException;
 import org.codehaus.groovy.control.CompilerConfiguration;
-import org.codehaus.groovy.util.ManagedConcurrentValueMap;
-import org.codehaus.groovy.util.ReferenceBundle;
 import org.codehaus.groovy.runtime.InvokerHelper;
 import org.codehaus.groovy.runtime.MetaClassHelper;
 import org.codehaus.groovy.runtime.MethodClosure;
+import org.codehaus.groovy.util.ManagedConcurrentValueMap;
+import org.codehaus.groovy.util.ReferenceBundle;
 
 import javax.script.AbstractScriptEngine;
 import javax.script.Bindings;
@@ -73,12 +72,10 @@ import javax.script.ScriptContext;
 import javax.script.ScriptEngineFactory;
 import javax.script.ScriptException;
 import javax.script.SimpleBindings;
-
 import java.io.IOException;
 import java.io.PrintWriter;
 import java.io.Reader;
 import java.io.Writer;
-
 import java.lang.reflect.InvocationHandler;
 import java.lang.reflect.Method;
 import java.lang.reflect.Proxy;

http://git-wip-us.apache.org/repos/asf/groovy/blob/276594ae/subprojects/groovy-macro/src/main/groovy/org/codehaus/groovy/macro/matcher/ASTFinder.java
----------------------------------------------------------------------
diff --git a/subprojects/groovy-macro/src/main/groovy/org/codehaus/groovy/macro/matcher/ASTFinder.java b/subprojects/groovy-macro/src/main/groovy/org/codehaus/groovy/macro/matcher/ASTFinder.java
index 409a523..b22e116 100644
--- a/subprojects/groovy-macro/src/main/groovy/org/codehaus/groovy/macro/matcher/ASTFinder.java
+++ b/subprojects/groovy-macro/src/main/groovy/org/codehaus/groovy/macro/matcher/ASTFinder.java
@@ -25,7 +25,40 @@ import org.codehaus.groovy.ast.MethodNode;
 import org.codehaus.groovy.ast.ModuleNode;
 import org.codehaus.groovy.ast.PackageNode;
 import org.codehaus.groovy.ast.PropertyNode;
-import org.codehaus.groovy.ast.expr.*;
+import org.codehaus.groovy.ast.expr.ArgumentListExpression;
+import org.codehaus.groovy.ast.expr.ArrayExpression;
+import org.codehaus.groovy.ast.expr.AttributeExpression;
+import org.codehaus.groovy.ast.expr.BinaryExpression;
+import org.codehaus.groovy.ast.expr.BitwiseNegationExpression;
+import org.codehaus.groovy.ast.expr.BooleanExpression;
+import org.codehaus.groovy.ast.expr.CastExpression;
+import org.codehaus.groovy.ast.expr.ClassExpression;
+import org.codehaus.groovy.ast.expr.ClosureExpression;
+import org.codehaus.groovy.ast.expr.ClosureListExpression;
+import org.codehaus.groovy.ast.expr.ConstantExpression;
+import org.codehaus.groovy.ast.expr.ConstructorCallExpression;
+import org.codehaus.groovy.ast.expr.DeclarationExpression;
+import org.codehaus.groovy.ast.expr.ElvisOperatorExpression;
+import org.codehaus.groovy.ast.expr.FieldExpression;
+import org.codehaus.groovy.ast.expr.GStringExpression;
+import org.codehaus.groovy.ast.expr.ListExpression;
+import org.codehaus.groovy.ast.expr.MapEntryExpression;
+import org.codehaus.groovy.ast.expr.MapExpression;
+import org.codehaus.groovy.ast.expr.MethodCallExpression;
+import org.codehaus.groovy.ast.expr.MethodPointerExpression;
+import org.codehaus.groovy.ast.expr.NotExpression;
+import org.codehaus.groovy.ast.expr.PostfixExpression;
+import org.codehaus.groovy.ast.expr.PrefixExpression;
+import org.codehaus.groovy.ast.expr.PropertyExpression;
+import org.codehaus.groovy.ast.expr.RangeExpression;
+import org.codehaus.groovy.ast.expr.SpreadExpression;
+import org.codehaus.groovy.ast.expr.SpreadMapExpression;
+import org.codehaus.groovy.ast.expr.StaticMethodCallExpression;
+import org.codehaus.groovy.ast.expr.TernaryExpression;
+import org.codehaus.groovy.ast.expr.TupleExpression;
+import org.codehaus.groovy.ast.expr.UnaryMinusExpression;
+import org.codehaus.groovy.ast.expr.UnaryPlusExpression;
+import org.codehaus.groovy.ast.expr.VariableExpression;
 import org.codehaus.groovy.ast.stmt.AssertStatement;
 import org.codehaus.groovy.ast.stmt.BlockStatement;
 import org.codehaus.groovy.ast.stmt.BreakStatement;

http://git-wip-us.apache.org/repos/asf/groovy/blob/276594ae/subprojects/groovy-macro/src/main/groovy/org/codehaus/groovy/macro/matcher/ASTMatcher.groovy
----------------------------------------------------------------------
diff --git a/subprojects/groovy-macro/src/main/groovy/org/codehaus/groovy/macro/matcher/ASTMatcher.groovy b/subprojects/groovy-macro/src/main/groovy/org/codehaus/groovy/macro/matcher/ASTMatcher.groovy
index bbb0168..d2164e8 100644
--- a/subprojects/groovy-macro/src/main/groovy/org/codehaus/groovy/macro/matcher/ASTMatcher.groovy
+++ b/subprojects/groovy-macro/src/main/groovy/org/codehaus/groovy/macro/matcher/ASTMatcher.groovy
@@ -20,8 +20,52 @@ package org.codehaus.groovy.macro.matcher
 
 import groovy.transform.CompileStatic
 import groovy.transform.TypeCheckingMode
-import org.codehaus.groovy.ast.*
-import org.codehaus.groovy.ast.expr.*
+import org.codehaus.groovy.ast.ASTNode
+import org.codehaus.groovy.ast.AnnotatedNode
+import org.codehaus.groovy.ast.AnnotationNode
+import org.codehaus.groovy.ast.ClassNode
+import org.codehaus.groovy.ast.ConstructorNode
+import org.codehaus.groovy.ast.FieldNode
+import org.codehaus.groovy.ast.ImportNode
+import org.codehaus.groovy.ast.MethodNode
+import org.codehaus.groovy.ast.ModuleNode
+import org.codehaus.groovy.ast.PackageNode
+import org.codehaus.groovy.ast.Parameter
+import org.codehaus.groovy.ast.PropertyNode
+import org.codehaus.groovy.ast.expr.ArgumentListExpression
+import org.codehaus.groovy.ast.expr.ArrayExpression
+import org.codehaus.groovy.ast.expr.AttributeExpression
+import org.codehaus.groovy.ast.expr.BinaryExpression
+import org.codehaus.groovy.ast.expr.BitwiseNegationExpression
+import org.codehaus.groovy.ast.expr.BooleanExpression
+import org.codehaus.groovy.ast.expr.CastExpression
+import org.codehaus.groovy.ast.expr.ClassExpression
+import org.codehaus.groovy.ast.expr.ClosureExpression
+import org.codehaus.groovy.ast.expr.ClosureListExpression
+import org.codehaus.groovy.ast.expr.ConstantExpression
+import org.codehaus.groovy.ast.expr.ConstructorCallExpression
+import org.codehaus.groovy.ast.expr.DeclarationExpression
+import org.codehaus.groovy.ast.expr.Expression
+import org.codehaus.groovy.ast.expr.FieldExpression
+import org.codehaus.groovy.ast.expr.GStringExpression
+import org.codehaus.groovy.ast.expr.ListExpression
+import org.codehaus.groovy.ast.expr.MapEntryExpression
+import org.codehaus.groovy.ast.expr.MapExpression
+import org.codehaus.groovy.ast.expr.MethodCallExpression
+import org.codehaus.groovy.ast.expr.MethodPointerExpression
+import org.codehaus.groovy.ast.expr.NotExpression
+import org.codehaus.groovy.ast.expr.PostfixExpression
+import org.codehaus.groovy.ast.expr.PrefixExpression
+import org.codehaus.groovy.ast.expr.PropertyExpression
+import org.codehaus.groovy.ast.expr.RangeExpression
+import org.codehaus.groovy.ast.expr.SpreadExpression
+import org.codehaus.groovy.ast.expr.SpreadMapExpression
+import org.codehaus.groovy.ast.expr.StaticMethodCallExpression
+import org.codehaus.groovy.ast.expr.TernaryExpression
+import org.codehaus.groovy.ast.expr.TupleExpression
+import org.codehaus.groovy.ast.expr.UnaryMinusExpression
+import org.codehaus.groovy.ast.expr.UnaryPlusExpression
+import org.codehaus.groovy.ast.expr.VariableExpression
 import org.codehaus.groovy.ast.stmt.BlockStatement
 import org.codehaus.groovy.ast.stmt.ExpressionStatement
 import org.codehaus.groovy.ast.stmt.ForStatement

http://git-wip-us.apache.org/repos/asf/groovy/blob/276594ae/subprojects/groovy-macro/src/main/groovy/org/codehaus/groovy/macro/matcher/ContextualClassCodeVisitor.java
----------------------------------------------------------------------
diff --git a/subprojects/groovy-macro/src/main/groovy/org/codehaus/groovy/macro/matcher/ContextualClassCodeVisitor.java b/subprojects/groovy-macro/src/main/groovy/org/codehaus/groovy/macro/matcher/ContextualClassCodeVisitor.java
index e39ac05..f062837 100644
--- a/subprojects/groovy-macro/src/main/groovy/org/codehaus/groovy/macro/matcher/ContextualClassCodeVisitor.java
+++ b/subprojects/groovy-macro/src/main/groovy/org/codehaus/groovy/macro/matcher/ContextualClassCodeVisitor.java
@@ -27,7 +27,39 @@ import org.codehaus.groovy.ast.MethodNode;
 import org.codehaus.groovy.ast.ModuleNode;
 import org.codehaus.groovy.ast.PackageNode;
 import org.codehaus.groovy.ast.PropertyNode;
-import org.codehaus.groovy.ast.expr.*;
+import org.codehaus.groovy.ast.expr.ArrayExpression;
+import org.codehaus.groovy.ast.expr.AttributeExpression;
+import org.codehaus.groovy.ast.expr.BinaryExpression;
+import org.codehaus.groovy.ast.expr.BitwiseNegationExpression;
+import org.codehaus.groovy.ast.expr.BooleanExpression;
+import org.codehaus.groovy.ast.expr.CastExpression;
+import org.codehaus.groovy.ast.expr.ClassExpression;
+import org.codehaus.groovy.ast.expr.ClosureExpression;
+import org.codehaus.groovy.ast.expr.ClosureListExpression;
+import org.codehaus.groovy.ast.expr.ConstantExpression;
+import org.codehaus.groovy.ast.expr.ConstructorCallExpression;
+import org.codehaus.groovy.ast.expr.ElvisOperatorExpression;
+import org.codehaus.groovy.ast.expr.Expression;
+import org.codehaus.groovy.ast.expr.FieldExpression;
+import org.codehaus.groovy.ast.expr.GStringExpression;
+import org.codehaus.groovy.ast.expr.ListExpression;
+import org.codehaus.groovy.ast.expr.MapEntryExpression;
+import org.codehaus.groovy.ast.expr.MapExpression;
+import org.codehaus.groovy.ast.expr.MethodCallExpression;
+import org.codehaus.groovy.ast.expr.MethodPointerExpression;
+import org.codehaus.groovy.ast.expr.NotExpression;
+import org.codehaus.groovy.ast.expr.PostfixExpression;
+import org.codehaus.groovy.ast.expr.PrefixExpression;
+import org.codehaus.groovy.ast.expr.PropertyExpression;
+import org.codehaus.groovy.ast.expr.RangeExpression;
+import org.codehaus.groovy.ast.expr.SpreadExpression;
+import org.codehaus.groovy.ast.expr.SpreadMapExpression;
+import org.codehaus.groovy.ast.expr.StaticMethodCallExpression;
+import org.codehaus.groovy.ast.expr.TernaryExpression;
+import org.codehaus.groovy.ast.expr.TupleExpression;
+import org.codehaus.groovy.ast.expr.UnaryMinusExpression;
+import org.codehaus.groovy.ast.expr.UnaryPlusExpression;
+import org.codehaus.groovy.ast.expr.VariableExpression;
 import org.codehaus.groovy.ast.stmt.AssertStatement;
 import org.codehaus.groovy.ast.stmt.BlockStatement;
 import org.codehaus.groovy.ast.stmt.BreakStatement;

http://git-wip-us.apache.org/repos/asf/groovy/blob/276594ae/subprojects/groovy-macro/src/main/groovy/org/codehaus/groovy/macro/matcher/internal/MatchingConstraintsBuilder.groovy
----------------------------------------------------------------------
diff --git a/subprojects/groovy-macro/src/main/groovy/org/codehaus/groovy/macro/matcher/internal/MatchingConstraintsBuilder.groovy b/subprojects/groovy-macro/src/main/groovy/org/codehaus/groovy/macro/matcher/internal/MatchingConstraintsBuilder.groovy
index 0c4d195..a50c401 100644
--- a/subprojects/groovy-macro/src/main/groovy/org/codehaus/groovy/macro/matcher/internal/MatchingConstraintsBuilder.groovy
+++ b/subprojects/groovy-macro/src/main/groovy/org/codehaus/groovy/macro/matcher/internal/MatchingConstraintsBuilder.groovy
@@ -18,7 +18,6 @@
  */
 package org.codehaus.groovy.macro.matcher.internal
 
-import org.codehaus.groovy.ast.ASTNode
 import org.codehaus.groovy.macro.matcher.MatchingConstraints
 import org.codehaus.groovy.macro.matcher.TreeContext
 import org.codehaus.groovy.syntax.Token

http://git-wip-us.apache.org/repos/asf/groovy/blob/276594ae/subprojects/groovy-macro/src/main/groovy/org/codehaus/groovy/macro/methods/MacroGroovyMethods.java
----------------------------------------------------------------------
diff --git a/subprojects/groovy-macro/src/main/groovy/org/codehaus/groovy/macro/methods/MacroGroovyMethods.java b/subprojects/groovy-macro/src/main/groovy/org/codehaus/groovy/macro/methods/MacroGroovyMethods.java
index ae2a568..ee5e9c7 100644
--- a/subprojects/groovy-macro/src/main/groovy/org/codehaus/groovy/macro/methods/MacroGroovyMethods.java
+++ b/subprojects/groovy-macro/src/main/groovy/org/codehaus/groovy/macro/methods/MacroGroovyMethods.java
@@ -44,7 +44,11 @@ import org.codehaus.groovy.syntax.SyntaxException;
 
 import java.util.Iterator;
 
-import static org.codehaus.groovy.ast.tools.GeneralUtils.*;
+import static org.codehaus.groovy.ast.tools.GeneralUtils.args;
+import static org.codehaus.groovy.ast.tools.GeneralUtils.callX;
+import static org.codehaus.groovy.ast.tools.GeneralUtils.classX;
+import static org.codehaus.groovy.ast.tools.GeneralUtils.constX;
+import static org.codehaus.groovy.ast.tools.GeneralUtils.propX;
 
 public class MacroGroovyMethods {
 

http://git-wip-us.apache.org/repos/asf/groovy/blob/276594ae/subprojects/groovy-macro/src/main/groovy/org/codehaus/groovy/macro/transform/MacroCallTransformingVisitor.java
----------------------------------------------------------------------
diff --git a/subprojects/groovy-macro/src/main/groovy/org/codehaus/groovy/macro/transform/MacroCallTransformingVisitor.java b/subprojects/groovy-macro/src/main/groovy/org/codehaus/groovy/macro/transform/MacroCallTransformingVisitor.java
index 733d666..77d3196 100644
--- a/subprojects/groovy-macro/src/main/groovy/org/codehaus/groovy/macro/transform/MacroCallTransformingVisitor.java
+++ b/subprojects/groovy-macro/src/main/groovy/org/codehaus/groovy/macro/transform/MacroCallTransformingVisitor.java
@@ -18,8 +18,17 @@
  */
 package org.codehaus.groovy.macro.transform;
 
-import org.codehaus.groovy.ast.*;
-import org.codehaus.groovy.ast.expr.*;
+import org.codehaus.groovy.ast.ClassCodeVisitorSupport;
+import org.codehaus.groovy.ast.ClassHelper;
+import org.codehaus.groovy.ast.ClassNode;
+import org.codehaus.groovy.ast.GenericsType;
+import org.codehaus.groovy.ast.MethodNode;
+import org.codehaus.groovy.ast.expr.ClassExpression;
+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.PropertyExpression;
+import org.codehaus.groovy.ast.expr.TupleExpression;
 import org.codehaus.groovy.control.CompilationUnit;
 import org.codehaus.groovy.control.SourceUnit;
 import org.codehaus.groovy.macro.runtime.MacroContext;

http://git-wip-us.apache.org/repos/asf/groovy/blob/276594ae/subprojects/groovy-macro/src/main/groovy/org/codehaus/groovy/macro/transform/MacroClassTransformation.java
----------------------------------------------------------------------
diff --git a/subprojects/groovy-macro/src/main/groovy/org/codehaus/groovy/macro/transform/MacroClassTransformation.java b/subprojects/groovy-macro/src/main/groovy/org/codehaus/groovy/macro/transform/MacroClassTransformation.java
index 7ffc16b..9bf077c 100644
--- a/subprojects/groovy-macro/src/main/groovy/org/codehaus/groovy/macro/transform/MacroClassTransformation.java
+++ b/subprojects/groovy-macro/src/main/groovy/org/codehaus/groovy/macro/transform/MacroClassTransformation.java
@@ -18,7 +18,14 @@
  */
 package org.codehaus.groovy.macro.transform;
 
-import org.codehaus.groovy.ast.*;
+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.GroovyCodeVisitor;
+import org.codehaus.groovy.ast.InnerClassNode;
+import org.codehaus.groovy.ast.MethodCallTransformation;
+import org.codehaus.groovy.ast.TransformingCodeVisitor;
 import org.codehaus.groovy.ast.expr.ConstructorCallExpression;
 import org.codehaus.groovy.ast.expr.Expression;
 import org.codehaus.groovy.ast.expr.MethodCallExpression;
@@ -32,7 +39,11 @@ import org.codehaus.groovy.transform.GroovyASTTransformation;
 import java.util.Iterator;
 import java.util.List;
 
-import static org.codehaus.groovy.ast.tools.GeneralUtils.*;
+import static org.codehaus.groovy.ast.tools.GeneralUtils.args;
+import static org.codehaus.groovy.ast.tools.GeneralUtils.callX;
+import static org.codehaus.groovy.ast.tools.GeneralUtils.classX;
+import static org.codehaus.groovy.ast.tools.GeneralUtils.constX;
+import static org.codehaus.groovy.ast.tools.GeneralUtils.propX;
 
 /**
  * Transforms {@link MacroClass} calls into it's ClassNode

http://git-wip-us.apache.org/repos/asf/groovy/blob/276594ae/subprojects/groovy-macro/src/main/groovy/org/codehaus/groovy/macro/transform/MacroMethodsCache.java
----------------------------------------------------------------------
diff --git a/subprojects/groovy-macro/src/main/groovy/org/codehaus/groovy/macro/transform/MacroMethodsCache.java b/subprojects/groovy-macro/src/main/groovy/org/codehaus/groovy/macro/transform/MacroMethodsCache.java
index 90ca15b..e0d2b82 100644
--- a/subprojects/groovy-macro/src/main/groovy/org/codehaus/groovy/macro/transform/MacroMethodsCache.java
+++ b/subprojects/groovy-macro/src/main/groovy/org/codehaus/groovy/macro/transform/MacroMethodsCache.java
@@ -28,7 +28,12 @@ import org.codehaus.groovy.runtime.m12n.ExtensionModuleScanner;
 import org.codehaus.groovy.runtime.m12n.MetaInfExtensionModule;
 import org.codehaus.groovy.transform.stc.ExtensionMethodNode;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.WeakHashMap;
 import java.util.concurrent.locks.ReentrantReadWriteLock;
 
 /**

http://git-wip-us.apache.org/repos/asf/groovy/blob/276594ae/subprojects/groovy-macro/src/main/groovy/org/codehaus/groovy/macro/transform/MacroTransformation.java
----------------------------------------------------------------------
diff --git a/subprojects/groovy-macro/src/main/groovy/org/codehaus/groovy/macro/transform/MacroTransformation.java b/subprojects/groovy-macro/src/main/groovy/org/codehaus/groovy/macro/transform/MacroTransformation.java
index 3ea441a..f92cb87 100644
--- a/subprojects/groovy-macro/src/main/groovy/org/codehaus/groovy/macro/transform/MacroTransformation.java
+++ b/subprojects/groovy-macro/src/main/groovy/org/codehaus/groovy/macro/transform/MacroTransformation.java
@@ -19,7 +19,9 @@
 package org.codehaus.groovy.macro.transform;
 
 import groovy.transform.CompilationUnitAware;
-import org.codehaus.groovy.ast.*;
+import org.codehaus.groovy.ast.ASTNode;
+import org.codehaus.groovy.ast.GroovyCodeVisitor;
+import org.codehaus.groovy.ast.MethodCallTransformation;
 import org.codehaus.groovy.control.CompilationUnit;
 import org.codehaus.groovy.control.CompilePhase;
 import org.codehaus.groovy.control.SourceUnit;

http://git-wip-us.apache.org/repos/asf/groovy/blob/276594ae/subprojects/groovy-nio/src/main/java/org/codehaus/groovy/runtime/NioGroovyMethods.java
----------------------------------------------------------------------
diff --git a/subprojects/groovy-nio/src/main/java/org/codehaus/groovy/runtime/NioGroovyMethods.java b/subprojects/groovy-nio/src/main/java/org/codehaus/groovy/runtime/NioGroovyMethods.java
index d90d8d3..128bc09 100644
--- a/subprojects/groovy-nio/src/main/java/org/codehaus/groovy/runtime/NioGroovyMethods.java
+++ b/subprojects/groovy-nio/src/main/java/org/codehaus/groovy/runtime/NioGroovyMethods.java
@@ -18,9 +18,18 @@
  */
 package org.codehaus.groovy.runtime;
 
-import static java.nio.file.StandardOpenOption.APPEND;
-import static java.nio.file.StandardOpenOption.CREATE;
-import static org.codehaus.groovy.runtime.DefaultGroovyMethods.get;
+import groovy.io.FileType;
+import groovy.io.FileVisitResult;
+import groovy.io.GroovyPrintWriter;
+import groovy.lang.Closure;
+import groovy.lang.MetaClass;
+import groovy.lang.Writable;
+import groovy.transform.stc.ClosureParams;
+import groovy.transform.stc.FromString;
+import groovy.transform.stc.PickFirstResolver;
+import groovy.transform.stc.SimpleType;
+import org.codehaus.groovy.runtime.callsite.BooleanReturningMethodInvoker;
+import org.codehaus.groovy.runtime.typehandling.DefaultTypeTransformation;
 
 import java.io.BufferedInputStream;
 import java.io.BufferedOutputStream;
@@ -52,18 +61,9 @@ import java.util.List;
 import java.util.Map;
 import java.util.regex.Pattern;
 
-import groovy.io.FileType;
-import groovy.io.FileVisitResult;
-import groovy.io.GroovyPrintWriter;
-import groovy.lang.Closure;
-import groovy.lang.MetaClass;
-import groovy.lang.Writable;
-import groovy.transform.stc.ClosureParams;
-import groovy.transform.stc.FromString;
-import groovy.transform.stc.PickFirstResolver;
-import groovy.transform.stc.SimpleType;
-import org.codehaus.groovy.runtime.callsite.BooleanReturningMethodInvoker;
-import org.codehaus.groovy.runtime.typehandling.DefaultTypeTransformation;
+import static java.nio.file.StandardOpenOption.APPEND;
+import static java.nio.file.StandardOpenOption.CREATE;
+import static org.codehaus.groovy.runtime.DefaultGroovyMethods.get;
 
 /**
  * This class defines new groovy methods for Readers, Writers, InputStreams and

http://git-wip-us.apache.org/repos/asf/groovy/blob/276594ae/subprojects/groovy-nio/src/main/java/org/codehaus/groovy/runtime/WritablePath.java
----------------------------------------------------------------------
diff --git a/subprojects/groovy-nio/src/main/java/org/codehaus/groovy/runtime/WritablePath.java b/subprojects/groovy-nio/src/main/java/org/codehaus/groovy/runtime/WritablePath.java
index c33eff5..842872a 100644
--- a/subprojects/groovy-nio/src/main/java/org/codehaus/groovy/runtime/WritablePath.java
+++ b/subprojects/groovy-nio/src/main/java/org/codehaus/groovy/runtime/WritablePath.java
@@ -18,6 +18,8 @@
  */
 package org.codehaus.groovy.runtime;
 
+import groovy.lang.Writable;
+
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStreamReader;
@@ -34,8 +36,6 @@ import java.nio.file.WatchKey;
 import java.nio.file.WatchService;
 import java.util.Iterator;
 
-import groovy.lang.Writable;
-
 /**
  * A Writable Path.
  *

http://git-wip-us.apache.org/repos/asf/groovy/blob/276594ae/subprojects/groovy-servlet/src/main/java/groovy/servlet/AbstractHttpServlet.java
----------------------------------------------------------------------
diff --git a/subprojects/groovy-servlet/src/main/java/groovy/servlet/AbstractHttpServlet.java b/subprojects/groovy-servlet/src/main/java/groovy/servlet/AbstractHttpServlet.java
index ce2e67d..7e1dbbd 100644
--- a/subprojects/groovy-servlet/src/main/java/groovy/servlet/AbstractHttpServlet.java
+++ b/subprojects/groovy-servlet/src/main/java/groovy/servlet/AbstractHttpServlet.java
@@ -21,6 +21,11 @@ package groovy.servlet;
 import groovy.util.ResourceConnector;
 import groovy.util.ResourceException;
 
+import javax.servlet.ServletConfig;
+import javax.servlet.ServletContext;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
 import java.io.File;
 import java.io.IOException;
 import java.net.MalformedURLException;
@@ -31,12 +36,6 @@ import java.net.URLConnection;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-
 /**
  * A base class dealing with common HTTP servlet API housekeeping aspects.
  * <p>

http://git-wip-us.apache.org/repos/asf/groovy/blob/276594ae/subprojects/groovy-servlet/src/main/java/groovy/servlet/GroovyServlet.java
----------------------------------------------------------------------
diff --git a/subprojects/groovy-servlet/src/main/java/groovy/servlet/GroovyServlet.java b/subprojects/groovy-servlet/src/main/java/groovy/servlet/GroovyServlet.java
index e6653af..168f620 100644
--- a/subprojects/groovy-servlet/src/main/java/groovy/servlet/GroovyServlet.java
+++ b/subprojects/groovy-servlet/src/main/java/groovy/servlet/GroovyServlet.java
@@ -22,15 +22,13 @@ import groovy.lang.Closure;
 import groovy.util.GroovyScriptEngine;
 import groovy.util.ResourceException;
 import groovy.util.ScriptException;
-
-import java.io.IOException;
+import org.codehaus.groovy.runtime.GroovyCategorySupport;
 
 import javax.servlet.ServletConfig;
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-
-import org.codehaus.groovy.runtime.GroovyCategorySupport;
+import java.io.IOException;
 
 /**
  * This servlet will run Groovy scripts as Groovlets.  Groovlets are scripts

http://git-wip-us.apache.org/repos/asf/groovy/blob/276594ae/subprojects/groovy-servlet/src/main/java/groovy/servlet/ServletBinding.java
----------------------------------------------------------------------
diff --git a/subprojects/groovy-servlet/src/main/java/groovy/servlet/ServletBinding.java b/subprojects/groovy-servlet/src/main/java/groovy/servlet/ServletBinding.java
index bea4b55..3b386f9 100644
--- a/subprojects/groovy-servlet/src/main/java/groovy/servlet/ServletBinding.java
+++ b/subprojects/groovy-servlet/src/main/java/groovy/servlet/ServletBinding.java
@@ -20,6 +20,8 @@ package groovy.servlet;
 
 import groovy.lang.Binding;
 import groovy.xml.MarkupBuilder;
+import org.codehaus.groovy.GroovyBugError;
+import org.codehaus.groovy.runtime.MethodClosure;
 
 import javax.servlet.RequestDispatcher;
 import javax.servlet.ServletContext;
@@ -27,11 +29,11 @@ import javax.servlet.ServletException;
 import javax.servlet.ServletOutputStream;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-
-import org.codehaus.groovy.GroovyBugError;
-import org.codehaus.groovy.runtime.MethodClosure;
-
-import java.io.*;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.io.PrintWriter;
+import java.io.Writer;
 import java.lang.reflect.Constructor;
 import java.util.Enumeration;
 import java.util.LinkedHashMap;

http://git-wip-us.apache.org/repos/asf/groovy/blob/276594ae/subprojects/groovy-servlet/src/main/java/groovy/servlet/TemplateServlet.java
----------------------------------------------------------------------
diff --git a/subprojects/groovy-servlet/src/main/java/groovy/servlet/TemplateServlet.java b/subprojects/groovy-servlet/src/main/java/groovy/servlet/TemplateServlet.java
index 553ed3c..3f640de 100644
--- a/subprojects/groovy-servlet/src/main/java/groovy/servlet/TemplateServlet.java
+++ b/subprojects/groovy-servlet/src/main/java/groovy/servlet/TemplateServlet.java
@@ -22,6 +22,10 @@ import groovy.text.SimpleTemplateEngine;
 import groovy.text.Template;
 import groovy.text.TemplateEngine;
 
+import javax.servlet.ServletConfig;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
@@ -34,11 +38,6 @@ import java.util.Date;
 import java.util.Map;
 import java.util.WeakHashMap;
 
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
 /**
  * A generic servlet for serving (mostly HTML) templates.
  * <p>

http://git-wip-us.apache.org/repos/asf/groovy/blob/276594ae/subprojects/groovy-sql/src/main/java/groovy/sql/BatchingPreparedStatementWrapper.java
----------------------------------------------------------------------
diff --git a/subprojects/groovy-sql/src/main/java/groovy/sql/BatchingPreparedStatementWrapper.java b/subprojects/groovy-sql/src/main/java/groovy/sql/BatchingPreparedStatementWrapper.java
index 3a4dc0a..eb8d76c 100644
--- a/subprojects/groovy-sql/src/main/java/groovy/sql/BatchingPreparedStatementWrapper.java
+++ b/subprojects/groovy-sql/src/main/java/groovy/sql/BatchingPreparedStatementWrapper.java
@@ -22,7 +22,6 @@ import groovy.lang.Tuple;
 
 import java.sql.PreparedStatement;
 import java.sql.SQLException;
-
 import java.util.Arrays;
 import java.util.List;
 import java.util.logging.Logger;

http://git-wip-us.apache.org/repos/asf/groovy/blob/276594ae/subprojects/groovy-sql/src/main/java/groovy/sql/DataSet.java
----------------------------------------------------------------------
diff --git a/subprojects/groovy-sql/src/main/java/groovy/sql/DataSet.java b/subprojects/groovy-sql/src/main/java/groovy/sql/DataSet.java
index b294be0..551a349 100644
--- a/subprojects/groovy-sql/src/main/java/groovy/sql/DataSet.java
+++ b/subprojects/groovy-sql/src/main/java/groovy/sql/DataSet.java
@@ -23,13 +23,13 @@ import groovy.lang.GroovyRuntimeException;
 import groovy.transform.stc.ClosureParams;
 import groovy.transform.stc.SimpleType;
 import org.codehaus.groovy.ast.ClassNode;
-import org.codehaus.groovy.ast.MethodNode;
 import org.codehaus.groovy.ast.CodeVisitorSupport;
+import org.codehaus.groovy.ast.MethodNode;
 import org.codehaus.groovy.ast.stmt.Statement;
 
 import java.sql.Connection;
-import java.sql.SQLException;
 import java.sql.ResultSet;
+import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;

http://git-wip-us.apache.org/repos/asf/groovy/blob/276594ae/subprojects/groovy-sql/src/main/java/groovy/sql/GroovyResultSetExtension.java
----------------------------------------------------------------------
diff --git a/subprojects/groovy-sql/src/main/java/groovy/sql/GroovyResultSetExtension.java b/subprojects/groovy-sql/src/main/java/groovy/sql/GroovyResultSetExtension.java
index a1c7a83..e7eeda2 100644
--- a/subprojects/groovy-sql/src/main/java/groovy/sql/GroovyResultSetExtension.java
+++ b/subprojects/groovy-sql/src/main/java/groovy/sql/GroovyResultSetExtension.java
@@ -21,16 +21,15 @@ package groovy.sql;
 import groovy.lang.Closure;
 import groovy.lang.GroovyObjectSupport;
 import groovy.lang.MissingPropertyException;
+import org.codehaus.groovy.runtime.InvokerHelper;
+import org.codehaus.groovy.runtime.InvokerInvocationException;
 
 import java.sql.ResultSet;
-import java.sql.SQLException;
 import java.sql.ResultSetMetaData;
+import java.sql.SQLException;
 import java.util.Iterator;
 import java.util.Map;
 
-import org.codehaus.groovy.runtime.InvokerHelper;
-import org.codehaus.groovy.runtime.InvokerInvocationException;
-
 /**
  * GroovyResultSetExtension implements additional logic for ResultSet. Due to
  * the version incompatibility between java6 and java5 this methods are moved

http://git-wip-us.apache.org/repos/asf/groovy/blob/276594ae/subprojects/groovy-sql/src/main/java/groovy/sql/GroovyResultSetProxy.java
----------------------------------------------------------------------
diff --git a/subprojects/groovy-sql/src/main/java/groovy/sql/GroovyResultSetProxy.java b/subprojects/groovy-sql/src/main/java/groovy/sql/GroovyResultSetProxy.java
index 844847f..2e242d7 100644
--- a/subprojects/groovy-sql/src/main/java/groovy/sql/GroovyResultSetProxy.java
+++ b/subprojects/groovy-sql/src/main/java/groovy/sql/GroovyResultSetProxy.java
@@ -21,14 +21,13 @@ package groovy.sql;
 import groovy.lang.GroovyObject;
 import groovy.lang.GroovySystem;
 import groovy.lang.MetaClass;
+import org.codehaus.groovy.runtime.InvokerHelper;
 
 import java.lang.reflect.InvocationHandler;
 import java.lang.reflect.Method;
 import java.lang.reflect.Proxy;
 import java.sql.ResultSet;
 
-import org.codehaus.groovy.runtime.InvokerHelper;
-
 /**
  * GroovyResultSetProxy is used to create a proxy for GroovyResultSet.
  * Due to the version incompatibility between java 6 and older versions

http://git-wip-us.apache.org/repos/asf/groovy/blob/276594ae/subprojects/groovy-sql/src/main/java/groovy/sql/ResultSetMetaDataWrapper.java
----------------------------------------------------------------------
diff --git a/subprojects/groovy-sql/src/main/java/groovy/sql/ResultSetMetaDataWrapper.java b/subprojects/groovy-sql/src/main/java/groovy/sql/ResultSetMetaDataWrapper.java
index a55840b..05ccdb3 100644
--- a/subprojects/groovy-sql/src/main/java/groovy/sql/ResultSetMetaDataWrapper.java
+++ b/subprojects/groovy-sql/src/main/java/groovy/sql/ResultSetMetaDataWrapper.java
@@ -18,13 +18,13 @@
  */
 package groovy.sql;
 
-import java.sql.ResultSetMetaData;
-
 import groovy.lang.GroovyObjectSupport;
 import groovy.lang.MissingPropertyException;
 import groovy.lang.ReadOnlyPropertyException;
 import org.codehaus.groovy.runtime.InvokerHelper;
 
+import java.sql.ResultSetMetaData;
+
 /**
  * This class defines a wrapper for accessing a specific column in <code>ResultSetMetaData</code>.
  * This allows iteration over columns using idiomatic Groovy, e.g.:

http://git-wip-us.apache.org/repos/asf/groovy/blob/276594ae/subprojects/groovy-sql/src/main/java/groovy/sql/Sql.java
----------------------------------------------------------------------
diff --git a/subprojects/groovy-sql/src/main/java/groovy/sql/Sql.java b/subprojects/groovy-sql/src/main/java/groovy/sql/Sql.java
index 1eb6ccc..9d92043 100644
--- a/subprojects/groovy-sql/src/main/java/groovy/sql/Sql.java
+++ b/subprojects/groovy-sql/src/main/java/groovy/sql/Sql.java
@@ -20,7 +20,13 @@ package groovy.sql;
 
 import groovy.lang.Closure;
 import groovy.lang.GString;
+import groovy.lang.MissingPropertyException;
+import groovy.lang.Tuple;
+import groovy.transform.stc.ClosureParams;
+import groovy.transform.stc.SimpleType;
+import org.codehaus.groovy.runtime.InvokerHelper;
 
+import javax.sql.DataSource;
 import java.security.AccessController;
 import java.security.PrivilegedActionException;
 import java.security.PrivilegedExceptionAction;
@@ -33,19 +39,18 @@ import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.Statement;
 import java.sql.Types;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
 import java.util.logging.Logger;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import javax.sql.DataSource;
-
-import groovy.lang.MissingPropertyException;
-import groovy.lang.Tuple;
-import groovy.transform.stc.ClosureParams;
-import groovy.transform.stc.SimpleType;
-import org.codehaus.groovy.runtime.InvokerHelper;
-
 import static org.codehaus.groovy.runtime.SqlGroovyMethods.toRowResult;
 
 /**

http://git-wip-us.apache.org/repos/asf/groovy/blob/276594ae/subprojects/groovy-sql/src/main/java/groovy/sql/SqlWhereVisitor.java
----------------------------------------------------------------------
diff --git a/subprojects/groovy-sql/src/main/java/groovy/sql/SqlWhereVisitor.java b/subprojects/groovy-sql/src/main/java/groovy/sql/SqlWhereVisitor.java
index 08c4e7e..f994cae 100644
--- a/subprojects/groovy-sql/src/main/java/groovy/sql/SqlWhereVisitor.java
+++ b/subprojects/groovy-sql/src/main/java/groovy/sql/SqlWhereVisitor.java
@@ -18,9 +18,6 @@
  */
 package groovy.sql;
 
-import java.util.ArrayList;
-import java.util.List;
-
 import groovy.lang.GroovyRuntimeException;
 import org.codehaus.groovy.ast.CodeVisitorSupport;
 import org.codehaus.groovy.ast.expr.BinaryExpression;
@@ -33,6 +30,9 @@ import org.codehaus.groovy.ast.stmt.ReturnStatement;
 import org.codehaus.groovy.syntax.Token;
 import org.codehaus.groovy.syntax.Types;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * @author James Strachan
  */

http://git-wip-us.apache.org/repos/asf/groovy/blob/276594ae/subprojects/groovy-swing/src/main/groovy/groovy/swing/LookAndFeelHelper.groovy
----------------------------------------------------------------------
diff --git a/subprojects/groovy-swing/src/main/groovy/groovy/swing/LookAndFeelHelper.groovy b/subprojects/groovy-swing/src/main/groovy/groovy/swing/LookAndFeelHelper.groovy
index e2a90e3..6355d27 100644
--- a/subprojects/groovy-swing/src/main/groovy/groovy/swing/LookAndFeelHelper.groovy
+++ b/subprojects/groovy-swing/src/main/groovy/groovy/swing/LookAndFeelHelper.groovy
@@ -18,8 +18,7 @@
  */
 package groovy.swing
 
-import javax.swing.LookAndFeel
-import javax.swing.UIManager
+import javax.swing.*
 import javax.swing.plaf.metal.DefaultMetalTheme
 import javax.swing.plaf.metal.MetalLookAndFeel
 import javax.swing.plaf.metal.MetalTheme

http://git-wip-us.apache.org/repos/asf/groovy/blob/276594ae/subprojects/groovy-swing/src/main/groovy/groovy/swing/SwingBuilder.groovy
----------------------------------------------------------------------
diff --git a/subprojects/groovy-swing/src/main/groovy/groovy/swing/SwingBuilder.groovy b/subprojects/groovy-swing/src/main/groovy/groovy/swing/SwingBuilder.groovy
index 1089a54..e0306d9 100644
--- a/subprojects/groovy-swing/src/main/groovy/groovy/swing/SwingBuilder.groovy
+++ b/subprojects/groovy-swing/src/main/groovy/groovy/swing/SwingBuilder.groovy
@@ -18,72 +18,71 @@
  */
 package groovy.swing
 
-import java.lang.reflect.InvocationTargetException
-import java.util.logging.Logger
-import javax.swing.border.BevelBorder
-import javax.swing.border.EtchedBorder
-import javax.swing.table.TableColumn
-import org.codehaus.groovy.runtime.MethodClosure
-
-import java.awt.*
-import javax.swing.*
 import groovy.swing.factory.ActionFactory
-import groovy.swing.factory.MapFactory
+import groovy.swing.factory.BevelBorderFactory
 import groovy.swing.factory.BindFactory
+import groovy.swing.factory.BindGroupFactory
+import groovy.swing.factory.BindProxyFactory
+import groovy.swing.factory.BoxFactory
+import groovy.swing.factory.BoxLayoutFactory
+import groovy.swing.factory.ButtonGroupFactory
+import groovy.swing.factory.CellEditorFactory
+import groovy.swing.factory.CellEditorGetValueFactory
+import groovy.swing.factory.CellEditorPrepareFactory
+import groovy.swing.factory.ClosureColumnFactory
+import groovy.swing.factory.CollectionFactory
+import groovy.swing.factory.ColumnFactory
+import groovy.swing.factory.ColumnModelFactory
+import groovy.swing.factory.ComboBoxFactory
+import groovy.swing.factory.ComponentFactory
+import groovy.swing.factory.CompoundBorderFactory
 import groovy.swing.factory.DialogFactory
+import groovy.swing.factory.EmptyBorderFactory
+import groovy.swing.factory.EtchedBorderFactory
 import groovy.swing.factory.FormattedTextFactory
+import groovy.swing.factory.FrameFactory
+import groovy.swing.factory.GlueFactory
+import groovy.swing.factory.GridBagFactory
+import groovy.swing.factory.HBoxFactory
+import groovy.swing.factory.HGlueFactory
+import groovy.swing.factory.HStrutFactory
+import groovy.swing.factory.ImageIconFactory
+import groovy.swing.factory.InternalFrameFactory
+import groovy.swing.factory.LayoutFactory
+import groovy.swing.factory.LineBorderFactory
 import groovy.swing.factory.ListFactory
-import groovy.swing.factory.SeparatorFactory
-import groovy.swing.factory.ScrollPaneFactory
-import groovy.swing.factory.TableModelFactory
+import groovy.swing.factory.MapFactory
+import groovy.swing.factory.MatteBorderFactory
 import groovy.swing.factory.PropertyColumnFactory
-import groovy.swing.factory.ClosureColumnFactory
-import groovy.swing.factory.LineBorderFactory
-import groovy.swing.factory.BevelBorderFactory
-import groovy.swing.factory.ComponentFactory
-
-import groovy.swing.factory.BoxLayoutFactory
-import groovy.swing.factory.LayoutFactory
-import groovy.swing.factory.EmptyBorderFactory
-import groovy.swing.factory.TitledBorderFactory
-import groovy.swing.factory.CellEditorPrepareFactory
-import groovy.swing.factory.CellEditorGetValueFactory
-import groovy.swing.factory.CellEditorFactory
-import groovy.swing.factory.RendererUpdateFactory
 import groovy.swing.factory.RendererFactory
-import groovy.swing.factory.InternalFrameFactory
+import groovy.swing.factory.RendererUpdateFactory
+import groovy.swing.factory.RichActionWidgetFactory
 import groovy.swing.factory.RigidAreaFactory
-import groovy.swing.factory.GlueFactory
-import groovy.swing.factory.VStrutFactory
-import groovy.swing.factory.VGlueFactory
-import groovy.swing.factory.VBoxFactory
-import groovy.swing.factory.HStrutFactory
-import groovy.swing.factory.HGlueFactory
-import groovy.swing.factory.HBoxFactory
-import groovy.swing.factory.BoxFactory
-import groovy.swing.factory.ColumnFactory
-import groovy.swing.factory.BindGroupFactory
+import groovy.swing.factory.ScrollPaneFactory
+import groovy.swing.factory.SeparatorFactory
 import groovy.swing.factory.SplitPaneFactory
-import groovy.swing.factory.RichActionWidgetFactory
 import groovy.swing.factory.TDFactory
 import groovy.swing.factory.TRFactory
+import groovy.swing.factory.TabbedPaneFactory
+import groovy.swing.factory.TableFactory
 import groovy.swing.factory.TableLayoutFactory
-import groovy.swing.factory.WindowFactory
-import groovy.swing.factory.ComboBoxFactory
-import groovy.swing.factory.CompoundBorderFactory
+import groovy.swing.factory.TableModelFactory
 import groovy.swing.factory.TextArgWidgetFactory
-import groovy.swing.factory.ButtonGroupFactory
+import groovy.swing.factory.TitledBorderFactory
+import groovy.swing.factory.VBoxFactory
+import groovy.swing.factory.VGlueFactory
+import groovy.swing.factory.VStrutFactory
 import groovy.swing.factory.WidgetFactory
-import groovy.swing.factory.EtchedBorderFactory
-import groovy.swing.factory.TableFactory
-import groovy.swing.factory.GridBagFactory
-import groovy.swing.factory.MatteBorderFactory
-import groovy.swing.factory.FrameFactory
-import groovy.swing.factory.ColumnModelFactory
-import groovy.swing.factory.TabbedPaneFactory
-import groovy.swing.factory.BindProxyFactory
-import groovy.swing.factory.ImageIconFactory
-import groovy.swing.factory.CollectionFactory
+import groovy.swing.factory.WindowFactory
+import org.codehaus.groovy.runtime.MethodClosure
+
+import javax.swing.*
+import javax.swing.border.BevelBorder
+import javax.swing.border.EtchedBorder
+import javax.swing.table.TableColumn
+import java.awt.*
+import java.lang.reflect.InvocationTargetException
+import java.util.logging.Logger
 
 /**
  * A helper class for creating Swing widgets using GroovyMarkup

http://git-wip-us.apache.org/repos/asf/groovy/blob/276594ae/subprojects/groovy-swing/src/main/groovy/groovy/swing/binding/AbstractButtonProperties.java
----------------------------------------------------------------------
diff --git a/subprojects/groovy-swing/src/main/groovy/groovy/swing/binding/AbstractButtonProperties.java b/subprojects/groovy-swing/src/main/groovy/groovy/swing/binding/AbstractButtonProperties.java
index 8671270..56bdc04 100644
--- a/subprojects/groovy-swing/src/main/groovy/groovy/swing/binding/AbstractButtonProperties.java
+++ b/subprojects/groovy-swing/src/main/groovy/groovy/swing/binding/AbstractButtonProperties.java
@@ -18,7 +18,11 @@
  */
 package groovy.swing.binding;
 
-import org.codehaus.groovy.binding.*;
+import org.codehaus.groovy.binding.FullBinding;
+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 javax.swing.*;
 import java.awt.event.ItemEvent;

http://git-wip-us.apache.org/repos/asf/groovy/blob/276594ae/subprojects/groovy-swing/src/main/groovy/groovy/swing/binding/JComboBoxMetaMethods.groovy
----------------------------------------------------------------------
diff --git a/subprojects/groovy-swing/src/main/groovy/groovy/swing/binding/JComboBoxMetaMethods.groovy b/subprojects/groovy-swing/src/main/groovy/groovy/swing/binding/JComboBoxMetaMethods.groovy
index 3a9bc15..40d0a02 100644
--- a/subprojects/groovy-swing/src/main/groovy/groovy/swing/binding/JComboBoxMetaMethods.groovy
+++ b/subprojects/groovy-swing/src/main/groovy/groovy/swing/binding/JComboBoxMetaMethods.groovy
@@ -18,8 +18,7 @@
  */
 package groovy.swing.binding
 
-import javax.swing.ComboBoxModel
-import javax.swing.JComboBox
+import javax.swing.*
 
 /**
  * @author <a href="mailto:shemnon@yahoo.com">Danno Ferrin</a>

http://git-wip-us.apache.org/repos/asf/groovy/blob/276594ae/subprojects/groovy-swing/src/main/groovy/groovy/swing/binding/JComboBoxProperties.java
----------------------------------------------------------------------
diff --git a/subprojects/groovy-swing/src/main/groovy/groovy/swing/binding/JComboBoxProperties.java b/subprojects/groovy-swing/src/main/groovy/groovy/swing/binding/JComboBoxProperties.java
index 131bcde..a2c2fc7 100644
--- a/subprojects/groovy-swing/src/main/groovy/groovy/swing/binding/JComboBoxProperties.java
+++ b/subprojects/groovy-swing/src/main/groovy/groovy/swing/binding/JComboBoxProperties.java
@@ -18,16 +18,21 @@
  */
 package groovy.swing.binding;
 
-import org.codehaus.groovy.binding.*;
+import org.codehaus.groovy.binding.FullBinding;
+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 javax.swing.*;
-import javax.swing.event.*;
+import javax.swing.event.ListDataEvent;
+import javax.swing.event.ListDataListener;
+import java.awt.event.ItemEvent;
+import java.awt.event.ItemListener;
 import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
 import java.util.HashMap;
 import java.util.Map;
-import java.awt.event.ItemListener;
-import java.awt.event.ItemEvent;
 
 /**
  * @author <a href="mailto:shemnon@yahoo.com">Danno Ferrin</a>

http://git-wip-us.apache.org/repos/asf/groovy/blob/276594ae/subprojects/groovy-swing/src/main/groovy/groovy/swing/binding/JComponentProperties.java
----------------------------------------------------------------------
diff --git a/subprojects/groovy-swing/src/main/groovy/groovy/swing/binding/JComponentProperties.java b/subprojects/groovy-swing/src/main/groovy/groovy/swing/binding/JComponentProperties.java
index 1bc705b..cd97caa 100644
--- a/subprojects/groovy-swing/src/main/groovy/groovy/swing/binding/JComponentProperties.java
+++ b/subprojects/groovy-swing/src/main/groovy/groovy/swing/binding/JComponentProperties.java
@@ -18,11 +18,15 @@
  */
 package groovy.swing.binding;
 
-import org.codehaus.groovy.binding.*;
+import org.codehaus.groovy.binding.FullBinding;
+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 javax.swing.*;
 import java.awt.event.ComponentEvent;
 import java.awt.event.ComponentListener;
-import javax.swing.JComponent;
 import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
 import java.util.HashMap;

http://git-wip-us.apache.org/repos/asf/groovy/blob/276594ae/subprojects/groovy-swing/src/main/groovy/groovy/swing/binding/JListMetaMethods.groovy
----------------------------------------------------------------------
diff --git a/subprojects/groovy-swing/src/main/groovy/groovy/swing/binding/JListMetaMethods.groovy b/subprojects/groovy-swing/src/main/groovy/groovy/swing/binding/JListMetaMethods.groovy
index 32a715e..ef46be3 100644
--- a/subprojects/groovy-swing/src/main/groovy/groovy/swing/binding/JListMetaMethods.groovy
+++ b/subprojects/groovy-swing/src/main/groovy/groovy/swing/binding/JListMetaMethods.groovy
@@ -18,8 +18,7 @@
  */
 package groovy.swing.binding
 
-import javax.swing.ListModel
-import javax.swing.JList
+import javax.swing.*
 
 /**
  * @author <a href="mailto:shemnon@yahoo.com">Danno Ferrin</a>

http://git-wip-us.apache.org/repos/asf/groovy/blob/276594ae/subprojects/groovy-swing/src/main/groovy/groovy/swing/binding/JListProperties.groovy
----------------------------------------------------------------------
diff --git a/subprojects/groovy-swing/src/main/groovy/groovy/swing/binding/JListProperties.groovy b/subprojects/groovy-swing/src/main/groovy/groovy/swing/binding/JListProperties.groovy
index 76a222d..ebebb40 100644
--- a/subprojects/groovy-swing/src/main/groovy/groovy/swing/binding/JListProperties.groovy
+++ b/subprojects/groovy-swing/src/main/groovy/groovy/swing/binding/JListProperties.groovy
@@ -16,14 +16,21 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package groovy.swing.binding;
-
-import org.codehaus.groovy.binding.*;
-
-import javax.swing.*;
-import javax.swing.event.*;
-import java.beans.PropertyChangeEvent;
-import java.beans.PropertyChangeListener;
+package groovy.swing.binding
+
+import org.codehaus.groovy.binding.FullBinding
+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 javax.swing.*
+import javax.swing.event.ListDataEvent
+import javax.swing.event.ListDataListener
+import javax.swing.event.ListSelectionEvent
+import javax.swing.event.ListSelectionListener
+import java.beans.PropertyChangeEvent
+import java.beans.PropertyChangeListener
 
 /**
  * @author Andres Almiray

http://git-wip-us.apache.org/repos/asf/groovy/blob/276594ae/subprojects/groovy-swing/src/main/groovy/groovy/swing/binding/JScrollBarProperties.java
----------------------------------------------------------------------
diff --git a/subprojects/groovy-swing/src/main/groovy/groovy/swing/binding/JScrollBarProperties.java b/subprojects/groovy-swing/src/main/groovy/groovy/swing/binding/JScrollBarProperties.java
index b3d465e..36a4433 100644
--- a/subprojects/groovy-swing/src/main/groovy/groovy/swing/binding/JScrollBarProperties.java
+++ b/subprojects/groovy-swing/src/main/groovy/groovy/swing/binding/JScrollBarProperties.java
@@ -18,7 +18,11 @@
  */
 package groovy.swing.binding;
 
-import org.codehaus.groovy.binding.*;
+import org.codehaus.groovy.binding.FullBinding;
+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 javax.swing.*;
 import javax.swing.event.ChangeEvent;

http://git-wip-us.apache.org/repos/asf/groovy/blob/276594ae/subprojects/groovy-swing/src/main/groovy/groovy/swing/binding/JSliderProperties.java
----------------------------------------------------------------------
diff --git a/subprojects/groovy-swing/src/main/groovy/groovy/swing/binding/JSliderProperties.java b/subprojects/groovy-swing/src/main/groovy/groovy/swing/binding/JSliderProperties.java
index 53d1fa7..d9af8d7 100644
--- a/subprojects/groovy-swing/src/main/groovy/groovy/swing/binding/JSliderProperties.java
+++ b/subprojects/groovy-swing/src/main/groovy/groovy/swing/binding/JSliderProperties.java
@@ -18,7 +18,11 @@
  */
 package groovy.swing.binding;
 
-import org.codehaus.groovy.binding.*;
+import org.codehaus.groovy.binding.FullBinding;
+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 javax.swing.*;
 import javax.swing.event.ChangeEvent;

http://git-wip-us.apache.org/repos/asf/groovy/blob/276594ae/subprojects/groovy-swing/src/main/groovy/groovy/swing/binding/JSpinnerProperties.java
----------------------------------------------------------------------
diff --git a/subprojects/groovy-swing/src/main/groovy/groovy/swing/binding/JSpinnerProperties.java b/subprojects/groovy-swing/src/main/groovy/groovy/swing/binding/JSpinnerProperties.java
index 4861c3c..c19431e 100644
--- a/subprojects/groovy-swing/src/main/groovy/groovy/swing/binding/JSpinnerProperties.java
+++ b/subprojects/groovy-swing/src/main/groovy/groovy/swing/binding/JSpinnerProperties.java
@@ -18,7 +18,11 @@
  */
 package groovy.swing.binding;
 
-import org.codehaus.groovy.binding.*;
+import org.codehaus.groovy.binding.FullBinding;
+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 javax.swing.*;
 import javax.swing.event.ChangeEvent;

http://git-wip-us.apache.org/repos/asf/groovy/blob/276594ae/subprojects/groovy-swing/src/main/groovy/groovy/swing/binding/JTableMetaMethods.groovy
----------------------------------------------------------------------
diff --git a/subprojects/groovy-swing/src/main/groovy/groovy/swing/binding/JTableMetaMethods.groovy b/subprojects/groovy-swing/src/main/groovy/groovy/swing/binding/JTableMetaMethods.groovy
index 382407e..fb4cc9c 100644
--- a/subprojects/groovy-swing/src/main/groovy/groovy/swing/binding/JTableMetaMethods.groovy
+++ b/subprojects/groovy-swing/src/main/groovy/groovy/swing/binding/JTableMetaMethods.groovy
@@ -18,11 +18,12 @@
  */
 package groovy.swing.binding
 
-import javax.swing.JTable
+import org.codehaus.groovy.runtime.InvokerHelper
+
+import javax.swing.*
 import javax.swing.table.TableColumn
 import javax.swing.table.TableColumnModel
 import javax.swing.table.TableModel
-import org.codehaus.groovy.runtime.InvokerHelper
 
 class JTableMetaMethods {
 

http://git-wip-us.apache.org/repos/asf/groovy/blob/276594ae/subprojects/groovy-swing/src/main/groovy/groovy/swing/binding/JTableProperties.java
----------------------------------------------------------------------
diff --git a/subprojects/groovy-swing/src/main/groovy/groovy/swing/binding/JTableProperties.java b/subprojects/groovy-swing/src/main/groovy/groovy/swing/binding/JTableProperties.java
index cf5b2c3..73a89c7 100644
--- a/subprojects/groovy-swing/src/main/groovy/groovy/swing/binding/JTableProperties.java
+++ b/subprojects/groovy-swing/src/main/groovy/groovy/swing/binding/JTableProperties.java
@@ -19,7 +19,11 @@
 package groovy.swing.binding;
 
 
-import org.codehaus.groovy.binding.*;
+import org.codehaus.groovy.binding.FullBinding;
+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 javax.swing.*;
 import javax.swing.event.ListSelectionEvent;

http://git-wip-us.apache.org/repos/asf/groovy/blob/276594ae/subprojects/groovy-swing/src/main/groovy/groovy/swing/binding/JTextComponentProperties.java
----------------------------------------------------------------------
diff --git a/subprojects/groovy-swing/src/main/groovy/groovy/swing/binding/JTextComponentProperties.java b/subprojects/groovy-swing/src/main/groovy/groovy/swing/binding/JTextComponentProperties.java
index ffeec9b..cfd731e 100644
--- a/subprojects/groovy-swing/src/main/groovy/groovy/swing/binding/JTextComponentProperties.java
+++ b/subprojects/groovy-swing/src/main/groovy/groovy/swing/binding/JTextComponentProperties.java
@@ -18,7 +18,11 @@
  */
 package groovy.swing.binding;
 
-import org.codehaus.groovy.binding.*;
+import org.codehaus.groovy.binding.FullBinding;
+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 javax.swing.event.DocumentEvent;
 import javax.swing.event.DocumentListener;

http://git-wip-us.apache.org/repos/asf/groovy/blob/276594ae/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/ActionFactory.groovy
----------------------------------------------------------------------
diff --git a/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/ActionFactory.groovy b/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/ActionFactory.groovy
index baf37ea..12426ac 100644
--- a/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/ActionFactory.groovy
+++ b/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/ActionFactory.groovy
@@ -19,11 +19,10 @@
 package groovy.swing.factory
 
 import groovy.swing.impl.DefaultAction
-import javax.swing.Action
-import javax.swing.JComponent
-import javax.swing.KeyStroke
 import org.codehaus.groovy.runtime.InvokerHelper
 
+import javax.swing.*
+
 /**
  *
  * @author Danno Ferrin

http://git-wip-us.apache.org/repos/asf/groovy/blob/276594ae/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/BevelBorderFactory.groovy
----------------------------------------------------------------------
diff --git a/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/BevelBorderFactory.groovy b/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/BevelBorderFactory.groovy
index 3a591ca..e1f6dcd 100644
--- a/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/BevelBorderFactory.groovy
+++ b/subprojects/groovy-swing/src/main/groovy/groovy/swing/factory/BevelBorderFactory.groovy
@@ -18,8 +18,8 @@
  */
 package groovy.swing.factory
 
-import java.awt.Color
-import javax.swing.BorderFactory
+import javax.swing.*
+import java.awt.*
 
 /**
  * accepts no value<br>

http://git-wip-us.apache.org/repos/asf/groovy/blob/276594ae/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/276594ae/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 {