From ee47fa6e1a3828f7f52d4c3a8307074603e70740 Mon Sep 17 00:00:00 2001 From: Stefan Bodewig Date: Wed, 19 Apr 2017 15:30:15 +0200 Subject: [PATCH] whitespace --- src/main/org/apache/tools/ant/XmlLogger.java | 2 +- .../ant/filters/util/ChainReaderHelper.java | 6 +- .../org/apache/tools/ant/taskdefs/Ant.java | 2 +- .../tools/ant/taskdefs/AntStructure.java | 2 +- .../org/apache/tools/ant/taskdefs/Antlib.java | 2 +- .../org/apache/tools/ant/taskdefs/Delete.java | 2 +- .../org/apache/tools/ant/taskdefs/Expand.java | 8 +- .../apache/tools/ant/taskdefs/Javadoc.java | 2 +- .../apache/tools/ant/taskdefs/Replace.java | 2 +- .../org/apache/tools/ant/taskdefs/Rmic.java | 2 +- .../tools/ant/taskdefs/condition/Http.java | 2 +- .../tools/ant/taskdefs/email/EmailTask.java | 3 +- .../tools/ant/taskdefs/email/MimeMailer.java | 2 +- .../tools/ant/taskdefs/optional/ANTLR.java | 2 +- .../tools/ant/taskdefs/optional/NetRexxC.java | 2 +- .../optional/depend/ClassFileIterator.java | 4 +- .../ant/taskdefs/optional/depend/Depend.java | 6 +- .../optional/ejb/IPlanetEjbcTask.java | 2 +- .../optional/ejb/JonasDeploymentTool.java | 4 +- .../optional/extension/ExtensionUtil.java | 2 +- .../ant/taskdefs/optional/i18n/Translate.java | 4 +- .../optional/jdepend/JDependTask.java | 2 +- .../taskdefs/optional/junit/JUnitTask.java | 2 +- .../native2ascii/SunNative2Ascii.java | 2 +- .../tools/ant/types/AbstractFileSet.java | 2 +- .../apache/tools/ant/types/ZipScanner.java | 4 +- .../types/optional/depend/ClassfileSet.java | 2 +- .../types/optional/depend/DependScanner.java | 4 +- .../tools/ant/types/resources/Archives.java | 2 +- .../BaseResourceCollectionContainer.java | 2 +- .../ant/types/resources/FileResource.java | 2 +- .../ant/types/resources/ResourceList.java | 2 +- .../tools/ant/types/resources/Restrict.java | 2 +- .../DelegatedResourceComparator.java | 2 +- .../resources/comparators/FileSystem.java | 2 +- .../ant/types/resources/selectors/Name.java | 2 +- .../selectors/AbstractSelectorContainer.java | 4 +- .../ant/types/selectors/TypeSelector.java | 2 +- .../tools/ant/util/RegexpPatternMapper.java | 2 +- .../tools/ant/util/SourceFileScanner.java | 2 +- .../resources/LazyResourceCollectionTest.java | 82 +++++++++---------- 41 files changed, 94 insertions(+), 95 deletions(-) diff --git a/src/main/org/apache/tools/ant/XmlLogger.java b/src/main/org/apache/tools/ant/XmlLogger.java index 3a9848e0c..ea037c3e1 100644 --- a/src/main/org/apache/tools/ant/XmlLogger.java +++ b/src/main/org/apache/tools/ant/XmlLogger.java @@ -177,7 +177,7 @@ public class XmlLogger implements BuildLogger { } String outFilename = getProperty(event, "XmlLogger.file", "log.xml"); String xslUri = getProperty(event, "ant.XmlLogger.stylesheet.uri", "log.xsl"); - + try (OutputStream stream = outStream == null ? Files.newOutputStream(Paths.get(outFilename)) : outStream; Writer out = new OutputStreamWriter(stream, "UTF8")) { diff --git a/src/main/org/apache/tools/ant/filters/util/ChainReaderHelper.java b/src/main/org/apache/tools/ant/filters/util/ChainReaderHelper.java index 9ad2f3d6b..67694ac51 100644 --- a/src/main/org/apache/tools/ant/filters/util/ChainReaderHelper.java +++ b/src/main/org/apache/tools/ant/filters/util/ChainReaderHelper.java @@ -62,13 +62,13 @@ public final class ChainReaderHelper { public String readFully() throws IOException { return ChainReaderHelper.this.readFully(this); } - + @Override public void close() throws IOException { cleanUpClassLoaders(cleanupLoaders); super.close(); } - + @Override protected void finalize() throws Throwable { try { @@ -236,7 +236,7 @@ public final class ChainReaderHelper { final List finalFilters = filterChains.stream().map(FilterChain::getFilterReaders) .flatMap(Collection::stream).collect(Collectors.toList()); - + if (!finalFilters.isEmpty()) { boolean success = false; try { diff --git a/src/main/org/apache/tools/ant/taskdefs/Ant.java b/src/main/org/apache/tools/ant/taskdefs/Ant.java index b121ade37..3b4ed036e 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Ant.java +++ b/src/main/org/apache/tools/ant/taskdefs/Ant.java @@ -422,7 +422,7 @@ public class Ant extends Task { "%s task calling its own parent target.", getTaskName()); } - + final Map targetsMap = getProject().getTargets(); if (locals.stream().map(targetsMap::get) diff --git a/src/main/org/apache/tools/ant/taskdefs/AntStructure.java b/src/main/org/apache/tools/ant/taskdefs/AntStructure.java index 8dd7ff14f..977921c3b 100644 --- a/src/main/org/apache/tools/ant/taskdefs/AntStructure.java +++ b/src/main/org/apache/tools/ant/taskdefs/AntStructure.java @@ -214,7 +214,7 @@ public class AntStructure extends Task { final Set types) { out.println(""); out.println(""); - + out.println(tasks.stream().collect( Collectors.joining(" | ", ""))); diff --git a/src/main/org/apache/tools/ant/taskdefs/Antlib.java b/src/main/org/apache/tools/ant/taskdefs/Antlib.java index 24489cd75..519436e3c 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Antlib.java +++ b/src/main/org/apache/tools/ant/taskdefs/Antlib.java @@ -159,7 +159,7 @@ public class Antlib extends Task implements TaskContainer { @Override public void execute() { //TODO handle tasks added via #addTask() - + for (Task task : tasks) { UnknownElement ue = (UnknownElement) task; setLocation(ue.getLocation()); diff --git a/src/main/org/apache/tools/ant/taskdefs/Delete.java b/src/main/org/apache/tools/ant/taskdefs/Delete.java index ffdf9a871..7bc3c181e 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Delete.java +++ b/src/main/org/apache/tools/ant/taskdefs/Delete.java @@ -85,7 +85,7 @@ public class Delete extends MatchingTask { SymbolicLinkUtils.getSymbolicLinkUtils(); private static class ReverseDirs implements ResourceCollection { - + private Project project; private File basedir; private String[] dirs; diff --git a/src/main/org/apache/tools/ant/taskdefs/Expand.java b/src/main/org/apache/tools/ant/taskdefs/Expand.java index 62fc1968d..d6834aa2e 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Expand.java +++ b/src/main/org/apache/tools/ant/taskdefs/Expand.java @@ -61,12 +61,12 @@ import org.apache.tools.zip.ZipFile; */ public class Expand extends Task { public static final String NATIVE_ENCODING = "native-encoding"; - + /** Error message when more that one mapper is defined */ public static final String ERROR_MULTIPLE_MAPPERS = "Cannot define more than one mapper"; - + private static final FileUtils FILE_UTILS = FileUtils.getFileUtils(); - + private static final int BUFFER_SIZE = 1024; private File dest; //req private File source; // req @@ -185,7 +185,7 @@ public class Expand extends Task { getLocation()); } try ( - ZipFile + ZipFile zf = new ZipFile(srcF, encoding, scanForUnicodeExtraFields)){ boolean empty = true; Enumeration e = zf.getEntries(); diff --git a/src/main/org/apache/tools/ant/taskdefs/Javadoc.java b/src/main/org/apache/tools/ant/taskdefs/Javadoc.java index 62366adcb..a92e8da6f 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Javadoc.java +++ b/src/main/org/apache/tools/ant/taskdefs/Javadoc.java @@ -1907,7 +1907,7 @@ public class Javadoc extends Task { if (doclet.getName() == null) { throw new BuildException("The doclet name must be specified.", getLocation()); - } + } toExecute.createArgument().setValue("-doclet"); toExecute.createArgument().setValue(doclet.getName()); if (doclet.getPath() != null) { diff --git a/src/main/org/apache/tools/ant/taskdefs/Replace.java b/src/main/org/apache/tools/ant/taskdefs/Replace.java index 4213ef811..42fe2919d 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Replace.java +++ b/src/main/org/apache/tools/ant/taskdefs/Replace.java @@ -626,7 +626,7 @@ public class Replace extends MatchingTask { Properties props = new Properties(); try ( - InputStream + InputStream in = propertyResource.getInputStream()){ props.load(in); } catch (IOException e) { diff --git a/src/main/org/apache/tools/ant/taskdefs/Rmic.java b/src/main/org/apache/tools/ant/taskdefs/Rmic.java index c24adfb7b..e25812f67 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Rmic.java +++ b/src/main/org/apache/tools/ant/taskdefs/Rmic.java @@ -91,7 +91,7 @@ public class Rmic extends MatchingTask { /** rmic failed message */ public static final String ERROR_RMIC_FAILED = "Rmic failed; see the compiler error output for details."; - + /** unable to verify message */ public static final String ERROR_UNABLE_TO_VERIFY_CLASS = "Unable to verify class "; /** could not be found message */ diff --git a/src/main/org/apache/tools/ant/taskdefs/condition/Http.java b/src/main/org/apache/tools/ant/taskdefs/condition/Http.java index a475e0796..7f3427f3b 100644 --- a/src/main/org/apache/tools/ant/taskdefs/condition/Http.java +++ b/src/main/org/apache/tools/ant/taskdefs/condition/Http.java @@ -45,7 +45,7 @@ public class Http extends ProjectComponent implements Condition { private boolean followRedirects = true; private int errorsBeginAt = ERROR_BEGINS; - + /** * Set the url attribute * @param url the url of the request diff --git a/src/main/org/apache/tools/ant/taskdefs/email/EmailTask.java b/src/main/org/apache/tools/ant/taskdefs/email/EmailTask.java index 207a2e3f7..ec2987e8b 100644 --- a/src/main/org/apache/tools/ant/taskdefs/email/EmailTask.java +++ b/src/main/org/apache/tools/ant/taskdefs/email/EmailTask.java @@ -532,8 +532,7 @@ public class EmailTask extends Task { // identify which files should be attached Vector files = new Vector<>(); - - + if (attachments != null) { for (Resource r : attachments) { files.add(r.as(FileProvider.class).getFile()); diff --git a/src/main/org/apache/tools/ant/taskdefs/email/MimeMailer.java b/src/main/org/apache/tools/ant/taskdefs/email/MimeMailer.java index e80d8d150..b8f0516d0 100644 --- a/src/main/org/apache/tools/ant/taskdefs/email/MimeMailer.java +++ b/src/main/org/apache/tools/ant/taskdefs/email/MimeMailer.java @@ -283,7 +283,7 @@ public class MimeMailer extends Mailer { private static InternetAddress[] internetAddresses(final Vector list) throws AddressException, UnsupportedEncodingException { - + final int size = list.size(); final InternetAddress[] addrs = new InternetAddress[size]; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ANTLR.java b/src/main/org/apache/tools/ant/taskdefs/optional/ANTLR.java index 2ca244320..3d13f26eb 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/ANTLR.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/ANTLR.java @@ -306,7 +306,7 @@ public class ANTLR extends Task { int err = run(commandline.getCommandline()); if (err != 0) { throw new BuildException("ANTLR returned: " + err, getLocation()); - } + } String output = bos.toString(); if (output.indexOf("error:") > -1) { throw new BuildException("ANTLR signaled an error: " diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/NetRexxC.java b/src/main/org/apache/tools/ant/taskdefs/optional/NetRexxC.java index 9c6da4a32..070feb4f3 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/NetRexxC.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/NetRexxC.java @@ -786,7 +786,7 @@ public class NetRexxC extends MatchingTask { String[] compileArgs = Stream.concat(Stream.of(compileOptionsArray), compileList.stream()) .toArray(String[]::new); - + // need to set java.class.path property and restore it later // since the NetRexx compiler has no option for the classpath String currentClassPath = System.getProperty("java.class.path"); diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/depend/ClassFileIterator.java b/src/main/org/apache/tools/ant/taskdefs/optional/depend/ClassFileIterator.java index 0af757986..48c1f4503 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/depend/ClassFileIterator.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/depend/ClassFileIterator.java @@ -32,7 +32,7 @@ public interface ClassFileIterator extends Iterable { * @return the next class file in the iteration */ ClassFile getNextClassFile(); - + @Override default Iterator iterator() { @@ -58,7 +58,7 @@ public interface ClassFileIterator extends Iterable { next = getNextClassFile(); } } - + }; } } diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/depend/Depend.java b/src/main/org/apache/tools/ant/taskdefs/optional/depend/Depend.java index c08b089bc..cb3da261f 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/depend/Depend.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/depend/Depend.java @@ -245,7 +245,7 @@ public class Depend extends MatchingTask { Difference diff = new Difference(); diff.add(destPath); diff.add(dependClasspath); - + Path p; if (diff.isEmpty()) { p = null; @@ -762,10 +762,10 @@ public class Depend extends MatchingTask { if (file.getName().endsWith(".class")) { ClassFileInfo info = new ClassFileInfo(); info.absoluteFile = file; - + String relativeName = file.getPath().substring(rootLength + 1, file.getPath().length() - ".class".length()); - + info.className = ClassFileUtils.convertSlashName(relativeName); info.sourceFile = sourceFileKnownToExist = diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/IPlanetEjbcTask.java b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/IPlanetEjbcTask.java index 147e5d5ea..4d611a256 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/IPlanetEjbcTask.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/IPlanetEjbcTask.java @@ -307,7 +307,7 @@ public class IPlanetEjbcTask extends Task { private Path getClasspath() { if (classpath == null) { return new Path(getProject()).concatSystemClasspath("last"); - } + } return classpath.concatSystemClasspath("ignore"); } } diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/JonasDeploymentTool.java b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/JonasDeploymentTool.java index 71c08604d..04a2dd3b1 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/JonasDeploymentTool.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/JonasDeploymentTool.java @@ -583,13 +583,13 @@ public class JonasDeploymentTool extends GenericDeploymentTool { String genicClass; // GenIC class (3 are supported for various // versions // work around a bug of GenIC 2.5 - + // class name (search in the classpath provided for the ejbjar element) genicClass = getGenicClassName(classpath); if (genicClass == null) { log("Cannot find GenIC class in classpath.", Project.MSG_ERR); throw new BuildException("GenIC class not found, please check the classpath."); - } + } log("Using '" + genicClass + "' GenIC class." , Project.MSG_VERBOSE); genicTask.setClassname(genicClass); diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/extension/ExtensionUtil.java b/src/main/org/apache/tools/ant/taskdefs/optional/extension/ExtensionUtil.java index 7f951d969..7ed5fb991 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/extension/ExtensionUtil.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/extension/ExtensionUtil.java @@ -83,7 +83,7 @@ public final class ExtensionUtil { final List libraries) throws BuildException { final List extensions = new ArrayList<>(); - + for (FileSet fileSet : libraries) { boolean includeImpl = true; boolean includeURL = true; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/i18n/Translate.java b/src/main/org/apache/tools/ant/taskdefs/optional/i18n/Translate.java index 42e2be18b..3ec7d77a0 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/i18n/Translate.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/i18n/Translate.java @@ -364,14 +364,14 @@ public class Translate extends MatchingTask { Locale locale = new Locale(bundleLanguage, bundleCountry, bundleVariant); - + String language = locale.getLanguage().length() > 0 ? "_" + locale.getLanguage() : ""; String country = locale.getCountry().length() > 0 ? "_" + locale.getCountry() : ""; String variant = locale.getVariant().length() > 0 ? "_" + locale.getVariant() : ""; - + processBundle(bundle + language + country + variant, BUNDLE_SPECIFIED_LANGUAGE_COUNTRY_VARIANT, false); processBundle(bundle + language + country, BUNDLE_SPECIFIED_LANGUAGE_COUNTRY, false); processBundle(bundle + language, BUNDLE_SPECIFIED_LANGUAGE, false); diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/jdepend/JDependTask.java b/src/main/org/apache/tools/ant/taskdefs/optional/jdepend/JDependTask.java index abc52e319..331c97558 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/jdepend/JDependTask.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/jdepend/JDependTask.java @@ -584,7 +584,7 @@ public class JDependTask extends Task { getWorkingPath().ifPresent(path -> { for (String filepath : path.list()) { File f = new File(filepath); - + // not necessary as JDepend would fail, but why loose // some time? if (!f.exists() || !f.isDirectory()) { diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java b/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java index e32403c4b..d37337ab0 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java @@ -1672,7 +1672,7 @@ public class JUnitTask extends Task { final int count = batchTests.size(); @SuppressWarnings("unchecked") final Enumeration[] enums = new Enumeration[ count + 1]; - + for (int i = 0; i < count; i++) { final BatchTest batchtest = batchTests.get(i); enums[i] = batchtest.elements(); diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/native2ascii/SunNative2Ascii.java b/src/main/org/apache/tools/ant/taskdefs/optional/native2ascii/SunNative2Ascii.java index fdcce7d1d..268006eb4 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/native2ascii/SunNative2Ascii.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/native2ascii/SunNative2Ascii.java @@ -37,7 +37,7 @@ public final class SunNative2Ascii extends DefaultNative2Ascii { public static final String IMPLEMENTATION_NAME = "sun"; private static final String SUN_TOOLS_NATIVE2ASCII_MAIN = "sun.tools.native2ascii.Main"; - + /** {@inheritDoc} */ @Override protected void setup(Commandline cmd, Native2Ascii args) diff --git a/src/main/org/apache/tools/ant/types/AbstractFileSet.java b/src/main/org/apache/tools/ant/types/AbstractFileSet.java index 58e7c16db..bcfc5a0b3 100644 --- a/src/main/org/apache/tools/ant/types/AbstractFileSet.java +++ b/src/main/org/apache/tools/ant/types/AbstractFileSet.java @@ -949,7 +949,7 @@ public abstract class AbstractFileSet extends DataType if (isReference()) { super.dieOnCircularReference(stk, p); } else { - selectors.stream().filter(DataType.class::isInstance).forEach(fileSelector -> + selectors.stream().filter(DataType.class::isInstance).forEach(fileSelector -> pushAndInvokeCircularReferenceCheck((DataType) fileSelector, stk, p) ); for (PatternSet ps : additionalPatterns) { diff --git a/src/main/org/apache/tools/ant/types/ZipScanner.java b/src/main/org/apache/tools/ant/types/ZipScanner.java index 49f66ebd9..a3df040d2 100644 --- a/src/main/org/apache/tools/ant/types/ZipScanner.java +++ b/src/main/org/apache/tools/ant/types/ZipScanner.java @@ -60,7 +60,7 @@ public class ZipScanner extends ArchiveScanner { File srcFile = src.asOptional(FileProvider.class) .map(FileProvider::getFile).orElseThrow(() -> new BuildException( "Only file provider resources are supported")); - + try (ZipFile zf = new ZipFile(srcFile, encoding)) { Enumeration e = zf.getEntries(); @@ -87,4 +87,4 @@ public class ZipScanner extends ArchiveScanner { throw new BuildException("Problem opening " + srcFile, ex); } } -} \ No newline at end of file +} diff --git a/src/main/org/apache/tools/ant/types/optional/depend/ClassfileSet.java b/src/main/org/apache/tools/ant/types/optional/depend/ClassfileSet.java index f966646f1..7f9ff2d06 100644 --- a/src/main/org/apache/tools/ant/types/optional/depend/ClassfileSet.java +++ b/src/main/org/apache/tools/ant/types/optional/depend/ClassfileSet.java @@ -89,7 +89,7 @@ public class ClassfileSet extends FileSet { super(s); rootClasses.addAll(s.rootClasses); } - + /** * Add a fileset to which contains a collection of root classes used to * drive the search from classes. diff --git a/src/main/org/apache/tools/ant/types/optional/depend/DependScanner.java b/src/main/org/apache/tools/ant/types/optional/depend/DependScanner.java index 5ea51c766..f21b855a5 100644 --- a/src/main/org/apache/tools/ant/types/optional/depend/DependScanner.java +++ b/src/main/org/apache/tools/ant/types/optional/depend/DependScanner.java @@ -125,9 +125,9 @@ public class DependScanner extends DirectoryScanner { Set parentSet = Stream.of(parentScanner.getIncludedFiles()) .collect(Collectors.toSet()); - + Enumeration e = analyzer.getClassDependencies(); - + while (e.hasMoreElements()) { String classname = e.nextElement(); String filename = 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 f47676f9e..f616eb74b 100644 --- a/src/main/org/apache/tools/ant/types/resources/Archives.java +++ b/src/main/org/apache/tools/ant/types/resources/Archives.java @@ -190,7 +190,7 @@ public class Archives extends DataType setChecked(true); } } - + @Override protected Archives getCheckedRef() { return (Archives) super.getCheckedRef(); 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 e394ba9c1..b33533488 100644 --- a/src/main/org/apache/tools/ant/types/resources/BaseResourceCollectionContainer.java +++ b/src/main/org/apache/tools/ant/types/resources/BaseResourceCollectionContainer.java @@ -247,7 +247,7 @@ public abstract class BaseResourceCollectionContainer return coll.stream().map(Object::toString) .collect(Collectors.joining(File.pathSeparator)); } - + @Override protected BaseResourceCollectionContainer getCheckedRef() { return (BaseResourceCollectionContainer) super.getCheckedRef(); 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 a1c410af0..5a8ba90e2 100644 --- a/src/main/org/apache/tools/ant/types/resources/FileResource.java +++ b/src/main/org/apache/tools/ant/types/resources/FileResource.java @@ -406,7 +406,7 @@ public class FileResource extends Resource implements Touchable, FileProvider, } return fileResource; } - + @Override protected FileResource getCheckedRef() { return (FileResource) super.getCheckedRef(); diff --git a/src/main/org/apache/tools/ant/types/resources/ResourceList.java b/src/main/org/apache/tools/ant/types/resources/ResourceList.java index 204db1dba..ed8f5ec25 100644 --- a/src/main/org/apache/tools/ant/types/resources/ResourceList.java +++ b/src/main/org/apache/tools/ant/types/resources/ResourceList.java @@ -232,5 +232,5 @@ public class ResourceList extends DataType implements ResourceCollection { } return new FileResource(getProject(), expandedLine); } - + } diff --git a/src/main/org/apache/tools/ant/types/resources/Restrict.java b/src/main/org/apache/tools/ant/types/resources/Restrict.java index cc9cc2693..04256f098 100644 --- a/src/main/org/apache/tools/ant/types/resources/Restrict.java +++ b/src/main/org/apache/tools/ant/types/resources/Restrict.java @@ -155,7 +155,7 @@ public class Restrict setChecked(true); } } - + @Override protected Restrict getCheckedRef() { return (Restrict) super.getCheckedRef(); 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 dbe13d4d0..28f679315 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 @@ -118,7 +118,7 @@ s. setChecked(true); } } - + private static Comparator composite(List> foo) { Comparator result = null; if (foo != null) { 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 1d6d3c3d1..3ae793802 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 @@ -45,7 +45,7 @@ public class FileSystem extends ResourceComparator { protected int resourceCompare(Resource foo, Resource bar) { return compare(file(foo), file(bar)); } - + private File file(Resource r) { return r.asOptional(FileProvider.class) .orElseThrow(() -> new ClassCastException( diff --git a/src/main/org/apache/tools/ant/types/resources/selectors/Name.java b/src/main/org/apache/tools/ant/types/resources/selectors/Name.java index f5adeb469..fcbe51e08 100644 --- a/src/main/org/apache/tools/ant/types/resources/selectors/Name.java +++ b/src/main/org/apache/tools/ant/types/resources/selectors/Name.java @@ -132,7 +132,7 @@ public class Name implements ResourceSelector { private boolean matches(String name) { if (pattern != null) { return SelectorUtils.match(modify(pattern), modify(name), cs); - } + } if (reg == null) { reg = new RegularExpression(); reg.setPattern(regex); diff --git a/src/main/org/apache/tools/ant/types/selectors/AbstractSelectorContainer.java b/src/main/org/apache/tools/ant/types/selectors/AbstractSelectorContainer.java index 61f02b687..90a2a877f 100644 --- a/src/main/org/apache/tools/ant/types/selectors/AbstractSelectorContainer.java +++ b/src/main/org/apache/tools/ant/types/selectors/AbstractSelectorContainer.java @@ -359,10 +359,10 @@ public abstract class AbstractSelectorContainer extends DataType throw new BuildException(e); } } - + @Override protected AbstractSelectorContainer getCheckedRef() { return (AbstractSelectorContainer) super.getCheckedRef(); } - + } diff --git a/src/main/org/apache/tools/ant/types/selectors/TypeSelector.java b/src/main/org/apache/tools/ant/types/selectors/TypeSelector.java index ef6853f54..5d09c1777 100644 --- a/src/main/org/apache/tools/ant/types/selectors/TypeSelector.java +++ b/src/main/org/apache/tools/ant/types/selectors/TypeSelector.java @@ -32,7 +32,7 @@ public class TypeSelector extends BaseExtendSelector { /** Key to used for parameterized custom selector */ public static final String TYPE_KEY = "type"; - + private String type = null; /** diff --git a/src/main/org/apache/tools/ant/util/RegexpPatternMapper.java b/src/main/org/apache/tools/ant/util/RegexpPatternMapper.java index 597484734..e32a9877e 100644 --- a/src/main/org/apache/tools/ant/util/RegexpPatternMapper.java +++ b/src/main/org/apache/tools/ant/util/RegexpPatternMapper.java @@ -81,7 +81,7 @@ public class RegexpPatternMapper implements FileNameMapper { public void setFrom(String from) throws BuildException { if (from == null) { throw new BuildException("this mapper requires a 'from' attribute"); - } + } try { reg.setPattern(from); } catch (NoClassDefFoundError e) { diff --git a/src/main/org/apache/tools/ant/util/SourceFileScanner.java b/src/main/org/apache/tools/ant/util/SourceFileScanner.java index 879da8463..7d76eaf35 100644 --- a/src/main/org/apache/tools/ant/util/SourceFileScanner.java +++ b/src/main/org/apache/tools/ant/util/SourceFileScanner.java @@ -97,7 +97,7 @@ public class SourceFileScanner implements ResourceFactory { public String getName() { return f; } - }).toArray(Resource[]::new); + }).toArray(Resource[]::new); // build the list of sources which are out of date with // respect to the target diff --git a/src/tests/junit/org/apache/tools/ant/types/resources/LazyResourceCollectionTest.java b/src/tests/junit/org/apache/tools/ant/types/resources/LazyResourceCollectionTest.java index 34bcecdb3..4f9d56533 100644 --- a/src/tests/junit/org/apache/tools/ant/types/resources/LazyResourceCollectionTest.java +++ b/src/tests/junit/org/apache/tools/ant/types/resources/LazyResourceCollectionTest.java @@ -34,36 +34,36 @@ import static org.junit.Assert.fail; public class LazyResourceCollectionTest { private class StringResourceCollection implements ResourceCollection { - List createdIterators = new ArrayList<>(); + List createdIterators = new ArrayList<>(); - @Override + @Override public int size() { - return 3; + return 3; } - @Override + @Override public Iterator iterator() { StringResourceIterator it = new StringResourceIterator(); createdIterators.add(it); return it; } - @Override + @Override public boolean isFilesystemOnly() { return false; } } - private class StringResourceIterator implements Iterator { + private class StringResourceIterator implements Iterator { int cursor = 0; - @Override + @Override public void remove() { throw new UnsupportedOperationException(); } - @Override - public StringResource next() { + @Override + public StringResource next() { if (cursor < 3) { cursor++; return new StringResource("r" + cursor); @@ -71,7 +71,7 @@ public class LazyResourceCollectionTest { return null; } - @Override + @Override public boolean hasNext() { return cursor < 3; } @@ -85,25 +85,25 @@ public class LazyResourceCollectionTest { Iterator it = lazyCollection.iterator(); assertOneCreatedIterator(collectionTest); - StringResourceIterator stringResourceIterator = - collectionTest.createdIterators.get(0); + StringResourceIterator stringResourceIterator = + collectionTest.createdIterators.get(0); assertEquals("A resource was loaded without iterating", 1, - stringResourceIterator.cursor); + stringResourceIterator.cursor); - assertStringValue("r1", it.next()); + assertStringValue("r1", it.next()); assertOneCreatedIterator(collectionTest); assertEquals("Iterating once load more than 1 resource", 2, - stringResourceIterator.cursor); + stringResourceIterator.cursor); - assertStringValue("r2", it.next()); + assertStringValue("r2", it.next()); assertOneCreatedIterator(collectionTest); assertEquals("Iterating twice load more than 2 resources", 3, - stringResourceIterator.cursor); + stringResourceIterator.cursor); - assertStringValue("r3", it.next()); + assertStringValue("r3", it.next()); assertOneCreatedIterator(collectionTest); assertEquals("Iterating 3 times load more than 3 resources", 3, - stringResourceIterator.cursor); + stringResourceIterator.cursor); try { it.next(); @@ -131,37 +131,37 @@ public class LazyResourceCollectionTest { Iterator it2 = lazyCollection.iterator(); assertOneCreatedIterator(collectionTest); - StringResourceIterator stringResourceIterator = - collectionTest.createdIterators.get(0); + StringResourceIterator stringResourceIterator = + collectionTest.createdIterators.get(0); assertEquals("A resource was loaded without iterating", 1, - stringResourceIterator.cursor); + stringResourceIterator.cursor); - assertStringValue("r1", it1.next()); + assertStringValue("r1", it1.next()); assertEquals("Iterating once load more than 1 resource", 2, - stringResourceIterator.cursor); + stringResourceIterator.cursor); - assertStringValue("r1", it2.next()); + assertStringValue("r1", it2.next()); assertEquals( - "The second iterator did not lookup in the cache for a resource", 2, - stringResourceIterator.cursor); + "The second iterator did not lookup in the cache for a resource", 2, + stringResourceIterator.cursor); - assertStringValue("r2", it2.next()); + assertStringValue("r2", it2.next()); assertEquals("Iterating twice load more than 2 resources", 3, - stringResourceIterator.cursor); + stringResourceIterator.cursor); - assertStringValue("r2", it1.next()); + assertStringValue("r2", it1.next()); assertEquals( - "The first iterator did not lookup in the cache for a resource", 3, - stringResourceIterator.cursor); + "The first iterator did not lookup in the cache for a resource", 3, + stringResourceIterator.cursor); - assertStringValue("r3", it2.next()); + assertStringValue("r3", it2.next()); assertEquals("Iterating 3 times load more than 3 resources", 3, - stringResourceIterator.cursor); + stringResourceIterator.cursor); - assertStringValue("r3", it1.next()); + assertStringValue("r3", it1.next()); assertEquals( - "The first iterator did not lookup in the cache for a resource", 3, - stringResourceIterator.cursor); + "The first iterator did not lookup in the cache for a resource", 3, + stringResourceIterator.cursor); try { it1.next(); @@ -177,8 +177,8 @@ public class LazyResourceCollectionTest { // ok } } - - private void assertStringValue(String expected, Resource r) { - assertEquals(expected, r.as(StringResource.class).getValue()); - } + + private void assertStringValue(String expected, Resource r) { + assertEquals(expected, r.as(StringResource.class).getValue()); + } }