diff options
Diffstat (limited to 'src/main/org/apache/tools/ant/taskdefs')
38 files changed, 58 insertions, 67 deletions
diff --git a/src/main/org/apache/tools/ant/taskdefs/AbstractCvsTask.java b/src/main/org/apache/tools/ant/taskdefs/AbstractCvsTask.java index a83b8ba2e..f3cae4652 100644 --- a/src/main/org/apache/tools/ant/taskdefs/AbstractCvsTask.java +++ b/src/main/org/apache/tools/ant/taskdefs/AbstractCvsTask.java @@ -603,7 +603,7 @@ public abstract class AbstractCvsTask extends Task { */ public void setTag(String p) { // Check if not real tag => set it to null - if (!(p == null || p.trim().isEmpty())) { + if (p != null && !p.trim().isEmpty()) { tag = p; addCommandArgument("-r" + p); } @@ -639,7 +639,7 @@ public abstract class AbstractCvsTask extends Task { * can understand see man cvs */ public void setDate(String p) { - if (!(p == null || p.trim().isEmpty())) { + if (p != null && !p.trim().isEmpty()) { addCommandArgument("-D"); addCommandArgument(p); } diff --git a/src/main/org/apache/tools/ant/taskdefs/Antlib.java b/src/main/org/apache/tools/ant/taskdefs/Antlib.java index 519436e3c..769843728 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Antlib.java +++ b/src/main/org/apache/tools/ant/taskdefs/Antlib.java @@ -92,7 +92,7 @@ public class Antlib extends Task implements TaskContainer { UnknownElement ue = parser.parseAntlibDescriptor(project, antlibResource); // Check name is "antlib" - if (!(TAG.equals(ue.getTag()))) { + if (!TAG.equals(ue.getTag())) { throw new BuildException( "Unexpected tag " + ue.getTag() + " expecting " + TAG, ue.getLocation()); diff --git a/src/main/org/apache/tools/ant/taskdefs/Available.java b/src/main/org/apache/tools/ant/taskdefs/Available.java index 23496a083..b6d24bfad 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Available.java +++ b/src/main/org/apache/tools/ant/taskdefs/Available.java @@ -287,12 +287,12 @@ public class Available extends Task implements Condition { } else { setTaskName("available"); } - if (!(classname == null || checkClass(classname))) { + if (classname != null && !checkClass(classname)) { log("Unable to load class " + classname + appendix, Project.MSG_VERBOSE); return false; } - if ((file != null) && !checkFile()) { + if (file != null && !checkFile()) { StringBuilder buf = new StringBuilder("Unable to find "); if (type != null) { buf.append(type).append(' '); @@ -301,7 +301,7 @@ public class Available extends Task implements Condition { log(buf.toString(), Project.MSG_VERBOSE); return false; } - if ((resource != null) && !checkResource(resource)) { + if (resource != null && !checkResource(resource)) { log("Unable to load resource " + resource + appendix, Project.MSG_VERBOSE); return false; diff --git a/src/main/org/apache/tools/ant/taskdefs/Checksum.java b/src/main/org/apache/tools/ant/taskdefs/Checksum.java index f089ad77d..3f30f0250 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Checksum.java +++ b/src/main/org/apache/tools/ant/taskdefs/Checksum.java @@ -328,7 +328,7 @@ public class Checksum extends MatchingTask implements Condition { throw new BuildException( "Specify at least one source - a file or a resource collection."); } - if (!(resources == null || resources.isFilesystemOnly())) { + if (resources != null && !resources.isFilesystemOnly()) { throw new BuildException("Can only calculate checksums for file-based resources."); } if (file != null && file.exists() && file.isDirectory()) { diff --git a/src/main/org/apache/tools/ant/taskdefs/Copy.java b/src/main/org/apache/tools/ant/taskdefs/Copy.java index ca9feef47..5a3370504 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Copy.java +++ b/src/main/org/apache/tools/ant/taskdefs/Copy.java @@ -909,7 +909,7 @@ public class Copy extends Task { for (String dir : dirs) { final File d = new File(dir); if (!d.exists()) { - if (!(d.mkdirs() || d.isDirectory())) { + if (!d.mkdirs() && !d.isDirectory()) { log("Unable to create directory " + d.getAbsolutePath(), Project.MSG_ERR); } else { diff --git a/src/main/org/apache/tools/ant/taskdefs/Definer.java b/src/main/org/apache/tools/ant/taskdefs/Definer.java index 154974e91..92af5d618 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Definer.java +++ b/src/main/org/apache/tools/ant/taskdefs/Definer.java @@ -320,7 +320,7 @@ public abstract class Definer extends DefBase { */ private URL fileToURL() { String message = null; - if (!(file.exists())) { + if (!file.exists()) { message = "File " + file + " does not exist"; } if (message == null && !(file.isFile())) { diff --git a/src/main/org/apache/tools/ant/taskdefs/Delete.java b/src/main/org/apache/tools/ant/taskdefs/Delete.java index 2d1ab22b4..7b146d324 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Delete.java +++ b/src/main/org/apache/tools/ant/taskdefs/Delete.java @@ -748,7 +748,7 @@ public class Delete extends MatchingTask { if (!f.exists()) { continue; } - if (!(f.isDirectory()) || f.list().length == 0) { + if (!f.isDirectory() || f.list().length == 0) { log("Deleting " + f, verbosity); if (!delete(f) && failonerror) { handle("Unable to delete " diff --git a/src/main/org/apache/tools/ant/taskdefs/DependSet.java b/src/main/org/apache/tools/ant/taskdefs/DependSet.java index 0fbdf56d5..b02651034 100644 --- a/src/main/org/apache/tools/ant/taskdefs/DependSet.java +++ b/src/main/org/apache/tools/ant/taskdefs/DependSet.java @@ -205,7 +205,7 @@ public class DependSet extends MatchingTask { "At least one set of target files must be specified"); } //no sources = nothing to compare; no targets = nothing to delete: - if (!(sources.isEmpty() || targets.isEmpty() || uptodate(sources, targets))) { + if (!sources.isEmpty() && !targets.isEmpty() && !uptodate(sources, targets)) { log("Deleting all target files.", Project.MSG_VERBOSE); if (verbose) { for (String t : targets.list()) { diff --git a/src/main/org/apache/tools/ant/taskdefs/Exit.java b/src/main/org/apache/tools/ant/taskdefs/Exit.java index 35967a55b..d803d0b04 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Exit.java +++ b/src/main/org/apache/tools/ant/taskdefs/Exit.java @@ -138,7 +138,7 @@ public class Exit extends Task { : (testIfCondition() && testUnlessCondition()); if (fail) { String text = null; - if (!(message == null || message.trim().isEmpty())) { + if (message != null && !message.trim().isEmpty()) { text = message.trim(); } else { if (ifCondition != null && !"".equals(ifCondition) diff --git a/src/main/org/apache/tools/ant/taskdefs/Expand.java b/src/main/org/apache/tools/ant/taskdefs/Expand.java index 963561b43..56d5bf491 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Expand.java +++ b/src/main/org/apache/tools/ant/taskdefs/Expand.java @@ -268,7 +268,7 @@ public class Expand extends Task { entryName = entryName.substring(1); } - if (!(patternsets == null || patternsets.isEmpty())) { + if (patternsets != null && !patternsets.isEmpty()) { String name = entryName.replace('/', File.separatorChar) .replace('\\', File.separatorChar); diff --git a/src/main/org/apache/tools/ant/taskdefs/Javadoc.java b/src/main/org/apache/tools/ant/taskdefs/Javadoc.java index 9b5e3c7ff..19f6885a8 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Javadoc.java +++ b/src/main/org/apache/tools/ant/taskdefs/Javadoc.java @@ -2174,8 +2174,7 @@ public class Javadoc extends Task { private void doDocFilesSubDirs(final Commandline toExecute) { if (docFilesSubDirs) { toExecute.createArgument().setValue("-docfilessubdirs"); - if (!(excludeDocFilesSubDir == null - || excludeDocFilesSubDir.trim().isEmpty())) { + if (excludeDocFilesSubDir != null && !excludeDocFilesSubDir.trim().isEmpty()) { toExecute.createArgument().setValue("-excludedocfilessubdir"); toExecute.createArgument().setValue(excludeDocFilesSubDir); } diff --git a/src/main/org/apache/tools/ant/taskdefs/Length.java b/src/main/org/apache/tools/ant/taskdefs/Length.java index c39a7951a..04fab3ddc 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Length.java +++ b/src/main/org/apache/tools/ant/taskdefs/Length.java @@ -221,7 +221,7 @@ public class Length extends Task implements Condition { "the mode attribute is for use with the file/resource length function"); } } else if (resources != null) { - if (!(EACH.equals(mode) || ALL.equals(mode))) { + if (!EACH.equals(mode) && !ALL.equals(mode)) { throw new BuildException( "invalid mode setting for file/resource length function: \"" + mode + "\""); diff --git a/src/main/org/apache/tools/ant/taskdefs/LoadProperties.java b/src/main/org/apache/tools/ant/taskdefs/LoadProperties.java index b186eeffc..b04ad7d7b 100644 --- a/src/main/org/apache/tools/ant/taskdefs/LoadProperties.java +++ b/src/main/org/apache/tools/ant/taskdefs/LoadProperties.java @@ -183,7 +183,7 @@ public class LoadProperties extends Task { String text = instream.readFully(); - if (!(text == null || text.isEmpty())) { + if (text != null && !text.isEmpty()) { if (!text.endsWith("\n")) { text = text + "\n"; } diff --git a/src/main/org/apache/tools/ant/taskdefs/LoadResource.java b/src/main/org/apache/tools/ant/taskdefs/LoadResource.java index 1f44d2002..c23687218 100644 --- a/src/main/org/apache/tools/ant/taskdefs/LoadResource.java +++ b/src/main/org/apache/tools/ant/taskdefs/LoadResource.java @@ -178,7 +178,7 @@ public class LoadResource extends Task { text = null; } - if (!(text == null || text.isEmpty())) { + if (text != null && !text.isEmpty()) { getProject().setNewProperty(property, text); log("loaded " + text.length() + " characters", Project.MSG_VERBOSE); diff --git a/src/main/org/apache/tools/ant/taskdefs/MacroDef.java b/src/main/org/apache/tools/ant/taskdefs/MacroDef.java index d69907d0d..1892f6805 100644 --- a/src/main/org/apache/tools/ant/taskdefs/MacroDef.java +++ b/src/main/org/apache/tools/ant/taskdefs/MacroDef.java @@ -729,8 +729,8 @@ public class MacroDef extends AntlibDefinition { } if (getURI() == null || "".equals(getURI()) || getURI().equals(ProjectHelper.ANT_CORE_URI)) { - if (!(other.getURI() == null || "".equals(other.getURI()) - || other.getURI().equals(ProjectHelper.ANT_CORE_URI))) { + if (other.getURI() != null && !"".equals(other.getURI()) + && !other.getURI().equals(ProjectHelper.ANT_CORE_URI)) { return false; } } else if (!getURI().equals(other.getURI())) { diff --git a/src/main/org/apache/tools/ant/taskdefs/MacroInstance.java b/src/main/org/apache/tools/ant/taskdefs/MacroInstance.java index 12249e68c..23ff8ab49 100644 --- a/src/main/org/apache/tools/ant/taskdefs/MacroInstance.java +++ b/src/main/org/apache/tools/ant/taskdefs/MacroInstance.java @@ -375,7 +375,7 @@ public class MacroInstance extends Task implements DynamicAttribute, TaskContain text = text.trim(); } localAttributes.put(macroDef.getText().getName(), text); - } else if (!(text == null || text.trim().isEmpty())) { + } else if (text != null && !text.trim().isEmpty()) { throw new BuildException( "The \"%s\" macro does not support nested text data.", getTaskName()); diff --git a/src/main/org/apache/tools/ant/taskdefs/MatchingTask.java b/src/main/org/apache/tools/ant/taskdefs/MatchingTask.java index a7654db7d..99371d41a 100644 --- a/src/main/org/apache/tools/ant/taskdefs/MatchingTask.java +++ b/src/main/org/apache/tools/ant/taskdefs/MatchingTask.java @@ -162,7 +162,7 @@ public abstract class MatchingTask extends Task implements SelectorContainer { public void XsetIgnore(String ignoreString) { log("The ignore attribute is deprecated." + "Please use the excludes attribute.", Project.MSG_WARN); - if (!(ignoreString == null || ignoreString.isEmpty())) { + if (ignoreString != null && !ignoreString.isEmpty()) { StringTokenizer tok = new StringTokenizer(ignoreString, ", ", false); while (tok.hasMoreTokens()) { diff --git a/src/main/org/apache/tools/ant/taskdefs/Move.java b/src/main/org/apache/tools/ant/taskdefs/Move.java index 28a308602..a2f841497 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Move.java +++ b/src/main/org/apache/tools/ant/taskdefs/Move.java @@ -179,7 +179,7 @@ public class Move extends Copy { } File d = new File(toDirName); if (!d.exists()) { - if (!(d.mkdirs() || d.exists())) { + if (!d.mkdirs() && !d.exists()) { log("Unable to create directory " + d.getAbsolutePath(), Project.MSG_ERR); } else { @@ -372,8 +372,8 @@ public class Move extends Copy { + " is a no-op.", Project.MSG_VERBOSE); return true; } - if (!(getFileUtils().areSame(sourceFile, destFile) - || getFileUtils().tryHardToDelete(destFile, performGc))) { + if (!getFileUtils().areSame(sourceFile, destFile) + && !getFileUtils().tryHardToDelete(destFile, performGc)) { throw new BuildException("Unable to remove existing file %s", destFile); } diff --git a/src/main/org/apache/tools/ant/taskdefs/Parallel.java b/src/main/org/apache/tools/ant/taskdefs/Parallel.java index c149a4aee..0922b9f84 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Parallel.java +++ b/src/main/org/apache/tools/ant/taskdefs/Parallel.java @@ -269,7 +269,7 @@ public class Parallel extends Task ThreadGroup group = new ThreadGroup("parallel"); TaskRunnable[] daemons = null; - if (!(daemonTasks == null || daemonTasks.tasks.isEmpty())) { + if (daemonTasks != null && !daemonTasks.tasks.isEmpty()) { daemons = new TaskRunnable[daemonTasks.tasks.size()]; } diff --git a/src/main/org/apache/tools/ant/taskdefs/SubAnt.java b/src/main/org/apache/tools/ant/taskdefs/SubAnt.java index cd97123ed..d930a8d2b 100644 --- a/src/main/org/apache/tools/ant/taskdefs/SubAnt.java +++ b/src/main/org/apache/tools/ant/taskdefs/SubAnt.java @@ -227,7 +227,7 @@ public class SubAnt extends Task { log("Leaving directory: " + subdirPath + "\n", Project.MSG_INFO); } } catch (RuntimeException ex) { - if (!(getProject().isKeepGoingMode())) { + if (!getProject().isKeepGoingMode()) { if (verbose && subdirPath != null) { log("Leaving directory: " + subdirPath + "\n", Project.MSG_INFO); } @@ -235,7 +235,7 @@ public class SubAnt extends Task { } thrownException = ex; } catch (Throwable ex) { - if (!(getProject().isKeepGoingMode())) { + if (!getProject().isKeepGoingMode()) { if (verbose && subdirPath != null) { log("Leaving directory: " + subdirPath + "\n", Project.MSG_INFO); } diff --git a/src/main/org/apache/tools/ant/taskdefs/UpToDate.java b/src/main/org/apache/tools/ant/taskdefs/UpToDate.java index 03babd97d..19dcd2316 100644 --- a/src/main/org/apache/tools/ant/taskdefs/UpToDate.java +++ b/src/main/org/apache/tools/ant/taskdefs/UpToDate.java @@ -159,7 +159,7 @@ public class UpToDate extends Task implements Condition { "At least one srcfile or a nested <srcfiles> or <srcresources> element must be set."); } - if (!(sourceFileSets.isEmpty() && sourceResources.isEmpty()) + if ((!sourceFileSets.isEmpty() || !sourceResources.isEmpty()) && sourceFile != null) { throw new BuildException( "Cannot specify both the srcfile attribute and a nested <srcfiles> or <srcresources> element."); diff --git a/src/main/org/apache/tools/ant/taskdefs/XSLTProcess.java b/src/main/org/apache/tools/ant/taskdefs/XSLTProcess.java index a7c6fa2e5..98bc45816 100644 --- a/src/main/org/apache/tools/ant/taskdefs/XSLTProcess.java +++ b/src/main/org/apache/tools/ant/taskdefs/XSLTProcess.java @@ -889,11 +889,9 @@ public class XSLTProcess extends MatchingTask implements XSLTLogger { */ private void ensureDirectoryFor(final File targetFile) throws BuildException { final File directory = targetFile.getParentFile(); - if (!directory.exists()) { - if (!(directory.mkdirs() || directory.isDirectory())) { - handleError("Unable to create directory: " - + directory.getAbsolutePath()); - } + if (!directory.exists() && !directory.mkdirs() && !directory.isDirectory()) { + handleError("Unable to create directory: " + + directory.getAbsolutePath()); } } diff --git a/src/main/org/apache/tools/ant/taskdefs/Zip.java b/src/main/org/apache/tools/ant/taskdefs/Zip.java index 078c21a75..a0dc95e75 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Zip.java +++ b/src/main/org/apache/tools/ant/taskdefs/Zip.java @@ -1600,13 +1600,13 @@ public class Zip extends MatchingTask { final List<Resource> resources = new Vector<>(); if (!doFilesonly) { for (String d : rs.getIncludedDirectories()) { - if (!(d.isEmpty() && skipEmptyNames)) { + if (!d.isEmpty() || !skipEmptyNames) { resources.add(rs.getResource(d)); } } } for (String f : rs.getIncludedFiles()) { - if (!(f.isEmpty() && skipEmptyNames)) { + if (!f.isEmpty() || !skipEmptyNames) { resources.add(rs.getResource(f)); } } diff --git a/src/main/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java b/src/main/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java index a9ba55f8c..58f751f35 100644 --- a/src/main/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java +++ b/src/main/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java @@ -334,7 +334,7 @@ public abstract class DefaultCompilerAdapter } } - if (!(extdirs == null || extdirs.isEmpty())) { + if (extdirs != null && !extdirs.isEmpty()) { cmd.createArgument().setValue("-extdirs"); cmd.createArgument().setPath(extdirs); } diff --git a/src/main/org/apache/tools/ant/taskdefs/compilers/Jikes.java b/src/main/org/apache/tools/ant/taskdefs/compilers/Jikes.java index cb9385c02..f0662484f 100644 --- a/src/main/org/apache/tools/ant/taskdefs/compilers/Jikes.java +++ b/src/main/org/apache/tools/ant/taskdefs/compilers/Jikes.java @@ -83,7 +83,7 @@ public class Jikes extends DefaultCompilerAdapter { classpath.append(new Path(project, jikesPath)); } - if (!(extdirs == null || extdirs.isEmpty())) { + if (extdirs != null && !extdirs.isEmpty()) { cmd.createArgument().setValue("-extdirs"); cmd.createArgument().setPath(extdirs); } diff --git a/src/main/org/apache/tools/ant/taskdefs/condition/ResourceContains.java b/src/main/org/apache/tools/ant/taskdefs/condition/ResourceContains.java index 033701b47..8a82c7820 100644 --- a/src/main/org/apache/tools/ant/taskdefs/condition/ResourceContains.java +++ b/src/main/org/apache/tools/ant/taskdefs/condition/ResourceContains.java @@ -88,8 +88,7 @@ public class ResourceContains implements Condition { o = rc.iterator().next(); } } else { - throw new BuildException("Illegal value at '%s': %s", refid, - o); + throw new BuildException("Illegal value at '%s': %s", refid, o); } } this.resource = (Resource) o; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/EchoProperties.java b/src/main/org/apache/tools/ant/taskdefs/optional/EchoProperties.java index 2ce593eb8..6f4179c21 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/EchoProperties.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/EchoProperties.java @@ -209,7 +209,7 @@ public class EchoProperties extends Task { * @since Ant 1.7 */ public void setRegex(String regex) { - if (!(regex == null || regex.isEmpty())) { + if (regex != null && !regex.isEmpty()) { this.regex = regex; PropertySet ps = new PropertySet(); ps.setProject(getProject()); diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ccm/Continuus.java b/src/main/org/apache/tools/ant/taskdefs/optional/ccm/Continuus.java index 845c7bf4c..869ed7f0b 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/ccm/Continuus.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/ccm/Continuus.java @@ -103,7 +103,7 @@ public abstract class Continuus extends Task { */ protected final String getCcmCommand() { String toReturn = ccmDir; - if (!("".equals(toReturn) || toReturn.endsWith("/"))) { + if (!"".equals(toReturn) && !toReturn.endsWith("/")) { toReturn += "/"; } diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/ClearCase.java b/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/ClearCase.java index eba0e9a6c..8db603dc1 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/ClearCase.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/ClearCase.java @@ -128,7 +128,7 @@ public abstract class ClearCase extends Task { */ protected final String getClearToolCommand() { String toReturn = mClearToolDir; - if (!("".equals(toReturn) || toReturn.endsWith("/"))) { + if (!"".equals(toReturn) && !toReturn.endsWith("/")) { toReturn += "/"; } diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/BorlandDeploymentTool.java b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/BorlandDeploymentTool.java index 6c1566cb2..8894045cf 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/BorlandDeploymentTool.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/BorlandDeploymentTool.java @@ -240,7 +240,7 @@ public class BorlandDeploymentTool extends GenericDeploymentTool protected void addVendorFiles(Hashtable<String, File> ejbFiles, String ddPrefix) { //choose the right vendor DD - if (!(version == BES || version == BAS)) { + if (version != BES && version != BAS) { throw new BuildException("version " + version + " is not supported"); } diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/BorlandGenerateClient.java b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/BorlandGenerateClient.java index 87925e4e7..5df3b368e 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/BorlandGenerateClient.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/BorlandGenerateClient.java @@ -160,8 +160,7 @@ public class BorlandGenerateClient extends Task { setMode(JAVA_MODE); } - if (!(version == BorlandDeploymentTool.BES - || version == BorlandDeploymentTool.BAS)) { + if (version != BorlandDeploymentTool.BES && version != BorlandDeploymentTool.BAS) { throw new BuildException("version %d is not supported", version); } diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WeblogicDeploymentTool.java b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WeblogicDeploymentTool.java index 8356471c6..d2ae38bea 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WeblogicDeploymentTool.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WeblogicDeploymentTool.java @@ -566,8 +566,8 @@ public class WeblogicDeploymentTool extends GenericDeploymentTool { } Path combinedClasspath = getCombinedClasspath(); - if (!(wlClasspath == null || combinedClasspath == null - || combinedClasspath.toString().trim().isEmpty())) { + if (wlClasspath != null && combinedClasspath != null + && !combinedClasspath.toString().trim().isEmpty()) { javaTask.createArg().setValue("-classpath"); javaTask.createArg().setPath(combinedClasspath); } diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/image/Image.java b/src/main/org/apache/tools/ant/taskdefs/optional/image/Image.java index ef6c7db13..1f36d3ef0 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/image/Image.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/image/Image.java @@ -240,7 +240,7 @@ public class Image extends MatchingTask { if (dstFile.exists()) { // avoid overwriting unless necessary - if(!overwrite + if (!overwrite && srcFile.lastModified() <= dstFile.lastModified()) { log(srcFile + " omitted as " + dstFile diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/jlink/jlink.java b/src/main/org/apache/tools/ant/taskdefs/optional/jlink/jlink.java index 2a3e519e7..7531e98d3 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/jlink/jlink.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/jlink/jlink.java @@ -355,7 +355,7 @@ public class jlink { */ String name = inputEntry.getName(); - if (!(inputEntry.isDirectory() || name.endsWith(".class"))) { + if (!inputEntry.isDirectory() && !name.endsWith(".class")) { try (InputStream input = zip.getInputStream(zip.getEntry(name))) { String className = ClassNameReader.getClassName(input); diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java b/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java index 8c62d5611..b57663a71 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java @@ -1703,8 +1703,8 @@ public class JUnitTask extends Task { private void checkModules() { if (hasPath(getCommandline().getModulepath()) || hasPath(getCommandline().getUpgrademodulepath())) { - if (!(batchTests.stream().allMatch(BaseTest::getFork) - && tests.stream().allMatch(BaseTest::getFork))) { + if (!batchTests.stream().allMatch(BaseTest::getFork) + || !tests.stream().allMatch(BaseTest::getFork)) { throw new BuildException( "The module path requires fork attribute to be set to true."); } diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/net/FTP.java b/src/main/org/apache/tools/ant/taskdefs/optional/net/FTP.java index 95b0be34b..e5bc65874 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/net/FTP.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/net/FTP.java @@ -2394,8 +2394,8 @@ public class FTP extends Task implements FTPTaskConfig { // to indicate that an attempt to create a directory has // failed because the directory already exists. int rc = ftp.getReplyCode(); - if (!(ignoreNoncriticalErrors && (rc == CODE_550 - || rc == CODE_553 || rc == CODE_521))) { + if (!ignoreNoncriticalErrors + || rc != CODE_550 && rc != CODE_553 && rc != CODE_521) { throw new BuildException( "could not create directory: %s", ftp.getReplyString()); @@ -2420,8 +2420,7 @@ public class FTP extends Task implements FTPTaskConfig { private void handleMkDirFailure(FTPClient ftp) throws BuildException { int rc = ftp.getReplyCode(); - if (!(ignoreNoncriticalErrors - && (rc == CODE_550 || rc == CODE_553 || rc == CODE_521))) { + if (!ignoreNoncriticalErrors || rc != CODE_550 && rc != CODE_553 && rc != CODE_521) { throw new BuildException("could not create directory: %s", ftp.getReplyString()); } diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/net/FTPTaskMirrorImpl.java b/src/main/org/apache/tools/ant/taskdefs/optional/net/FTPTaskMirrorImpl.java index 85b868012..61de4009c 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/net/FTPTaskMirrorImpl.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/net/FTPTaskMirrorImpl.java @@ -1768,9 +1768,8 @@ public class FTPTaskMirrorImpl implements FTPTaskMirror { // to indicate that an attempt to create a directory has // failed because the directory already exists. int rc = ftp.getReplyCode(); - if (!(task.isIgnoreNoncriticalErrors() && (rc == CODE_550 - || rc == CODE_553 - || rc == CODE_521))) { + if (!task.isIgnoreNoncriticalErrors() + || rc != CODE_550 && rc != CODE_553 && rc != CODE_521) { throw new BuildException("could not create directory: " + ftp.getReplyString()); } @@ -1799,9 +1798,8 @@ public class FTPTaskMirrorImpl implements FTPTaskMirror { private void handleMkDirFailure(FTPClient ftp) throws BuildException { int rc = ftp.getReplyCode(); - if (!(task.isIgnoreNoncriticalErrors() && (rc == CODE_550 - || rc == CODE_553 - || rc == CODE_521))) { + if (!task.isIgnoreNoncriticalErrors() + || rc != CODE_550 && rc != CODE_553 && rc != CODE_521) { throw new BuildException("could not create directory: " + ftp.getReplyString()); } diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ssh/Directory.java b/src/main/org/apache/tools/ant/taskdefs/optional/ssh/Directory.java index c57248bf0..47b618b76 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/ssh/Directory.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/ssh/Directory.java @@ -138,13 +138,12 @@ public class Directory { return true; } - if (!(obj instanceof Directory)) { - return false; + if (obj instanceof Directory) { + Directory d = (Directory) obj; + return this.directory.equals(d.directory); } - Directory d = (Directory) obj; - - return this.directory.equals(d.directory); + return false; } /** |