From cb92815cb0ffc6668ba9040e008a057813281321 Mon Sep 17 00:00:00 2001 From: Gintas Grigelionis Date: Fri, 11 May 2018 15:17:46 +0200 Subject: [PATCH] Sort imports --- src/main/org/apache/tools/ant/taskdefs/Ant.java | 2 +- src/main/org/apache/tools/ant/taskdefs/AntStructure.java | 2 +- .../apache/tools/ant/taskdefs/optional/ejb/IPlanetEjbc.java | 4 ++-- .../org/apache/tools/ant/filters/DynamicFilterTest.java | 2 +- .../org/apache/tools/ant/taskdefs/RmicAdvancedTest.java | 2 +- .../junit/org/apache/tools/ant/taskdefs/SQLExecTest.java | 6 +++--- src/tests/junit/org/apache/tools/ant/taskdefs/TarTest.java | 2 +- .../junit/org/apache/tools/ant/taskdefs/TouchTest.java | 2 +- 8 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/main/org/apache/tools/ant/taskdefs/Ant.java b/src/main/org/apache/tools/ant/taskdefs/Ant.java index ca3251995..b09448c76 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Ant.java +++ b/src/main/org/apache/tools/ant/taskdefs/Ant.java @@ -22,8 +22,8 @@ import java.io.File; import java.io.IOException; import java.io.PrintStream; import java.lang.reflect.Method; -import java.util.HashMap; import java.nio.file.Files; +import java.util.HashMap; import java.util.HashSet; import java.util.Iterator; import java.util.List; diff --git a/src/main/org/apache/tools/ant/taskdefs/AntStructure.java b/src/main/org/apache/tools/ant/taskdefs/AntStructure.java index a23efa161..39fe89fe5 100644 --- a/src/main/org/apache/tools/ant/taskdefs/AntStructure.java +++ b/src/main/org/apache/tools/ant/taskdefs/AntStructure.java @@ -25,8 +25,8 @@ import java.io.OutputStream; import java.io.OutputStreamWriter; import java.io.PrintWriter; import java.io.UnsupportedEncodingException; -import java.util.ArrayList; import java.nio.file.Files; +import java.util.ArrayList; import java.util.Enumeration; import java.util.Hashtable; import java.util.List; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/IPlanetEjbc.java b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/IPlanetEjbc.java index 8c930bc23..a49c7e0ca 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/IPlanetEjbc.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/IPlanetEjbc.java @@ -23,9 +23,9 @@ import java.io.File; import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; -import java.time.Instant; import java.nio.file.Files; import java.nio.file.Paths; +import java.time.Instant; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; @@ -41,11 +41,11 @@ import java.util.stream.Stream; import javax.xml.parsers.SAXParser; import javax.xml.parsers.SAXParserFactory; +import org.apache.tools.ant.util.StringUtils; import org.xml.sax.AttributeList; import org.xml.sax.HandlerBase; import org.xml.sax.InputSource; import org.xml.sax.SAXException; -import org.apache.tools.ant.util.StringUtils; /** * Compiles EJB stubs and skeletons for the iPlanet Application diff --git a/src/tests/junit/org/apache/tools/ant/filters/DynamicFilterTest.java b/src/tests/junit/org/apache/tools/ant/filters/DynamicFilterTest.java index b85b41e00..28f4d17d0 100644 --- a/src/tests/junit/org/apache/tools/ant/filters/DynamicFilterTest.java +++ b/src/tests/junit/org/apache/tools/ant/filters/DynamicFilterTest.java @@ -19,8 +19,8 @@ package org.apache.tools.ant.filters; import java.io.File; -import java.io.Reader; import java.io.IOException; +import java.io.Reader; import org.apache.tools.ant.BuildFileRule; import org.apache.tools.ant.FileUtilities; diff --git a/src/tests/junit/org/apache/tools/ant/taskdefs/RmicAdvancedTest.java b/src/tests/junit/org/apache/tools/ant/taskdefs/RmicAdvancedTest.java index 2322a360b..475ab9411 100644 --- a/src/tests/junit/org/apache/tools/ant/taskdefs/RmicAdvancedTest.java +++ b/src/tests/junit/org/apache/tools/ant/taskdefs/RmicAdvancedTest.java @@ -21,8 +21,8 @@ package org.apache.tools.ant.taskdefs; import org.apache.tools.ant.BuildFileRule; import org.apache.tools.ant.BuildException; -import org.apache.tools.ant.taskdefs.rmic.RmicAdapterFactory; import org.apache.tools.ant.taskdefs.rmic.DefaultRmicAdapter; +import org.apache.tools.ant.taskdefs.rmic.RmicAdapterFactory; import org.apache.tools.ant.util.JavaEnvUtils; import org.junit.Before; import org.junit.Ignore; diff --git a/src/tests/junit/org/apache/tools/ant/taskdefs/SQLExecTest.java b/src/tests/junit/org/apache/tools/ant/taskdefs/SQLExecTest.java index 5067c658f..e74b09372 100644 --- a/src/tests/junit/org/apache/tools/ant/taskdefs/SQLExecTest.java +++ b/src/tests/junit/org/apache/tools/ant/taskdefs/SQLExecTest.java @@ -17,13 +17,13 @@ */ package org.apache.tools.ant.taskdefs; -import java.sql.Driver; import java.sql.Connection; -import java.sql.SQLException; +import java.sql.Driver; import java.sql.DriverPropertyInfo; -import java.util.Properties; +import java.sql.SQLException; import java.io.File; import java.net.URL; +import java.util.Properties; import java.util.logging.Logger; import org.apache.tools.ant.BuildException; diff --git a/src/tests/junit/org/apache/tools/ant/taskdefs/TarTest.java b/src/tests/junit/org/apache/tools/ant/taskdefs/TarTest.java index e31aab654..d3f583a39 100644 --- a/src/tests/junit/org/apache/tools/ant/taskdefs/TarTest.java +++ b/src/tests/junit/org/apache/tools/ant/taskdefs/TarTest.java @@ -18,8 +18,8 @@ package org.apache.tools.ant.taskdefs; -import java.io.IOException; import java.io.File; +import java.io.IOException; import org.apache.tools.ant.BuildException; import org.apache.tools.ant.BuildFileRule; diff --git a/src/tests/junit/org/apache/tools/ant/taskdefs/TouchTest.java b/src/tests/junit/org/apache/tools/ant/taskdefs/TouchTest.java index 1924530b2..8c0acbdcf 100644 --- a/src/tests/junit/org/apache/tools/ant/taskdefs/TouchTest.java +++ b/src/tests/junit/org/apache/tools/ant/taskdefs/TouchTest.java @@ -18,8 +18,8 @@ package org.apache.tools.ant.taskdefs; -import org.apache.tools.ant.BuildFileRule; import org.apache.tools.ant.BuildException; +import org.apache.tools.ant.BuildFileRule; import org.apache.tools.ant.util.FileUtils; import org.junit.After; import org.junit.Before;