You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@ant.apache.org by bo...@apache.org on 2014/07/12 18:25:41 UTC
[3/4] git commit: whitespace
whitespace
Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/df33426b
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/df33426b
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/df33426b
Branch: refs/heads/master
Commit: df33426bf23dd97171dc3e0e7cb85de87d421bce
Parents: ba17089
Author: Stefan Bodewig <bo...@apache.org>
Authored: Sat Jul 12 18:06:55 2014 +0200
Committer: Stefan Bodewig <bo...@apache.org>
Committed: Sat Jul 12 18:25:02 2014 +0200
----------------------------------------------------------------------
.../checkstyle-frames-sortby-check.xsl | 72 ++++++++++----------
.../org/apache/tools/ant/AntClassLoader.java | 64 ++++++++---------
.../org/apache/tools/ant/DirectoryScanner.java | 38 +++++------
.../org/apache/tools/ant/ExtensionPoint.java | 4 +-
.../apache/tools/ant/IntrospectionHelper.java | 43 ++++++------
src/main/org/apache/tools/ant/Main.java | 14 ++--
src/main/org/apache/tools/ant/Project.java | 46 ++++++-------
.../apache/tools/ant/filters/ConcatFilter.java | 4 +-
.../org/apache/tools/ant/launch/Launcher.java | 6 +-
.../tools/ant/listener/AnsiColorLogger.java | 6 +-
.../apache/tools/ant/listener/SilentLogger.java | 12 ++--
.../apache/tools/ant/taskdefs/AntStructure.java | 12 ++--
.../apache/tools/ant/taskdefs/BindTargets.java | 2 +-
.../org/apache/tools/ant/taskdefs/Copy.java | 44 ++++++------
.../org/apache/tools/ant/taskdefs/EchoXML.java | 2 +-
src/main/org/apache/tools/ant/taskdefs/Get.java | 32 ++++-----
.../org/apache/tools/ant/taskdefs/Input.java | 4 +-
.../org/apache/tools/ant/taskdefs/Javac.java | 2 +-
.../org/apache/tools/ant/taskdefs/Javadoc.java | 19 +++---
.../org/apache/tools/ant/taskdefs/MakeUrl.java | 2 +-
.../org/apache/tools/ant/taskdefs/Manifest.java | 16 ++---
.../apache/tools/ant/taskdefs/PathConvert.java | 6 +-
.../tools/ant/taskdefs/ProjectHelperTask.java | 2 +-
.../org/apache/tools/ant/taskdefs/Property.java | 6 +-
.../apache/tools/ant/taskdefs/Redirector.java | 2 +-
.../org/apache/tools/ant/taskdefs/Rmic.java | 2 +-
.../org/apache/tools/ant/taskdefs/SQLExec.java | 10 +--
.../org/apache/tools/ant/taskdefs/Sleep.java | 2 +-
.../org/apache/tools/ant/taskdefs/SubAnt.java | 12 ++--
.../org/apache/tools/ant/taskdefs/Sync.java | 12 ++--
src/main/org/apache/tools/ant/taskdefs/War.java | 6 +-
.../apache/tools/ant/taskdefs/XSLTProcess.java | 14 ++--
src/main/org/apache/tools/ant/taskdefs/Zip.java | 26 +++----
.../taskdefs/compilers/AptCompilerAdapter.java | 2 +-
.../compilers/DefaultCompilerAdapter.java | 6 +-
.../ant/taskdefs/condition/IsReachable.java | 2 +-
.../tools/ant/taskdefs/cvslib/CvsTagDiff.java | 4 +-
.../ant/taskdefs/optional/PropertyFile.java | 8 +--
.../ant/taskdefs/optional/ReplaceRegExp.java | 2 +-
.../ant/taskdefs/optional/TraXLiaison.java | 22 +++---
.../taskdefs/optional/Xalan2TraceSupport.java | 1 -
.../depend/constantpool/MethodTypeCPInfo.java | 6 +-
.../optional/ejb/IPlanetDeploymentTool.java | 14 ++--
.../optional/extension/ExtensionSet.java | 6 +-
.../ant/taskdefs/optional/junit/Constants.java | 4 +-
.../optional/junit/JUnit4TestMethodAdapter.java | 10 +--
.../ant/taskdefs/optional/junit/JUnitTask.java | 30 ++++----
.../ant/taskdefs/optional/junit/JUnitTest.java | 4 +-
.../optional/junit/JUnitTestRunner.java | 54 +++++++--------
.../optional/junit/TearDownOnVmCrash.java | 24 +++----
.../optional/junit/XMLJUnitResultFormatter.java | 26 +++----
.../taskdefs/optional/splash/SplashTask.java | 12 ++--
.../ant/taskdefs/optional/ssh/Directory.java | 4 +-
.../ant/taskdefs/optional/ssh/SSHBase.java | 18 ++---
.../ant/taskdefs/optional/ssh/SSHExec.java | 4 +-
.../ant/taskdefs/optional/ssh/SSHSession.java | 24 +++----
.../tools/ant/taskdefs/optional/ssh/Scp.java | 10 +--
.../taskdefs/optional/ssh/ScpFromMessage.java | 4 +-
.../ant/taskdefs/optional/unix/Symlink.java | 10 +--
.../org/apache/tools/ant/types/FilterChain.java | 4 +-
.../org/apache/tools/ant/types/FilterSet.java | 4 +-
.../org/apache/tools/ant/types/Permissions.java | 6 +-
.../tools/ant/types/mappers/CutDirsMapper.java | 6 +-
.../tools/ant/types/resources/Archives.java | 14 ++--
.../resources/ContentTransformingResource.java | 10 +--
.../LazyResourceCollectionWrapper.java | 16 ++---
.../ant/types/resources/MappedResource.java | 12 ++--
.../ant/types/resources/MultiRootFileSet.java | 20 +++---
.../ant/types/resources/selectors/Type.java | 4 +-
.../ant/types/selectors/MappingSelector.java | 4 +-
.../ant/types/selectors/PresentSelector.java | 8 +--
.../ant/types/selectors/TokenizedPath.java | 6 +-
.../ant/util/LayoutPreservingProperties.java | 18 ++---
.../ant/util/LineOrientedOutputStream.java | 8 +--
.../LineOrientedOutputStreamRedirector.java | 8 +--
.../org/apache/tools/ant/util/ProcessUtil.java | 10 +--
.../apache/tools/ant/util/ResourceUtils.java | 8 +--
.../tools/ant/util/SymbolicLinkUtils.java | 4 +-
.../org/apache/tools/ant/util/UnicodeUtil.java | 36 +++++-----
.../org/apache/tools/ant/util/XmlConstants.java | 4 +-
src/main/org/apache/tools/tar/TarEntry.java | 2 +-
.../org/apache/tools/tar/TarOutputStream.java | 2 +-
src/main/org/apache/tools/tar/TarUtils.java | 6 +-
.../tools/zip/AbstractUnicodeExtraField.java | 10 +--
.../apache/tools/zip/FallbackZipEncoding.java | 6 +-
.../org/apache/tools/zip/NioZipEncoding.java | 6 +-
.../apache/tools/zip/Simple8BitZipEncoding.java | 8 +--
.../tools/zip/UnicodeCommentExtraField.java | 2 +-
.../apache/tools/zip/UnicodePathExtraField.java | 2 +-
src/main/org/apache/tools/zip/ZipEntry.java | 2 +-
src/main/org/apache/tools/zip/ZipFile.java | 2 +-
.../org/apache/tools/zip/ZipOutputStream.java | 6 +-
92 files changed, 556 insertions(+), 563 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ant/blob/df33426b/src/etc/checkstyle/checkstyle-frames-sortby-check.xsl
----------------------------------------------------------------------
diff --git a/src/etc/checkstyle/checkstyle-frames-sortby-check.xsl b/src/etc/checkstyle/checkstyle-frames-sortby-check.xsl
index d08e90e..060f878 100644
--- a/src/etc/checkstyle/checkstyle-frames-sortby-check.xsl
+++ b/src/etc/checkstyle/checkstyle-frames-sortby-check.xsl
@@ -53,8 +53,8 @@
<!--
Generates the HTML page with the data.
- -->
- <xsl:template name="sorted.html">
+ -->
+ <xsl:template name="sorted.html">
<html>
<head>
<title>CheckStyle Audit</title>
@@ -71,17 +71,17 @@
<xsl:apply-templates select="." mode="data"/>
</body>
</html>
- </xsl:template>
+ </xsl:template>
<!--
Key for detecting duplicate CheckModules
- -->
+ -->
<xsl:key name="module" match="file/error" use="@source"/>
-
-
-
+
+
+
<!--
Generates the navagation bar.
-->
@@ -101,9 +101,9 @@
</xsl:for-each>
</ul>
</xsl:template>
-
-
-
+
+
+
<!--
Generates the data part.
-->
@@ -127,10 +127,10 @@
<!--
Generates the content table for the given check module.
@param filter full qualified module name
- -->
+ -->
<xsl:template name="data">
<xsl:param name="filter"/>
-
+
<table>
<tr>
<th>file</th>
@@ -150,9 +150,9 @@
</xsl:for-each>
</table>
</xsl:template>
-
-
-
+
+
+
<!--
Generates the data rows for the current check module.
Ignores errors in the current file from other modules.
@@ -183,15 +183,15 @@
<!--
Generates the CSS with the layout instructions.
Generated so this XSL is the single source of the whole report.
- -->
- <xsl:template name="sorted.css">
+ -->
+ <xsl:template name="sorted.css">
body {
font:normal 80% arial,helvetica,sanserif;
color: black;
background-color: white;
margin: 0;
padding: 1em;
- min-width: 41em;
+ min-width: 41em;
}
h1 {
font-weight:bold;
@@ -203,9 +203,9 @@
border: 2px ridge silver;
}
html<xsl:text disable-output-escaping="yes">></xsl:text>body h1 {
- border-color: gray;
+ border-color: gray;
}
-
+
ul#navigation {
font-size: 0.83em;
float: left; width: 18em;
@@ -233,7 +233,7 @@
ul#navigation a:active {
color: white; background-color: gray;
}
-
+
div#content {
margin: 0 1em 1em 16em;
padding: 0 1em;
@@ -271,10 +271,10 @@
}
table tr:nth-child(odd) td {
background: #efefef;
- }
+ }
table tr:nth-child(even) td {
background: #fff;
- }
+ }
</xsl:template>
@@ -282,8 +282,8 @@
<!--
Generates the JavaScript for the dynamic style.
Generated so this XSL is the single source of the whole report.
- -->
- <xsl:template name="switch.js">
+ -->
+ <xsl:template name="switch.js">
/*
* Hides all "hideable" div-containers
*/
@@ -296,11 +296,11 @@
}
return;
}
-
+
/*
* Shows one div-container and hides the other.
- * @param id id of the element to show
- */
+ * @param id id of the element to show
+ */
function change(id) {
hideAll();
e = document.getElementById(id);
@@ -310,11 +310,11 @@
window.scrollTo(0, 0);
return;
}
-
+
/*
* Shows only the first data row.
- * Used in body:onload so the user could directly see some messages.
- */
+ * Used in body:onload so the user could directly see some messages.
+ */
function openFirst() {
hideAll();
for (i = 0; i <xsl:text disable-output-escaping="yes"><</xsl:text> allElements.length; i++) {
@@ -325,7 +325,7 @@
}
return;
}
- </xsl:template>
+ </xsl:template>
@@ -333,19 +333,19 @@
Calculates the index of the last occurence of a substring in a string.
@param txt the whole string in which to search
@delimiter the substring to search
- -->
+ -->
<xsl:template name="last-index-of">
<xsl:param name="txt"/>
<xsl:param name="remainder" select="$txt"/>
<xsl:param name="delimiter" select="' '"/>
-
+
<xsl:choose>
<xsl:when test="contains($remainder, $delimiter)">
<xsl:call-template name="last-index-of">
<xsl:with-param name="txt" select="$txt"/>
<xsl:with-param name="remainder" select="substring-after($remainder, $delimiter)"/>
<xsl:with-param name="delimiter" select="$delimiter"/>
- </xsl:call-template>
+ </xsl:call-template>
</xsl:when>
<xsl:otherwise>
<xsl:variable name="lastIndex" select="string-length(substring($txt, 1, string-length($txt)-string-length($remainder)))+1"/>
@@ -364,4 +364,4 @@
</xsl:choose>
</xsl:template>
-</xsl:stylesheet>
\ No newline at end of file
+</xsl:stylesheet>
http://git-wip-us.apache.org/repos/asf/ant/blob/df33426b/src/main/org/apache/tools/ant/AntClassLoader.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/AntClassLoader.java b/src/main/org/apache/tools/ant/AntClassLoader.java
index f2ce34d..607ada7 100644
--- a/src/main/org/apache/tools/ant/AntClassLoader.java
+++ b/src/main/org/apache/tools/ant/AntClassLoader.java
@@ -119,7 +119,7 @@ public class AntClassLoader extends ClassLoader implements SubBuildListener {
* @return <code>true</code> if there are more elements in the
* enumeration; <code>false</code> otherwise.
*/
- public boolean hasMoreElements() {
+ public boolean hasMoreElements() {
return (this.nextResource != null);
}
@@ -128,7 +128,7 @@ public class AntClassLoader extends ClassLoader implements SubBuildListener {
*
* @return the next resource in the enumeration
*/
- public URL nextElement() {
+ public URL nextElement() {
final URL ret = this.nextResource;
if (ret == null) {
throw new NoSuchElementException();
@@ -220,7 +220,7 @@ public class AntClassLoader extends ClassLoader implements SubBuildListener {
/** Static map of jar file/time to manifest class-path entries */
private static Map<String, String> pathMap =
- Collections.synchronizedMap(new HashMap<String, String>());
+ Collections.synchronizedMap(new HashMap<String, String>());
/**
* The context loader saved when setting the thread's current
@@ -289,7 +289,7 @@ public class AntClassLoader extends ClassLoader implements SubBuildListener {
* load the a class through this loader.
*/
public AntClassLoader(
- final ClassLoader parent, final Project project, final Path classpath, final boolean parentFirst) {
+ final ClassLoader parent, final Project project, final Path classpath, final boolean parentFirst) {
this(project, classpath);
if (parent != null) {
setParent(parent);
@@ -576,7 +576,7 @@ public class AntClassLoader extends ClassLoader implements SubBuildListener {
* Use Class.forName with initialize=true instead.
*/
@Deprecated
- public static void initializeClass(final Class<?> theClass) {
+ public static void initializeClass(final Class<?> theClass) {
// ***HACK*** We ask the VM to create an instance
// by voluntarily providing illegal arguments to force
// the VM to run the class' static initializer, while
@@ -698,7 +698,7 @@ public class AntClassLoader extends ClassLoader implements SubBuildListener {
* resource cannot be found on the loader's classpath.
*/
@Override
- public InputStream getResourceAsStream(final String name) {
+ public InputStream getResourceAsStream(final String name) {
InputStream resourceStream = null;
if (isParentFirst(name)) {
resourceStream = loadBaseResource(name);
@@ -716,8 +716,8 @@ public class AntClassLoader extends ClassLoader implements SubBuildListener {
if (resourceStream == null && !isParentFirst(name)) {
if (ignoreBase) {
resourceStream = getRootLoader() == null
- ? null
- : getRootLoader().getResourceAsStream(name);
+ ? null
+ : getRootLoader().getResourceAsStream(name);
} else {
resourceStream = loadBaseResource(name);
}
@@ -877,7 +877,7 @@ public class AntClassLoader extends ClassLoader implements SubBuildListener {
* adequate privileges to get the resource.
*/
@Override
- public URL getResource(final String name) {
+ public URL getResource(final String name) {
// we need to search the components of the path to see if
// we can find the class we want.
URL url = null;
@@ -944,7 +944,7 @@ public class AntClassLoader extends ClassLoader implements SubBuildListener {
* @exception IOException if I/O errors occurs (can't happen)
*/
@Override
- protected Enumeration<URL> findResources(final String name) throws IOException {
+ protected Enumeration<URL> findResources(final String name) throws IOException {
return findResources(name, true);
}
@@ -961,7 +961,7 @@ public class AntClassLoader extends ClassLoader implements SubBuildListener {
* @exception IOException if I/O errors occurs (can't happen)
*/
protected Enumeration<URL> findResources(final String name,
- final boolean parentHasBeenSearched)
+ final boolean parentHasBeenSearched)
throws IOException {
final Enumeration<URL> mine = new ResourceEnumeration(name);
Enumeration<URL> base;
@@ -1070,8 +1070,8 @@ public class AntClassLoader extends ClassLoader implements SubBuildListener {
* classpath.
*/
@Override
- protected synchronized Class<?> loadClass(final String classname, final boolean resolve)
- throws ClassNotFoundException {
+ protected synchronized Class<?> loadClass(final String classname, final boolean resolve)
+ throws ClassNotFoundException {
// 'sync' is needed - otherwise 2 threads can load the same class
// twice, resulting in LinkageError: duplicated class definition.
// findLoadedClass avoids that, but without sync it won't work.
@@ -1084,11 +1084,11 @@ public class AntClassLoader extends ClassLoader implements SubBuildListener {
try {
theClass = findBaseClass(classname);
log("Class " + classname + " loaded from parent loader " + "(parentFirst)",
- Project.MSG_DEBUG);
+ Project.MSG_DEBUG);
} catch (final ClassNotFoundException cnfe) {
theClass = findClass(classname);
log("Class " + classname + " loaded from ant loader " + "(parentFirst)",
- Project.MSG_DEBUG);
+ Project.MSG_DEBUG);
}
} else {
try {
@@ -1135,13 +1135,13 @@ public class AntClassLoader extends ClassLoader implements SubBuildListener {
* @throws IOException if the class data cannot be read.
*/
protected Class<?> defineClassFromData(final File container, final byte[] classData, final String classname)
- throws IOException {
+ throws IOException {
definePackage(container, classname);
final ProtectionDomain currentPd = Project.class.getProtectionDomain();
final String classResource = getClassFilename(classname);
final CodeSource src = new CodeSource(FILE_UTILS.getFileURL(container),
- getCertificates(container,
- classResource));
+ getCertificates(container,
+ classResource));
final ProtectionDomain classesPd =
new ProtectionDomain(src, currentPd.getPermissions(),
this,
@@ -1288,7 +1288,7 @@ public class AntClassLoader extends ClassLoader implements SubBuildListener {
}
}
definePackage(packageName, specificationTitle, specificationVersion, specificationVendor,
- implementationTitle, implementationVersion, implementationVendor, sealBase);
+ implementationTitle, implementationVersion, implementationVendor, sealBase);
}
/**
@@ -1308,7 +1308,7 @@ public class AntClassLoader extends ClassLoader implements SubBuildListener {
* reading the class from the stream.
*/
private Class<?> getClassFromStream(final InputStream stream, final String classname, final File container)
- throws IOException, SecurityException {
+ throws IOException, SecurityException {
final ByteArrayOutputStream baos = new ByteArrayOutputStream();
int bytesRead = -1;
final byte[] buffer = new byte[BUFFER_SIZE];
@@ -1332,7 +1332,7 @@ public class AntClassLoader extends ClassLoader implements SubBuildListener {
* on this loader's classpath.
*/
@Override
- public Class<?> findClass(final String name) throws ClassNotFoundException {
+ public Class<?> findClass(final String name) throws ClassNotFoundException {
log("Finding class " + name, Project.MSG_DEBUG);
return findClassInComponents(name);
}
@@ -1380,7 +1380,7 @@ public class AntClassLoader extends ClassLoader implements SubBuildListener {
} catch (final IOException ioe) {
// ioe.printStackTrace();
log("Exception reading component " + pathComponent + " (reason: "
- + ioe.getMessage() + ")", Project.MSG_VERBOSE);
+ + ioe.getMessage() + ")", Project.MSG_VERBOSE);
} finally {
FileUtils.close(stream);
}
@@ -1443,7 +1443,7 @@ public class AntClassLoader extends ClassLoader implements SubBuildListener {
*
* @param event the buildStarted event
*/
- public void buildStarted(final BuildEvent event) {
+ public void buildStarted(final BuildEvent event) {
// Not significant for the class loader.
}
@@ -1453,7 +1453,7 @@ public class AntClassLoader extends ClassLoader implements SubBuildListener {
*
* @param event the buildFinished event
*/
- public void buildFinished(final BuildEvent event) {
+ public void buildFinished(final BuildEvent event) {
cleanup();
}
@@ -1466,7 +1466,7 @@ public class AntClassLoader extends ClassLoader implements SubBuildListener {
*
* @since Ant 1.6.2
*/
- public void subBuildFinished(final BuildEvent event) {
+ public void subBuildFinished(final BuildEvent event) {
if (event.getProject() == project) {
cleanup();
}
@@ -1479,7 +1479,7 @@ public class AntClassLoader extends ClassLoader implements SubBuildListener {
*
* @since Ant 1.6.2
*/
- public void subBuildStarted(final BuildEvent event) {
+ public void subBuildStarted(final BuildEvent event) {
// Not significant for the class loader.
}
@@ -1488,7 +1488,7 @@ public class AntClassLoader extends ClassLoader implements SubBuildListener {
*
* @param event the targetStarted event
*/
- public void targetStarted(final BuildEvent event) {
+ public void targetStarted(final BuildEvent event) {
// Not significant for the class loader.
}
@@ -1497,7 +1497,7 @@ public class AntClassLoader extends ClassLoader implements SubBuildListener {
*
* @param event the targetFinished event
*/
- public void targetFinished(final BuildEvent event) {
+ public void targetFinished(final BuildEvent event) {
// Not significant for the class loader.
}
@@ -1506,7 +1506,7 @@ public class AntClassLoader extends ClassLoader implements SubBuildListener {
*
* @param event the taskStarted event
*/
- public void taskStarted(final BuildEvent event) {
+ public void taskStarted(final BuildEvent event) {
// Not significant for the class loader.
}
@@ -1515,7 +1515,7 @@ public class AntClassLoader extends ClassLoader implements SubBuildListener {
*
* @param event the taskFinished event
*/
- public void taskFinished(final BuildEvent event) {
+ public void taskFinished(final BuildEvent event) {
// Not significant for the class loader.
}
@@ -1524,7 +1524,7 @@ public class AntClassLoader extends ClassLoader implements SubBuildListener {
*
* @param event the messageLogged event
*/
- public void messageLogged(final BuildEvent event) {
+ public void messageLogged(final BuildEvent event) {
// Not significant for the class loader.
}
@@ -1546,7 +1546,7 @@ public class AntClassLoader extends ClassLoader implements SubBuildListener {
* @return the path that this classloader has.
*/
@Override
- public String toString() {
+ public String toString() {
return "AntClassLoader[" + getClasspath() + "]";
}
http://git-wip-us.apache.org/repos/asf/ant/blob/df33426b/src/main/org/apache/tools/ant/DirectoryScanner.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/DirectoryScanner.java b/src/main/org/apache/tools/ant/DirectoryScanner.java
index 3565c83..709779a 100644
--- a/src/main/org/apache/tools/ant/DirectoryScanner.java
+++ b/src/main/org/apache/tools/ant/DirectoryScanner.java
@@ -146,7 +146,7 @@ public class DirectoryScanner
* method instead.
*/
@Deprecated
- protected static final String[] DEFAULTEXCLUDES = {
+ protected static final String[] DEFAULTEXCLUDES = {
// Miscellaneous typical temporary files
SelectorUtils.DEEP_TREE_MATCH + "/*~",
SelectorUtils.DEEP_TREE_MATCH + "/#*#",
@@ -619,7 +619,7 @@ public class DirectoryScanner
*
* @param basedir The base directory to scan.
*/
- public void setBasedir(final String basedir) {
+ public void setBasedir(final String basedir) {
setBasedir(basedir == null ? (File) null
: new File(basedir.replace('/', File.separatorChar).replace(
'\\', File.separatorChar)));
@@ -631,7 +631,7 @@ public class DirectoryScanner
*
* @param basedir The base directory for scanning.
*/
- public synchronized void setBasedir(final File basedir) {
+ public synchronized void setBasedir(final File basedir) {
this.basedir = basedir;
}
@@ -641,7 +641,7 @@ public class DirectoryScanner
*
* @return the base directory to be scanned.
*/
- public synchronized File getBasedir() {
+ public synchronized File getBasedir() {
return basedir;
}
@@ -662,7 +662,7 @@ public class DirectoryScanner
* @param isCaseSensitive whether or not the file system should be
* regarded as a case sensitive one.
*/
- public synchronized void setCaseSensitive(final boolean isCaseSensitive) {
+ public synchronized void setCaseSensitive(final boolean isCaseSensitive) {
this.isCaseSensitive = isCaseSensitive;
}
@@ -720,7 +720,7 @@ public class DirectoryScanner
* list is given, all elements must be
* non-<code>null</code>.
*/
- public synchronized void setIncludes(final String[] includes) {
+ public synchronized void setIncludes(final String[] includes) {
if (includes == null) {
this.includes = null;
} else {
@@ -743,7 +743,7 @@ public class DirectoryScanner
* should be excluded. If a non-<code>null</code> list is
* given, all elements must be non-<code>null</code>.
*/
- public synchronized void setExcludes(final String[] excludes) {
+ public synchronized void setExcludes(final String[] excludes) {
if (excludes == null) {
this.excludes = null;
} else {
@@ -808,7 +808,7 @@ public class DirectoryScanner
*
* @param selectors specifies the selectors to be invoked on a scan.
*/
- public synchronized void setSelectors(final FileSelector[] selectors) {
+ public synchronized void setSelectors(final FileSelector[] selectors) {
this.selectors = selectors;
}
@@ -833,7 +833,7 @@ public class DirectoryScanner
* @exception IllegalStateException if the base directory was set
* incorrectly (i.e. if it doesn't exist or isn't a directory).
*/
- public void scan() throws IllegalStateException {
+ public void scan() throws IllegalStateException {
synchronized (scanLock) {
if (scanning) {
while (scanning) {
@@ -1568,7 +1568,7 @@ public class DirectoryScanner
* @return the names of the files which matched at least one of the
* include patterns and none of the exclude patterns.
*/
- public String[] getIncludedFiles() {
+ public String[] getIncludedFiles() {
String[] files;
synchronized (this) {
if (filesIncluded == null) {
@@ -1603,7 +1603,7 @@ public class DirectoryScanner
*
* @see #slowScan
*/
- public synchronized String[] getNotIncludedFiles() {
+ public synchronized String[] getNotIncludedFiles() {
slowScan();
final String[] files = new String[filesNotIncluded.size()];
filesNotIncluded.copyInto(files);
@@ -1621,7 +1621,7 @@ public class DirectoryScanner
*
* @see #slowScan
*/
- public synchronized String[] getExcludedFiles() {
+ public synchronized String[] getExcludedFiles() {
slowScan();
final String[] files = new String[filesExcluded.size()];
filesExcluded.copyInto(files);
@@ -1639,7 +1639,7 @@ public class DirectoryScanner
*
* @see #slowScan
*/
- public synchronized String[] getDeselectedFiles() {
+ public synchronized String[] getDeselectedFiles() {
slowScan();
final String[] files = new String[filesDeselected.size()];
filesDeselected.copyInto(files);
@@ -1654,7 +1654,7 @@ public class DirectoryScanner
* @return the names of the directories which matched at least one of the
* include patterns and none of the exclude patterns.
*/
- public String[] getIncludedDirectories() {
+ public String[] getIncludedDirectories() {
String[] directories;
synchronized (this) {
if (dirsIncluded == null) {
@@ -1689,7 +1689,7 @@ public class DirectoryScanner
*
* @see #slowScan
*/
- public synchronized String[] getNotIncludedDirectories() {
+ public synchronized String[] getNotIncludedDirectories() {
slowScan();
final String[] directories = new String[dirsNotIncluded.size()];
dirsNotIncluded.copyInto(directories);
@@ -1707,7 +1707,7 @@ public class DirectoryScanner
*
* @see #slowScan
*/
- public synchronized String[] getExcludedDirectories() {
+ public synchronized String[] getExcludedDirectories() {
slowScan();
final String[] directories = new String[dirsExcluded.size()];
dirsExcluded.copyInto(directories);
@@ -1725,7 +1725,7 @@ public class DirectoryScanner
*
* @see #slowScan
*/
- public synchronized String[] getDeselectedDirectories() {
+ public synchronized String[] getDeselectedDirectories() {
slowScan();
final String[] directories = new String[dirsDeselected.size()];
dirsDeselected.copyInto(directories);
@@ -1754,7 +1754,7 @@ public class DirectoryScanner
/**
* Add default exclusions to the current exclusions set.
*/
- public synchronized void addDefaultExcludes() {
+ public synchronized void addDefaultExcludes() {
final int excludesLength = excludes == null ? 0 : excludes.length;
String[] newExcludes;
final String[] defaultExcludesTemp = getDefaultExcludes();
@@ -1777,7 +1777,7 @@ public class DirectoryScanner
* @return the resource with the given name.
* @since Ant 1.5.2
*/
- public synchronized Resource getResource(final String name) {
+ public synchronized Resource getResource(final String name) {
return new FileResource(basedir, name);
}
http://git-wip-us.apache.org/repos/asf/ant/blob/df33426b/src/main/org/apache/tools/ant/ExtensionPoint.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/ExtensionPoint.java b/src/main/org/apache/tools/ant/ExtensionPoint.java
index d944437..32c8c55 100644
--- a/src/main/org/apache/tools/ant/ExtensionPoint.java
+++ b/src/main/org/apache/tools/ant/ExtensionPoint.java
@@ -45,7 +45,7 @@ public class ExtensionPoint extends Target {
* Throws an exception.
*/
@Override
- public final void addTask(Task task) {
+ public final void addTask(Task task) {
throw new BuildException(NO_CHILDREN_ALLOWED);
}
@@ -53,7 +53,7 @@ public class ExtensionPoint extends Target {
* Throws an exception.
*/
@Override
- public final void addDataType(RuntimeConfigurable r) {
+ public final void addDataType(RuntimeConfigurable r) {
throw new BuildException(NO_CHILDREN_ALLOWED);
}
http://git-wip-us.apache.org/repos/asf/ant/blob/df33426b/src/main/org/apache/tools/ant/IntrospectionHelper.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/IntrospectionHelper.java b/src/main/org/apache/tools/ant/IntrospectionHelper.java
index a1e6874..3008656 100644
--- a/src/main/org/apache/tools/ant/IntrospectionHelper.java
+++ b/src/main/org/apache/tools/ant/IntrospectionHelper.java
@@ -552,7 +552,7 @@ public final class IntrospectionHelper {
if (nestedElement != null) {
nc = new NestedCreator(null) {
@Override
- Object create(final Project project, final Object parent, final Object ignore) {
+ Object create(final Project project, final Object parent, final Object ignore) {
return nestedElement;
}
};
@@ -608,7 +608,7 @@ public final class IntrospectionHelper {
* element instance, or if the creating method fails.
*/
@Deprecated
- public Object createElement(final Project project, final Object parent, final String elementName)
+ public Object createElement(final Project project, final Object parent, final String elementName)
throws BuildException {
final NestedCreator nc = getNestedCreator(project, "", parent, elementName, null);
try {
@@ -1049,7 +1049,7 @@ public final class IntrospectionHelper {
if (java.lang.Object.class == reflectedArg) {
return new AttributeSetter(m, arg) {
@Override
- public void set(final Project p, final Object parent, final String value)
+ public void set(final Project p, final Object parent, final String value)
throws InvocationTargetException,
IllegalAccessException {
throw new BuildException(
@@ -1061,7 +1061,7 @@ public final class IntrospectionHelper {
if (java.lang.String.class.equals(reflectedArg)) {
return new AttributeSetter(m, arg) {
@Override
- public void set(final Project p, final Object parent, final String value)
+ public void set(final Project p, final Object parent, final String value)
throws InvocationTargetException, IllegalAccessException {
m.invoke(parent, (Object[]) new String[] {value});
}
@@ -1071,7 +1071,7 @@ public final class IntrospectionHelper {
if (java.lang.Character.class.equals(reflectedArg)) {
return new AttributeSetter(m, arg) {
@Override
- public void set(final Project p, final Object parent, final String value)
+ public void set(final Project p, final Object parent, final String value)
throws InvocationTargetException, IllegalAccessException {
if (value.length() == 0) {
throw new BuildException("The value \"\" is not a "
@@ -1085,7 +1085,7 @@ public final class IntrospectionHelper {
if (java.lang.Boolean.class.equals(reflectedArg)) {
return new AttributeSetter(m, arg) {
@Override
- public void set(final Project p, final Object parent, final String value)
+ public void set(final Project p, final Object parent, final String value)
throws InvocationTargetException, IllegalAccessException {
m.invoke(parent, (Object[]) new Boolean[] {
Project.toBoolean(value) ? Boolean.TRUE : Boolean.FALSE });
@@ -1096,7 +1096,7 @@ public final class IntrospectionHelper {
if (java.lang.Class.class.equals(reflectedArg)) {
return new AttributeSetter(m, arg) {
@Override
- public void set(final Project p, final Object parent, final String value)
+ public void set(final Project p, final Object parent, final String value)
throws InvocationTargetException, IllegalAccessException, BuildException {
try {
m.invoke(parent, new Object[] {Class.forName(value)});
@@ -1110,7 +1110,7 @@ public final class IntrospectionHelper {
if (java.io.File.class.equals(reflectedArg)) {
return new AttributeSetter(m, arg) {
@Override
- public void set(final Project p, final Object parent, final String value)
+ public void set(final Project p, final Object parent, final String value)
throws InvocationTargetException, IllegalAccessException {
m.invoke(parent, new Object[] {p.resolveFile(value)});
}
@@ -1120,7 +1120,7 @@ public final class IntrospectionHelper {
if (Resource.class.equals(reflectedArg) || FileProvider.class.equals(reflectedArg)) {
return new AttributeSetter(m, arg) {
@Override
- void set(final Project p, final Object parent, final String value) throws InvocationTargetException,
+ void set(final Project p, final Object parent, final String value) throws InvocationTargetException,
IllegalAccessException, BuildException {
m.invoke(parent, new Object[] {new FileResource(p, p.resolveFile(value))});
};
@@ -1130,7 +1130,7 @@ public final class IntrospectionHelper {
if (EnumeratedAttribute.class.isAssignableFrom(reflectedArg)) {
return new AttributeSetter(m, arg) {
@Override
- public void set(final Project p, final Object parent, final String value)
+ public void set(final Project p, final Object parent, final String value)
throws InvocationTargetException, IllegalAccessException, BuildException {
try {
final EnumeratedAttribute ea = (EnumeratedAttribute) reflectedArg.newInstance();
@@ -1151,7 +1151,7 @@ public final class IntrospectionHelper {
if (java.lang.Long.class.equals(reflectedArg)) {
return new AttributeSetter(m, arg) {
@Override
- public void set(final Project p, final Object parent, final String value)
+ public void set(final Project p, final Object parent, final String value)
throws InvocationTargetException, IllegalAccessException, BuildException {
try {
m.invoke(parent, new Object[] {
@@ -1195,7 +1195,7 @@ public final class IntrospectionHelper {
return new AttributeSetter(m, arg) {
@Override
- public void set(final Project p, final Object parent, final String value)
+ public void set(final Project p, final Object parent, final String value)
throws InvocationTargetException, IllegalAccessException, BuildException {
try {
final Object[] args = finalIncludeProject
@@ -1229,14 +1229,13 @@ public final class IntrospectionHelper {
if (reflectedArg.isEnum()) {
return new AttributeSetter(m, arg) {
@Override
- public void set(final Project p, final Object parent, final String value)
+ public void set(final Project p, final Object parent, final String value)
throws InvocationTargetException, IllegalAccessException,
BuildException {
Enum<?> setValue;
try {
@SuppressWarnings({ "unchecked", "rawtypes" })
- final
- Enum<?> enumValue = Enum.valueOf((Class<? extends Enum>) reflectedArg,
+ final Enum<?> enumValue = Enum.valueOf((Class<? extends Enum>) reflectedArg,
value);
setValue = enumValue;
} catch (final IllegalArgumentException e) {
@@ -1422,7 +1421,7 @@ public final class IntrospectionHelper {
}
@Override
- Object create(final Project project, final Object parent, final Object ignore)
+ Object create(final Project project, final Object parent, final Object ignore)
throws InvocationTargetException, IllegalAccessException {
return getMethod().invoke(parent, new Object[] {});
}
@@ -1444,12 +1443,12 @@ public final class IntrospectionHelper {
}
@Override
- boolean isPolyMorphic() {
+ boolean isPolyMorphic() {
return true;
}
@Override
- Object create(final Project project, final Object parent, Object child)
+ Object create(final Project project, final Object parent, Object child)
throws InvocationTargetException, IllegalAccessException, InstantiationException {
if (child == null) {
child = constructor.newInstance(
@@ -1466,7 +1465,7 @@ public final class IntrospectionHelper {
}
@Override
- void store(final Object parent, final Object child)
+ void store(final Object parent, final Object child)
throws InvocationTargetException, IllegalAccessException, InstantiationException {
if (behavior == ADD_CONFIGURED) {
istore(parent, child);
@@ -1565,7 +1564,7 @@ public final class IntrospectionHelper {
return new NestedCreator(methodAndObject.method) {
@Override
- Object create(final Project project, final Object parent, final Object ignore)
+ Object create(final Project project, final Object parent, final Object ignore)
throws InvocationTargetException, IllegalAccessException {
if (!getMethod().getName().endsWith("Configured")) {
getMethod().invoke(parent, new Object[] {realObject});
@@ -1574,12 +1573,12 @@ public final class IntrospectionHelper {
}
@Override
- Object getRealObject() {
+ Object getRealObject() {
return realObject;
}
@Override
- void store(final Object parent, final Object child) throws InvocationTargetException,
+ void store(final Object parent, final Object child) throws InvocationTargetException,
IllegalAccessException, InstantiationException {
if (getMethod().getName().endsWith("Configured")) {
getMethod().invoke(parent, new Object[] {realObject});
http://git-wip-us.apache.org/repos/asf/ant/blob/df33426b/src/main/org/apache/tools/ant/Main.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/Main.java b/src/main/org/apache/tools/ant/Main.java
index 8453176..b9492ac 100644
--- a/src/main/org/apache/tools/ant/Main.java
+++ b/src/main/org/apache/tools/ant/Main.java
@@ -157,7 +157,7 @@ public class Main implements AntMain {
private final Map<Class<?>, List<String>> extraArguments = new HashMap<Class<?>, List<String>>();
private static final GetProperty NOPROPERTIES = new GetProperty() {
- public Object getProperty(final String aName) {
+ public Object getProperty(final String aName) {
// No existing property takes precedence
return null;
}
@@ -207,7 +207,7 @@ public class Main implements AntMain {
*
* @since Ant 1.6
*/
- public void startAnt(final String[] args, final Properties additionalUserProperties,
+ public void startAnt(final String[] args, final Properties additionalUserProperties,
final ClassLoader coreLoader) {
try {
@@ -305,7 +305,7 @@ public class Main implements AntMain {
* @deprecated since 1.6.x
*/
@Deprecated
- protected Main(final String[] args) throws BuildException {
+ protected Main(final String[] args) throws BuildException {
processArgs(args);
}
@@ -684,7 +684,7 @@ public class Main implements AntMain {
* @return Parent file or null if none
*/
@Deprecated
- private File getParentFile(final File file) {
+ private File getParentFile(final File file) {
final File parent = file.getParentFile();
if (parent != null && msgOutputLevel >= Project.MSG_VERBOSE) {
@@ -898,11 +898,9 @@ public class Main implements AntMain {
// resolve properties
final PropertyHelper propertyHelper = PropertyHelper.getPropertyHelper(project);
@SuppressWarnings({ "rawtypes", "unchecked" })
- final
- Map raw = new HashMap(definedProps);
+ final Map raw = new HashMap(definedProps);
@SuppressWarnings("unchecked")
- final
- Map<String, Object> props = raw;
+ final Map<String, Object> props = raw;
final ResolvePropertyMap resolver = new ResolvePropertyMap(project,
NOPROPERTIES, propertyHelper.getExpanders());
http://git-wip-us.apache.org/repos/asf/ant/blob/df33426b/src/main/org/apache/tools/ant/Project.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/Project.java b/src/main/org/apache/tools/ant/Project.java
index 0412efa..b7ab25b 100644
--- a/src/main/org/apache/tools/ant/Project.java
+++ b/src/main/org/apache/tools/ant/Project.java
@@ -92,7 +92,7 @@ public class Project implements ResourceFactory {
* Use {@link JavaEnvUtils#JAVA_1_0} instead.
*/
@Deprecated
- public static final String JAVA_1_0 = JavaEnvUtils.JAVA_1_0;
+ public static final String JAVA_1_0 = JavaEnvUtils.JAVA_1_0;
/**
* Version constant for Java 1.1 .
*
@@ -100,7 +100,7 @@ public class Project implements ResourceFactory {
* Use {@link JavaEnvUtils#JAVA_1_1} instead.
*/
@Deprecated
- public static final String JAVA_1_1 = JavaEnvUtils.JAVA_1_1;
+ public static final String JAVA_1_1 = JavaEnvUtils.JAVA_1_1;
/**
* Version constant for Java 1.2 .
*
@@ -108,7 +108,7 @@ public class Project implements ResourceFactory {
* Use {@link JavaEnvUtils#JAVA_1_2} instead.
*/
@Deprecated
- public static final String JAVA_1_2 = JavaEnvUtils.JAVA_1_2;
+ public static final String JAVA_1_2 = JavaEnvUtils.JAVA_1_2;
/**
* Version constant for Java 1.3 .
*
@@ -116,7 +116,7 @@ public class Project implements ResourceFactory {
* Use {@link JavaEnvUtils#JAVA_1_3} instead.
*/
@Deprecated
- public static final String JAVA_1_3 = JavaEnvUtils.JAVA_1_3;
+ public static final String JAVA_1_3 = JavaEnvUtils.JAVA_1_3;
/**
* Version constant for Java 1.4 .
*
@@ -124,7 +124,7 @@ public class Project implements ResourceFactory {
* Use {@link JavaEnvUtils#JAVA_1_4} instead.
*/
@Deprecated
- public static final String JAVA_1_4 = JavaEnvUtils.JAVA_1_4;
+ public static final String JAVA_1_4 = JavaEnvUtils.JAVA_1_4;
/** Default filter start token. */
public static final String TOKEN_START = FilterSet.DEFAULT_TOKEN_START;
@@ -179,7 +179,7 @@ public class Project implements ResourceFactory {
messageLogged */
private final ThreadLocal<Boolean> isLoggingMessage = new ThreadLocal<Boolean>() {
@Override
- protected Boolean initialValue() {
+ protected Boolean initialValue() {
return Boolean.FALSE;
}
};
@@ -713,7 +713,7 @@ public class Project implements ResourceFactory {
* @see #setDefault(String)
*/
@Deprecated
- public void setDefaultTarget(final String defaultTarget) {
+ public void setDefaultTarget(final String defaultTarget) {
setDefault(defaultTarget);
}
@@ -798,7 +798,7 @@ public class Project implements ResourceFactory {
* @see FilterSet#addFilter(String,String)
*/
@Deprecated
- public void addFilter(final String token, final String value) {
+ public void addFilter(final String token, final String value) {
if (token == null) {
return;
}
@@ -818,7 +818,7 @@ public class Project implements ResourceFactory {
* @see FilterSet#getFilterHash()
*/
@Deprecated
- public Hashtable<String, String> getFilters() {
+ public Hashtable<String, String> getFilters() {
// we need to build the hashtable dynamically
return globalFilterSet.getFilterHash();
}
@@ -910,7 +910,7 @@ public class Project implements ResourceFactory {
* Use org.apache.tools.ant.util.JavaEnvUtils instead.
*/
@Deprecated
- public static String getJavaVersion() {
+ public static String getJavaVersion() {
return JavaEnvUtils.getJavaVersion();
}
@@ -1461,7 +1461,7 @@ public class Project implements ResourceFactory {
* @deprecated since 1.4.x
*/
@Deprecated
- public File resolveFile(final String fileName, final File rootDir) {
+ public File resolveFile(final String fileName, final File rootDir) {
return FILE_UTILS.resolveFile(rootDir, fileName);
}
@@ -1501,7 +1501,7 @@ public class Project implements ResourceFactory {
* @see PathTokenizer
*/
@Deprecated
- public static String translatePath(final String toProcess) {
+ public static String translatePath(final String toProcess) {
return FileUtils.translatePath(toProcess);
}
@@ -1519,7 +1519,7 @@ public class Project implements ResourceFactory {
* @deprecated since 1.4.x
*/
@Deprecated
- public void copyFile(final String sourceFile, final String destFile)
+ public void copyFile(final String sourceFile, final String destFile)
throws IOException {
FILE_UTILS.copyFile(sourceFile, destFile);
}
@@ -1540,7 +1540,7 @@ public class Project implements ResourceFactory {
* @deprecated since 1.4.x
*/
@Deprecated
- public void copyFile(final String sourceFile, final String destFile, final boolean filtering)
+ public void copyFile(final String sourceFile, final String destFile, final boolean filtering)
throws IOException {
FILE_UTILS.copyFile(sourceFile, destFile,
filtering ? globalFilters : null);
@@ -1565,7 +1565,7 @@ public class Project implements ResourceFactory {
* @deprecated since 1.4.x
*/
@Deprecated
- public void copyFile(final String sourceFile, final String destFile, final boolean filtering,
+ public void copyFile(final String sourceFile, final String destFile, final boolean filtering,
final boolean overwrite) throws IOException {
FILE_UTILS.copyFile(sourceFile, destFile,
filtering ? globalFilters : null, overwrite);
@@ -1595,7 +1595,7 @@ public class Project implements ResourceFactory {
* @deprecated since 1.4.x
*/
@Deprecated
- public void copyFile(final String sourceFile, final String destFile, final boolean filtering,
+ public void copyFile(final String sourceFile, final String destFile, final boolean filtering,
final boolean overwrite, final boolean preserveLastModified)
throws IOException {
FILE_UTILS.copyFile(sourceFile, destFile,
@@ -1616,7 +1616,7 @@ public class Project implements ResourceFactory {
* @deprecated since 1.4.x
*/
@Deprecated
- public void copyFile(final File sourceFile, final File destFile) throws IOException {
+ public void copyFile(final File sourceFile, final File destFile) throws IOException {
FILE_UTILS.copyFile(sourceFile, destFile);
}
@@ -1636,7 +1636,7 @@ public class Project implements ResourceFactory {
* @deprecated since 1.4.x
*/
@Deprecated
- public void copyFile(final File sourceFile, final File destFile, final boolean filtering)
+ public void copyFile(final File sourceFile, final File destFile, final boolean filtering)
throws IOException {
FILE_UTILS.copyFile(sourceFile, destFile,
filtering ? globalFilters : null);
@@ -1661,7 +1661,7 @@ public class Project implements ResourceFactory {
* @deprecated since 1.4.x
*/
@Deprecated
- public void copyFile(final File sourceFile, final File destFile, final boolean filtering,
+ public void copyFile(final File sourceFile, final File destFile, final boolean filtering,
final boolean overwrite) throws IOException {
FILE_UTILS.copyFile(sourceFile, destFile,
filtering ? globalFilters : null, overwrite);
@@ -1691,7 +1691,7 @@ public class Project implements ResourceFactory {
* @deprecated since 1.4.x
*/
@Deprecated
- public void copyFile(final File sourceFile, final File destFile, final boolean filtering,
+ public void copyFile(final File sourceFile, final File destFile, final boolean filtering,
final boolean overwrite, final boolean preserveLastModified)
throws IOException {
FILE_UTILS.copyFile(sourceFile, destFile,
@@ -1714,7 +1714,7 @@ public class Project implements ResourceFactory {
* above 1.1.
*/
@Deprecated
- public void setFileLastModified(final File file, final long time)
+ public void setFileLastModified(final File file, final long time)
throws BuildException {
FILE_UTILS.setFileLastModified(file, time);
log("Setting modification time for " + file, MSG_VERBOSE);
@@ -2443,7 +2443,7 @@ public class Project implements ResourceFactory {
* @return mapped value.
*/
@Override
- public Object get(final Object key) {
+ public Object get(final Object key) {
Object o = getReal(key);
if (o instanceof UnknownElement) {
// Make sure that
@@ -2487,7 +2487,7 @@ public class Project implements ResourceFactory {
* @return the file resource.
* @since Ant 1.7
*/
- public Resource getResource(final String name) {
+ public Resource getResource(final String name) {
return new FileResource(getBaseDir(), name);
}
}
http://git-wip-us.apache.org/repos/asf/ant/blob/df33426b/src/main/org/apache/tools/ant/filters/ConcatFilter.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/filters/ConcatFilter.java b/src/main/org/apache/tools/ant/filters/ConcatFilter.java
index 593e74a..0ac6024 100644
--- a/src/main/org/apache/tools/ant/filters/ConcatFilter.java
+++ b/src/main/org/apache/tools/ant/filters/ConcatFilter.java
@@ -91,7 +91,7 @@ public final class ConcatFilter extends BaseParamFilterReader
* during reading
*/
@Override
- public int read() throws IOException {
+ public int read() throws IOException {
// do the "singleton" initialization
if (!getInitialized()) {
initialize();
@@ -171,7 +171,7 @@ public final class ConcatFilter extends BaseParamFilterReader
* @return a new filter based on this configuration, but filtering
* the specified reader
*/
- public Reader chain(final Reader rdr) {
+ public Reader chain(final Reader rdr) {
final ConcatFilter newFilter = new ConcatFilter(rdr);
newFilter.setPrepend(getPrepend());
newFilter.setAppend(getAppend());
http://git-wip-us.apache.org/repos/asf/ant/blob/df33426b/src/main/org/apache/tools/ant/launch/Launcher.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/launch/Launcher.java b/src/main/org/apache/tools/ant/launch/Launcher.java
index 228f6f6..bf881db 100644
--- a/src/main/org/apache/tools/ant/launch/Launcher.java
+++ b/src/main/org/apache/tools/ant/launch/Launcher.java
@@ -35,8 +35,8 @@ import java.util.StringTokenizer;
*/
public class Launcher {
- private Launcher() {
- }
+ private Launcher() {
+ }
/**
* The Ant Home (installation) Directory property.
@@ -156,7 +156,7 @@ public class Launcher {
final URL url = Locator.fileToURL(element);
if (launchDiag) {
- System.out.println("adding library URL: " + url);
+ System.out.println("adding library URL: " + url);
}
libPathURLs.add(url);
}
http://git-wip-us.apache.org/repos/asf/ant/blob/df33426b/src/main/org/apache/tools/ant/listener/AnsiColorLogger.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/listener/AnsiColorLogger.java b/src/main/org/apache/tools/ant/listener/AnsiColorLogger.java
index 9683c41..2e69500 100644
--- a/src/main/org/apache/tools/ant/listener/AnsiColorLogger.java
+++ b/src/main/org/apache/tools/ant/listener/AnsiColorLogger.java
@@ -208,9 +208,9 @@ public class AnsiColorLogger extends DefaultLogger {
*/
/** {@inheritDoc}. */
@Override
- protected void printMessage(final String message,
- final PrintStream stream,
- final int priority) {
+ protected void printMessage(final String message,
+ final PrintStream stream,
+ final int priority) {
if (message != null && stream != null) {
if (!colorsSet) {
setColors();
http://git-wip-us.apache.org/repos/asf/ant/blob/df33426b/src/main/org/apache/tools/ant/listener/SilentLogger.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/listener/SilentLogger.java b/src/main/org/apache/tools/ant/listener/SilentLogger.java
index 7b63b87..6ddfd7f 100644
--- a/src/main/org/apache/tools/ant/listener/SilentLogger.java
+++ b/src/main/org/apache/tools/ant/listener/SilentLogger.java
@@ -28,34 +28,34 @@ import org.apache.tools.ant.DefaultLogger;
public class SilentLogger extends DefaultLogger {
@Override
- public void buildStarted(BuildEvent event) {
+ public void buildStarted(BuildEvent event) {
// log nothing
}
@Override
- public void buildFinished(BuildEvent event) {
+ public void buildFinished(BuildEvent event) {
if (event.getException() != null) {
super.buildFinished(event);
}
}
@Override
- public void targetStarted(BuildEvent event) {
+ public void targetStarted(BuildEvent event) {
// log nothing
}
@Override
- public void targetFinished(BuildEvent event) {
+ public void targetFinished(BuildEvent event) {
// log nothing
}
@Override
- public void taskStarted(BuildEvent event) {
+ public void taskStarted(BuildEvent event) {
// log nothing
}
@Override
- public void taskFinished(BuildEvent event) {
+ public void taskFinished(BuildEvent event) {
// log nothing
}
http://git-wip-us.apache.org/repos/asf/ant/blob/df33426b/src/main/org/apache/tools/ant/taskdefs/AntStructure.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/AntStructure.java b/src/main/org/apache/tools/ant/taskdefs/AntStructure.java
index db7d916..20f811a 100644
--- a/src/main/org/apache/tools/ant/taskdefs/AntStructure.java
+++ b/src/main/org/apache/tools/ant/taskdefs/AntStructure.java
@@ -76,7 +76,7 @@ public class AntStructure extends Task {
* @exception BuildException if the DTD cannot be written.
*/
@Override
- public void execute() throws BuildException {
+ public void execute() throws BuildException {
if (output == null) {
throw new BuildException("output attribute is required", getLocation());
@@ -182,12 +182,12 @@ public class AntStructure extends Task {
private final Hashtable<String, String> visited = new Hashtable<String, String>();
- public void printTail(final PrintWriter out) {
+ public void printTail(final PrintWriter out) {
visited.clear();
}
- public void printHead(final PrintWriter out, final Project p, final Hashtable<String, Class<?>> tasks,
- final Hashtable<String, Class<?>> types) {
+ public void printHead(final PrintWriter out, final Project p, final Hashtable<String, Class<?>> tasks,
+ final Hashtable<String, Class<?>> types) {
printHead(out, tasks.keys(), types.keys());
}
@@ -244,7 +244,7 @@ public class AntStructure extends Task {
/**
* Prints the definition for the target element.
*/
- public void printTargetDecl(final PrintWriter out) {
+ public void printTargetDecl(final PrintWriter out) {
out.print("<!ELEMENT target (");
out.print(TASKS);
out.print(" | ");
@@ -277,7 +277,7 @@ public class AntStructure extends Task {
/**
* Print the definition for a given element.
*/
- public void printElementDecl(final PrintWriter out, final Project p,
+ public void printElementDecl(final PrintWriter out, final Project p,
final String name, final Class<?> element) {
if (visited.containsKey(name)) {
http://git-wip-us.apache.org/repos/asf/ant/blob/df33426b/src/main/org/apache/tools/ant/taskdefs/BindTargets.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/BindTargets.java b/src/main/org/apache/tools/ant/taskdefs/BindTargets.java
index 7103422..45ad9ae 100644
--- a/src/main/org/apache/tools/ant/taskdefs/BindTargets.java
+++ b/src/main/org/apache/tools/ant/taskdefs/BindTargets.java
@@ -64,7 +64,7 @@ public class BindTargets extends Task {
}
@Override
- public void execute() throws BuildException {
+ public void execute() throws BuildException {
if (extensionPoint == null) {
throw new BuildException("extensionPoint required", getLocation());
}
http://git-wip-us.apache.org/repos/asf/ant/blob/df33426b/src/main/org/apache/tools/ant/taskdefs/Copy.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/Copy.java b/src/main/org/apache/tools/ant/taskdefs/Copy.java
index 191b9e3..2394b8f 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Copy.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Copy.java
@@ -176,7 +176,7 @@ public class Copy extends Task {
* consistently let the Introspection mechanism work.
*/
@Deprecated
- public void setPreserveLastModified(final String preserve) {
+ public void setPreserveLastModified(final String preserve) {
setPreserveLastModified(Project.toBoolean(preserve));
}
@@ -285,17 +285,17 @@ public class Copy extends Task {
this.includeEmpty = includeEmpty;
}
- /**
- * Set quiet mode. Used to hide messages when a file or directory to be
- * copied does not exist.
- *
- * @param quiet
- * whether or not to display error messages when a file or
- * directory does not exist. Default is false.
- */
- public void setQuiet(final boolean quiet) {
- this.quiet = quiet;
- }
+ /**
+ * Set quiet mode. Used to hide messages when a file or directory to be
+ * copied does not exist.
+ *
+ * @param quiet
+ * whether or not to display error messages when a file or
+ * directory does not exist. Default is false.
+ */
+ public void setQuiet(final boolean quiet) {
+ this.quiet = quiet;
+ }
/**
* Set method of handling mappers that return multiple
@@ -429,7 +429,7 @@ public class Copy extends Task {
* @exception BuildException if an error occurs.
*/
@Override
- public void execute() throws BuildException {
+ public void execute() throws BuildException {
final File savedFile = file; // may be altered in validateAttributes
final File savedDestFile = destFile;
final File savedDestDir = destDir;
@@ -823,16 +823,14 @@ public class Copy extends Task {
toCopy = new Resource[v.size()];
v.copyInto(toCopy);
} else {
- toCopy = ResourceUtils.selectOutOfDateSources(
- this,
- fromResources,
- mapper,
- new ResourceFactory() {
- public Resource getResource(final String name) {
- return new FileResource(toDir, name);
- }
- },
- granularity);
+ toCopy = ResourceUtils.selectOutOfDateSources(this, fromResources,
+ mapper,
+ new ResourceFactory() {
+ public Resource getResource(final String name) {
+ return new FileResource(toDir, name);
+ }
+ },
+ granularity);
}
for (int i = 0; i < toCopy.length; i++) {
final String[] mappedFiles = mapper.mapFileName(toCopy[i].getName());
http://git-wip-us.apache.org/repos/asf/ant/blob/df33426b/src/main/org/apache/tools/ant/taskdefs/EchoXML.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/EchoXML.java b/src/main/org/apache/tools/ant/taskdefs/EchoXML.java
index 16855bf..4a4fda2 100644
--- a/src/main/org/apache/tools/ant/taskdefs/EchoXML.java
+++ b/src/main/org/apache/tools/ant/taskdefs/EchoXML.java
@@ -116,7 +116,7 @@ public class EchoXML extends XMLFragment {
}
/** {@inheritDoc}. */
@Override
- public String[] getValues() {
+ public String[] getValues() {
return new String[] {IGNORE, ELEMENTS, ALL};
}
http://git-wip-us.apache.org/repos/asf/ant/blob/df33426b/src/main/org/apache/tools/ant/taskdefs/Get.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/Get.java b/src/main/org/apache/tools/ant/taskdefs/Get.java
index 0577d51..0f6cd68 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Get.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Get.java
@@ -95,7 +95,7 @@ public class Get extends Task {
* @exception BuildException Thrown in unrecoverable error.
*/
@Override
- public void execute() throws BuildException {
+ public void execute() throws BuildException {
checkAttributes();
for (final Resource r : sources) {
@@ -168,7 +168,7 @@ public class Get extends Task {
* @deprecated only gets the first configured resource
*/
@Deprecated
- public boolean doGet(final int logLevel, final DownloadProgress progress)
+ public boolean doGet(final int logLevel, final DownloadProgress progress)
throws IOException {
checkAttributes();
for (final Resource r : sources) {
@@ -520,20 +520,20 @@ public class Get extends Task {
/**
* begin a download
*/
- public void beginDownload() {
+ public void beginDownload() {
}
/**
* tick handler
*
*/
- public void onTick() {
+ public void onTick() {
}
/**
* end a download
*/
- public void endDownload() {
+ public void endDownload() {
}
}
@@ -557,7 +557,7 @@ public class Get extends Task {
/**
* begin a download
*/
- public void beginDownload() {
+ public void beginDownload() {
dots = 0;
}
@@ -565,7 +565,7 @@ public class Get extends Task {
* tick handler
*
*/
- public void onTick() {
+ public void onTick() {
out.print(".");
if (dots++ > DOTS_PER_LINE) {
out.flush();
@@ -576,7 +576,7 @@ public class Get extends Task {
/**
* end a download
*/
- public void endDownload() {
+ public void endDownload() {
out.println();
out.flush();
}
@@ -612,7 +612,7 @@ public class Get extends Task {
}
@Override
- public void run() {
+ public void run() {
try {
success = get();
} catch (final IOException ioex) {
@@ -762,12 +762,12 @@ public class Get extends Task {
return connection;
}
- private boolean isMoved(final int responseCode) {
- return responseCode == HttpURLConnection.HTTP_MOVED_PERM ||
- responseCode == HttpURLConnection.HTTP_MOVED_TEMP ||
- responseCode == HttpURLConnection.HTTP_SEE_OTHER ||
- responseCode == HTTP_MOVED_TEMP;
- }
+ private boolean isMoved(final int responseCode) {
+ return responseCode == HttpURLConnection.HTTP_MOVED_PERM ||
+ responseCode == HttpURLConnection.HTTP_MOVED_TEMP ||
+ responseCode == HttpURLConnection.HTTP_SEE_OTHER ||
+ responseCode == HTTP_MOVED_TEMP;
+ }
private boolean downloadFile()
throws FileNotFoundException, IOException {
@@ -792,7 +792,7 @@ public class Get extends Task {
}
if (GZIP_CONTENT_ENCODING.equals(connection.getContentEncoding())) {
- is = new GZIPInputStream(is);
+ is = new GZIPInputStream(is);
}
os = new FileOutputStream(dest);
http://git-wip-us.apache.org/repos/asf/ant/blob/df33426b/src/main/org/apache/tools/ant/taskdefs/Input.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/Input.java b/src/main/org/apache/tools/ant/taskdefs/Input.java
index a1a0a22..ed05131 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Input.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Input.java
@@ -130,7 +130,7 @@ public class Input extends Task {
/** {@inheritDoc} */
@Override
- public String[] getValues() {
+ public String[] getValues() {
return VALUES;
}
private InputHandler getInputHandler() {
@@ -210,7 +210,7 @@ public class Input extends Task {
* @throws BuildException on error
*/
@Override
- public void execute () throws BuildException {
+ public void execute () throws BuildException {
if (addproperty != null
&& getProject().getProperty(addproperty) != null) {
log("skipping " + getTaskName() + " as property " + addproperty
http://git-wip-us.apache.org/repos/asf/ant/blob/df33426b/src/main/org/apache/tools/ant/taskdefs/Javac.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/Javac.java b/src/main/org/apache/tools/ant/taskdefs/Javac.java
index a564f76..75a35cf 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Javac.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Javac.java
@@ -912,7 +912,7 @@ public class Javac extends MatchingTask {
* @exception BuildException if an error occurs
*/
@Override
- public void execute() throws BuildException {
+ public void execute() throws BuildException {
checkParameters();
resetFileLists();
http://git-wip-us.apache.org/repos/asf/ant/blob/df33426b/src/main/org/apache/tools/ant/taskdefs/Javadoc.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/Javadoc.java b/src/main/org/apache/tools/ant/taskdefs/Javadoc.java
index a82b52a..7637be7 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Javadoc.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Javadoc.java
@@ -279,7 +279,7 @@ public class Javadoc extends Task {
* @return the package name.
*/
@Override
- public String toString() {
+ public String toString() {
return getName();
}
}
@@ -364,7 +364,7 @@ public class Javadoc extends Task {
* @return the allowed values for the access type.
*/
@Override
- public String[] getValues() {
+ public String[] getValues() {
// Protected first so if any GUI tool offers a default
// based on enum #0, it will be right.
return new String[] {"protected", "public", "package", "private"};
@@ -865,7 +865,7 @@ public class Javadoc extends Task {
* Use the {@link #setExtdirs(Path)} version.
*/
@Deprecated
- public void setExtdirs(final String path) {
+ public void setExtdirs(final String path) {
cmd.createArgument().setValue("-extdirs");
cmd.createArgument().setValue(path);
}
@@ -1702,7 +1702,7 @@ public class Javadoc extends Task {
* @throws BuildException on error
*/
@Override
- public void execute() throws BuildException {
+ public void execute() throws BuildException {
checkTaskName();
final Vector<String> packagesToDoc = new Vector<String>();
@@ -1718,8 +1718,7 @@ public class Javadoc extends Task {
checkPackages(packagesToDoc, sourceDirs);
@SuppressWarnings("unchecked")
- final
- Vector<SourceFile> sourceFilesToDoc = (Vector<SourceFile>) sourceFiles.clone();
+ final Vector<SourceFile> sourceFilesToDoc = (Vector<SourceFile>) sourceFiles.clone();
addSourceFiles(sourceFilesToDoc);
checkPackagesToDoc(packagesToDoc, sourceFilesToDoc);
@@ -2370,8 +2369,7 @@ public class Javadoc extends Task {
private void parsePackages(final Vector<String> pn, final Path sp) {
final HashSet<String> addedPackages = new HashSet<String>();
@SuppressWarnings("unchecked")
- final
- Vector<DirSet> dirSets = (Vector<DirSet>) packageSets.clone();
+ final Vector<DirSet> dirSets = (Vector<DirSet>) packageSets.clone();
// for each sourcePath entry, add a directoryset with includes
// taken from packagenames attribute and nested package
@@ -2434,7 +2432,7 @@ public class Javadoc extends Task {
// are there any java files in this directory?
final File pd = new File(baseDir, dirs[i]);
final String[] files = pd.list(new FilenameFilter () {
- public boolean accept(final File dir1, final String name) {
+ public boolean accept(final File dir1, final String name) {
return name.endsWith(".java")
|| (includeNoSourcePackages
&& name.equals("package.html"));
@@ -2576,8 +2574,9 @@ public class Javadoc extends Task {
//
private String queuedLine = null;
private boolean sawWarnings = false;
+
@Override
- protected void processLine(final String line, final int messageLevel) {
+ protected void processLine(final String line, final int messageLevel) {
if (line.contains("warning")) {
sawWarnings = true;
}
http://git-wip-us.apache.org/repos/asf/ant/blob/df33426b/src/main/org/apache/tools/ant/taskdefs/MakeUrl.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/MakeUrl.java b/src/main/org/apache/tools/ant/taskdefs/MakeUrl.java
index 8aa3b07..e23c025 100644
--- a/src/main/org/apache/tools/ant/taskdefs/MakeUrl.java
+++ b/src/main/org/apache/tools/ant/taskdefs/MakeUrl.java
@@ -235,7 +235,7 @@ public class MakeUrl extends Task {
* if something goes wrong with the build
*/
@Override
- public void execute() throws BuildException {
+ public void execute() throws BuildException {
validate();
//now exit here if the property is already set
if (getProject().getProperty(property) != null) {
http://git-wip-us.apache.org/repos/asf/ant/blob/df33426b/src/main/org/apache/tools/ant/taskdefs/Manifest.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/Manifest.java b/src/main/org/apache/tools/ant/taskdefs/Manifest.java
index 9fa576f..06c74dd 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Manifest.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Manifest.java
@@ -167,7 +167,7 @@ public class Manifest {
* @return a hashcode based on the key and values.
*/
@Override
- public int hashCode() {
+ public int hashCode() {
int hashCode = 0;
if (name != null) {
@@ -184,7 +184,7 @@ public class Manifest {
* @return true if the key and values are the same.
*/
@Override
- public boolean equals(Object rhs) {
+ public boolean equals(Object rhs) {
if (rhs == null || rhs.getClass() != getClass()) {
return false;
}
@@ -721,7 +721,7 @@ public class Manifest {
* @since Ant 1.5.2
*/
@Override
- public Object clone() {
+ public Object clone() {
Section cloned = new Section();
cloned.setName(name);
Enumeration<String> e = getAttributeKeys();
@@ -761,7 +761,7 @@ public class Manifest {
* @return a hash value based on the attributes.
*/
@Override
- public int hashCode() {
+ public int hashCode() {
return attributes.hashCode();
}
@@ -771,7 +771,7 @@ public class Manifest {
* @return true if the attributes are the same.
*/
@Override
- public boolean equals(Object rhs) {
+ public boolean equals(Object rhs) {
if (rhs == null || rhs.getClass() != getClass()) {
return false;
}
@@ -1061,7 +1061,7 @@ public class Manifest {
* appears in a Manifest file.
*/
@Override
- public String toString() {
+ public String toString() {
StringWriter sw = new StringWriter();
try {
write(new PrintWriter(sw));
@@ -1100,7 +1100,7 @@ public class Manifest {
* @return a hashcode based on the version, main and sections.
*/
@Override
- public int hashCode() {
+ public int hashCode() {
int hashCode = 0;
if (manifestVersion != null) {
@@ -1118,7 +1118,7 @@ public class Manifest {
* @return true if the version, main and sections are the same.
*/
@Override
- public boolean equals(Object rhs) {
+ public boolean equals(Object rhs) {
if (rhs == null || rhs.getClass() != getClass()) {
return false;
}
http://git-wip-us.apache.org/repos/asf/ant/blob/df33426b/src/main/org/apache/tools/ant/taskdefs/PathConvert.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/PathConvert.java b/src/main/org/apache/tools/ant/taskdefs/PathConvert.java
index cf1f389..abbc5fd 100644
--- a/src/main/org/apache/tools/ant/taskdefs/PathConvert.java
+++ b/src/main/org/apache/tools/ant/taskdefs/PathConvert.java
@@ -169,7 +169,7 @@ public class PathConvert extends Task {
* @return the list of values for this enumerated attribute.
*/
@Override
- public String[] getValues() {
+ public String[] getValues() {
return new String[]{"windows", "unix", "netware", "os/2", "tandem"};
}
}
@@ -227,7 +227,7 @@ public class PathConvert extends Task {
* @see #setTargetos(PathConvert.TargetOs)
*/
@Deprecated
- public void setTargetos(String target) {
+ public void setTargetos(String target) {
TargetOs to = new TargetOs();
to.setValue(target);
setTargetos(to);
@@ -334,7 +334,7 @@ public class PathConvert extends Task {
* @throws BuildException if something is invalid.
*/
@Override
- public void execute() throws BuildException {
+ public void execute() throws BuildException {
Resources savedPath = path;
String savedPathSep = pathSep; // may be altered in validateSetup
String savedDirSep = dirSep; // may be altered in validateSetup
http://git-wip-us.apache.org/repos/asf/ant/blob/df33426b/src/main/org/apache/tools/ant/taskdefs/ProjectHelperTask.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/ProjectHelperTask.java b/src/main/org/apache/tools/ant/taskdefs/ProjectHelperTask.java
index 66580e4..8f348a7 100644
--- a/src/main/org/apache/tools/ant/taskdefs/ProjectHelperTask.java
+++ b/src/main/org/apache/tools/ant/taskdefs/ProjectHelperTask.java
@@ -40,7 +40,7 @@ public class ProjectHelperTask extends Task {
}
@Override
- public void execute() throws BuildException {
+ public void execute() throws BuildException {
ProjectHelperRepository repo = ProjectHelperRepository.getInstance();
for (Iterator it = projectHelpers.iterator(); it.hasNext();) {
ProjectHelper helper = (ProjectHelper) it.next();
http://git-wip-us.apache.org/repos/asf/ant/blob/df33426b/src/main/org/apache/tools/ant/taskdefs/Property.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/Property.java b/src/main/org/apache/tools/ant/taskdefs/Property.java
index eca3bd3..8efcd45 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Property.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Property.java
@@ -432,7 +432,7 @@ public class Property extends Task {
* @ant.attribute ignore="true"
*/
@Deprecated
- public void setUserProperty(boolean userProperty) {
+ public void setUserProperty(boolean userProperty) {
log("DEPRECATED: Ignoring request to set user property in Property"
+ " task.", Project.MSG_WARN);
}
@@ -442,7 +442,7 @@ public class Property extends Task {
* @return the current value or the empty string
*/
@Override
- public String toString() {
+ public String toString() {
return value == null ? "" : value;
}
@@ -453,7 +453,7 @@ public class Property extends Task {
* @throws BuildException on error
*/
@Override
- public void execute() throws BuildException {
+ public void execute() throws BuildException {
if (getProject() == null) {
throw new IllegalStateException("project has not been set");
}
http://git-wip-us.apache.org/repos/asf/ant/blob/df33426b/src/main/org/apache/tools/ant/taskdefs/Redirector.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/Redirector.java b/src/main/org/apache/tools/ant/taskdefs/Redirector.java
index 3735b70..3b35d23 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Redirector.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Redirector.java
@@ -71,7 +71,7 @@ public class Redirector {
}
@Override
- public void close() throws IOException {
+ public void close() throws IOException {
synchronized (outMutex) {
if (!closed && !(appendOut && appendProperties)) {
setPropertyFromBAOS(this, property);
http://git-wip-us.apache.org/repos/asf/ant/blob/df33426b/src/main/org/apache/tools/ant/taskdefs/Rmic.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/Rmic.java b/src/main/org/apache/tools/ant/taskdefs/Rmic.java
index 87dde5a..6935f9e 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Rmic.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Rmic.java
@@ -588,7 +588,7 @@ public class Rmic extends MatchingTask {
* if there's a problem with baseDir or RMIC
*/
@Override
- public void execute() throws BuildException {
+ public void execute() throws BuildException {
try {
compileList.clear();
http://git-wip-us.apache.org/repos/asf/ant/blob/df33426b/src/main/org/apache/tools/ant/taskdefs/SQLExec.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/SQLExec.java b/src/main/org/apache/tools/ant/taskdefs/SQLExec.java
index 874939b..6d1e514 100644
--- a/src/main/org/apache/tools/ant/taskdefs/SQLExec.java
+++ b/src/main/org/apache/tools/ant/taskdefs/SQLExec.java
@@ -91,7 +91,7 @@ public class SQLExec extends JDBCTask {
public static final String NORMAL = "normal", ROW = "row";
/** @return the enumerated strings */
@Override
- public String[] getValues() {
+ public String[] getValues() {
return new String[] {NORMAL, ROW};
}
}
@@ -591,7 +591,7 @@ public class SQLExec extends JDBCTask {
* @throws BuildException on error.
*/
@Override
- public void execute() throws BuildException {
+ public void execute() throws BuildException {
Vector savedTransaction = (Vector) transactions.clone();
String savedSqlCommand = sqlCommand;
@@ -853,7 +853,7 @@ public class SQLExec extends JDBCTask {
* @throws SQLException on SQL problems.
*/
@Deprecated
- protected void printResults(PrintStream out) throws SQLException {
+ protected void printResults(PrintStream out) throws SQLException {
ResultSet rs = getStatement().getResultSet();
try {
printResults(rs, out);
@@ -958,7 +958,7 @@ public class SQLExec extends JDBCTask {
* expected RDBMS.</p>
*/
@Override
- protected Connection getConnection() {
+ protected Connection getConnection() {
if (conn == null) {
conn = super.getConnection();
if (!isValidRdbms(conn)) {
@@ -993,7 +993,7 @@ public class SQLExec extends JDBCTask {
public static class OnError extends EnumeratedAttribute {
/** @return the enumerated values */
@Override
- public String[] getValues() {
+ public String[] getValues() {
return new String[] {"continue", "stop", "abort"};
}
}
http://git-wip-us.apache.org/repos/asf/ant/blob/df33426b/src/main/org/apache/tools/ant/taskdefs/Sleep.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/Sleep.java b/src/main/org/apache/tools/ant/taskdefs/Sleep.java
index 0fe27c5..6468c39 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Sleep.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Sleep.java
@@ -172,7 +172,7 @@ public class Sleep extends Task {
* @exception BuildException Description of Exception
*/
@Override
- public void execute()
+ public void execute()
throws BuildException {
try {
validate();