diff options
Diffstat (limited to 'src/main/org/apache/tools/ant/types/selectors')
14 files changed, 36 insertions, 29 deletions
diff --git a/src/main/org/apache/tools/ant/types/selectors/DateSelector.java b/src/main/org/apache/tools/ant/types/selectors/DateSelector.java index e0cf072f0..aea94a8be 100644 --- a/src/main/org/apache/tools/ant/types/selectors/DateSelector.java +++ b/src/main/org/apache/tools/ant/types/selectors/DateSelector.java @@ -20,8 +20,8 @@ package org.apache.tools.ant.types.selectors; import java.io.File; import java.text.DateFormat; -import java.text.SimpleDateFormat; import java.text.ParseException; +import java.text.SimpleDateFormat; import java.util.Locale; import org.apache.tools.ant.Project; diff --git a/src/main/org/apache/tools/ant/types/selectors/DifferentSelector.java b/src/main/org/apache/tools/ant/types/selectors/DifferentSelector.java index 9b979e918..c701fb845 100644 --- a/src/main/org/apache/tools/ant/types/selectors/DifferentSelector.java +++ b/src/main/org/apache/tools/ant/types/selectors/DifferentSelector.java @@ -18,12 +18,12 @@ package org.apache.tools.ant.types.selectors; -import org.apache.tools.ant.util.FileUtils; -import org.apache.tools.ant.BuildException; - import java.io.File; import java.io.IOException; +import org.apache.tools.ant.BuildException; +import org.apache.tools.ant.util.FileUtils; + /** * This selector selects files against a mapped set of target files, selecting * all those files which are different. diff --git a/src/main/org/apache/tools/ant/types/selectors/ExtendSelector.java b/src/main/org/apache/tools/ant/types/selectors/ExtendSelector.java index d55768454..af8c920f6 100644 --- a/src/main/org/apache/tools/ant/types/selectors/ExtendSelector.java +++ b/src/main/org/apache/tools/ant/types/selectors/ExtendSelector.java @@ -21,9 +21,9 @@ package org.apache.tools.ant.types.selectors; import java.io.File; import java.util.Vector; -import org.apache.tools.ant.Project; import org.apache.tools.ant.AntClassLoader; import org.apache.tools.ant.BuildException; +import org.apache.tools.ant.Project; import org.apache.tools.ant.types.Parameter; import org.apache.tools.ant.types.Path; import org.apache.tools.ant.types.Reference; diff --git a/src/main/org/apache/tools/ant/types/selectors/MappingSelector.java b/src/main/org/apache/tools/ant/types/selectors/MappingSelector.java index 3b96f1b65..63e7a4493 100644 --- a/src/main/org/apache/tools/ant/types/selectors/MappingSelector.java +++ b/src/main/org/apache/tools/ant/types/selectors/MappingSelector.java @@ -18,13 +18,13 @@ package org.apache.tools.ant.types.selectors; -import org.apache.tools.ant.types.Mapper; +import java.io.File; + import org.apache.tools.ant.BuildException; -import org.apache.tools.ant.util.IdentityMapper; +import org.apache.tools.ant.types.Mapper; import org.apache.tools.ant.util.FileNameMapper; import org.apache.tools.ant.util.FileUtils; - -import java.io.File; +import org.apache.tools.ant.util.IdentityMapper; /** * A mapping selector is an abstract class adding mapping support to the base diff --git a/src/main/org/apache/tools/ant/types/selectors/ReadableSelector.java b/src/main/org/apache/tools/ant/types/selectors/ReadableSelector.java index f4ee5bae0..b0c527c5d 100644 --- a/src/main/org/apache/tools/ant/types/selectors/ReadableSelector.java +++ b/src/main/org/apache/tools/ant/types/selectors/ReadableSelector.java @@ -19,6 +19,7 @@ package org.apache.tools.ant.types.selectors; import java.io.File; + import org.apache.tools.ant.types.Resource; import org.apache.tools.ant.types.resources.FileProvider; import org.apache.tools.ant.types.resources.selectors.ResourceSelector; diff --git a/src/main/org/apache/tools/ant/types/selectors/SelectSelector.java b/src/main/org/apache/tools/ant/types/selectors/SelectSelector.java index d0bf593a8..2089012ce 100644 --- a/src/main/org/apache/tools/ant/types/selectors/SelectSelector.java +++ b/src/main/org/apache/tools/ant/types/selectors/SelectSelector.java @@ -18,8 +18,8 @@ package org.apache.tools.ant.types.selectors; -import java.util.Enumeration; import java.io.File; +import java.util.Enumeration; import org.apache.tools.ant.Project; import org.apache.tools.ant.PropertyHelper; diff --git a/src/main/org/apache/tools/ant/types/selectors/SelectorContainer.java b/src/main/org/apache/tools/ant/types/selectors/SelectorContainer.java index 089e132a9..47e4e4fd6 100644 --- a/src/main/org/apache/tools/ant/types/selectors/SelectorContainer.java +++ b/src/main/org/apache/tools/ant/types/selectors/SelectorContainer.java @@ -19,6 +19,7 @@ package org.apache.tools.ant.types.selectors; import java.util.Enumeration; + import org.apache.tools.ant.Project; import org.apache.tools.ant.types.selectors.modifiedselector.ModifiedSelector; diff --git a/src/main/org/apache/tools/ant/types/selectors/SignedSelector.java b/src/main/org/apache/tools/ant/types/selectors/SignedSelector.java index 74f8bd55c..cd5150223 100644 --- a/src/main/org/apache/tools/ant/types/selectors/SignedSelector.java +++ b/src/main/org/apache/tools/ant/types/selectors/SignedSelector.java @@ -18,8 +18,9 @@ package org.apache.tools.ant.types.selectors; import java.io.File; -import org.apache.tools.ant.types.DataType; + import org.apache.tools.ant.taskdefs.condition.IsSigned; +import org.apache.tools.ant.types.DataType; /** * Selector that chooses files based on whether they are signed or not. diff --git a/src/main/org/apache/tools/ant/types/selectors/WritableSelector.java b/src/main/org/apache/tools/ant/types/selectors/WritableSelector.java index 219b9d32a..6ffd57193 100644 --- a/src/main/org/apache/tools/ant/types/selectors/WritableSelector.java +++ b/src/main/org/apache/tools/ant/types/selectors/WritableSelector.java @@ -19,6 +19,7 @@ package org.apache.tools.ant.types.selectors; import java.io.File; + import org.apache.tools.ant.types.Resource; import org.apache.tools.ant.types.resources.FileProvider; import org.apache.tools.ant.types.resources.selectors.ResourceSelector; diff --git a/src/main/org/apache/tools/ant/types/selectors/modifiedselector/ChecksumAlgorithm.java b/src/main/org/apache/tools/ant/types/selectors/modifiedselector/ChecksumAlgorithm.java index d05803a3a..210d5dc97 100644 --- a/src/main/org/apache/tools/ant/types/selectors/modifiedselector/ChecksumAlgorithm.java +++ b/src/main/org/apache/tools/ant/types/selectors/modifiedselector/ChecksumAlgorithm.java @@ -18,15 +18,16 @@ package org.apache.tools.ant.types.selectors.modifiedselector; -import java.util.Locale; -import java.util.zip.Checksum; -import java.util.zip.CRC32; -import java.util.zip.Adler32; -import java.util.zip.CheckedInputStream; +import java.io.BufferedInputStream; import java.io.File; import java.io.FileInputStream; -import java.io.BufferedInputStream; import java.security.NoSuchAlgorithmException; +import java.util.Locale; +import java.util.zip.Adler32; +import java.util.zip.CRC32; +import java.util.zip.CheckedInputStream; +import java.util.zip.Checksum; + import org.apache.tools.ant.BuildException; diff --git a/src/main/org/apache/tools/ant/types/selectors/modifiedselector/DigestAlgorithm.java b/src/main/org/apache/tools/ant/types/selectors/modifiedselector/DigestAlgorithm.java index a421b6f91..085b4fe75 100644 --- a/src/main/org/apache/tools/ant/types/selectors/modifiedselector/DigestAlgorithm.java +++ b/src/main/org/apache/tools/ant/types/selectors/modifiedselector/DigestAlgorithm.java @@ -21,11 +21,12 @@ package org.apache.tools.ant.types.selectors.modifiedselector; import java.io.File; import java.io.FileInputStream; -import java.util.Locale; import java.security.DigestInputStream; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; import java.security.NoSuchProviderException; +import java.util.Locale; + import org.apache.tools.ant.BuildException; diff --git a/src/main/org/apache/tools/ant/types/selectors/modifiedselector/HashvalueAlgorithm.java b/src/main/org/apache/tools/ant/types/selectors/modifiedselector/HashvalueAlgorithm.java index 8ecd0e000..8af9d12ed 100644 --- a/src/main/org/apache/tools/ant/types/selectors/modifiedselector/HashvalueAlgorithm.java +++ b/src/main/org/apache/tools/ant/types/selectors/modifiedselector/HashvalueAlgorithm.java @@ -18,11 +18,12 @@ package org.apache.tools.ant.types.selectors.modifiedselector; -import org.apache.tools.ant.util.FileUtils; import java.io.File; import java.io.FileReader; import java.io.Reader; +import org.apache.tools.ant.util.FileUtils; + /** * Computes a 'hashvalue' for the content of file using String.hashValue(). * Use of this algorithm doesn't require any additional nested <param>s and diff --git a/src/main/org/apache/tools/ant/types/selectors/modifiedselector/ModifiedSelector.java b/src/main/org/apache/tools/ant/types/selectors/modifiedselector/ModifiedSelector.java index a934b692c..f93e406a9 100644 --- a/src/main/org/apache/tools/ant/types/selectors/modifiedselector/ModifiedSelector.java +++ b/src/main/org/apache/tools/ant/types/selectors/modifiedselector/ModifiedSelector.java @@ -25,12 +25,12 @@ import java.util.Comparator; import java.util.Iterator; import java.util.Vector; -// Ant -import org.apache.tools.ant.Project; -import org.apache.tools.ant.IntrospectionHelper; +import org.apache.tools.ant.BuildEvent; import org.apache.tools.ant.BuildException; import org.apache.tools.ant.BuildListener; -import org.apache.tools.ant.BuildEvent; +import org.apache.tools.ant.IntrospectionHelper; +// Ant +import org.apache.tools.ant.Project; import org.apache.tools.ant.types.EnumeratedAttribute; import org.apache.tools.ant.types.Parameter; import org.apache.tools.ant.types.Path; diff --git a/src/main/org/apache/tools/ant/types/selectors/modifiedselector/PropertiesfileCache.java b/src/main/org/apache/tools/ant/types/selectors/modifiedselector/PropertiesfileCache.java index 4a8caa263..1446e8904 100644 --- a/src/main/org/apache/tools/ant/types/selectors/modifiedselector/PropertiesfileCache.java +++ b/src/main/org/apache/tools/ant/types/selectors/modifiedselector/PropertiesfileCache.java @@ -19,15 +19,15 @@ package org.apache.tools.ant.types.selectors.modifiedselector; -import java.util.Iterator; -import java.util.Vector; -import java.util.Enumeration; -import java.util.Properties; -import java.io.File; import java.io.BufferedInputStream; -import java.io.FileInputStream; import java.io.BufferedOutputStream; +import java.io.File; +import java.io.FileInputStream; import java.io.FileOutputStream; +import java.util.Enumeration; +import java.util.Iterator; +import java.util.Properties; +import java.util.Vector; /** |