From d5836ac061734031a67a6c3bb5fb2fe1e73e566f Mon Sep 17 00:00:00 2001 From: Jacobus Martinus Kruithof Date: Sun, 8 Apr 2007 12:08:27 +0000 Subject: [PATCH] Changes after static code analysis. Code totally equivalent git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@526545 13f79535-47bb-0310-9956-ffa450edef68 --- .../org/apache/tools/ant/ComponentHelper.java | 2 +- src/main/org/apache/tools/ant/Main.java | 4 +--- .../tools/ant/filters/StripJavaComments.java | 2 +- .../org/apache/tools/ant/taskdefs/Execute.java | 4 ++-- src/main/org/apache/tools/ant/taskdefs/Jar.java | 4 ++-- .../org/apache/tools/ant/taskdefs/SignJar.java | 2 +- src/main/org/apache/tools/ant/taskdefs/Tar.java | 2 +- .../org/apache/tools/ant/taskdefs/UpToDate.java | 15 ++++++--------- .../tools/ant/taskdefs/condition/IsSigned.java | 2 +- .../tools/ant/taskdefs/cvslib/CvsTagEntry.java | 6 +++--- .../apache/tools/ant/taskdefs/optional/ANTLR.java | 2 +- .../ant/taskdefs/optional/depend/Depend.java | 2 +- .../BaseResourceCollectionContainer.java | 2 +- .../types/selectors/ContainsRegexpSelector.java | 12 +++++------- .../apache/tools/ant/util/ContainerMapper.java | 2 +- 15 files changed, 28 insertions(+), 35 deletions(-) diff --git a/src/main/org/apache/tools/ant/ComponentHelper.java b/src/main/org/apache/tools/ant/ComponentHelper.java index 1322d3fa1..8458d8b3b 100644 --- a/src/main/org/apache/tools/ant/ComponentHelper.java +++ b/src/main/org/apache/tools/ant/ComponentHelper.java @@ -1046,7 +1046,7 @@ public class ComponentHelper { boolean found = false; if (clazz instanceof Class) { for (Iterator i = values().iterator(); i.hasNext() && !found;) { - found |= (((AntTypeDefinition) (i.next())).getExposedClass( + found = (((AntTypeDefinition) (i.next())).getExposedClass( project) == clazz); } } diff --git a/src/main/org/apache/tools/ant/Main.java b/src/main/org/apache/tools/ant/Main.java index a83996c3a..041084146 100644 --- a/src/main/org/apache/tools/ant/Main.java +++ b/src/main/org/apache/tools/ant/Main.java @@ -821,9 +821,7 @@ public class Main implements AntMain { handler = (InputHandler) ClasspathUtils.newInstance( inputHandlerClassname, Main.class.getClassLoader(), InputHandler.class); - if (project != null) { - project.setProjectReference(handler); - } + project.setProjectReference(handler); } project.setInputHandler(handler); } diff --git a/src/main/org/apache/tools/ant/filters/StripJavaComments.java b/src/main/org/apache/tools/ant/filters/StripJavaComments.java index c986acd3c..65bccd703 100644 --- a/src/main/org/apache/tools/ant/filters/StripJavaComments.java +++ b/src/main/org/apache/tools/ant/filters/StripJavaComments.java @@ -105,7 +105,7 @@ public final class StripJavaComments ch = in.read(); if (ch == '*') { ch = in.read(); - while (ch == '*' && ch != -1) { + while (ch == '*') { ch = in.read(); } diff --git a/src/main/org/apache/tools/ant/taskdefs/Execute.java b/src/main/org/apache/tools/ant/taskdefs/Execute.java index 95316296c..ca7a3b6b3 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Execute.java +++ b/src/main/org/apache/tools/ant/taskdefs/Execute.java @@ -1047,7 +1047,7 @@ public class Execute { // Build the command File commandDir = workingDir; - if (workingDir == null && project != null) { + if (workingDir == null) { commandDir = project.getBaseDir(); } String[] newcmd = new String[cmd.length + 2]; @@ -1106,7 +1106,7 @@ public class Execute { // Build the command File commandDir = workingDir; - if (workingDir == null && project != null) { + if (workingDir == null) { commandDir = project.getBaseDir(); } String[] newcmd = new String[cmd.length + 3]; diff --git a/src/main/org/apache/tools/ant/taskdefs/Jar.java b/src/main/org/apache/tools/ant/taskdefs/Jar.java index 12187e543..6c8bb605e 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Jar.java +++ b/src/main/org/apache/tools/ant/taskdefs/Jar.java @@ -571,7 +571,7 @@ public class Jar extends Zip { long lastModified, File fromArchive, int mode) throws IOException { if (MANIFEST_NAME.equalsIgnoreCase(vPath)) { - if (!doubleFilePass || (doubleFilePass && skipWriting)) { + if (!doubleFilePass || skipWriting) { filesetManifest(fromArchive, is); } } else if (INDEX_NAME.equalsIgnoreCase(vPath) && index) { @@ -779,7 +779,7 @@ public class Jar extends Zip { super.cleanUp(); // we want to save this info if we are going to make another pass - if (!doubleFilePass || (doubleFilePass && !skipWriting)) { + if (!doubleFilePass || !skipWriting) { manifest = null; configuredManifest = savedConfiguredManifest; filesetManifest = null; diff --git a/src/main/org/apache/tools/ant/taskdefs/SignJar.java b/src/main/org/apache/tools/ant/taskdefs/SignJar.java index a92293494..4a30b6d58 100644 --- a/src/main/org/apache/tools/ant/taskdefs/SignJar.java +++ b/src/main/org/apache/tools/ant/taskdefs/SignJar.java @@ -376,7 +376,7 @@ public class SignJar extends AbstractJarSignerTask { //DO NOT SET THE -signedjar OPTION if source==dest //unless you like fielding hotspot crash reports - if (null != targetFile && !jarSource.equals(targetFile)) { + if (!jarSource.equals(targetFile)) { addValue(cmd, "-signedjar"); addValue(cmd, targetFile.getPath()); } diff --git a/src/main/org/apache/tools/ant/taskdefs/Tar.java b/src/main/org/apache/tools/ant/taskdefs/Tar.java index fad582a54..1b4e4f65b 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Tar.java +++ b/src/main/org/apache/tools/ant/taskdefs/Tar.java @@ -584,7 +584,7 @@ public class Tar extends MatchingTask { Iterator iter = rc.iterator(); while (upToDate && iter.hasNext()) { Resource r = (Resource) iter.next(); - upToDate &= archiveIsUpToDate(r); + upToDate = archiveIsUpToDate(r); } } return upToDate; diff --git a/src/main/org/apache/tools/ant/taskdefs/UpToDate.java b/src/main/org/apache/tools/ant/taskdefs/UpToDate.java index 782c3a8b2..6059be3e2 100644 --- a/src/main/org/apache/tools/ant/taskdefs/UpToDate.java +++ b/src/main/org/apache/tools/ant/taskdefs/UpToDate.java @@ -185,14 +185,12 @@ public class UpToDate extends Task implements Condition { boolean upToDate = true; if (sourceFile != null) { if (mapperElement == null) { - upToDate = upToDate - && (targetFile.lastModified() >= sourceFile.lastModified()); + upToDate = targetFile.lastModified() >= sourceFile.lastModified(); } else { SourceFileScanner sfs = new SourceFileScanner(this); - upToDate = upToDate - && (sfs.restrict(new String[] {sourceFile.getAbsolutePath()}, + upToDate = sfs.restrict(new String[] {sourceFile.getAbsolutePath()}, null, null, - mapperElement.getImplementation()).length == 0); + mapperElement.getImplementation()).length == 0; } } @@ -204,15 +202,14 @@ public class UpToDate extends Task implements Condition { while (upToDate && e.hasMoreElements()) { FileSet fs = (FileSet) e.nextElement(); DirectoryScanner ds = fs.getDirectoryScanner(getProject()); - upToDate = upToDate && scanDir(fs.getDir(getProject()), + upToDate = scanDir(fs.getDir(getProject()), ds.getIncludedFiles()); } if (upToDate) { Resource[] r = sourceResources.listResources(); - upToDate = upToDate - && (ResourceUtils.selectOutOfDateSources( - this, r, getMapper(), getProject()).length == 0); + upToDate = ResourceUtils.selectOutOfDateSources( + this, r, getMapper(), getProject()).length == 0; } return upToDate; diff --git a/src/main/org/apache/tools/ant/taskdefs/condition/IsSigned.java b/src/main/org/apache/tools/ant/taskdefs/condition/IsSigned.java index c163fa9e2..59d5a3aa5 100644 --- a/src/main/org/apache/tools/ant/taskdefs/condition/IsSigned.java +++ b/src/main/org/apache/tools/ant/taskdefs/condition/IsSigned.java @@ -111,7 +111,7 @@ public class IsSigned extends DataType implements Condition { if (file == null) { throw new BuildException("The file attribute must be set."); } - if (file != null && !file.exists()) { + if (!file.exists()) { log("The file \"" + file.getAbsolutePath() + "\" does not exist.", Project.MSG_VERBOSE); return false; diff --git a/src/main/org/apache/tools/ant/taskdefs/cvslib/CvsTagEntry.java b/src/main/org/apache/tools/ant/taskdefs/cvslib/CvsTagEntry.java index 5f79ed23d..6e349c7d4 100644 --- a/src/main/org/apache/tools/ant/taskdefs/cvslib/CvsTagEntry.java +++ b/src/main/org/apache/tools/ant/taskdefs/cvslib/CvsTagEntry.java @@ -92,15 +92,15 @@ public class CvsTagEntry { public String toString() { StringBuffer buffer = new StringBuffer(); buffer.append(filename); - if ((revision == null)) { + if (revision == null) { buffer.append(" was removed"); if (prevRevision != null) { buffer.append("; previous revision was ").append(prevRevision); } - } else if (revision != null && prevRevision == null) { + } else if (prevRevision == null) { buffer.append(" is new; current revision is ") .append(revision); - } else if (revision != null && prevRevision != null) { + } else { buffer.append(" has changed from ") .append(prevRevision).append(" to ").append(revision); } diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ANTLR.java b/src/main/org/apache/tools/ant/taskdefs/optional/ANTLR.java index 7cbb44c63..d97fd4dfb 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/ANTLR.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/ANTLR.java @@ -290,7 +290,7 @@ public class ANTLR extends Task { if (targetIsOutOfDate) { log("Compiling " + targetFile + " as it is newer than " + generatedFile, Project.MSG_VERBOSE); - } else if (superGrammarIsOutOfDate) { + } else { log("Compiling " + targetFile + " as " + superGrammar + " is newer than " + generatedFile, Project.MSG_VERBOSE); } diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/depend/Depend.java b/src/main/org/apache/tools/ant/taskdefs/optional/depend/Depend.java index cb6a1ba17..a60e762eb 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/depend/Depend.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/depend/Depend.java @@ -417,7 +417,7 @@ public class Depend extends MatchingTask { } classpathFileCache.put(dependency, classpathFileObject); } - if (classpathFileObject != null && classpathFileObject != nullFileMarker) { + if (classpathFileObject != nullFileMarker) { // we need to add this jar to the list for this class. File jarFile = (File) classpathFileObject; dependencies.put(jarFile, jarFile); diff --git a/src/main/org/apache/tools/ant/types/resources/BaseResourceCollectionContainer.java b/src/main/org/apache/tools/ant/types/resources/BaseResourceCollectionContainer.java index 68e2e7f91..0722b3c65 100644 --- a/src/main/org/apache/tools/ant/types/resources/BaseResourceCollectionContainer.java +++ b/src/main/org/apache/tools/ant/types/resources/BaseResourceCollectionContainer.java @@ -150,7 +150,7 @@ public abstract class BaseResourceCollectionContainer //first the easy way, if all children are filesystem-only, return true: boolean goEarly = true; for (Iterator i = rc.iterator(); goEarly && i.hasNext();) { - goEarly &= ((ResourceCollection) i.next()).isFilesystemOnly(); + goEarly = ((ResourceCollection) i.next()).isFilesystemOnly(); } if (goEarly) { return true; diff --git a/src/main/org/apache/tools/ant/types/selectors/ContainsRegexpSelector.java b/src/main/org/apache/tools/ant/types/selectors/ContainsRegexpSelector.java index 46df737e0..4de2725eb 100644 --- a/src/main/org/apache/tools/ant/types/selectors/ContainsRegexpSelector.java +++ b/src/main/org/apache/tools/ant/types/selectors/ContainsRegexpSelector.java @@ -158,13 +158,11 @@ public class ContainsRegexpSelector extends BaseExtendSelector } catch (IOException ioe) { throw new BuildException("Could not read " + r.toLongString()); } finally { - if (in != null) { - try { - in.close(); - } catch (Exception e) { - throw new BuildException("Could not close " - + r.toLongString()); - } + try { + in.close(); + } catch (Exception e) { + throw new BuildException("Could not close " + + r.toLongString()); } } } diff --git a/src/main/org/apache/tools/ant/util/ContainerMapper.java b/src/main/org/apache/tools/ant/util/ContainerMapper.java index 45e6058a4..f47f42783 100755 --- a/src/main/org/apache/tools/ant/util/ContainerMapper.java +++ b/src/main/org/apache/tools/ant/util/ContainerMapper.java @@ -83,7 +83,7 @@ public abstract class ContainerMapper implements FileNameMapper { boolean foundit = false; for (Iterator iter = mappers.iterator(); iter.hasNext() && !foundit;) { FileNameMapper next = (FileNameMapper) (iter.next()); - foundit |= (next == fileNameMapper + foundit = (next == fileNameMapper || (next instanceof ContainerMapper && ((ContainerMapper) next).contains(fileNameMapper))); }