http://git-wip-us.apache.org/repos/asf/groovy/blob/117d6c24/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/117d6c24/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 6069c04..a2a09b0 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,11 +20,9 @@ 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 static jline.internal.Preconditions.checkNotNull; +import static jline.internal.Preconditions.checkNotNull /** * Similar to a strict jline ArgumentCompleter, this completer http://git-wip-us.apache.org/repos/asf/groovy/blob/117d6c24/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 3bed8b2..27635be 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/117d6c24/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/117d6c24/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/117d6c24/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/117d6c24/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 e661da3..1d769fa 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/117d6c24/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/117d6c24/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 0a30b7d..88b67ff 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/117d6c24/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 23969dc..1468b85 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/117d6c24/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 c1de561..9c9cb0c 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/117d6c24/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 322e9f1..e8e1c57 100644 --- a/subprojects/groovy-json/src/main/java/groovy/json/JsonOutput.java +++ b/subprojects/groovy-json/src/main/java/groovy/json/JsonOutput.java @@ -30,7 +30,18 @@ import java.math.BigDecimal; import java.math.BigInteger; import java.net.URL; import java.text.SimpleDateFormat; -import java.util.*; +import java.util.Arrays; +import java.util.Calendar; +import java.util.Collections; +import java.util.Date; +import java.util.Enumeration; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Locale; +import java.util.Map; +import java.util.TimeZone; +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/117d6c24/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/117d6c24/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/117d6c24/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 cce6e8d..fc548df 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/117d6c24/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/117d6c24/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/117d6c24/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/117d6c24/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/117d6c24/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 da98357..962369d 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/117d6c24/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/117d6c24/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/117d6c24/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/117d6c24/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 9089234..a4762cc 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,17 @@ */ 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.SimpleType; +import org.codehaus.groovy.runtime.callsite.BooleanReturningMethodInvoker; +import org.codehaus.groovy.runtime.typehandling.DefaultTypeTransformation; import java.io.BufferedInputStream; import java.io.BufferedOutputStream; @@ -52,17 +60,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.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/117d6c24/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/117d6c24/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/117d6c24/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/117d6c24/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 ad58122..2bf244e 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/117d6c24/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 f192380..9e714ab 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/117d6c24/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 b762313..985671e 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/117d6c24/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 d53e637..b6d5d6f 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/117d6c24/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/117d6c24/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 14caf6c..352c442 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/117d6c24/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 c7613d0..a359289 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/117d6c24/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/117d6c24/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/117d6c24/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/117d6c24/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/117d6c24/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:[email protected]";>Danno Ferrin</a> http://git-wip-us.apache.org/repos/asf/groovy/blob/117d6c24/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:[email protected]";>Danno Ferrin</a> http://git-wip-us.apache.org/repos/asf/groovy/blob/117d6c24/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/117d6c24/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:[email protected]";>Danno Ferrin</a> http://git-wip-us.apache.org/repos/asf/groovy/blob/117d6c24/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/117d6c24/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/117d6c24/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/117d6c24/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/117d6c24/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/117d6c24/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/117d6c24/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/117d6c24/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/117d6c24/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/117d6c24/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:[email protected]";>Danno Ferrin</a> http://git-wip-us.apache.org/repos/asf/groovy/blob/117d6c24/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/117d6c24/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/117d6c24/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/117d6c24/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/117d6c24/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/117d6c24/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/117d6c24/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/117d6c24/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/117d6c24/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/117d6c24/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/117d6c24/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/117d6c24/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/117d6c24/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/117d6c24/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/117d6c24/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/117d6c24/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/117d6c24/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/117d6c24/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/117d6c24/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/117d6c24/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/117d6c24/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/117d6c24/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/117d6c24/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/117d6c24/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/117d6c24/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/117d6c24/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 {
