Repository: groovy Updated Branches: refs/heads/GROOVY_2_4_X 913ad1ef4 -> b9b2c891a
Optimize imports Project: http://git-wip-us.apache.org/repos/asf/groovy/repo Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/b9b2c891 Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/b9b2c891 Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/b9b2c891 Branch: refs/heads/GROOVY_2_4_X Commit: b9b2c891a489ec21901803bfe9bab831f9062839 Parents: 913ad1e Author: sunlan <[email protected]> Authored: Thu Nov 30 16:55:16 2017 +0800 Committer: sunlan <[email protected]> Committed: Thu Nov 30 16:55:16 2017 +0800 ---------------------------------------------------------------------- .../src/main/java/groovy/util/AntBuilder.java | 13 ++++++++++++- .../groovy/ant/AntProjectPropertiesDelegate.java | 4 ++-- .../org/codehaus/groovy/ant/CompileTaskSupport.java | 4 +--- .../main/java/org/codehaus/groovy/ant/FileScanner.java | 8 ++++---- .../org/codehaus/groovy/ant/GenerateStubsTask.java | 2 -- .../main/java/org/codehaus/groovy/ant/GroovycTask.java | 2 -- .../main/java/org/codehaus/groovy/ant/Groovydoc.java | 6 +++++- 7 files changed, 24 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/groovy/blob/b9b2c891/subprojects/groovy-ant/src/main/java/groovy/util/AntBuilder.java ---------------------------------------------------------------------- diff --git a/subprojects/groovy-ant/src/main/java/groovy/util/AntBuilder.java b/subprojects/groovy-ant/src/main/java/groovy/util/AntBuilder.java index 2e71ecc..92961e4 100644 --- a/subprojects/groovy-ant/src/main/java/groovy/util/AntBuilder.java +++ b/subprojects/groovy-ant/src/main/java/groovy/util/AntBuilder.java @@ -19,7 +19,18 @@ package groovy.util; import groovy.xml.QName; -import org.apache.tools.ant.*; +import org.apache.tools.ant.BuildException; +import org.apache.tools.ant.BuildLogger; +import org.apache.tools.ant.DemuxInputStream; +import org.apache.tools.ant.DemuxOutputStream; +import org.apache.tools.ant.Location; +import org.apache.tools.ant.NoBannerLogger; +import org.apache.tools.ant.Project; +import org.apache.tools.ant.ProjectHelper; +import org.apache.tools.ant.RuntimeConfigurable; +import org.apache.tools.ant.Target; +import org.apache.tools.ant.Task; +import org.apache.tools.ant.UnknownElement; import org.apache.tools.ant.dispatch.DispatchUtils; import org.apache.tools.ant.helper.AntXMLContext; import org.apache.tools.ant.helper.ProjectHelper2; http://git-wip-us.apache.org/repos/asf/groovy/blob/b9b2c891/subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/AntProjectPropertiesDelegate.java ---------------------------------------------------------------------- diff --git a/subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/AntProjectPropertiesDelegate.java b/subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/AntProjectPropertiesDelegate.java index 184a6e4..b56579b 100644 --- a/subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/AntProjectPropertiesDelegate.java +++ b/subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/AntProjectPropertiesDelegate.java @@ -20,12 +20,12 @@ package org.codehaus.groovy.ant; import org.apache.tools.ant.Project; -import java.util.Hashtable; import java.util.Collection; import java.util.Enumeration; +import java.util.Hashtable; +import java.util.Iterator; import java.util.Map; import java.util.Set; -import java.util.Iterator; /** * @author Guillaume Laforge http://git-wip-us.apache.org/repos/asf/groovy/blob/b9b2c891/subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/CompileTaskSupport.java ---------------------------------------------------------------------- diff --git a/subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/CompileTaskSupport.java b/subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/CompileTaskSupport.java index 0c9d90b..65177a1 100644 --- a/subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/CompileTaskSupport.java +++ b/subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/CompileTaskSupport.java @@ -19,18 +19,16 @@ package org.codehaus.groovy.ant; import groovy.lang.GroovyClassLoader; - import org.apache.tools.ant.BuildException; import org.apache.tools.ant.taskdefs.MatchingTask; import org.apache.tools.ant.types.Path; import org.apache.tools.ant.types.Reference; - import org.codehaus.groovy.control.CompilerConfiguration; import org.codehaus.groovy.tools.ErrorReporter; import java.io.File; -import java.io.StringWriter; import java.io.PrintWriter; +import java.io.StringWriter; /** * Support for compilation related tasks. http://git-wip-us.apache.org/repos/asf/groovy/blob/b9b2c891/subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/FileScanner.java ---------------------------------------------------------------------- diff --git a/subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/FileScanner.java b/subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/FileScanner.java index 9774e47..e9098f1 100644 --- a/subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/FileScanner.java +++ b/subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/FileScanner.java @@ -18,14 +18,14 @@ */ package org.codehaus.groovy.ant; -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; - import org.apache.tools.ant.Project; import org.apache.tools.ant.Task; import org.apache.tools.ant.types.FileSet; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; + /** * <p><code>FileScanner</code> is a bean which allows the iteration * over a number of files from a collection of FileSet instances. http://git-wip-us.apache.org/repos/asf/groovy/blob/b9b2c891/subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/GenerateStubsTask.java ---------------------------------------------------------------------- diff --git a/subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/GenerateStubsTask.java b/subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/GenerateStubsTask.java index 28964d3..f32df10 100644 --- a/subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/GenerateStubsTask.java +++ b/subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/GenerateStubsTask.java @@ -19,10 +19,8 @@ package org.codehaus.groovy.ant; import groovy.lang.GroovyClassLoader; - import org.apache.tools.ant.BuildException; import org.apache.tools.ant.DirectoryScanner; - import org.codehaus.groovy.tools.javac.JavaStubCompilationUnit; import java.io.File; http://git-wip-us.apache.org/repos/asf/groovy/blob/b9b2c891/subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/GroovycTask.java ---------------------------------------------------------------------- diff --git a/subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/GroovycTask.java b/subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/GroovycTask.java index 6c8fccd..eceea41 100644 --- a/subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/GroovycTask.java +++ b/subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/GroovycTask.java @@ -19,13 +19,11 @@ package org.codehaus.groovy.ant; import groovy.lang.GroovyClassLoader; - import org.apache.tools.ant.BuildException; import org.apache.tools.ant.DirectoryScanner; import org.apache.tools.ant.types.Path; import org.apache.tools.ant.util.GlobPatternMapper; import org.apache.tools.ant.util.SourceFileScanner; - import org.codehaus.groovy.control.CompilationUnit; import java.io.File; http://git-wip-us.apache.org/repos/asf/groovy/blob/b9b2c891/subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/Groovydoc.java ---------------------------------------------------------------------- diff --git a/subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/Groovydoc.java b/subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/Groovydoc.java index 682f175..5395742 100644 --- a/subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/Groovydoc.java +++ b/subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/Groovydoc.java @@ -34,7 +34,11 @@ import org.codehaus.groovy.tools.groovydoc.gstringTemplates.GroovyDocTemplateInf import java.io.File; import java.io.FilenameFilter; import java.io.IOException; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import java.util.Properties; +import java.util.StringTokenizer; /** * Access to the GroovyDoc tool from Ant.
