diff options
Diffstat (limited to 'src/main/org/apache/tools/ant/types/resources')
37 files changed, 85 insertions, 79 deletions
diff --git a/src/main/org/apache/tools/ant/types/resources/AbstractClasspathResource.java b/src/main/org/apache/tools/ant/types/resources/AbstractClasspathResource.java index 0aeaf9e31..417da9a7a 100644 --- a/src/main/org/apache/tools/ant/types/resources/AbstractClasspathResource.java +++ b/src/main/org/apache/tools/ant/types/resources/AbstractClasspathResource.java @@ -17,18 +17,18 @@ */ package org.apache.tools.ant.types.resources; +import java.io.FilterInputStream; +import java.io.IOException; +import java.io.InputStream; +import java.util.Stack; + import org.apache.tools.ant.AntClassLoader; import org.apache.tools.ant.Project; -import org.apache.tools.ant.types.Resource; import org.apache.tools.ant.types.Path; import org.apache.tools.ant.types.Reference; +import org.apache.tools.ant.types.Resource; import org.apache.tools.ant.util.FileUtils; -import java.io.FilterInputStream; -import java.io.InputStream; -import java.io.IOException; -import java.util.Stack; - /** * * A Resource representation of anything that is accessed via a Java classloader. diff --git a/src/main/org/apache/tools/ant/types/resources/ArchiveResource.java b/src/main/org/apache/tools/ant/types/resources/ArchiveResource.java index a6cba5b7b..308de03e0 100644 --- a/src/main/org/apache/tools/ant/types/resources/ArchiveResource.java +++ b/src/main/org/apache/tools/ant/types/resources/ArchiveResource.java @@ -22,9 +22,9 @@ import java.util.Stack; import org.apache.tools.ant.BuildException; import org.apache.tools.ant.Project; +import org.apache.tools.ant.types.Reference; import org.apache.tools.ant.types.Resource; import org.apache.tools.ant.types.ResourceCollection; -import org.apache.tools.ant.types.Reference; /** * A Resource representation of an entry inside an archive. diff --git a/src/main/org/apache/tools/ant/types/resources/Archives.java b/src/main/org/apache/tools/ant/types/resources/Archives.java index 3667c8d50..0f45437df 100644 --- a/src/main/org/apache/tools/ant/types/resources/Archives.java +++ b/src/main/org/apache/tools/ant/types/resources/Archives.java @@ -21,6 +21,7 @@ import java.util.Iterator; import java.util.LinkedList; import java.util.List; import java.util.Stack; + import org.apache.tools.ant.BuildException; import org.apache.tools.ant.Project; import org.apache.tools.ant.types.ArchiveFileSet; diff --git a/src/main/org/apache/tools/ant/types/resources/BZip2Resource.java b/src/main/org/apache/tools/ant/types/resources/BZip2Resource.java index a00d696c3..0c2dd4be8 100644 --- a/src/main/org/apache/tools/ant/types/resources/BZip2Resource.java +++ b/src/main/org/apache/tools/ant/types/resources/BZip2Resource.java @@ -17,8 +17,8 @@ */ package org.apache.tools.ant.types.resources; -import java.io.InputStream; import java.io.IOException; +import java.io.InputStream; import java.io.OutputStream; import org.apache.tools.bzip2.CBZip2InputStream; diff --git a/src/main/org/apache/tools/ant/types/resources/BaseResourceCollectionContainer.java b/src/main/org/apache/tools/ant/types/resources/BaseResourceCollectionContainer.java index 27af1c876..281fa0f1f 100644 --- a/src/main/org/apache/tools/ant/types/resources/BaseResourceCollectionContainer.java +++ b/src/main/org/apache/tools/ant/types/resources/BaseResourceCollectionContainer.java @@ -18,15 +18,15 @@ package org.apache.tools.ant.types.resources; import java.io.File; -import java.util.List; -import java.util.Stack; -import java.util.Iterator; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; +import java.util.Iterator; +import java.util.List; +import java.util.Stack; -import org.apache.tools.ant.Project; import org.apache.tools.ant.BuildException; +import org.apache.tools.ant.Project; import org.apache.tools.ant.types.DataType; import org.apache.tools.ant.types.Resource; import org.apache.tools.ant.types.ResourceCollection; diff --git a/src/main/org/apache/tools/ant/types/resources/BaseResourceCollectionWrapper.java b/src/main/org/apache/tools/ant/types/resources/BaseResourceCollectionWrapper.java index c5dad48c8..78ba95eea 100644 --- a/src/main/org/apache/tools/ant/types/resources/BaseResourceCollectionWrapper.java +++ b/src/main/org/apache/tools/ant/types/resources/BaseResourceCollectionWrapper.java @@ -19,6 +19,7 @@ package org.apache.tools.ant.types.resources; import java.util.Collection; import java.util.Iterator; + import org.apache.tools.ant.types.Resource; /** diff --git a/src/main/org/apache/tools/ant/types/resources/ContentTransformingResource.java b/src/main/org/apache/tools/ant/types/resources/ContentTransformingResource.java index d5c8c3754..4921e34aa 100644 --- a/src/main/org/apache/tools/ant/types/resources/ContentTransformingResource.java +++ b/src/main/org/apache/tools/ant/types/resources/ContentTransformingResource.java @@ -17,8 +17,8 @@ */ package org.apache.tools.ant.types.resources; -import java.io.InputStream; import java.io.IOException; +import java.io.InputStream; import java.io.OutputStream; import org.apache.tools.ant.BuildException; diff --git a/src/main/org/apache/tools/ant/types/resources/Difference.java b/src/main/org/apache/tools/ant/types/resources/Difference.java index 7afa7bb40..3f3c983c9 100644 --- a/src/main/org/apache/tools/ant/types/resources/Difference.java +++ b/src/main/org/apache/tools/ant/types/resources/Difference.java @@ -22,6 +22,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.List; import java.util.Set; + import org.apache.tools.ant.BuildException; import org.apache.tools.ant.types.Resource; import org.apache.tools.ant.types.ResourceCollection; diff --git a/src/main/org/apache/tools/ant/types/resources/FailFast.java b/src/main/org/apache/tools/ant/types/resources/FailFast.java index e95bc81dc..dc962bb4f 100644 --- a/src/main/org/apache/tools/ant/types/resources/FailFast.java +++ b/src/main/org/apache/tools/ant/types/resources/FailFast.java @@ -17,12 +17,13 @@ */ package org.apache.tools.ant.types.resources; -import java.util.Set; +import java.util.ConcurrentModificationException; import java.util.HashSet; import java.util.Iterator; -import java.util.WeakHashMap; import java.util.NoSuchElementException; -import java.util.ConcurrentModificationException; +import java.util.Set; +import java.util.WeakHashMap; + import org.apache.tools.ant.types.Resource; /** diff --git a/src/main/org/apache/tools/ant/types/resources/FileResource.java b/src/main/org/apache/tools/ant/types/resources/FileResource.java index e7070323f..3ed49b812 100644 --- a/src/main/org/apache/tools/ant/types/resources/FileResource.java +++ b/src/main/org/apache/tools/ant/types/resources/FileResource.java @@ -18,18 +18,18 @@ package org.apache.tools.ant.types.resources; import java.io.File; +import java.io.FileInputStream; +import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; -import java.io.FileInputStream; -import java.io.FileOutputStream; -import org.apache.tools.ant.Project; import org.apache.tools.ant.BuildException; -import org.apache.tools.ant.util.FileUtils; -import org.apache.tools.ant.types.Resource; +import org.apache.tools.ant.Project; import org.apache.tools.ant.types.Reference; +import org.apache.tools.ant.types.Resource; import org.apache.tools.ant.types.ResourceFactory; +import org.apache.tools.ant.util.FileUtils; /** * A Resource representation of a File. diff --git a/src/main/org/apache/tools/ant/types/resources/Files.java b/src/main/org/apache/tools/ant/types/resources/Files.java index 4dc682b89..521bcc8d2 100644 --- a/src/main/org/apache/tools/ant/types/resources/Files.java +++ b/src/main/org/apache/tools/ant/types/resources/Files.java @@ -18,19 +18,19 @@ package org.apache.tools.ant.types.resources; import java.io.File; -import java.util.Vector; -import java.util.Iterator; import java.util.Collections; +import java.util.Iterator; +import java.util.Vector; -import org.apache.tools.ant.Project; import org.apache.tools.ant.BuildException; import org.apache.tools.ant.DirectoryScanner; -import org.apache.tools.ant.types.Reference; +import org.apache.tools.ant.Project; import org.apache.tools.ant.types.PatternSet; +import org.apache.tools.ant.types.Reference; import org.apache.tools.ant.types.Resource; import org.apache.tools.ant.types.ResourceCollection; -import org.apache.tools.ant.types.selectors.FileSelector; import org.apache.tools.ant.types.selectors.AbstractSelectorContainer; +import org.apache.tools.ant.types.selectors.FileSelector; /** * ResourceCollection implementation; like AbstractFileSet with absolute paths. diff --git a/src/main/org/apache/tools/ant/types/resources/First.java b/src/main/org/apache/tools/ant/types/resources/First.java index c5f670f6e..ea9e7d0ae 100644 --- a/src/main/org/apache/tools/ant/types/resources/First.java +++ b/src/main/org/apache/tools/ant/types/resources/First.java @@ -17,10 +17,11 @@ */ package org.apache.tools.ant.types.resources; -import java.util.Iterator; import java.util.ArrayList; import java.util.Collection; +import java.util.Iterator; import java.util.List; + import org.apache.tools.ant.types.Resource; /** diff --git a/src/main/org/apache/tools/ant/types/resources/GZipResource.java b/src/main/org/apache/tools/ant/types/resources/GZipResource.java index 9c02f08ae..3f95a6982 100644 --- a/src/main/org/apache/tools/ant/types/resources/GZipResource.java +++ b/src/main/org/apache/tools/ant/types/resources/GZipResource.java @@ -17,8 +17,8 @@ */ package org.apache.tools.ant.types.resources; -import java.io.InputStream; import java.io.IOException; +import java.io.InputStream; import java.io.OutputStream; import java.util.zip.GZIPInputStream; import java.util.zip.GZIPOutputStream; diff --git a/src/main/org/apache/tools/ant/types/resources/Intersect.java b/src/main/org/apache/tools/ant/types/resources/Intersect.java index 015e5da16..301df7c06 100644 --- a/src/main/org/apache/tools/ant/types/resources/Intersect.java +++ b/src/main/org/apache/tools/ant/types/resources/Intersect.java @@ -17,10 +17,10 @@ */ package org.apache.tools.ant.types.resources; -import java.util.List; -import java.util.Iterator; import java.util.ArrayList; import java.util.Collection; +import java.util.Iterator; +import java.util.List; import org.apache.tools.ant.BuildException; import org.apache.tools.ant.types.Resource; diff --git a/src/main/org/apache/tools/ant/types/resources/JavaConstantResource.java b/src/main/org/apache/tools/ant/types/resources/JavaConstantResource.java index 63b617118..fe6ed6945 100644 --- a/src/main/org/apache/tools/ant/types/resources/JavaConstantResource.java +++ b/src/main/org/apache/tools/ant/types/resources/JavaConstantResource.java @@ -17,9 +17,9 @@ */ package org.apache.tools.ant.types.resources; +import java.io.ByteArrayInputStream; import java.io.IOException; import java.io.InputStream; -import java.io.ByteArrayInputStream; import java.lang.reflect.Field; /** diff --git a/src/main/org/apache/tools/ant/types/resources/Last.java b/src/main/org/apache/tools/ant/types/resources/Last.java index 93910f1af..312271b23 100644 --- a/src/main/org/apache/tools/ant/types/resources/Last.java +++ b/src/main/org/apache/tools/ant/types/resources/Last.java @@ -17,9 +17,9 @@ */ package org.apache.tools.ant.types.resources; -import java.util.Iterator; import java.util.ArrayList; import java.util.Collection; +import java.util.Iterator; import java.util.List; import org.apache.tools.ant.BuildException; diff --git a/src/main/org/apache/tools/ant/types/resources/LazyResourceCollectionWrapper.java b/src/main/org/apache/tools/ant/types/resources/LazyResourceCollectionWrapper.java index 0460253af..a66098d76 100644 --- a/src/main/org/apache/tools/ant/types/resources/LazyResourceCollectionWrapper.java +++ b/src/main/org/apache/tools/ant/types/resources/LazyResourceCollectionWrapper.java @@ -21,6 +21,7 @@ import java.util.ArrayList; import java.util.Iterator; import java.util.List; import java.util.NoSuchElementException; + import org.apache.tools.ant.types.Resource; /** diff --git a/src/main/org/apache/tools/ant/types/resources/MappedResource.java b/src/main/org/apache/tools/ant/types/resources/MappedResource.java index 6f7184d74..bffc9a8f8 100644 --- a/src/main/org/apache/tools/ant/types/resources/MappedResource.java +++ b/src/main/org/apache/tools/ant/types/resources/MappedResource.java @@ -17,9 +17,6 @@ */ package org.apache.tools.ant.types.resources; -import java.io.File; -import java.util.Iterator; - import org.apache.tools.ant.types.Reference; import org.apache.tools.ant.types.Resource; import org.apache.tools.ant.util.FileNameMapper; diff --git a/src/main/org/apache/tools/ant/types/resources/MappedResourceCollection.java b/src/main/org/apache/tools/ant/types/resources/MappedResourceCollection.java index 6452bba91..2f1a926b6 100644 --- a/src/main/org/apache/tools/ant/types/resources/MappedResourceCollection.java +++ b/src/main/org/apache/tools/ant/types/resources/MappedResourceCollection.java @@ -22,6 +22,7 @@ import java.util.ArrayList; import java.util.Collection; import java.util.Iterator; import java.util.Stack; + import org.apache.tools.ant.BuildException; import org.apache.tools.ant.Project; import org.apache.tools.ant.types.DataType; diff --git a/src/main/org/apache/tools/ant/types/resources/PropertyResource.java b/src/main/org/apache/tools/ant/types/resources/PropertyResource.java index 9517e014b..a7cecb4b8 100644 --- a/src/main/org/apache/tools/ant/types/resources/PropertyResource.java +++ b/src/main/org/apache/tools/ant/types/resources/PropertyResource.java @@ -18,10 +18,10 @@ package org.apache.tools.ant.types.resources; +import java.io.ByteArrayInputStream; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; -import java.io.ByteArrayInputStream; import org.apache.tools.ant.Project; import org.apache.tools.ant.PropertyHelper; diff --git a/src/main/org/apache/tools/ant/types/resources/ResourceDecorator.java b/src/main/org/apache/tools/ant/types/resources/ResourceDecorator.java index 0de40524e..3806cf2ca 100644 --- a/src/main/org/apache/tools/ant/types/resources/ResourceDecorator.java +++ b/src/main/org/apache/tools/ant/types/resources/ResourceDecorator.java @@ -17,15 +17,15 @@ */ package org.apache.tools.ant.types.resources; -import java.io.InputStream; import java.io.IOException; +import java.io.InputStream; import java.io.OutputStream; import java.util.Stack; import org.apache.tools.ant.BuildException; import org.apache.tools.ant.Project; -import org.apache.tools.ant.types.Resource; import org.apache.tools.ant.types.Reference; +import org.apache.tools.ant.types.Resource; import org.apache.tools.ant.types.ResourceCollection; /** diff --git a/src/main/org/apache/tools/ant/types/resources/Resources.java b/src/main/org/apache/tools/ant/types/resources/Resources.java index 6f2e3cf2d..1dd888d4d 100644 --- a/src/main/org/apache/tools/ant/types/resources/Resources.java +++ b/src/main/org/apache/tools/ant/types/resources/Resources.java @@ -19,17 +19,17 @@ package org.apache.tools.ant.types.resources; import java.io.File; -import java.util.List; -import java.util.Stack; -import java.util.Vector; -import java.util.Iterator; +import java.util.AbstractCollection; import java.util.Collection; import java.util.Collections; -import java.util.AbstractCollection; +import java.util.Iterator; +import java.util.List; import java.util.NoSuchElementException; +import java.util.Stack; +import java.util.Vector; -import org.apache.tools.ant.Project; import org.apache.tools.ant.BuildException; +import org.apache.tools.ant.Project; import org.apache.tools.ant.types.DataType; import org.apache.tools.ant.types.Resource; import org.apache.tools.ant.types.ResourceCollection; diff --git a/src/main/org/apache/tools/ant/types/resources/Sort.java b/src/main/org/apache/tools/ant/types/resources/Sort.java index 50f50327c..b4dc88c2e 100644 --- a/src/main/org/apache/tools/ant/types/resources/Sort.java +++ b/src/main/org/apache/tools/ant/types/resources/Sort.java @@ -17,19 +17,19 @@ */ package org.apache.tools.ant.types.resources; -import java.util.List; -import java.util.Stack; -import java.util.Iterator; import java.util.Collection; import java.util.Collections; +import java.util.Iterator; +import java.util.List; +import java.util.Stack; -import org.apache.tools.ant.Project; import org.apache.tools.ant.BuildException; +import org.apache.tools.ant.Project; import org.apache.tools.ant.types.DataType; import org.apache.tools.ant.types.Resource; import org.apache.tools.ant.types.ResourceCollection; -import org.apache.tools.ant.types.resources.comparators.ResourceComparator; import org.apache.tools.ant.types.resources.comparators.DelegatedResourceComparator; +import org.apache.tools.ant.types.resources.comparators.ResourceComparator; import org.apache.tools.ant.util.CollectionUtils; /** diff --git a/src/main/org/apache/tools/ant/types/resources/StringResource.java b/src/main/org/apache/tools/ant/types/resources/StringResource.java index a550b2b0e..b12a2e14f 100644 --- a/src/main/org/apache/tools/ant/types/resources/StringResource.java +++ b/src/main/org/apache/tools/ant/types/resources/StringResource.java @@ -17,17 +17,17 @@ */ package org.apache.tools.ant.types.resources; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.FilterOutputStream; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; -import java.io.FilterOutputStream; -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; import org.apache.tools.ant.BuildException; import org.apache.tools.ant.Project; -import org.apache.tools.ant.types.Resource; import org.apache.tools.ant.types.Reference; +import org.apache.tools.ant.types.Resource; /** * Exposes a string as a Resource. diff --git a/src/main/org/apache/tools/ant/types/resources/TarResource.java b/src/main/org/apache/tools/ant/types/resources/TarResource.java index eae9cf095..62f1f2670 100644 --- a/src/main/org/apache/tools/ant/types/resources/TarResource.java +++ b/src/main/org/apache/tools/ant/types/resources/TarResource.java @@ -18,12 +18,12 @@ package org.apache.tools.ant.types.resources; import java.io.File; +import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; -import java.io.IOException; -import org.apache.tools.ant.Project; import org.apache.tools.ant.BuildException; +import org.apache.tools.ant.Project; import org.apache.tools.ant.types.Resource; import org.apache.tools.ant.util.FileUtils; import org.apache.tools.tar.TarEntry; diff --git a/src/main/org/apache/tools/ant/types/resources/Tokens.java b/src/main/org/apache/tools/ant/types/resources/Tokens.java index 185e4844b..0a518c3dc 100644 --- a/src/main/org/apache/tools/ant/types/resources/Tokens.java +++ b/src/main/org/apache/tools/ant/types/resources/Tokens.java @@ -17,16 +17,16 @@ */ package org.apache.tools.ant.types.resources; -import java.io.InputStreamReader; import java.io.IOException; +import java.io.InputStreamReader; import java.io.UnsupportedEncodingException; -import java.util.Stack; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; +import java.util.Stack; -import org.apache.tools.ant.Project; import org.apache.tools.ant.BuildException; +import org.apache.tools.ant.Project; import org.apache.tools.ant.types.DataType; import org.apache.tools.ant.types.Resource; import org.apache.tools.ant.types.ResourceCollection; diff --git a/src/main/org/apache/tools/ant/types/resources/URLResource.java b/src/main/org/apache/tools/ant/types/resources/URLResource.java index e77827a85..3ad1bd179 100644 --- a/src/main/org/apache/tools/ant/types/resources/URLResource.java +++ b/src/main/org/apache/tools/ant/types/resources/URLResource.java @@ -23,14 +23,14 @@ import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; import java.net.HttpURLConnection; +import java.net.MalformedURLException; import java.net.URL; import java.net.URLConnection; -import java.net.MalformedURLException; -import org.apache.tools.ant.Project; import org.apache.tools.ant.BuildException; -import org.apache.tools.ant.types.Resource; +import org.apache.tools.ant.Project; import org.apache.tools.ant.types.Reference; +import org.apache.tools.ant.types.Resource; import org.apache.tools.ant.util.FileUtils; /** diff --git a/src/main/org/apache/tools/ant/types/resources/ZipResource.java b/src/main/org/apache/tools/ant/types/resources/ZipResource.java index 9b31d61c2..37fc98ec4 100644 --- a/src/main/org/apache/tools/ant/types/resources/ZipResource.java +++ b/src/main/org/apache/tools/ant/types/resources/ZipResource.java @@ -18,20 +18,20 @@ package org.apache.tools.ant.types.resources; import java.io.File; +import java.io.FilterInputStream; +import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; -import java.io.IOException; -import java.io.FilterInputStream; -import org.apache.tools.ant.Project; import org.apache.tools.ant.BuildException; +import org.apache.tools.ant.Project; +import org.apache.tools.ant.types.Reference; import org.apache.tools.ant.types.Resource; import org.apache.tools.ant.types.ResourceCollection; -import org.apache.tools.ant.types.Reference; import org.apache.tools.ant.util.FileUtils; -import org.apache.tools.zip.ZipFile; import org.apache.tools.zip.ZipEntry; import org.apache.tools.zip.ZipExtraField; +import org.apache.tools.zip.ZipFile; /** * A Resource representation of an entry in a zipfile. diff --git a/src/main/org/apache/tools/ant/types/resources/comparators/DelegatedResourceComparator.java b/src/main/org/apache/tools/ant/types/resources/comparators/DelegatedResourceComparator.java index edc308ffc..aa2f55a83 100644 --- a/src/main/org/apache/tools/ant/types/resources/comparators/DelegatedResourceComparator.java +++ b/src/main/org/apache/tools/ant/types/resources/comparators/DelegatedResourceComparator.java @@ -17,10 +17,10 @@ */ package org.apache.tools.ant.types.resources.comparators; +import java.util.Iterator; import java.util.List; import java.util.Stack; import java.util.Vector; -import java.util.Iterator; import org.apache.tools.ant.BuildException; import org.apache.tools.ant.Project; diff --git a/src/main/org/apache/tools/ant/types/resources/comparators/FileSystem.java b/src/main/org/apache/tools/ant/types/resources/comparators/FileSystem.java index 8ae857839..7eafeb947 100644 --- a/src/main/org/apache/tools/ant/types/resources/comparators/FileSystem.java +++ b/src/main/org/apache/tools/ant/types/resources/comparators/FileSystem.java @@ -18,6 +18,7 @@ package org.apache.tools.ant.types.resources.comparators; import java.io.File; + import org.apache.tools.ant.types.Resource; import org.apache.tools.ant.types.resources.FileProvider; import org.apache.tools.ant.util.FileUtils; diff --git a/src/main/org/apache/tools/ant/types/resources/comparators/Reverse.java b/src/main/org/apache/tools/ant/types/resources/comparators/Reverse.java index 70e6cd820..c787a7652 100644 --- a/src/main/org/apache/tools/ant/types/resources/comparators/Reverse.java +++ b/src/main/org/apache/tools/ant/types/resources/comparators/Reverse.java @@ -18,6 +18,7 @@ package org.apache.tools.ant.types.resources.comparators; import java.util.Stack; + import org.apache.tools.ant.BuildException; import org.apache.tools.ant.Project; import org.apache.tools.ant.types.DataType; diff --git a/src/main/org/apache/tools/ant/types/resources/selectors/Compare.java b/src/main/org/apache/tools/ant/types/resources/selectors/Compare.java index 08c88ceb2..f345c278f 100644 --- a/src/main/org/apache/tools/ant/types/resources/selectors/Compare.java +++ b/src/main/org/apache/tools/ant/types/resources/selectors/Compare.java @@ -19,16 +19,16 @@ package org.apache.tools.ant.types.resources.selectors; import java.util.Stack; -import org.apache.tools.ant.Project; import org.apache.tools.ant.BuildException; +import org.apache.tools.ant.Project; import org.apache.tools.ant.types.Comparison; import org.apache.tools.ant.types.DataType; -import org.apache.tools.ant.types.Resource; import org.apache.tools.ant.types.Quantifier; +import org.apache.tools.ant.types.Resource; import org.apache.tools.ant.types.ResourceCollection; import org.apache.tools.ant.types.resources.Union; -import org.apache.tools.ant.types.resources.comparators.ResourceComparator; import org.apache.tools.ant.types.resources.comparators.DelegatedResourceComparator; +import org.apache.tools.ant.types.resources.comparators.ResourceComparator; /** * ResourceSelector that compares against "control" Resource(s) diff --git a/src/main/org/apache/tools/ant/types/resources/selectors/Date.java b/src/main/org/apache/tools/ant/types/resources/selectors/Date.java index e12899944..c48e4bc5a 100644 --- a/src/main/org/apache/tools/ant/types/resources/selectors/Date.java +++ b/src/main/org/apache/tools/ant/types/resources/selectors/Date.java @@ -18,8 +18,8 @@ package org.apache.tools.ant.types.resources.selectors; 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.BuildException; diff --git a/src/main/org/apache/tools/ant/types/resources/selectors/InstanceOf.java b/src/main/org/apache/tools/ant/types/resources/selectors/InstanceOf.java index bb663f0a3..39b310886 100644 --- a/src/main/org/apache/tools/ant/types/resources/selectors/InstanceOf.java +++ b/src/main/org/apache/tools/ant/types/resources/selectors/InstanceOf.java @@ -18,11 +18,11 @@ package org.apache.tools.ant.types.resources.selectors; -import org.apache.tools.ant.Project; -import org.apache.tools.ant.ProjectHelper; +import org.apache.tools.ant.AntTypeDefinition; import org.apache.tools.ant.BuildException; import org.apache.tools.ant.ComponentHelper; -import org.apache.tools.ant.AntTypeDefinition; +import org.apache.tools.ant.Project; +import org.apache.tools.ant.ProjectHelper; import org.apache.tools.ant.types.Resource; /** diff --git a/src/main/org/apache/tools/ant/types/resources/selectors/ResourceSelectorContainer.java b/src/main/org/apache/tools/ant/types/resources/selectors/ResourceSelectorContainer.java index 6fd2e0608..6b1c8002e 100644 --- a/src/main/org/apache/tools/ant/types/resources/selectors/ResourceSelectorContainer.java +++ b/src/main/org/apache/tools/ant/types/resources/selectors/ResourceSelectorContainer.java @@ -18,13 +18,13 @@ package org.apache.tools.ant.types.resources.selectors; import java.util.ArrayList; +import java.util.Collections; +import java.util.Iterator; import java.util.List; import java.util.Stack; -import java.util.Iterator; -import java.util.Collections; -import org.apache.tools.ant.Project; import org.apache.tools.ant.BuildException; +import org.apache.tools.ant.Project; import org.apache.tools.ant.types.DataType; /** diff --git a/src/main/org/apache/tools/ant/types/resources/selectors/Size.java b/src/main/org/apache/tools/ant/types/resources/selectors/Size.java index 1309d7eae..4d6c87e2c 100644 --- a/src/main/org/apache/tools/ant/types/resources/selectors/Size.java +++ b/src/main/org/apache/tools/ant/types/resources/selectors/Size.java @@ -17,8 +17,8 @@ */ package org.apache.tools.ant.types.resources.selectors; -import org.apache.tools.ant.types.Resource; import org.apache.tools.ant.types.Comparison; +import org.apache.tools.ant.types.Resource; /** * Size ResourceSelector. diff --git a/src/main/org/apache/tools/ant/types/resources/selectors/Type.java b/src/main/org/apache/tools/ant/types/resources/selectors/Type.java index 2a9c66eb4..6c8cd7a12 100644 --- a/src/main/org/apache/tools/ant/types/resources/selectors/Type.java +++ b/src/main/org/apache/tools/ant/types/resources/selectors/Type.java @@ -18,8 +18,8 @@ package org.apache.tools.ant.types.resources.selectors; import org.apache.tools.ant.BuildException; -import org.apache.tools.ant.types.Resource; import org.apache.tools.ant.types.EnumeratedAttribute; +import org.apache.tools.ant.types.Resource; /** * Type file/dir ResourceSelector. |