You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@ant.apache.org by gi...@apache.org on 2018/11/04 18:46:24 UTC
[3/3] ant git commit: Revert last 5 commits
Revert last 5 commits
Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/551cb55e
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/551cb55e
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/551cb55e
Branch: refs/heads/master
Commit: 551cb55e328281002810714a9059f34f0502c13d
Parents: 2b699eb
Author: Gintas Grigelionis <gi...@apache.org>
Authored: Sun Nov 4 19:45:48 2018 +0100
Committer: Gintas Grigelionis <gi...@apache.org>
Committed: Sun Nov 4 19:45:48 2018 +0100
----------------------------------------------------------------------
.../org/apache/tools/ant/AntClassLoader.java | 49 +++++++------
.../org/apache/tools/ant/AntTypeDefinition.java | 7 +-
.../org/apache/tools/ant/BuildException.java | 1 -
.../org/apache/tools/ant/ComponentHelper.java | 6 +-
.../org/apache/tools/ant/DirectoryScanner.java | 4 +-
src/main/org/apache/tools/ant/Evaluable.java | 1 -
.../apache/tools/ant/IntrospectionHelper.java | 11 ++-
src/main/org/apache/tools/ant/Main.java | 24 ++++---
src/main/org/apache/tools/ant/Project.java | 10 +--
.../org/apache/tools/ant/ProjectHelper.java | 1 -
.../org/apache/tools/ant/PropertyHelper.java | 50 +++++++------
.../apache/tools/ant/RuntimeConfigurable.java | 8 ++-
.../org/apache/tools/ant/UnknownElement.java | 17 +++--
.../tools/ant/dispatch/DispatchUtils.java | 2 +-
.../tools/ant/filters/BaseFilterReader.java | 2 -
.../apache/tools/ant/filters/ConcatFilter.java | 18 ++---
.../apache/tools/ant/filters/FixCrLfFilter.java | 16 -----
.../apache/tools/ant/filters/HeadFilter.java | 14 ++--
.../tools/ant/filters/StripJavaComments.java | 36 +++++-----
.../apache/tools/ant/filters/TabsToSpaces.java | 8 ++-
.../apache/tools/ant/filters/TokenFilter.java | 10 +--
.../apache/tools/ant/helper/ProjectHelper2.java | 35 +++++----
.../tools/ant/helper/ProjectHelperImpl.java | 15 ----
.../apache/tools/ant/listener/MailLogger.java | 16 +++--
.../tools/ant/taskdefs/AbstractCvsTask.java | 2 +-
.../apache/tools/ant/taskdefs/Available.java | 29 +++++---
.../org/apache/tools/ant/taskdefs/Delete.java | 8 +--
.../apache/tools/ant/taskdefs/ExecuteOn.java | 11 +--
.../org/apache/tools/ant/taskdefs/Exit.java | 6 +-
.../org/apache/tools/ant/taskdefs/FixCRLF.java | 7 +-
.../org/apache/tools/ant/taskdefs/Java.java | 19 ++---
.../org/apache/tools/ant/taskdefs/Jikes.java | 6 +-
.../tools/ant/taskdefs/JikesOutputParser.java | 4 +-
.../apache/tools/ant/taskdefs/PreSetDef.java | 17 ++---
.../org/apache/tools/ant/taskdefs/Recorder.java | 2 +-
.../apache/tools/ant/taskdefs/Redirector.java | 6 +-
.../org/apache/tools/ant/taskdefs/SQLExec.java | 9 ++-
.../tools/ant/taskdefs/TaskOutputStream.java | 2 +-
.../org/apache/tools/ant/taskdefs/Touch.java | 4 +-
src/main/org/apache/tools/ant/taskdefs/Zip.java | 6 +-
.../apache/tools/ant/taskdefs/condition/Os.java | 8 +--
.../tools/ant/taskdefs/email/EmailAddress.java | 11 +--
.../tools/ant/taskdefs/email/MimeMailer.java | 3 +-
.../ant/taskdefs/optional/SchemaValidate.java | 2 +-
.../ant/taskdefs/optional/TraXLiaison.java | 3 -
.../ant/taskdefs/optional/XMLValidateTask.java | 8 +--
.../ant/taskdefs/optional/depend/Depend.java | 27 ++++---
.../optional/ejb/DescriptorHandler.java | 14 ++--
.../ant/taskdefs/optional/ejb/IPlanetEjbc.java | 10 ++-
.../optional/ejb/JonasDeploymentTool.java | 36 +++++-----
.../taskdefs/optional/extension/Extension.java | 68 +++++++++++-------
.../optional/javah/JavahAdapterFactory.java | 8 +--
.../ant/taskdefs/optional/junit/JUnitTask.java | 76 +++++++++++---------
.../optional/junitlauncher/LauncherSupport.java | 13 ++--
.../optional/junitlauncher/TestRequest.java | 1 -
.../confined/JUnitLauncherTask.java | 8 +--
.../tools/ant/taskdefs/optional/net/FTP.java | 29 ++++----
.../taskdefs/optional/net/FTPConfigurator.java | 4 +-
.../optional/net/FTPTaskMirrorImpl.java | 33 +++++----
.../optional/ssh/ScpFromMessageBySftp.java | 12 ++--
.../ant/taskdefs/optional/unix/Symlink.java | 10 +--
.../ant/taskdefs/rmic/DefaultRmicAdapter.java | 7 +-
.../tools/ant/types/EnumeratedAttribute.java | 2 +-
src/main/org/apache/tools/ant/types/Path.java | 3 +-
.../org/apache/tools/ant/types/Permissions.java | 2 +-
.../tools/ant/types/RedirectorElement.java | 7 +-
.../tools/ant/types/resources/URLResource.java | 20 +++---
.../tools/ant/types/resources/ZipResource.java | 2 -
.../ant/types/selectors/SelectorUtils.java | 8 +--
.../ant/types/selectors/TokenizedPattern.java | 3 -
.../modifiedselector/EqualComparator.java | 4 +-
.../modifiedselector/HashvalueAlgorithm.java | 1 -
.../modifiedselector/ModifiedSelector.java | 2 +-
.../modifiedselector/PropertiesfileCache.java | 2 +-
.../apache/tools/ant/util/Base64Converter.java | 2 +-
.../apache/tools/ant/util/DOMElementWriter.java | 2 +-
.../org/apache/tools/ant/util/FileUtils.java | 2 +-
.../tools/ant/util/GlobPatternMapper.java | 6 +-
.../tools/ant/util/KeepAliveInputStream.java | 1 -
.../tools/ant/util/KeepAliveOutputStream.java | 1 -
.../ant/util/LayoutPreservingProperties.java | 8 ++-
.../apache/tools/ant/util/LazyHashtable.java | 7 --
.../apache/tools/ant/util/LinkedHashtable.java | 1 -
.../tools/ant/util/RegexpPatternMapper.java | 9 ++-
.../org/apache/tools/ant/util/StreamUtils.java | 2 -
.../org/apache/tools/ant/util/WorkerAnt.java | 1 -
.../org/apache/tools/bzip2/BZip2Constants.java | 2 +-
src/main/org/apache/tools/bzip2/BlockSort.java | 16 ++---
.../apache/tools/bzip2/CBZip2OutputStream.java | 17 +++--
src/main/org/apache/tools/tar/TarBuffer.java | 45 ++++++++----
.../org/apache/tools/tar/TarInputStream.java | 2 +-
src/main/org/apache/tools/tar/TarUtils.java | 4 +-
.../apache/tools/zip/Simple8BitZipEncoding.java | 1 -
.../apache/tools/zip/ZipEightByteInteger.java | 2 +-
src/main/org/apache/tools/zip/ZipFile.java | 3 +-
src/main/org/apache/tools/zip/ZipLong.java | 2 +-
.../org/apache/tools/zip/ZipOutputStream.java | 8 ++-
.../ant/taskdefs/ExecStreamRedirectorTest.java | 4 +-
.../org/apache/tools/ant/taskdefs/JavaTest.java | 8 +--
.../junitlauncher/JUnitLauncherTaskTest.java | 53 ++++++--------
.../apache/tools/ant/types/XMLCatalogTest.java | 9 +--
.../types/selectors/ModifiedSelectorTest.java | 2 +-
.../ant/util/regexp/RegexpMatcherTest.java | 8 +--
103 files changed, 625 insertions(+), 549 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ant/blob/551cb55e/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 8abc261..db4df96 100644
--- a/src/main/org/apache/tools/ant/AntClassLoader.java
+++ b/src/main/org/apache/tools/ant/AntClassLoader.java
@@ -126,9 +126,8 @@ public class AntClassLoader extends ClassLoader implements SubBuildListener, Clo
* @return <code>true</code> if there are more elements in the
* enumeration; <code>false</code> otherwise.
*/
- @Override
public boolean hasMoreElements() {
- return this.nextResource != null;
+ return (this.nextResource != null);
}
/**
@@ -136,7 +135,6 @@ public class AntClassLoader extends ClassLoader implements SubBuildListener, Clo
*
* @return the next resource in the enumeration
*/
- @Override
public URL nextElement() {
final URL ret = this.nextResource;
if (ret == null) {
@@ -371,8 +369,8 @@ public class AntClassLoader extends ClassLoader implements SubBuildListener, Clo
} catch (final BuildException e) {
// ignore path elements which are invalid
// relative to the project
- log("Ignoring path element " + pathElement + " from "
- + "classpath due to exception " + e, Project.MSG_DEBUG);
+ log("Ignoring path element " + pathElement + " from " +
+ "classpath due to exception " + e, Project.MSG_DEBUG);
}
}
}
@@ -586,25 +584,27 @@ public class AntClassLoader extends ClassLoader implements SubBuildListener, Clo
final Constructor<?>[] cons = theClass.getDeclaredConstructors();
//At least one constructor is guaranteed to be there, but check anyway.
- if (cons != null && cons.length > 0 && cons[0] != null) {
- final String[] strs = new String[NUMBER_OF_STRINGS];
- try {
- cons[0].newInstance((Object[]) strs);
- // Expecting an exception to be thrown by this call:
- // IllegalArgumentException: wrong number of Arguments
- } catch (final Exception e) {
- // Ignore - we are interested only in the side
- // effect - that of getting the static initializers
- // invoked. As we do not want to call a valid
- // constructor to get this side effect, an
- // attempt is made to call a hopefully
- // invalid constructor - come on, nobody
- // would have a constructor that takes in
- // 256 String arguments ;-)
- // (In fact, they can't - according to JVM spec
- // section 4.10, the number of method parameters is limited
- // to 255 by the definition of a method descriptor.
- // Constructors count as methods here.)
+ if (cons != null) {
+ if (cons.length > 0 && cons[0] != null) {
+ final String[] strs = new String[NUMBER_OF_STRINGS];
+ try {
+ cons[0].newInstance((Object[]) strs);
+ // Expecting an exception to be thrown by this call:
+ // IllegalArgumentException: wrong number of Arguments
+ } catch (final Exception e) {
+ // Ignore - we are interested only in the side
+ // effect - that of getting the static initializers
+ // invoked. As we do not want to call a valid
+ // constructor to get this side effect, an
+ // attempt is made to call a hopefully
+ // invalid constructor - come on, nobody
+ // would have a constructor that takes in
+ // 256 String arguments ;-)
+ // (In fact, they can't - according to JVM spec
+ // section 4.10, the number of method parameters is limited
+ // to 255 by the definition of a method descriptor.
+ // Constructors count as methods here.)
+ }
}
}
}
@@ -1523,7 +1523,6 @@ public class AntClassLoader extends ClassLoader implements SubBuildListener, Clo
}
/** {@inheritDoc} */
- @Override
public void close() {
cleanup();
}
http://git-wip-us.apache.org/repos/asf/ant/blob/551cb55e/src/main/org/apache/tools/ant/AntTypeDefinition.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/AntTypeDefinition.java b/src/main/org/apache/tools/ant/AntTypeDefinition.java
index 20ae38d..387577f 100644
--- a/src/main/org/apache/tools/ant/AntTypeDefinition.java
+++ b/src/main/org/apache/tools/ant/AntTypeDefinition.java
@@ -315,7 +315,8 @@ public class AntTypeDefinition {
noArg = false;
}
//now we instantiate
- T o = ctor.newInstance(noArg ? new Object[0] : new Object[] {project});
+ T o = ctor.newInstance(
+ ((noArg) ? new Object[0] : new Object[] {project}));
//set up project references.
project.setProjectReference(o);
@@ -330,12 +331,12 @@ public class AntTypeDefinition {
* @return true if the definitions are the same.
*/
public boolean sameDefinition(AntTypeDefinition other, Project project) {
- return other != null && other.getClass() == getClass()
+ return (other != null && other.getClass() == getClass()
&& other.getTypeClass(project).equals(getTypeClass(project))
&& other.getExposedClass(project).equals(getExposedClass(project))
&& other.restrict == restrict
&& other.adapterClass == adapterClass
- && other.adaptToClass == adaptToClass;
+ && other.adaptToClass == adaptToClass);
}
/**
http://git-wip-us.apache.org/repos/asf/ant/blob/551cb55e/src/main/org/apache/tools/ant/BuildException.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/BuildException.java b/src/main/org/apache/tools/ant/BuildException.java
index 33168d7..827f317 100644
--- a/src/main/org/apache/tools/ant/BuildException.java
+++ b/src/main/org/apache/tools/ant/BuildException.java
@@ -141,7 +141,6 @@ public class BuildException extends RuntimeException {
*
* @return the location of the error and the error message
*/
- @Override
public String toString() {
return location.toString() + getMessage();
}
http://git-wip-us.apache.org/repos/asf/ant/blob/551cb55e/src/main/org/apache/tools/ant/ComponentHelper.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/ComponentHelper.java b/src/main/org/apache/tools/ant/ComponentHelper.java
index 1cc84f8..28fa824 100644
--- a/src/main/org/apache/tools/ant/ComponentHelper.java
+++ b/src/main/org/apache/tools/ant/ComponentHelper.java
@@ -710,9 +710,9 @@ public class ComponentHelper {
}
Class<?> oldClass = old.getExposedClass(project);
boolean isTask = oldClass != null && Task.class.isAssignableFrom(oldClass);
- project.log(String.format("Trying to override old definition of %s %s",
- isTask ? "task" : "datatype", name), def.similarDefinition(old,
- project) ? Project.MSG_VERBOSE : Project.MSG_WARN);
+ project.log("Trying to override old definition of "
+ + (isTask ? "task " : "datatype ") + name, (def.similarDefinition(old,
+ project)) ? Project.MSG_VERBOSE : Project.MSG_WARN);
}
project.log(" +Datatype " + name + " " + def.getClassName(), Project.MSG_DEBUG);
antTypeTable.put(name, def);
http://git-wip-us.apache.org/repos/asf/ant/blob/551cb55e/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 295079b..289239b 100644
--- a/src/main/org/apache/tools/ant/DirectoryScanner.java
+++ b/src/main/org/apache/tools/ant/DirectoryScanner.java
@@ -1245,8 +1245,8 @@ public class DirectoryScanner
continue;
}
} catch (IOException e) {
- System.err.println("Failed to determine if " + file + " causes a "
- + "filesystem loop due to symbolic link; continuing");
+ System.err.println("Failed to determine if " + file + " causes a " +
+ "filesystem loop due to symbolic link; continuing");
}
final String[] children = file.list();
http://git-wip-us.apache.org/repos/asf/ant/blob/551cb55e/src/main/org/apache/tools/ant/Evaluable.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/Evaluable.java b/src/main/org/apache/tools/ant/Evaluable.java
index fbe5c9f..bd0ec7e 100644
--- a/src/main/org/apache/tools/ant/Evaluable.java
+++ b/src/main/org/apache/tools/ant/Evaluable.java
@@ -29,7 +29,6 @@ public interface Evaluable<T> extends Supplier<T> {
T eval();
- @Override
default T get() {
return eval();
}
http://git-wip-us.apache.org/repos/asf/ant/blob/551cb55e/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 4f1defe..15307c8 100644
--- a/src/main/org/apache/tools/ant/IntrospectionHelper.java
+++ b/src/main/org/apache/tools/ant/IntrospectionHelper.java
@@ -218,12 +218,11 @@ public final class IntrospectionHelper {
*/
continue;
}
- if (File.class.equals(args[0])
- && (Resource.class.equals(as.type) || FileProvider.class.equals(as.type))) {
- /*
- Ant Resources/FileProviders override java.io.File
- */
- continue;
+ if (File.class.equals(args[0])) {
+ // Ant Resources/FileProviders override java.io.File
+ if (Resource.class.equals(as.type) || FileProvider.class.equals(as.type)) {
+ continue;
+ }
}
/*
In cases other than those just explicitly covered,
http://git-wip-us.apache.org/repos/asf/ant/blob/551cb55e/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 bc51b6c..4e078e0 100644
--- a/src/main/org/apache/tools/ant/Main.java
+++ b/src/main/org/apache/tools/ant/Main.java
@@ -737,8 +737,10 @@ public class Main implements AntMain {
for (final ArgumentProcessor processor : processorRegistry.getProcessors()) {
final List<String> extraArgs = extraArguments.get(processor.getClass());
- if (extraArgs != null && processor.handleArg(extraArgs)) {
- return;
+ if (extraArgs != null) {
+ if (processor.handleArg(extraArgs)) {
+ return;
+ }
}
}
@@ -808,8 +810,10 @@ public class Main implements AntMain {
for (final ArgumentProcessor processor : processorRegistry.getProcessors()) {
final List<String> extraArgs = extraArguments.get(processor.getClass());
- if (extraArgs != null && processor.handleArg(project, extraArgs)) {
- return;
+ if (extraArgs != null) {
+ if (processor.handleArg(project, extraArgs)) {
+ return;
+ }
}
}
@@ -821,8 +825,10 @@ public class Main implements AntMain {
}
// make sure that we have a target to execute
- if (targets.isEmpty() && project.getDefaultTarget() != null) {
- targets.addElement(project.getDefaultTarget());
+ if (targets.isEmpty()) {
+ if (project.getDefaultTarget() != null) {
+ targets.addElement(project.getDefaultTarget());
+ }
}
project.executeTargets(targets);
@@ -1060,8 +1066,10 @@ public class Main implements AntMain {
props.load(in);
in.close();
shortAntVersion = props.getProperty("VERSION");
- antVersion = "Apache Ant(TM) version " + shortAntVersion
- + " compiled on " + props.getProperty("DATE");
+ antVersion = "Apache Ant(TM) version " +
+ shortAntVersion +
+ " compiled on " +
+ props.getProperty("DATE");
} catch (final IOException ioe) {
throw new BuildException("Could not load the version information:"
+ ioe.getMessage());
http://git-wip-us.apache.org/repos/asf/ant/blob/551cb55e/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 6ff43d4..62aafbc 100644
--- a/src/main/org/apache/tools/ant/Project.java
+++ b/src/main/org/apache/tools/ant/Project.java
@@ -268,7 +268,7 @@ public class Project implements ResourceFactory {
public Project createSubProject() {
Project subProject = null;
try {
- subProject = getClass().newInstance();
+ subProject = (getClass().newInstance());
} catch (final Exception e) {
subProject = new Project();
}
@@ -927,7 +927,7 @@ public class Project implements ResourceFactory {
throw new BuildException("Ant cannot work on Java prior to 1.8");
}
log("Detected Java version: " + javaVersion + " in: "
- + JavaEnvUtils.getJavaHome(), MSG_VERBOSE);
+ + System.getProperty("java.home"), MSG_VERBOSE);
log("Detected OS: " + System.getProperty("os.name"), MSG_VERBOSE);
}
@@ -1716,9 +1716,9 @@ public class Project implements ResourceFactory {
* <code>false</code> otherwise.
*/
public static boolean toBoolean(final String s) {
- return "on".equalsIgnoreCase(s)
+ return ("on".equalsIgnoreCase(s)
|| "true".equalsIgnoreCase(s)
- || "yes".equalsIgnoreCase(s);
+ || "yes".equalsIgnoreCase(s));
}
/**
@@ -1828,7 +1828,7 @@ public class Project implements ResourceFactory {
.collect(Collectors.joining(","))
+ " is " + ret, MSG_VERBOSE);
- final Vector<Target> complete = returnAll ? ret : new Vector<>(ret);
+ final Vector<Target> complete = (returnAll) ? ret : new Vector<>(ret);
for (final String curTarget : targetTable.keySet()) {
final String st = state.get(curTarget);
if (st == null) {
http://git-wip-us.apache.org/repos/asf/ant/blob/551cb55e/src/main/org/apache/tools/ant/ProjectHelper.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/ProjectHelper.java b/src/main/org/apache/tools/ant/ProjectHelper.java
index c12ebf7..10e528d 100644
--- a/src/main/org/apache/tools/ant/ProjectHelper.java
+++ b/src/main/org/apache/tools/ant/ProjectHelper.java
@@ -128,7 +128,6 @@ public class ProjectHelper {
return name;
}
- @Override
public String toString() {
return name;
}
http://git-wip-us.apache.org/repos/asf/ant/blob/551cb55e/src/main/org/apache/tools/ant/PropertyHelper.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/PropertyHelper.java b/src/main/org/apache/tools/ant/PropertyHelper.java
index 84e8bb2..fdd4376 100644
--- a/src/main/org/apache/tools/ant/PropertyHelper.java
+++ b/src/main/org/apache/tools/ant/PropertyHelper.java
@@ -144,7 +144,8 @@ public class PropertyHelper implements GetProperty {
* @param propertyHelper the invoking PropertyHelper.
* @return true if this entity 'owns' the property.
*/
- boolean setNew(String property, Object value, PropertyHelper propertyHelper);
+ boolean setNew(
+ String property, Object value, PropertyHelper propertyHelper);
/**
* Set a property.
@@ -156,7 +157,8 @@ public class PropertyHelper implements GetProperty {
* @param propertyHelper the invoking PropertyHelper.
* @return true if this entity 'owns' the property.
*/
- boolean set(String property, Object value, PropertyHelper propertyHelper);
+ boolean set(
+ String property, Object value, PropertyHelper propertyHelper);
}
//TODO PropertyEnumerator Delegate type, would improve PropertySet
@@ -171,7 +173,6 @@ public class PropertyHelper implements GetProperty {
private final String PREFIX = "toString:";
private final int PREFIX_LEN = PREFIX.length();
- @Override
public Object evaluate(String property, PropertyHelper propertyHelper) {
Object o = null;
if (property.startsWith(PREFIX) && propertyHelper.getProject() != null) {
@@ -181,15 +182,18 @@ public class PropertyHelper implements GetProperty {
}
};
- private static final PropertyExpander DEFAULT_EXPANDER = (s, pos, notUsed) -> {
+ private static final PropertyExpander DEFAULT_EXPANDER =
+ (s, pos, notUsed) -> {
int index = pos.getIndex();
//directly check near, triggering characters:
- if (s.length() - index >= 3 && '$' == s.charAt(index) && '{' == s.charAt(index + 1)) {
+ if (s.length() - index >= 3 && '$' == s.charAt(index)
+ && '{' == s.charAt(index + 1)) {
int start = index + 2;
//defer to String.indexOf() for protracted check:
int end = s.indexOf('}', start);
if (end < 0) {
- throw new BuildException("Syntax error in property: " + s.substring(index));
+ throw new BuildException(
+ "Syntax error in property: " + s.substring(index));
}
pos.setIndex(end + 1);
return start == end ? "" : s.substring(start, end);
@@ -198,16 +202,19 @@ public class PropertyHelper implements GetProperty {
};
/** dummy */
- private static final PropertyExpander SKIP_DOUBLE_DOLLAR = (s, pos, notUsed) -> {
+ private static final PropertyExpander SKIP_DOUBLE_DOLLAR =
+ (s, pos, notUsed) -> {
int index = pos.getIndex();
- /* check for $$; if found, advance by one--
- * this expander is at the bottom of the stack
- * and will thus be the last consulted,
- * so the next thing that ParseProperties will do
- * is advance the parse position beyond the second $
- */
- if (s.length() - index >= 2 && '$' == s.charAt(index) && '$' == s.charAt(++index)) {
- pos.setIndex(index);
+ if (s.length() - index >= 2) {
+ /* check for $$; if found, advance by one--
+ * this expander is at the bottom of the stack
+ * and will thus be the last consulted,
+ * so the next thing that ParseProperties will do
+ * is advance the parse position beyond the second $
+ */
+ if ('$' == s.charAt(index) && '$' == s.charAt(++index)) {
+ pos.setIndex(index);
+ }
}
return null;
};
@@ -219,7 +226,6 @@ public class PropertyHelper implements GetProperty {
private final String PREFIX = "ant.refid:";
private final int PREFIX_LEN = PREFIX.length();
- @Override
public Object evaluate(String prop, PropertyHelper helper) {
return prop.startsWith(PREFIX) && helper.getProject() != null
? helper.getProject().getReference(prop.substring(PREFIX_LEN))
@@ -273,7 +279,8 @@ public class PropertyHelper implements GetProperty {
* @since Ant 1.8.0
*/
public static Object getProperty(Project project, String name) {
- return PropertyHelper.getPropertyHelper(project).getProperty(name);
+ return PropertyHelper.getPropertyHelper(project)
+ .getProperty(name);
}
/**
@@ -285,7 +292,8 @@ public class PropertyHelper implements GetProperty {
* @since Ant 1.8.0
*/
public static void setProperty(Project project, String name, Object value) {
- PropertyHelper.getPropertyHelper(project).setProperty(name, value, true);
+ PropertyHelper.getPropertyHelper(project)
+ .setProperty(name, value, true);
}
/**
@@ -296,8 +304,10 @@ public class PropertyHelper implements GetProperty {
* @param value the value to use.
* @since Ant 1.8.0
*/
- public static void setNewProperty(Project project, String name, Object value) {
- PropertyHelper.getPropertyHelper(project).setNewProperty(name, value);
+ public static void setNewProperty(
+ Project project, String name, Object value) {
+ PropertyHelper.getPropertyHelper(project)
+ .setNewProperty(name, value);
}
//override facility for subclasses to put custom hashtables in
http://git-wip-us.apache.org/repos/asf/ant/blob/551cb55e/src/main/org/apache/tools/ant/RuntimeConfigurable.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/RuntimeConfigurable.java b/src/main/org/apache/tools/ant/RuntimeConfigurable.java
index e7b187b..90c34a2 100644
--- a/src/main/org/apache/tools/ant/RuntimeConfigurable.java
+++ b/src/main/org/apache/tools/ant/RuntimeConfigurable.java
@@ -596,9 +596,11 @@ public class RuntimeConfigurable implements Serializable {
}
// Text
- if (r.characters != null
- && (characters == null || characters.toString().trim().isEmpty())) {
- characters = new StringBuffer(r.characters.toString());
+ if (r.characters != null) {
+ if (characters == null
+ || characters.toString().trim().isEmpty()) {
+ characters = new StringBuffer(r.characters.toString());
+ }
}
}
}
http://git-wip-us.apache.org/repos/asf/ant/blob/551cb55e/src/main/org/apache/tools/ant/UnknownElement.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/UnknownElement.java b/src/main/org/apache/tools/ant/UnknownElement.java
index fff6ff4..4d1cc31 100644
--- a/src/main/org/apache/tools/ant/UnknownElement.java
+++ b/src/main/org/apache/tools/ant/UnknownElement.java
@@ -346,14 +346,19 @@ public class UnknownElement extends Task {
RuntimeConfigurable childWrapper = parentWrapper.getChild(i);
UnknownElement child = it.next();
try {
- // fall tru and fail in handlechild (unsupported element)
- if (!childWrapper.isEnabled(child) && ih.supportsNestedElement(parentUri,
- ProjectHelper.genComponentName(child.getNamespace(), child.getTag()))) {
- continue;
+ if (!childWrapper.isEnabled(child)) {
+ if (ih.supportsNestedElement(
+ parentUri, ProjectHelper.genComponentName(
+ child.getNamespace(), child.getTag()))) {
+ continue;
+ }
+ // fall tru and fail in handlechild (unsupported element)
}
- if (!handleChild(parentUri, ih, parent, child, childWrapper)) {
+ if (!handleChild(
+ parentUri, ih, parent, child, childWrapper)) {
if (!(parent instanceof TaskContainer)) {
- ih.throwNotSupported(getProject(), parent, child.getTag());
+ ih.throwNotSupported(getProject(), parent,
+ child.getTag());
} else {
// a task container - anything could happen - just add the
// child to the container
http://git-wip-us.apache.org/repos/asf/ant/blob/551cb55e/src/main/org/apache/tools/ant/dispatch/DispatchUtils.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/dispatch/DispatchUtils.java b/src/main/org/apache/tools/ant/dispatch/DispatchUtils.java
index f2802a9..efaccf8 100644
--- a/src/main/org/apache/tools/ant/dispatch/DispatchUtils.java
+++ b/src/main/org/apache/tools/ant/dispatch/DispatchUtils.java
@@ -104,7 +104,7 @@ public class DispatchUtils {
} catch (InvocationTargetException ie) {
Throwable t = ie.getTargetException();
if (t instanceof BuildException) {
- throw (BuildException) t;
+ throw ((BuildException) t);
} else {
throw new BuildException(t);
}
http://git-wip-us.apache.org/repos/asf/ant/blob/551cb55e/src/main/org/apache/tools/ant/filters/BaseFilterReader.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/filters/BaseFilterReader.java b/src/main/org/apache/tools/ant/filters/BaseFilterReader.java
index 6a7e2a9..dfd16f1 100644
--- a/src/main/org/apache/tools/ant/filters/BaseFilterReader.java
+++ b/src/main/org/apache/tools/ant/filters/BaseFilterReader.java
@@ -78,7 +78,6 @@ public abstract class BaseFilterReader extends FilterReader {
*
* @exception IOException If an I/O error occurs
*/
- @Override
public final int read(final char[] cbuf, final int off,
final int len) throws IOException {
for (int i = 0; i < len; i++) {
@@ -106,7 +105,6 @@ public abstract class BaseFilterReader extends FilterReader {
* @exception IllegalArgumentException If <code>n</code> is negative.
* @exception IOException If an I/O error occurs
*/
- @Override
public final long skip(final long n)
throws IOException, IllegalArgumentException {
if (n < 0L) {
http://git-wip-us.apache.org/repos/asf/ant/blob/551cb55e/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 76232e4..72b68f8 100644
--- a/src/main/org/apache/tools/ant/filters/ConcatFilter.java
+++ b/src/main/org/apache/tools/ant/filters/ConcatFilter.java
@@ -113,14 +113,16 @@ public final class ConcatFilter extends BaseParamFilterReader
if (ch == -1) {
ch = super.read();
}
- // don't call super.close() because that reader is used
- // on other places ...
- if (ch == -1 && appendReader != null) {
- ch = appendReader.read();
- if (ch == -1) {
- // I am the only one so I have to close the reader
- appendReader.close();
- appendReader = null;
+ if (ch == -1) {
+ // don't call super.close() because that reader is used
+ // on other places ...
+ if (appendReader != null) {
+ ch = appendReader.read();
+ if (ch == -1) {
+ // I am the only one so I have to close the reader
+ appendReader.close();
+ appendReader = null;
+ }
}
}
http://git-wip-us.apache.org/repos/asf/ant/blob/551cb55e/src/main/org/apache/tools/ant/filters/FixCrLfFilter.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/filters/FixCrLfFilter.java b/src/main/org/apache/tools/ant/filters/FixCrLfFilter.java
index b9e9173..5cb4633 100644
--- a/src/main/org/apache/tools/ant/filters/FixCrLfFilter.java
+++ b/src/main/org/apache/tools/ant/filters/FixCrLfFilter.java
@@ -442,47 +442,38 @@ public final class FixCrLfFilter extends BaseParamFilterReader implements Chaina
return in instanceof SimpleFilterReader && ((SimpleFilterReader) in).editsBlocked();
}
- @Override
public int read() throws IOException {
return preemptIndex > 0 ? preempt[--preemptIndex] : in.read();
}
- @Override
public void close() throws IOException {
in.close();
}
- @Override
public void reset() throws IOException {
in.reset();
}
- @Override
public boolean markSupported() {
return in.markSupported();
}
- @Override
public boolean ready() throws IOException {
return in.ready();
}
- @Override
public void mark(int i) throws IOException {
in.mark(i);
}
- @Override
public long skip(long i) throws IOException {
return in.skip(i);
}
- @Override
public int read(char[] buf) throws IOException {
return read(buf, 0, buf.length);
}
- @Override
public int read(char[] buf, int start, int length) throws IOException {
int count = 0;
int c = 0;
@@ -521,12 +512,10 @@ public final class FixCrLfFilter extends BaseParamFilterReader implements Chaina
state = JAVA;
}
- @Override
public boolean editsBlocked() {
return editsBlocked || super.editsBlocked();
}
- @Override
public int read() throws IOException {
int thisChar = super.read();
// Mask, block from being edited, all characters in constants.
@@ -639,7 +628,6 @@ public final class FixCrLfFilter extends BaseParamFilterReader implements Chaina
this.fixLast = fixLast;
}
- @Override
public int read() throws IOException {
int thisChar = super.read();
@@ -716,7 +704,6 @@ public final class FixCrLfFilter extends BaseParamFilterReader implements Chaina
super(in);
}
- @Override
public int read() throws IOException {
int thisChar = super.read();
@@ -746,7 +733,6 @@ public final class FixCrLfFilter extends BaseParamFilterReader implements Chaina
}
}
- @Override
public int read() throws IOException {
int lookAhead2 = super.read();
@@ -771,7 +757,6 @@ public final class FixCrLfFilter extends BaseParamFilterReader implements Chaina
this.tabLength = tabLength;
}
- @Override
public int read() throws IOException {
int c = super.read();
@@ -851,7 +836,6 @@ public final class FixCrLfFilter extends BaseParamFilterReader implements Chaina
this.tabLength = tabLength;
}
- @Override
public int read() throws IOException {
int c = super.read();
http://git-wip-us.apache.org/repos/asf/ant/blob/551cb55e/src/main/org/apache/tools/ant/filters/HeadFilter.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/filters/HeadFilter.java b/src/main/org/apache/tools/ant/filters/HeadFilter.java
index 931e7a4..3ac59b7 100644
--- a/src/main/org/apache/tools/ant/filters/HeadFilter.java
+++ b/src/main/org/apache/tools/ant/filters/HeadFilter.java
@@ -203,13 +203,17 @@ public final class HeadFilter extends BaseParamFilterReader
*/
private String headFilter(String line) {
linesRead++;
- if (skip > 0 && (linesRead - 1) < skip) {
- return null;
+ if (skip > 0) {
+ if ((linesRead - 1) < skip) {
+ return null;
+ }
}
- if (lines > 0 && linesRead > (lines + skip)) {
- eof = true;
- return null;
+ if (lines > 0) {
+ if (linesRead > (lines + skip)) {
+ eof = true;
+ return null;
+ }
}
return line;
}
http://git-wip-us.apache.org/repos/asf/ant/blob/551cb55e/src/main/org/apache/tools/ant/filters/StripJavaComments.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/filters/StripJavaComments.java b/src/main/org/apache/tools/ant/filters/StripJavaComments.java
index fa5f34a..488873e 100644
--- a/src/main/org/apache/tools/ant/filters/StripJavaComments.java
+++ b/src/main/org/apache/tools/ant/filters/StripJavaComments.java
@@ -93,30 +93,32 @@ public final class StripJavaComments
quoted = !quoted;
} else {
quoted = false;
- if (!inString && ch == '/') {
- ch = in.read();
+ if (!inString) {
if (ch == '/') {
- while (ch != '\n' && ch != -1 && ch != '\r') {
- ch = in.read();
- }
- } else if (ch == '*') {
- while (ch != -1) {
- ch = in.read();
- if (ch == '*') {
+ ch = in.read();
+ if (ch == '/') {
+ while (ch != '\n' && ch != -1 && ch != '\r') {
+ ch = in.read();
+ }
+ } else if (ch == '*') {
+ while (ch != -1) {
ch = in.read();
- while (ch == '*') {
+ if (ch == '*') {
ch = in.read();
- }
+ while (ch == '*') {
+ ch = in.read();
+ }
- if (ch == '/') {
- ch = read();
- break;
+ if (ch == '/') {
+ ch = read();
+ break;
+ }
}
}
+ } else {
+ readAheadCh = ch;
+ ch = '/';
}
- } else {
- readAheadCh = ch;
- ch = '/';
}
}
}
http://git-wip-us.apache.org/repos/asf/ant/blob/551cb55e/src/main/org/apache/tools/ant/filters/TabsToSpaces.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/filters/TabsToSpaces.java b/src/main/org/apache/tools/ant/filters/TabsToSpaces.java
index 15ab656..15c7c50 100644
--- a/src/main/org/apache/tools/ant/filters/TabsToSpaces.java
+++ b/src/main/org/apache/tools/ant/filters/TabsToSpaces.java
@@ -143,9 +143,11 @@ public final class TabsToSpaces
Parameter[] params = getParameters();
if (params != null) {
for (Parameter param : params) {
- if (param != null && TAB_LENGTH_KEY.equals(param.getName())) {
- tabLength = Integer.parseInt(param.getValue());
- break;
+ if (param != null) {
+ if (TAB_LENGTH_KEY.equals(param.getName())) {
+ tabLength = Integer.parseInt(param.getValue());
+ break;
+ }
}
}
}
http://git-wip-us.apache.org/repos/asf/ant/blob/551cb55e/src/main/org/apache/tools/ant/filters/TokenFilter.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/filters/TokenFilter.java b/src/main/org/apache/tools/ant/filters/TokenFilter.java
index 2401956..a8d54ca 100644
--- a/src/main/org/apache/tools/ant/filters/TokenFilter.java
+++ b/src/main/org/apache/tools/ant/filters/TokenFilter.java
@@ -40,7 +40,8 @@ import org.apache.tools.ant.util.regexp.RegexpUtil;
* @see ChainableReader
* @see org.apache.tools.ant.DynamicConfigurator
*/
-public class TokenFilter extends BaseFilterReader implements ChainableReader {
+public class TokenFilter extends BaseFilterReader
+ implements ChainableReader {
/**
* string filters implement this interface
*/
@@ -365,7 +366,6 @@ public class TokenFilter extends BaseFilterReader implements ChainableReader {
* @param line the string to be filtered
* @return the filtered line
*/
- @Override
public String filter(String line) {
if (from == null) {
throw new BuildException("Missing from in stringreplace");
@@ -420,7 +420,6 @@ public class TokenFilter extends BaseFilterReader implements ChainableReader {
* @return null if the string does not contain "contains",
* string otherwise
*/
- @Override
public String filter(String string) {
if (contains == null) {
throw new BuildException("Missing contains in containsstring");
@@ -489,7 +488,6 @@ public class TokenFilter extends BaseFilterReader implements ChainableReader {
* @param line the string to modify
* @return the modified string
*/
- @Override
public String filter(String line) {
initialize();
@@ -559,7 +557,6 @@ public class TokenFilter extends BaseFilterReader implements ChainableReader {
* @param string the string to apply filter on
* @return the filtered string
*/
- @Override
public String filter(String string) {
initialize();
if (!regexp.matches(string, options)) {
@@ -579,7 +576,6 @@ public class TokenFilter extends BaseFilterReader implements ChainableReader {
* @param line the string to be trimmed
* @return the trimmed string
*/
- @Override
public String filter(String line) {
return line.trim();
}
@@ -593,7 +589,6 @@ public class TokenFilter extends BaseFilterReader implements ChainableReader {
* @param line the line to modify
* @return the trimmed line
*/
- @Override
public String filter(String line) {
if (line.trim().isEmpty()) {
return null;
@@ -624,7 +619,6 @@ public class TokenFilter extends BaseFilterReader implements ChainableReader {
* @param string the string to remove the characters from
* @return the converted string
*/
- @Override
public String filter(String string) {
StringBuffer output = new StringBuffer(string.length());
for (int i = 0; i < string.length(); ++i) {
http://git-wip-us.apache.org/repos/asf/ant/blob/551cb55e/src/main/org/apache/tools/ant/helper/ProjectHelper2.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/helper/ProjectHelper2.java b/src/main/org/apache/tools/ant/helper/ProjectHelper2.java
index b53fa9b..22ebee0 100644
--- a/src/main/org/apache/tools/ant/helper/ProjectHelper2.java
+++ b/src/main/org/apache/tools/ant/helper/ProjectHelper2.java
@@ -728,8 +728,10 @@ public class ProjectHelper2 extends ProjectHelper {
String value = attrs.getValue(i);
switch (attrs.getLocalName(i)) {
case "default":
- if (value != null && !value.isEmpty() && !context.isIgnoringProjectTag()) {
- project.setDefault(value);
+ if (value != null && !value.isEmpty()) {
+ if (!context.isIgnoringProjectTag()) {
+ project.setDefault(value);
+ }
}
break;
case "name":
@@ -739,21 +741,22 @@ public class ProjectHelper2 extends ProjectHelper {
if (!context.isIgnoringProjectTag()) {
project.setName(value);
project.addReference(value, project);
- } else if (isInIncludeMode() && !value.isEmpty()
- && getCurrentTargetPrefix() != null
- && getCurrentTargetPrefix().endsWith(
- ProjectHelper.USE_PROJECT_NAME_AS_TARGET_PREFIX)) {
- String newTargetPrefix = getCurrentTargetPrefix().replace(
- ProjectHelper.USE_PROJECT_NAME_AS_TARGET_PREFIX, value);
- // help nested include tasks
- setCurrentTargetPrefix(newTargetPrefix);
+ } else if (isInIncludeMode()) {
+ if (!value.isEmpty() && getCurrentTargetPrefix() != null
+ && getCurrentTargetPrefix().endsWith(ProjectHelper.USE_PROJECT_NAME_AS_TARGET_PREFIX)) {
+ String newTargetPrefix = getCurrentTargetPrefix().replace(ProjectHelper.USE_PROJECT_NAME_AS_TARGET_PREFIX, value);
+ // help nested include tasks
+ setCurrentTargetPrefix(newTargetPrefix);
+ }
}
}
break;
case "id":
- // What's the difference between id and name ?
- if (value != null && !context.isIgnoringProjectTag()) {
- project.addReference(value, project);
+ if (value != null) {
+ // What's the difference between id and name ?
+ if (!context.isIgnoringProjectTag()) {
+ project.addReference(value, project);
+ }
}
break;
case "basedir":
@@ -1016,8 +1019,10 @@ public class ProjectHelper2 extends ProjectHelper {
project.addOrReplaceTarget(newName, newTarget);
}
if (extensionPointMissing != null && extensionPoint == null) {
- throw new BuildException("onMissingExtensionPoint attribute cannot "
- + "be specified unless extensionOf is specified", target.getLocation());
+ throw new BuildException("onMissingExtensionPoint attribute cannot " +
+ "be specified unless extensionOf is specified",
+ target.getLocation());
+
}
if (extensionPoint != null) {
ProjectHelper helper =
http://git-wip-us.apache.org/repos/asf/ant/blob/551cb55e/src/main/org/apache/tools/ant/helper/ProjectHelperImpl.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/helper/ProjectHelperImpl.java b/src/main/org/apache/tools/ant/helper/ProjectHelperImpl.java
index bcb76e2..e6461b6 100644
--- a/src/main/org/apache/tools/ant/helper/ProjectHelperImpl.java
+++ b/src/main/org/apache/tools/ant/helper/ProjectHelperImpl.java
@@ -228,7 +228,6 @@ public class ProjectHelperImpl extends ProjectHelper {
* @exception SAXParseException if this method is not overridden, or in
* case of error in an overridden version
*/
- @Override
public void startElement(String tag, AttributeList attrs) throws SAXParseException {
throw new SAXParseException("Unexpected element \"" + tag + "\"", helperImpl.locator);
}
@@ -245,7 +244,6 @@ public class ProjectHelperImpl extends ProjectHelper {
* @exception SAXParseException if this method is not overridden, or in
* case of error in an overridden version
*/
- @Override
public void characters(char[] buf, int start, int count) throws SAXParseException {
String s = new String(buf, start, count).trim();
@@ -265,7 +263,6 @@ public class ProjectHelperImpl extends ProjectHelper {
* @exception SAXException in case of error (not thrown in
* this implementation)
*/
- @Override
public void endElement(String name) throws SAXException {
// Let parent resume handling SAX events
helperImpl.parser.setDocumentHandler(parentHandler);
@@ -293,7 +290,6 @@ public class ProjectHelperImpl extends ProjectHelper {
* @param systemId The system identifier provided in the XML
* document. Will not be <code>null</code>.
*/
- @Override
public InputSource resolveEntity(String publicId, String systemId) {
helperImpl.project.log("resolving systemId: " + systemId, Project.MSG_VERBOSE);
@@ -333,7 +329,6 @@ public class ProjectHelperImpl extends ProjectHelper {
* @exception SAXParseException if the tag given is not
* <code>"project"</code>
*/
- @Override
public void startElement(String tag, AttributeList attrs) throws SAXParseException {
if ("project".equals(tag)) {
new ProjectHandler(helperImpl, this).init(tag, attrs);
@@ -349,7 +344,6 @@ public class ProjectHelperImpl extends ProjectHelper {
* @param locator The locator used by the parser.
* Will not be <code>null</code>.
*/
- @Override
public void setDocumentLocator(Locator locator) {
helperImpl.locator = locator;
}
@@ -465,7 +459,6 @@ public class ProjectHelperImpl extends ProjectHelper {
* <code>"property"</code>, <code>"target"</code>
* or a data type definition
*/
- @Override
public void startElement(String name, AttributeList attrs) throws SAXParseException {
if ("target".equals(name)) {
handleTarget(name, attrs);
@@ -603,7 +596,6 @@ public class ProjectHelperImpl extends ProjectHelper {
* @exception SAXParseException if an error occurs when initialising
* the appropriate child handler
*/
- @Override
public void startElement(String name, AttributeList attrs) throws SAXParseException {
handleElement(helperImpl, this, target, name, attrs);
}
@@ -654,7 +646,6 @@ public class ProjectHelperImpl extends ProjectHelper {
* @param start The start element in the array.
* @param count The number of characters to read from the array.
*/
- @Override
public void characters(char[] buf, int start, int count) {
String text = new String(buf, start, count);
String currentDescription = helperImpl.project.getDescription();
@@ -774,7 +765,6 @@ public class ProjectHelperImpl extends ProjectHelper {
* @param start The start element in the array.
* @param count The number of characters to read from the array.
*/
- @Override
public void characters(char[] buf, int start, int count) {
wrapper.addText(buf, start, count);
}
@@ -792,7 +782,6 @@ public class ProjectHelperImpl extends ProjectHelper {
* @exception SAXParseException if an error occurs when initialising
* the appropriate child handler
*/
- @Override
public void startElement(String name, AttributeList attrs) throws SAXParseException {
if (task instanceof TaskContainer) {
// task can contain other tasks - no other nested elements possible
@@ -911,7 +900,6 @@ public class ProjectHelperImpl extends ProjectHelper {
* @param start The start element in the array.
* @param count The number of characters to read from the array.
*/
- @Override
public void characters(char[] buf, int start, int count) {
childWrapper.addText(buf, start, count);
}
@@ -929,7 +917,6 @@ public class ProjectHelperImpl extends ProjectHelper {
* @exception SAXParseException if an error occurs when initialising
* the appropriate child handler
*/
- @Override
public void startElement(String name, AttributeList attrs) throws SAXParseException {
if (child instanceof TaskContainer) {
// taskcontainer nested element can contain other tasks - no other
@@ -1012,7 +999,6 @@ public class ProjectHelperImpl extends ProjectHelper {
*
* @see ProjectHelper#addText(Project,Object,char[],int,int)
*/
- @Override
public void characters(char[] buf, int start, int count) {
wrapper.addText(buf, start, count);
}
@@ -1029,7 +1015,6 @@ public class ProjectHelperImpl extends ProjectHelper {
* @exception SAXParseException if an error occurs when initialising
* the child handler
*/
- @Override
public void startElement(String name, AttributeList attrs) throws SAXParseException {
new NestedElementHandler(helperImpl, this, element, wrapper, target).init(name, attrs);
}
http://git-wip-us.apache.org/repos/asf/ant/blob/551cb55e/src/main/org/apache/tools/ant/listener/MailLogger.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/listener/MailLogger.java b/src/main/org/apache/tools/ant/listener/MailLogger.java
index 29068b4..c2b9e25 100644
--- a/src/main/org/apache/tools/ant/listener/MailLogger.java
+++ b/src/main/org/apache/tools/ant/listener/MailLogger.java
@@ -143,13 +143,16 @@ public class MailLogger extends DefaultLogger {
}
Values values = new Values()
.mailhost(getValue(properties, "mailhost", "localhost"))
- .port(Integer.parseInt(getValue(properties, "port",
- String.valueOf(MailMessage.DEFAULT_PORT))))
+ .port(Integer.parseInt(
+ getValue(
+ properties, "port",
+ String.valueOf(MailMessage.DEFAULT_PORT))))
.user(getValue(properties, "user", ""))
.password(getValue(properties, "password", ""))
- .ssl(Project.toBoolean(getValue(properties, "ssl", "off")))
+ .ssl(Project.toBoolean(getValue(properties,
+ "ssl", "off")))
.starttls(Project.toBoolean(getValue(properties,
- "starttls.enable", "off")))
+ "starttls.enable", "off")))
.from(getValue(properties, "from", null))
.replytoList(getValue(properties, "replyto", ""))
.toList(getValue(properties, prefix + ".to", null))
@@ -158,8 +161,9 @@ public class MailLogger extends DefaultLogger {
.mimeType(getValue(properties, "mimeType", DEFAULT_MIME_TYPE))
.charset(getValue(properties, "charset", ""))
.body(getValue(properties, prefix + ".body", ""))
- .subject(getValue(properties, prefix + ".subject",
- success ? "Build Success" : "Build Failure"));
+ .subject(getValue(
+ properties, prefix + ".subject",
+ (success) ? "Build Success" : "Build Failure"));
if (values.user().isEmpty()
&& values.password().isEmpty()
&& !values.ssl() && !values.starttls()) {
http://git-wip-us.apache.org/repos/asf/ant/blob/551cb55e/src/main/org/apache/tools/ant/taskdefs/AbstractCvsTask.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/AbstractCvsTask.java b/src/main/org/apache/tools/ant/taskdefs/AbstractCvsTask.java
index 503a3f3..c55c1ec 100644
--- a/src/main/org/apache/tools/ant/taskdefs/AbstractCvsTask.java
+++ b/src/main/org/apache/tools/ant/taskdefs/AbstractCvsTask.java
@@ -364,7 +364,7 @@ public abstract class AbstractCvsTask extends Task {
log("Caught exception: " + e.getMessage(), Project.MSG_WARN);
} catch (BuildException e) {
if (failOnError) {
- throw e;
+ throw(e);
}
Throwable t = e.getCause();
if (t == null) {
http://git-wip-us.apache.org/repos/asf/ant/blob/551cb55e/src/main/org/apache/tools/ant/taskdefs/Available.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/Available.java b/src/main/org/apache/tools/ant/taskdefs/Available.java
index 83100d3..1a4f2b5 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Available.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Available.java
@@ -266,10 +266,12 @@ public class Available extends Task implements Condition {
"At least one of (classname|file|resource) is required",
getLocation());
}
- if (type != null && file == null) {
- throw new BuildException(
+ if (type != null) {
+ if (file == null) {
+ throw new BuildException(
"The type attribute is only valid when specifying the file attribute.",
getLocation());
+ }
}
if (classpath != null) {
classpath.setProject(getProject());
@@ -340,16 +342,19 @@ public class Available extends Task implements Condition {
// ** full-pathname specified == path in list
// ** simple name specified == path in list
if (path.exists()
- && (filename.equals(p) || filename.equals(path.getName()))) {
+ && (filename.equals(p)
+ || filename.equals(path.getName()))) {
if (type == null) {
log("Found: " + path, Project.MSG_VERBOSE);
return true;
}
- if (type.isDir() && path.isDirectory()) {
+ if (type.isDir()
+ && path.isDirectory()) {
log("Found directory: " + path, Project.MSG_VERBOSE);
return true;
}
- if (type.isFile() && path.isFile()) {
+ if (type.isFile()
+ && path.isFile()) {
log("Found file: " + path, Project.MSG_VERBOSE);
return true;
}
@@ -358,7 +363,8 @@ public class Available extends Task implements Condition {
}
File parent = path.getParentFile();
// ** full-pathname specified == parent dir of path in list
- if (parent != null && parent.exists() && filename.equals(parent.getAbsolutePath())) {
+ if (parent != null && parent.exists()
+ && filename.equals(parent.getAbsolutePath())) {
if (type == null) {
log("Found: " + parent, Project.MSG_VERBOSE);
return true;
@@ -371,14 +377,17 @@ public class Available extends Task implements Condition {
return false;
}
// ** simple name specified == path in list + name
- if (path.exists() && path.isDirectory()
- && checkFile(new File(path, filename), filename + " in " + path)) {
- return true;
+ if (path.exists() && path.isDirectory()) {
+ if (checkFile(new File(path, filename),
+ filename + " in " + path)) {
+ return true;
+ }
}
// ** simple name specified == parent dir + name
while (searchParents && parent != null && parent.exists()) {
- if (checkFile(new File(parent, filename), filename + " in " + parent)) {
+ if (checkFile(new File(parent, filename),
+ filename + " in " + parent)) {
return true;
}
parent = parent.getParentFile();
http://git-wip-us.apache.org/repos/asf/ant/blob/551cb55e/src/main/org/apache/tools/ant/taskdefs/Delete.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/Delete.java b/src/main/org/apache/tools/ant/taskdefs/Delete.java
index 35fb993..bf810e8 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Delete.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Delete.java
@@ -819,12 +819,12 @@ public class Delete extends MatchingTask {
boolean isFsLoop = false;
try {
- isFsLoop = Files.isSymbolicLink(f.toPath())
- && FileUtils.getFileUtils().isLeadingPath(f.getAbsoluteFile(),
+ isFsLoop = Files.isSymbolicLink(f.toPath()) &&
+ FileUtils.getFileUtils().isLeadingPath(f.getAbsoluteFile(),
d.getAbsoluteFile(), true);
} catch (IOException e) {
- log("Failed to check if " + f + " causes a filesystem loop due to "
- + "symbolic link; continuing");
+ log("Failed to check if " + f + " causes a filesystem loop due to " +
+ "symbolic link; continuing");
}
if (f.isDirectory() && !isFsLoop) {
http://git-wip-us.apache.org/repos/asf/ant/blob/551cb55e/src/main/org/apache/tools/ant/taskdefs/ExecuteOn.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/ExecuteOn.java b/src/main/org/apache/tools/ant/taskdefs/ExecuteOn.java
index 8d80132..8994978 100644
--- a/src/main/org/apache/tools/ant/taskdefs/ExecuteOn.java
+++ b/src/main/org/apache/tools/ant/taskdefs/ExecuteOn.java
@@ -361,12 +361,13 @@ public class ExecuteOn extends ExecTask {
Vector<File> baseDirs = new Vector<>();
for (AbstractFileSet fs : filesets) {
String currentType = type;
- if (fs instanceof DirSet && !FileDirBoth.DIR.equals(type)) {
- log("Found a nested dirset but type is " + type + ". "
- + "Temporarily switching to type=\"dir\" on the assumption"
- + " that you really did mean <dirset> not <fileset>.",
+ if (fs instanceof DirSet) {
+ if (!FileDirBoth.DIR.equals(type)) {
+ log("Found a nested dirset but type is " + type + ". "
+ + "Temporarily switching to type=\"dir\" on the assumption that you really did mean <dirset> not <fileset>.",
Project.MSG_DEBUG);
- currentType = FileDirBoth.DIR;
+ currentType = FileDirBoth.DIR;
+ }
}
File base = fs.getDir(getProject());
http://git-wip-us.apache.org/repos/asf/ant/blob/551cb55e/src/main/org/apache/tools/ant/taskdefs/Exit.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/Exit.java b/src/main/org/apache/tools/ant/taskdefs/Exit.java
index 7394887..c55c584 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Exit.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Exit.java
@@ -134,8 +134,8 @@ public class Exit extends Task {
*/
@Override
public void execute() throws BuildException {
- boolean fail = nestedConditionPresent() ? testNestedCondition()
- : testIfCondition() && testUnlessCondition();
+ boolean fail = (nestedConditionPresent()) ? testNestedCondition()
+ : (testIfCondition() && testUnlessCondition());
if (fail) {
String text = null;
if (message != null && !message.trim().isEmpty()) {
@@ -231,7 +231,7 @@ public class Exit extends Task {
* @return <code>boolean</code>.
*/
private boolean nestedConditionPresent() {
- return nestedCondition != null;
+ return (nestedCondition != null);
}
}
http://git-wip-us.apache.org/repos/asf/ant/blob/551cb55e/src/main/org/apache/tools/ant/taskdefs/FixCRLF.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/FixCRLF.java b/src/main/org/apache/tools/ant/taskdefs/FixCRLF.java
index af6c6fe..cdac0d2 100644
--- a/src/main/org/apache/tools/ant/taskdefs/FixCRLF.java
+++ b/src/main/org/apache/tools/ant/taskdefs/FixCRLF.java
@@ -420,9 +420,10 @@ public class FixCRLF extends MatchingTask implements ChainableReader {
throws BuildException {
this.srcFile = srcFile;
try {
- reader = new BufferedReader(encoding == null ? new FileReader(srcFile)
- : new InputStreamReader(Files.newInputStream(srcFile.toPath()),
- encoding), INBUFLEN);
+ reader = new BufferedReader(
+ ((encoding == null) ? new FileReader(srcFile)
+ : new InputStreamReader(
+ Files.newInputStream(srcFile.toPath()), encoding)), INBUFLEN);
nextLine();
} catch (IOException e) {
http://git-wip-us.apache.org/repos/asf/ant/blob/551cb55e/src/main/org/apache/tools/ant/taskdefs/Java.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/Java.java b/src/main/org/apache/tools/ant/taskdefs/Java.java
index 58fcffb..6e3e54d 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Java.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Java.java
@@ -53,9 +53,6 @@ public class Java extends Task {
private static final String TIMEOUT_MESSAGE =
"Timeout: killed the sub-process";
- private static final String WRONG_ATTRIBUTES_MESSAGE =
- "Cannot use combination of 'classname', 'jar', 'module', 'sourcefile' attributes in same command";
-
private CommandlineJava cmdl = new CommandlineJava();
private Environment env = new Environment();
private boolean fork = false;
@@ -368,7 +365,8 @@ public class Java extends Task {
public void setJar(File jarfile) throws BuildException {
if (getCommandLine().getClassname() != null || getCommandLine().getModule() != null
|| getCommandLine().getSourceFile() != null) {
- throw new BuildException(WRONG_ATTRIBUTES_MESSAGE);
+ throw new BuildException(
+ "Cannot use combination of 'jar', 'sourcefile', 'classname', 'module' attributes in same command");
}
getCommandLine().setJar(jarfile.getAbsolutePath());
}
@@ -383,7 +381,7 @@ public class Java extends Task {
public void setClassname(String s) throws BuildException {
if (getCommandLine().getJar() != null || getCommandLine().getSourceFile() != null) {
throw new BuildException(
- "Cannot use combination of 'classname', 'jar', 'sourcefile' attributes in same command");
+ "Cannot use combination of 'jar', 'classname', sourcefile attributes in same command");
}
getCommandLine().setClassname(s);
}
@@ -399,7 +397,7 @@ public class Java extends Task {
public void setModule(String module) throws BuildException {
if (getCommandLine().getJar() != null || getCommandLine().getSourceFile() != null) {
throw new BuildException(
- "Cannot use combination of 'jar', 'module', 'sourcefile' attributes in same command");
+ "Cannot use combination of 'jar', 'module', sourcefile attributes in same command");
}
getCommandLine().setModule(module);
}
@@ -414,9 +412,12 @@ public class Java extends Task {
* @since Ant 1.10.5
*/
public void setSourceFile(final String sourceFile) throws BuildException {
- if (getCommandLine().getClassname() != null || getCommandLine().getJar() != null
- || getCommandLine().getModule() != null) {
- throw new BuildException(WRONG_ATTRIBUTES_MESSAGE);
+ final String jar = getCommandLine().getJar();
+ final String className = getCommandLine().getClassname();
+ final String module = getCommandLine().getModule();
+ if (jar != null || className != null || module != null) {
+ throw new BuildException("Cannot use 'sourcefile' in combination with 'jar' or " +
+ "'module' or 'classname'");
}
getCommandLine().setSourceFile(sourceFile);
}
http://git-wip-us.apache.org/repos/asf/ant/blob/551cb55e/src/main/org/apache/tools/ant/taskdefs/Jikes.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/Jikes.java b/src/main/org/apache/tools/ant/taskdefs/Jikes.java
index 4e299e2..3896001 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Jikes.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Jikes.java
@@ -123,8 +123,10 @@ public class Jikes {
throw new BuildException("Error running Jikes compiler", e);
}
} finally {
- if (tmpFile != null && !tmpFile.delete()) {
- tmpFile.deleteOnExit();
+ if (tmpFile != null) {
+ if (!tmpFile.delete()) {
+ tmpFile.deleteOnExit();
+ }
}
}
}
http://git-wip-us.apache.org/repos/asf/ant/blob/551cb55e/src/main/org/apache/tools/ant/taskdefs/JikesOutputParser.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/JikesOutputParser.java b/src/main/org/apache/tools/ant/taskdefs/JikesOutputParser.java
index 0fb5834..569968c 100644
--- a/src/main/org/apache/tools/ant/taskdefs/JikesOutputParser.java
+++ b/src/main/org/apache/tools/ant/taskdefs/JikesOutputParser.java
@@ -169,9 +169,9 @@ public class JikesOutputParser implements ExecuteStreamHandler {
private void log(String line) {
if (!emacsMode) {
- task.log("", error ? Project.MSG_ERR : Project.MSG_WARN);
+ task.log("", (error ? Project.MSG_ERR : Project.MSG_WARN));
}
- task.log(line, error ? Project.MSG_ERR : Project.MSG_WARN);
+ task.log(line, (error ? Project.MSG_ERR : Project.MSG_WARN));
}
/**
http://git-wip-us.apache.org/repos/asf/ant/blob/551cb55e/src/main/org/apache/tools/ant/taskdefs/PreSetDef.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/PreSetDef.java b/src/main/org/apache/tools/ant/taskdefs/PreSetDef.java
index f4b49c6..b343919 100644
--- a/src/main/org/apache/tools/ant/taskdefs/PreSetDef.java
+++ b/src/main/org/apache/tools/ant/taskdefs/PreSetDef.java
@@ -266,9 +266,9 @@ public class PreSetDef extends AntlibDefinition implements TaskContainer {
*/
@Override
public boolean sameDefinition(AntTypeDefinition other, Project project) {
- return other != null && other.getClass() == getClass() && parent != null
- && parent.sameDefinition(((PreSetDefinition) other).parent, project)
- && element.similar(((PreSetDefinition) other).element);
+ return (other != null && other.getClass() == getClass() && parent != null
+ && parent.sameDefinition(((PreSetDefinition) other).parent, project)
+ && element.similar(((PreSetDefinition) other).element));
}
/**
@@ -279,11 +279,12 @@ public class PreSetDef extends AntlibDefinition implements TaskContainer {
* @return true if the definitions are similar.
*/
@Override
- public boolean similarDefinition(AntTypeDefinition other, Project project) {
- return other != null && other.getClass().getName().equals(getClass().getName())
- && parent != null
- && parent.similarDefinition(((PreSetDefinition) other).parent, project)
- && element.similar(((PreSetDefinition) other).element);
+ public boolean similarDefinition(
+ AntTypeDefinition other, Project project) {
+ return (other != null && other.getClass().getName().equals(
+ getClass().getName()) && parent != null
+ && parent.similarDefinition(((PreSetDefinition) other).parent, project)
+ && element.similar(((PreSetDefinition) other).element));
}
}
}
http://git-wip-us.apache.org/repos/asf/ant/blob/551cb55e/src/main/org/apache/tools/ant/taskdefs/Recorder.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/Recorder.java b/src/main/org/apache/tools/ant/taskdefs/Recorder.java
index 5d3d049..90410b6 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Recorder.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Recorder.java
@@ -114,7 +114,7 @@ public class Recorder extends Task implements SubBuildListener {
* @param append if true, append to a previous file.
*/
public void setAppend(boolean append) {
- this.append = append ? Boolean.TRUE : Boolean.FALSE;
+ this.append = (append ? Boolean.TRUE : Boolean.FALSE);
}
http://git-wip-us.apache.org/repos/asf/ant/blob/551cb55e/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 af51675..5d07de1 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Redirector.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Redirector.java
@@ -695,7 +695,8 @@ public class Redirector {
/** outStreams */
private void outStreams() {
if (out != null && out.length > 0) {
- final String logHead = "Output " + (appendOut ? "appended" : "redirected") + " to ";
+ final String logHead = "Output "
+ + ((appendOut) ? "appended" : "redirected") + " to ";
outputStream = foldFiles(out, logHead, Project.MSG_VERBOSE,
appendOut, createEmptyFilesOut);
}
@@ -716,7 +717,8 @@ public class Redirector {
private void errorStreams() {
if (error != null && error.length > 0) {
- final String logHead = "Error " + (appendErr ? "appended" : "redirected") + " to ";
+ final String logHead = "Error "
+ + ((appendErr) ? "appended" : "redirected") + " to ";
errorStream = foldFiles(error, logHead, Project.MSG_VERBOSE,
appendErr, createEmptyFilesErr);
} else if (!(logError || outputStream == null) && errorProperty == null) {
http://git-wip-us.apache.org/repos/asf/ant/blob/551cb55e/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 15f6552..73deb8a 100644
--- a/src/main/org/apache/tools/ant/taskdefs/SQLExec.java
+++ b/src/main/org/apache/tools/ant/taskdefs/SQLExec.java
@@ -619,14 +619,17 @@ public class SQLExec extends JDBCTask {
sqlCommand = sqlCommand.trim();
try {
- if (srcFile == null && sqlCommand.isEmpty() && resources == null && transactions.isEmpty()) {
- throw new BuildException(
+ if (srcFile == null && sqlCommand.isEmpty() && resources == null) {
+ if (transactions.isEmpty()) {
+ throw new BuildException(
"Source file or resource collection, transactions or sql statement must be set!",
getLocation());
+ }
}
if (srcFile != null && !srcFile.isFile()) {
- throw new BuildException("Source file " + srcFile + " is not a file!", getLocation());
+ throw new BuildException("Source file " + srcFile
+ + " is not a file!", getLocation());
}
if (resources != null) {
http://git-wip-us.apache.org/repos/asf/ant/blob/551cb55e/src/main/org/apache/tools/ant/taskdefs/TaskOutputStream.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/TaskOutputStream.java b/src/main/org/apache/tools/ant/taskdefs/TaskOutputStream.java
index 7e38d44..eb6853f 100644
--- a/src/main/org/apache/tools/ant/taskdefs/TaskOutputStream.java
+++ b/src/main/org/apache/tools/ant/taskdefs/TaskOutputStream.java
@@ -70,7 +70,7 @@ public class TaskOutputStream extends OutputStream {
* @param c the character to write
* @throws IOException on error
*/
- @Override
+
public void write(int c) throws IOException {
char cc = (char) c;
if (cc == '\r' || cc == '\n') {
http://git-wip-us.apache.org/repos/asf/ant/blob/551cb55e/src/main/org/apache/tools/ant/taskdefs/Touch.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/Touch.java b/src/main/org/apache/tools/ant/taskdefs/Touch.java
index d7c9e97..86c573a 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Touch.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Touch.java
@@ -254,7 +254,7 @@ public class Touch extends Task {
}
}
log("Setting millis to " + workmillis + " from datetime attribute",
- millis < 0 ? Project.MSG_DEBUG : Project.MSG_VERBOSE);
+ ((millis < 0) ? Project.MSG_DEBUG : Project.MSG_VERBOSE));
setMillis(workmillis);
// only set if successful to this point:
dateTimeConfigured = true;
@@ -352,7 +352,7 @@ public class Touch extends Task {
private void touch(File file, long modTime) {
if (!file.exists()) {
log("Creating " + file,
- verbose ? Project.MSG_INFO : Project.MSG_VERBOSE);
+ ((verbose) ? Project.MSG_INFO : Project.MSG_VERBOSE));
try {
FILE_UTILS.createNewFile(file, mkdirs);
} catch (IOException ioe) {
http://git-wip-us.apache.org/repos/asf/ant/blob/551cb55e/src/main/org/apache/tools/ant/taskdefs/Zip.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/Zip.java b/src/main/org/apache/tools/ant/taskdefs/Zip.java
index 696b5d6..65bfdec 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Zip.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Zip.java
@@ -761,9 +761,11 @@ public class Zip extends MatchingTask {
// If we've been successful on an update, delete the
// temporary file
- if (doUpdate && !renamedFile.delete()) {
- log("Warning: unable to delete temporary file "
+ if (doUpdate) {
+ if (!renamedFile.delete()) {
+ log("Warning: unable to delete temporary file "
+ renamedFile.getName(), Project.MSG_WARN);
+ }
}
success = true;
} finally {
http://git-wip-us.apache.org/repos/asf/ant/blob/551cb55e/src/main/org/apache/tools/ant/taskdefs/condition/Os.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/condition/Os.java b/src/main/org/apache/tools/ant/taskdefs/condition/Os.java
index 21178de..9ca87a9 100644
--- a/src/main/org/apache/tools/ant/taskdefs/condition/Os.java
+++ b/src/main/org/apache/tools/ant/taskdefs/condition/Os.java
@@ -264,12 +264,12 @@ public class Os implements Condition {
boolean isNT = false;
if (isWindows) {
//there are only four 9x platforms that we look for
- //wince isn't really 9x, but crippled enough to
- //be a muchness. Ant doesn't run on CE, anyway.
- is9x = OS_NAME.contains("95")
+ is9x = (OS_NAME.contains("95")
|| OS_NAME.contains("98")
|| OS_NAME.contains("me")
- || OS_NAME.contains("ce");
+ //wince isn't really 9x, but crippled enough to
+ //be a muchness. Ant doesn't run on CE, anyway.
+ || OS_NAME.contains("ce"));
isNT = !is9x;
}
switch (family) {
http://git-wip-us.apache.org/repos/asf/ant/blob/551cb55e/src/main/org/apache/tools/ant/taskdefs/email/EmailAddress.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/email/EmailAddress.java b/src/main/org/apache/tools/ant/taskdefs/email/EmailAddress.java
index eb317f8..f8e2133 100644
--- a/src/main/org/apache/tools/ant/taskdefs/email/EmailAddress.java
+++ b/src/main/org/apache/tools/ant/taskdefs/email/EmailAddress.java
@@ -51,11 +51,12 @@ public class EmailAddress {
int len = email.length();
// shortcut for "<address>"
- if (len > minLen
- && (email.charAt(0) == '<' || email.charAt(1) == '<')
- && (email.charAt(len - 1) == '>' || email.charAt(len - 2) == '>')) {
- this.address = trim(email, true);
- return;
+ if (len > minLen) {
+ if ((email.charAt(0) == '<' || email.charAt(1) == '<')
+ && (email.charAt(len - 1) == '>' || email.charAt(len - 2) == '>')) {
+ this.address = trim(email, true);
+ return;
+ }
}
int paramDepth = 0;
http://git-wip-us.apache.org/repos/asf/ant/blob/551cb55e/src/main/org/apache/tools/ant/taskdefs/email/MimeMailer.java
----------------------------------------------------------------------
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 3335490..7406756 100644
--- a/src/main/org/apache/tools/ant/taskdefs/email/MimeMailer.java
+++ b/src/main/org/apache/tools/ant/taskdefs/email/MimeMailer.java
@@ -111,7 +111,8 @@ public class MimeMailer extends Mailer {
return type;
}
// Must be like "text/plain; charset=windows-1251"
- return (type != null ? type : "text/plain") + "; charset=" + charset;
+ return (type != null ? type : "text/plain") +
+ "; charset=" + charset;
}
@Override
http://git-wip-us.apache.org/repos/asf/ant/blob/551cb55e/src/main/org/apache/tools/ant/taskdefs/optional/SchemaValidate.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/SchemaValidate.java b/src/main/org/apache/tools/ant/taskdefs/optional/SchemaValidate.java
index a7ad4a4..40e531c 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/SchemaValidate.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/SchemaValidate.java
@@ -479,7 +479,7 @@ public class SchemaValidate extends XMLValidateTask {
public int hashCode() {
int result;
// CheckStyle:MagicNumber OFF
- result = namespace == null ? 0 : namespace.hashCode();
+ result = (namespace == null ? 0 : namespace.hashCode());
result = 29 * result + (file == null ? 0 : file.hashCode());
result = 29 * result + (url == null ? 0 : url.hashCode());
// CheckStyle:MagicNumber OFF