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:23 UTC
[2/3] ant git commit: Revert last 5 commits
http://git-wip-us.apache.org/repos/asf/ant/blob/551cb55e/src/main/org/apache/tools/ant/taskdefs/optional/TraXLiaison.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/TraXLiaison.java b/src/main/org/apache/tools/ant/taskdefs/optional/TraXLiaison.java
index 87f383d..ebfd501 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/TraXLiaison.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/TraXLiaison.java
@@ -531,7 +531,6 @@ public class TraXLiaison implements XSLTLiaison4, ErrorListener, XSLTLoggerAware
* Log an error.
* @param e the exception to log.
*/
- @Override
public void error(final TransformerException e) {
logError(e, "Error");
}
@@ -540,7 +539,6 @@ public class TraXLiaison implements XSLTLiaison4, ErrorListener, XSLTLoggerAware
* Log a fatal error.
* @param e the exception to log.
*/
- @Override
public void fatalError(final TransformerException e) {
logError(e, "Fatal Error");
throw new BuildException("Fatal error during transformation using " + stylesheet + ": " + e.getMessageAndLocation(), e);
@@ -550,7 +548,6 @@ public class TraXLiaison implements XSLTLiaison4, ErrorListener, XSLTLoggerAware
* Log a warning.
* @param e the exception to log.
*/
- @Override
public void warning(final TransformerException e) {
if (!suppressWarnings) {
logError(e, "Warning");
http://git-wip-us.apache.org/repos/asf/ant/blob/551cb55e/src/main/org/apache/tools/ant/taskdefs/optional/XMLValidateTask.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/XMLValidateTask.java b/src/main/org/apache/tools/ant/taskdefs/optional/XMLValidateTask.java
index 2d0391b..c7000b3 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/XMLValidateTask.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/XMLValidateTask.java
@@ -364,7 +364,7 @@ public class XMLValidateTask extends Task {
* @return true when a SAX1 parser is in use
*/
protected boolean isSax1Parser() {
- return xmlReader instanceof ParserAdapter;
+ return (xmlReader instanceof ParserAdapter);
}
/**
@@ -599,7 +599,6 @@ public class XMLValidateTask extends Task {
* record a fatal error
* @param exception the fatal error
*/
- @Override
public void fatalError(SAXParseException exception) {
failed = true;
doLog(exception, Project.MSG_ERR);
@@ -608,7 +607,6 @@ public class XMLValidateTask extends Task {
* receive notification of a recoverable error
* @param exception the error
*/
- @Override
public void error(SAXParseException exception) {
failed = true;
doLog(exception, Project.MSG_ERR);
@@ -617,7 +615,6 @@ public class XMLValidateTask extends Task {
* receive notification of a warning
* @param exception the warning
*/
- @Override
public void warning(SAXParseException exception) {
// depending on implementation, XMLReader can yield hips of warning,
// only output then if user explicitly asked for it
@@ -627,6 +624,7 @@ public class XMLValidateTask extends Task {
}
private void doLog(SAXParseException e, int logLevel) {
+
log(getMessage(e), logLevel);
}
@@ -745,4 +743,6 @@ public class XMLValidateTask extends Task {
} // Property
+
+
}
http://git-wip-us.apache.org/repos/asf/ant/blob/551cb55e/src/main/org/apache/tools/ant/taskdefs/optional/depend/Depend.java
----------------------------------------------------------------------
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 4f2cf13..8b80cb8 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
@@ -305,12 +305,15 @@ public class Depend extends MatchingTask {
List<String> dependencyList = null;
- // try to read the dependency info from the map if it is not out of date
- if (cache != null && cacheFileExists
+ if (cache != null) {
+ // try to read the dependency info from the map if it is
+ // not out of date
+ if (cacheFileExists
&& cacheLastModified > info.absoluteFile.lastModified()) {
- // depFile exists and is newer than the class file
- // need to get dependency list from the map.
- dependencyList = dependencyMap.get(info.className);
+ // depFile exists and is newer than the class file
+ // need to get dependency list from the map.
+ dependencyList = dependencyMap.get(info.className);
+ }
}
if (dependencyList == null) {
@@ -509,16 +512,20 @@ public class Depend extends MatchingTask {
* @param affectedClass the name of the affected .class file
* @param className the file that is triggering the out of dateness
*/
- private void warnOutOfDateButNotDeleted(ClassFileInfo affectedClassInfo, String affectedClass,
+ private void warnOutOfDateButNotDeleted(
+ ClassFileInfo affectedClassInfo, String affectedClass,
String className) {
if (affectedClassInfo.isUserWarned) {
return;
}
int level = Project.MSG_WARN;
- // downgrade warnings on RMI stublike classes, as they are generated by rmic,
- // so there is no need to tell the user that their source is missing.
- if (!warnOnRmiStubs && isRmiStub(affectedClass, className)) {
- level = Project.MSG_VERBOSE;
+ if (!warnOnRmiStubs) {
+ //downgrade warnings on RMI stublike classes, as they are generated
+ //by rmic, so there is no need to tell the user that their source is
+ //missing.
+ if (isRmiStub(affectedClass, className)) {
+ level = Project.MSG_VERBOSE;
+ }
}
log("The class " + affectedClass + " in file "
+ affectedClassInfo.absoluteFile.getPath()
http://git-wip-us.apache.org/repos/asf/ant/blob/551cb55e/src/main/org/apache/tools/ant/taskdefs/optional/ejb/DescriptorHandler.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/DescriptorHandler.java b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/DescriptorHandler.java
index f20baab..e68ddf0 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/DescriptorHandler.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/DescriptorHandler.java
@@ -157,10 +157,12 @@ public class DescriptorHandler extends HandlerBase {
return;
}
- if (getClass().getResource(location) != null && publicId != null) {
- resourceDTDs.put(publicId, location);
- owningTask.log("Mapped publicId " + publicId + " to resource "
+ if (getClass().getResource(location) != null) {
+ if (publicId != null) {
+ resourceDTDs.put(publicId, location);
+ owningTask.log("Mapped publicId " + publicId + " to resource "
+ location, Project.MSG_VERBOSE);
+ }
}
try {
@@ -381,8 +383,10 @@ public class DescriptorHandler extends HandlerBase {
}
// Get the value of the <ejb-name> tag. Only the first occurrence.
- if (currentElement.equals(EJB_NAME) && ejbName == null) {
- ejbName = currentText.trim();
+ if (currentElement.equals(EJB_NAME)) {
+ if (ejbName == null) {
+ ejbName = currentText.trim();
+ }
}
}
}
http://git-wip-us.apache.org/repos/asf/ant/blob/551cb55e/src/main/org/apache/tools/ant/taskdefs/optional/ejb/IPlanetEjbc.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/IPlanetEjbc.java b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/IPlanetEjbc.java
index 40a2b7c..4484062 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/IPlanetEjbc.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/IPlanetEjbc.java
@@ -1081,7 +1081,12 @@ public class IPlanetEjbc {
* be run to bring the stubs and skeletons up to date.
*/
public boolean mustBeRecompiled(File destDir) {
- return destClassesModified(destDir) < sourceClassesModified(destDir);
+
+ long sourceModified = sourceClassesModified(destDir);
+
+ long destModified = destClassesModified(destDir);
+
+ return (destModified < sourceModified);
}
/**
@@ -1231,7 +1236,8 @@ public class IPlanetEjbc {
* names for the stubs and skeletons to be generated.
*/
private String[] classesToGenerate() {
- String[] classnames = iiop ? new String[NUM_CLASSES_WITH_IIOP]
+ String[] classnames = (iiop)
+ ? new String[NUM_CLASSES_WITH_IIOP]
: new String[NUM_CLASSES_WITHOUT_IIOP];
final String remotePkg = remote.getPackageName() + ".";
http://git-wip-us.apache.org/repos/asf/ant/blob/551cb55e/src/main/org/apache/tools/ant/taskdefs/optional/ejb/JonasDeploymentTool.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/JonasDeploymentTool.java b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/JonasDeploymentTool.java
index ef3749f..33e1251 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/JonasDeploymentTool.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/JonasDeploymentTool.java
@@ -468,27 +468,29 @@ public class JonasDeploymentTool extends GenericDeploymentTool {
String baseName = null;
- // try to find JOnAS specific convention name
- if (getConfig().namingScheme.getValue().equals(EjbJar.NamingScheme.DESCRIPTOR)
- && !descriptorFileName.contains(getConfig().baseNameTerminator)) {
+ if (getConfig().namingScheme.getValue().equals(EjbJar.NamingScheme.DESCRIPTOR)) {
- // baseNameTerminator not found: the descriptor use the
- // JOnAS naming convention, ie [Foo.xml,jonas-Foo.xml] and
- // not [Foo<baseNameTerminator>-ejb-jar.xml,
- // Foo<baseNameTerminator>-jonas-ejb-jar.xml].
+ // try to find JOnAS specific convention name
+ if (!descriptorFileName.contains(getConfig().baseNameTerminator)) {
- String aCanonicalDescriptor = descriptorFileName.replace('\\', '/');
- int lastSeparatorIndex = aCanonicalDescriptor.lastIndexOf('/');
- int endOfBaseName;
+ // baseNameTerminator not found: the descriptor use the
+ // JOnAS naming convention, ie [Foo.xml,jonas-Foo.xml] and
+ // not [Foo<baseNameTerminator>-ejb-jar.xml,
+ // Foo<baseNameTerminator>-jonas-ejb-jar.xml].
- if (lastSeparatorIndex != -1) {
- endOfBaseName = descriptorFileName.indexOf(".xml", lastSeparatorIndex);
- } else {
- endOfBaseName = descriptorFileName.indexOf(".xml");
- }
+ String aCanonicalDescriptor = descriptorFileName.replace('\\', '/');
+ int lastSeparatorIndex = aCanonicalDescriptor.lastIndexOf('/');
+ int endOfBaseName;
- if (endOfBaseName != -1) {
- baseName = descriptorFileName.substring(0, endOfBaseName);
+ if (lastSeparatorIndex != -1) {
+ endOfBaseName = descriptorFileName.indexOf(".xml", lastSeparatorIndex);
+ } else {
+ endOfBaseName = descriptorFileName.indexOf(".xml");
+ }
+
+ if (endOfBaseName != -1) {
+ baseName = descriptorFileName.substring(0, endOfBaseName);
+ }
}
}
http://git-wip-us.apache.org/repos/asf/ant/blob/551cb55e/src/main/org/apache/tools/ant/taskdefs/optional/extension/Extension.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/extension/Extension.java b/src/main/org/apache/tools/ant/taskdefs/optional/extension/Extension.java
index 1acb933..1000d8d 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/extension/Extension.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/extension/Extension.java
@@ -190,11 +190,12 @@ public final class Extension {
if (null == manifest) {
return new Extension[0];
}
- return Stream.concat(Optional.ofNullable(manifest.getMainAttributes())
- .map(Stream::of).orElse(Stream.empty()),
+ return Stream
+ .concat(Optional.ofNullable(manifest.getMainAttributes())
+ .map(Stream::of).orElse(Stream.empty()),
manifest.getEntries().values().stream())
- .map(attrs -> getExtension("", attrs)).filter(Objects::nonNull)
- .toArray(Extension[]::new);
+ .map(attrs -> getExtension("", attrs)).filter(Objects::nonNull)
+ .toArray(Extension[]::new);
}
/**
@@ -254,13 +255,15 @@ public final class Extension {
specificationVendor);
}
- final DeweyDecimal specificationVersion = extension.getSpecificationVersion();
+ final DeweyDecimal specificationVersion
+ = extension.getSpecificationVersion();
if (null != specificationVersion) {
attributes.putValue(prefix + SPECIFICATION_VERSION,
specificationVersion.toString());
}
- final String implementationVendorID = extension.getImplementationVendorID();
+ final String implementationVendorID
+ = extension.getImplementationVendorID();
if (null != implementationVendorID) {
attributes.putValue(prefix + IMPLEMENTATION_VENDOR_ID,
implementationVendorID);
@@ -272,7 +275,8 @@ public final class Extension {
implementationVendor);
}
- final DeweyDecimal implementationVersion = extension.getImplementationVersion();
+ final DeweyDecimal implementationVersion
+ = extension.getImplementationVersion();
if (null != implementationVersion) {
attributes.putValue(prefix + IMPLEMENTATION_VERSION,
implementationVersion.toString());
@@ -310,7 +314,8 @@ public final class Extension {
if (null != specificationVersion) {
try {
- this.specificationVersion = new DeweyDecimal(specificationVersion);
+ this.specificationVersion
+ = new DeweyDecimal(specificationVersion);
} catch (final NumberFormatException nfe) {
final String error = "Bad specification version format '"
+ specificationVersion + "' in '" + extensionName
@@ -418,24 +423,33 @@ public final class Extension {
}
// Available specification version must be >= required
- final DeweyDecimal requiredSpecificationVersion = required.getSpecificationVersion();
- if (null != requiredSpecificationVersion && (null == specificationVersion
- || !isCompatible(specificationVersion, requiredSpecificationVersion))) {
- return REQUIRE_SPECIFICATION_UPGRADE;
+ final DeweyDecimal requiredSpecificationVersion
+ = required.getSpecificationVersion();
+ if (null != requiredSpecificationVersion) {
+ if (null == specificationVersion
+ || !isCompatible(specificationVersion, requiredSpecificationVersion)) {
+ return REQUIRE_SPECIFICATION_UPGRADE;
+ }
}
// Implementation Vendor ID must match
- final String requiredImplementationVendorID = required.getImplementationVendorID();
- if (null != requiredImplementationVendorID && (null == implementationVendorID
- || !implementationVendorID.equals(requiredImplementationVendorID))) {
- return REQUIRE_VENDOR_SWITCH;
+ final String requiredImplementationVendorID
+ = required.getImplementationVendorID();
+ if (null != requiredImplementationVendorID) {
+ if (null == implementationVendorID
+ || !implementationVendorID.equals(requiredImplementationVendorID)) {
+ return REQUIRE_VENDOR_SWITCH;
+ }
}
// Implementation version must be >= required
- final DeweyDecimal requiredImplementationVersion = required.getImplementationVersion();
- if (null != requiredImplementationVersion && (null == implementationVersion
- || !isCompatible(implementationVersion, requiredImplementationVersion))) {
- return REQUIRE_IMPLEMENTATION_UPGRADE;
+ final DeweyDecimal requiredImplementationVersion
+ = required.getImplementationVersion();
+ if (null != requiredImplementationVersion) {
+ if (null == implementationVersion
+ || !isCompatible(implementationVersion, requiredImplementationVersion)) {
+ return REQUIRE_IMPLEMENTATION_UPGRADE;
+ }
}
// This available optional package satisfies the requirements
@@ -453,7 +467,7 @@ public final class Extension {
* @return true if the specified extension is compatible with this extension
*/
public boolean isCompatibleWith(final Extension required) {
- return COMPATIBLE == getCompatibilityWith(required);
+ return (COMPATIBLE == getCompatibilityWith(required));
}
/**
@@ -502,7 +516,8 @@ public final class Extension {
* @param first First version number (dotted decimal)
* @param second Second version number (dotted decimal)
*/
- private boolean isCompatible(final DeweyDecimal first, final DeweyDecimal second) {
+ private boolean isCompatible(final DeweyDecimal first,
+ final DeweyDecimal second) {
return first.isGreaterThanOrEqual(second);
}
@@ -515,7 +530,8 @@ public final class Extension {
* EXTENSION_LIST or OPTIONAL_EXTENSION_LIST)
* @return the list of listed extensions
*/
- private static Extension[] getListed(final Manifest manifest, final Attributes.Name listKey) {
+ private static Extension[] getListed(final Manifest manifest,
+ final Attributes.Name listKey) {
final List<Extension> results = new ArrayList<>();
final Attributes mainAttributes = manifest.getMainAttributes();
@@ -560,7 +576,8 @@ public final class Extension {
* @param onToken the token
* @return the resultant array
*/
- private static String[] split(final String string, final String onToken) {
+ private static String[] split(final String string,
+ final String onToken) {
final StringTokenizer tokenizer = new StringTokenizer(string, onToken);
final String[] result = new String[tokenizer.countTokens()];
@@ -583,7 +600,8 @@ public final class Extension {
* @param attributes Attributes to searched
* @return the new Extension object, or null
*/
- private static Extension getExtension(final String prefix, final Attributes attributes) {
+ private static Extension getExtension(final String prefix,
+ final Attributes attributes) {
//WARNING: We trim the values of all the attributes because
//Some extension declarations are badly defined (ie have spaces
//after version or vendorID)
http://git-wip-us.apache.org/repos/asf/ant/blob/551cb55e/src/main/org/apache/tools/ant/taskdefs/optional/javah/JavahAdapterFactory.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/javah/JavahAdapterFactory.java b/src/main/org/apache/tools/ant/taskdefs/optional/javah/JavahAdapterFactory.java
index c55fa69..931131b 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/javah/JavahAdapterFactory.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/javah/JavahAdapterFactory.java
@@ -83,15 +83,15 @@ public class JavahAdapterFactory {
Path classpath)
throws BuildException {
if ((JavaEnvUtils.isKaffe() && choice == null)
- || Kaffeh.IMPLEMENTATION_NAME.equals(choice)) {
+ || Kaffeh.IMPLEMENTATION_NAME.equals(choice)) {
return new Kaffeh();
}
if ((JavaEnvUtils.isGij() && choice == null)
- || Gcjh.IMPLEMENTATION_NAME.equals(choice)) {
+ || Gcjh.IMPLEMENTATION_NAME.equals(choice)) {
return new Gcjh();
}
- if (JavaEnvUtils.isAtLeastJavaVersion("10")
- && (choice == null || ForkingJavah.IMPLEMENTATION_NAME.equals(choice))) {
+ if (JavaEnvUtils.isAtLeastJavaVersion("10") &&
+ (choice == null || ForkingJavah.IMPLEMENTATION_NAME.equals(choice))) {
throw new BuildException("javah does not exist under Java 10 and higher,"
+ " use the javac task with nativeHeaderDir instead");
}
http://git-wip-us.apache.org/repos/asf/ant/blob/551cb55e/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java
----------------------------------------------------------------------
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 7e545e4..70c6198 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
@@ -1687,12 +1687,13 @@ public class JUnitTask extends Task {
* @since 1.9.8
*/
private void checkModules() {
- if ((hasPath(getCommandline().getModulepath())
- || hasPath(getCommandline().getUpgrademodulepath()))
- && (!batchTests.stream().allMatch(BaseTest::getFork)
- || !tests.stream().allMatch(BaseTest::getFork))) {
- throw new BuildException(
+ if (hasPath(getCommandline().getModulepath())
+ || hasPath(getCommandline().getUpgrademodulepath())) {
+ 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.");
+ }
}
}
@@ -1942,35 +1943,37 @@ public class JUnitTask extends Task {
private void createClassLoader() {
final Path userClasspath = getCommandline().getClasspath();
final Path userModulepath = getCommandline().getModulepath();
- if ((userClasspath != null || userModulepath != null) && (reloading || classLoader == null)) {
- deleteClassLoader();
- final Path path = new Path(getProject());
- if (userClasspath != null) {
- path.add((Path) userClasspath.clone());
- }
- if (userModulepath != null && !hasJunit(path)) {
- path.add(expandModulePath(userModulepath));
- }
- if (includeAntRuntime) {
- log("Implicitly adding " + antRuntimeClasses
+ if (userClasspath != null || userModulepath != null) {
+ if (reloading || classLoader == null) {
+ deleteClassLoader();
+ final Path path = new Path(getProject());
+ if (userClasspath != null) {
+ path.add((Path) userClasspath.clone());
+ }
+ if (userModulepath != null && !hasJunit(path)) {
+ path.add(expandModulePath(userModulepath));
+ }
+ if (includeAntRuntime) {
+ log("Implicitly adding " + antRuntimeClasses
+ " to CLASSPATH", Project.MSG_VERBOSE);
- path.append(antRuntimeClasses);
- }
- classLoader = getProject().createClassLoader(path);
- if (getClass().getClassLoader() != null
+ path.append(antRuntimeClasses);
+ }
+ classLoader = getProject().createClassLoader(path);
+ if (getClass().getClassLoader() != null
&& getClass().getClassLoader() != Project.class.getClassLoader()) {
- classLoader.setParent(getClass().getClassLoader());
- }
- classLoader.setParentFirst(false);
- classLoader.addJavaLibraries();
- log("Using CLASSPATH " + classLoader.getClasspath(),
+ classLoader.setParent(getClass().getClassLoader());
+ }
+ classLoader.setParentFirst(false);
+ classLoader.addJavaLibraries();
+ log("Using CLASSPATH " + classLoader.getClasspath(),
Project.MSG_VERBOSE);
- // make sure the test will be accepted as a TestCase
- classLoader.addSystemPackageRoot("junit");
- // make sure the test annotation are accepted
- classLoader.addSystemPackageRoot("org.junit");
- // will cause trouble in JDK 1.1 if omitted
- classLoader.addSystemPackageRoot("org.apache.tools.ant");
+ // make sure the test will be accepted as a TestCase
+ classLoader.addSystemPackageRoot("junit");
+ // make sure the test annotation are accepted
+ classLoader.addSystemPackageRoot("org.junit");
+ // will cause trouble in JDK 1.1 if omitted
+ classLoader.addSystemPackageRoot("org.apache.tools.ant");
+ }
}
}
@@ -2064,7 +2067,8 @@ public class JUnitTask extends Task {
*/
@Override
public boolean equals(final Object other) {
- if (other == null || other.getClass() != ForkedTestConfiguration.class) {
+ if (other == null
+ || other.getClass() != ForkedTestConfiguration.class) {
return false;
}
final ForkedTestConfiguration o = (ForkedTestConfiguration) other;
@@ -2072,9 +2076,13 @@ public class JUnitTask extends Task {
&& haltOnError == o.haltOnError
&& haltOnFailure == o.haltOnFailure
&& ((errorProperty == null && o.errorProperty == null)
- || (errorProperty != null && errorProperty.equals(o.errorProperty)))
+ ||
+ (errorProperty != null
+ && errorProperty.equals(o.errorProperty)))
&& ((failureProperty == null && o.failureProperty == null)
- || (failureProperty != null && failureProperty.equals(o.failureProperty)));
+ ||
+ (failureProperty != null
+ && failureProperty.equals(o.failureProperty)));
}
/**
http://git-wip-us.apache.org/repos/asf/ant/blob/551cb55e/src/main/org/apache/tools/ant/taskdefs/optional/junitlauncher/LauncherSupport.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/junitlauncher/LauncherSupport.java b/src/main/org/apache/tools/ant/taskdefs/optional/junitlauncher/LauncherSupport.java
index 0e88fa8..e55856a 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/junitlauncher/LauncherSupport.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/junitlauncher/LauncherSupport.java
@@ -206,8 +206,8 @@ public class LauncherSupport {
final Optional<Project> project = this.testExecutionContext.getProject();
for (final ListenerDefinition applicableListener : applicableListenerElements) {
if (project.isPresent() && !applicableListener.shouldUse(project.get())) {
- log("Excluding listener " + applicableListener.getClassName() + " since it's not applicable"
- + " in the context of project", null, Project.MSG_DEBUG);
+ log("Excluding listener " + applicableListener.getClassName() + " since it's not applicable" +
+ " in the context of project", null, Project.MSG_DEBUG);
continue;
}
final TestExecutionListener listener = requireTestExecutionListener(applicableListener, classLoader);
@@ -274,8 +274,7 @@ public class LauncherSupport {
throw new BuildException("Failed to load listener class " + className, e);
}
if (!TestExecutionListener.class.isAssignableFrom(klass)) {
- throw new BuildException("Listener class " + className + " is not of type "
- + TestExecutionListener.class.getName());
+ throw new BuildException("Listener class " + className + " is not of type " + TestExecutionListener.class.getName());
}
try {
return (TestExecutionListener) klass.newInstance();
@@ -309,8 +308,7 @@ public class LauncherSupport {
// if the test is configured to halt on test failures, throw a build error
final String errorMessage;
if (test instanceof NamedTest) {
- errorMessage = "Test " + ((NamedTest) test).getName() + " has "
- + summary.getTestsFailedCount() + " failure(s)";
+ errorMessage = "Test " + ((NamedTest) test).getName() + " has " + summary.getTestsFailedCount() + " failure(s)";
} else {
errorMessage = "Some test(s) have failure(s)";
}
@@ -368,8 +366,7 @@ public class LauncherSupport {
final Thread sysErrStreamer = new Thread(streamer);
sysErrStreamer.setDaemon(true);
sysErrStreamer.setName("junitlauncher-syserr-stream-reader");
- sysErrStreamer.setUncaughtExceptionHandler((t, e) -> this.log("Failed in syserr streaming",
- e, Project.MSG_INFO));
+ sysErrStreamer.setUncaughtExceptionHandler((t, e) -> this.log("Failed in syserr streaming", e, Project.MSG_INFO));
sysErrStreamer.start();
break;
}
http://git-wip-us.apache.org/repos/asf/ant/blob/551cb55e/src/main/org/apache/tools/ant/taskdefs/optional/junitlauncher/TestRequest.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/junitlauncher/TestRequest.java b/src/main/org/apache/tools/ant/taskdefs/optional/junitlauncher/TestRequest.java
index 2229c22..ef15536 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/junitlauncher/TestRequest.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/junitlauncher/TestRequest.java
@@ -82,7 +82,6 @@ final class TestRequest implements AutoCloseable {
return Collections.unmodifiableList(this.interestedInSysErr);
}
- @Override
public void close() throws Exception {
if (this.closables.isEmpty()) {
return;
http://git-wip-us.apache.org/repos/asf/ant/blob/551cb55e/src/main/org/apache/tools/ant/taskdefs/optional/junitlauncher/confined/JUnitLauncherTask.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/junitlauncher/confined/JUnitLauncherTask.java b/src/main/org/apache/tools/ant/taskdefs/optional/junitlauncher/confined/JUnitLauncherTask.java
index 12cef49..654211e 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/junitlauncher/confined/JUnitLauncherTask.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/junitlauncher/confined/JUnitLauncherTask.java
@@ -87,8 +87,8 @@ public class JUnitLauncherTask extends Task {
final Project project = getProject();
for (final TestDefinition test : this.tests) {
if (!test.shouldRun(project)) {
- log("Excluding test " + test + " since it's considered not to run "
- + "in context of project " + project, Project.MSG_DEBUG);
+ log("Excluding test " + test + " since it's considered not to run " +
+ "in context of project " + project, Project.MSG_DEBUG);
continue;
}
if (test.getForkDefinition() != null) {
@@ -214,8 +214,8 @@ public class JUnitLauncherTask extends Task {
try {
projectPropsPath = dumpProjectProperties();
} catch (IOException e) {
- throw new BuildException("Could not create the necessary properties file while forking"
- + " a process for a test", e);
+ throw new BuildException("Could not create the necessary properties file while forking a process" +
+ " for a test", e);
}
// --properties <path-to-properties-file>
commandlineJava.createArgument().setValue(Constants.ARG_PROPERTIES);
http://git-wip-us.apache.org/repos/asf/ant/blob/551cb55e/src/main/org/apache/tools/ant/taskdefs/optional/net/FTP.java
----------------------------------------------------------------------
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 f977df6..901ff06 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
@@ -710,25 +710,26 @@ public class FTP extends Task implements FTPTaskConfig {
boolean candidateFound = false;
String target = null;
for (int icounter = 0; icounter < array.length; icounter++) {
- if (array[icounter] != null && array[icounter].isDirectory()
- && !".".equals(array[icounter].getName())
+ if (array[icounter] != null && array[icounter].isDirectory()) {
+ if (!".".equals(array[icounter].getName())
&& !"..".equals(array[icounter].getName())) {
- candidateFound = true;
- target = fiddleName(array[icounter].getName());
- getProject().log("will try to cd to "
- + target + " where a directory called " + array[icounter].getName()
- + " exists", Project.MSG_DEBUG);
- for (int pcounter = 0; pcounter < array.length; pcounter++) {
- if (array[pcounter] != null
+ candidateFound = true;
+ target = fiddleName(array[icounter].getName());
+ getProject().log("will try to cd to "
+ + target + " where a directory called " + array[icounter].getName()
+ + " exists", Project.MSG_DEBUG);
+ for (int pcounter = 0; pcounter < array.length; pcounter++) {
+ if (array[pcounter] != null
&& pcounter != icounter
&& target.equals(array[pcounter].getName())) {
- candidateFound = false;
+ candidateFound = false;
+ break;
+ }
+ }
+ if (candidateFound) {
break;
}
}
- if (candidateFound) {
- break;
- }
}
}
if (candidateFound) {
@@ -875,7 +876,7 @@ public class FTP extends Task implements FTPTaskConfig {
* @return true if the file exists
*/
public boolean exists() {
- return ftpFile != null;
+ return (ftpFile != null);
}
/**
http://git-wip-us.apache.org/repos/asf/ant/blob/551cb55e/src/main/org/apache/tools/ant/taskdefs/optional/net/FTPConfigurator.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/net/FTPConfigurator.java b/src/main/org/apache/tools/ant/taskdefs/optional/net/FTPConfigurator.java
index cd1c383..f7650be 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/net/FTPConfigurator.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/net/FTPConfigurator.java
@@ -72,8 +72,8 @@ class FTPConfigurator {
if (!serverLanguageCodeConfig.isEmpty()
&& !FTPClientConfig.getSupportedLanguageCodes()
.contains(serverLanguageCodeConfig)) {
- throw new BuildException("unsupported language code"
- + serverLanguageCodeConfig);
+ throw new BuildException("unsupported language code" +
+ serverLanguageCodeConfig);
}
config.setServerLanguageCode(serverLanguageCodeConfig);
task.log("custom config: server language code = "
http://git-wip-us.apache.org/repos/asf/ant/blob/551cb55e/src/main/org/apache/tools/ant/taskdefs/optional/net/FTPTaskMirrorImpl.java
----------------------------------------------------------------------
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 8ae95d6..0d877aa 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
@@ -611,25 +611,26 @@ public class FTPTaskMirrorImpl implements FTPTaskMirror {
boolean candidateFound = false;
String target = null;
for (int icounter = 0; icounter < array.length; icounter++) {
- if (array[icounter] != null && array[icounter].isDirectory()
- && !".".equals(array[icounter].getName())
+ if (array[icounter] != null && array[icounter].isDirectory()) {
+ if (!".".equals(array[icounter].getName())
&& !"..".equals(array[icounter].getName())) {
- candidateFound = true;
- target = fiddleName(array[icounter].getName());
- task.log("will try to cd to "
- + target + " where a directory called " + array[icounter].getName()
- + " exists", Project.MSG_DEBUG);
- for (int pcounter = 0; pcounter < array.length; pcounter++) {
- if (array[pcounter] != null
+ candidateFound = true;
+ target = fiddleName(array[icounter].getName());
+ task.log("will try to cd to "
+ + target + " where a directory called " + array[icounter].getName()
+ + " exists", Project.MSG_DEBUG);
+ for (int pcounter = 0; pcounter < array.length; pcounter++) {
+ if (array[pcounter] != null
&& pcounter != icounter
&& target.equals(array[pcounter].getName())) {
- candidateFound = false;
+ candidateFound = false;
+ break;
+ }
+ }
+ if (candidateFound) {
break;
}
}
- if (candidateFound) {
- break;
- }
}
}
if (candidateFound) {
@@ -1297,10 +1298,12 @@ public class FTPTaskMirrorImpl implements FTPTaskMirror {
if (i >= 0) {
String cwd = ftp.printWorkingDirectory();
String parent = dir.getParent();
- if (parent != null && !ftp.changeWorkingDirectory(resolveFile(parent))) {
- throw new BuildException(
+ if (parent != null) {
+ if (!ftp.changeWorkingDirectory(resolveFile(parent))) {
+ throw new BuildException(
"could not change to directory: %s",
ftp.getReplyString());
+ }
}
while (i >= 0) {
http://git-wip-us.apache.org/repos/asf/ant/blob/551cb55e/src/main/org/apache/tools/ant/taskdefs/optional/ssh/ScpFromMessageBySftp.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ssh/ScpFromMessageBySftp.java b/src/main/org/apache/tools/ant/taskdefs/optional/ssh/ScpFromMessageBySftp.java
index 59e53a0..8c1ccf9 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/ssh/ScpFromMessageBySftp.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/ssh/ScpFromMessageBySftp.java
@@ -134,8 +134,10 @@ public class ScpFromMessageBySftp extends ScpFromMessage {
final String remoteFile,
final File localFile) throws SftpException {
String pwd = remoteFile;
- if (remoteFile.lastIndexOf('/') != -1 && remoteFile.length() > 1) {
- pwd = remoteFile.substring(0, remoteFile.lastIndexOf('/'));
+ if (remoteFile.lastIndexOf('/') != -1) {
+ if (remoteFile.length() > 1) {
+ pwd = remoteFile.substring(0, remoteFile.lastIndexOf('/'));
+ }
}
channel.cd(pwd);
if (!localFile.exists()) {
@@ -166,8 +168,10 @@ public class ScpFromMessageBySftp extends ScpFromMessage {
if (!localFile.exists()) {
final String path = localFile.getAbsolutePath();
final int i = path.lastIndexOf(File.pathSeparator);
- if (i != -1 && path.length() > File.pathSeparator.length()) {
- new File(path.substring(0, i)).mkdirs();
+ if (i != -1) {
+ if (path.length() > File.pathSeparator.length()) {
+ new File(path.substring(0, i)).mkdirs();
+ }
}
}
http://git-wip-us.apache.org/repos/asf/ant/blob/551cb55e/src/main/org/apache/tools/ant/taskdefs/optional/unix/Symlink.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/unix/Symlink.java b/src/main/org/apache/tools/ant/taskdefs/optional/unix/Symlink.java
index fd7285b..ba74f44 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/unix/Symlink.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/unix/Symlink.java
@@ -198,15 +198,16 @@ public class Symlink extends DispatchTask {
public void recreate() throws BuildException {
try {
if (fileSets.isEmpty()) {
- handleError("File set identifying link file(s) required for action recreate");
+ handleError(
+ "File set identifying link file(s) required for action recreate");
return;
}
final Properties links = loadLinks(fileSets);
for (final String lnk : links.stringPropertyNames()) {
final String res = links.getProperty(lnk);
try {
- if (Files.isSymbolicLink(Paths.get(lnk))
- && new File(lnk).getCanonicalPath().equals(new File(res).getCanonicalPath())) {
+ if (Files.isSymbolicLink(Paths.get(lnk)) &&
+ new File(lnk).getCanonicalPath().equals(new File(res).getCanonicalPath())) {
// it's already a symlink and the symlink target is the same
// as the target noted in the properties file. So there's no
// need to recreate it
@@ -215,8 +216,7 @@ public class Symlink extends DispatchTask {
continue;
}
} catch (IOException e) {
- final String errMessage = "Failed to check if path " + lnk
- + " is a symbolic link, linking to " + res;
+ final String errMessage = "Failed to check if path " + lnk + " is a symbolic link, linking to " + res;
if (failonerror) {
throw new BuildException(errMessage, e);
}
http://git-wip-us.apache.org/repos/asf/ant/blob/551cb55e/src/main/org/apache/tools/ant/taskdefs/rmic/DefaultRmicAdapter.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/rmic/DefaultRmicAdapter.java b/src/main/org/apache/tools/ant/taskdefs/rmic/DefaultRmicAdapter.java
index 10ad5a0..b4e8cbf 100644
--- a/src/main/org/apache/tools/ant/taskdefs/rmic/DefaultRmicAdapter.java
+++ b/src/main/org/apache/tools/ant/taskdefs/rmic/DefaultRmicAdapter.java
@@ -351,9 +351,10 @@ public abstract class DefaultRmicAdapter implements RmicAdapter {
attributes.log("Compilation " + cmd.describeArguments(),
Project.MSG_VERBOSE);
- String niceSourceList = (compileList.size() == 1 ? "File" : "Files") + " to be compiled:"
- + compileList.stream().peek(arg -> cmd.createArgument().setValue(arg))
- .collect(Collectors.joining(" "));
+ String niceSourceList = (compileList.size() == 1 ? "File" : "Files") +
+ " to be compiled:" +
+ compileList.stream().peek(arg -> cmd.createArgument().setValue(arg))
+ .collect(Collectors.joining(" "));
attributes.log(niceSourceList, Project.MSG_VERBOSE);
}
http://git-wip-us.apache.org/repos/asf/ant/blob/551cb55e/src/main/org/apache/tools/ant/types/EnumeratedAttribute.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/types/EnumeratedAttribute.java b/src/main/org/apache/tools/ant/types/EnumeratedAttribute.java
index 3e29d79..dac3966 100644
--- a/src/main/org/apache/tools/ant/types/EnumeratedAttribute.java
+++ b/src/main/org/apache/tools/ant/types/EnumeratedAttribute.java
@@ -103,7 +103,7 @@ public abstract class EnumeratedAttribute {
* @return true if the value is valid
*/
public final boolean containsValue(String value) {
- return indexOfValue(value) != -1;
+ return (indexOfValue(value) != -1);
}
/**
http://git-wip-us.apache.org/repos/asf/ant/blob/551cb55e/src/main/org/apache/tools/ant/types/Path.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/types/Path.java b/src/main/org/apache/tools/ant/types/Path.java
index a4b0b62..08f5f22 100644
--- a/src/main/org/apache/tools/ant/types/Path.java
+++ b/src/main/org/apache/tools/ant/types/Path.java
@@ -331,7 +331,8 @@ public class Path extends DataType implements Cloneable, ResourceCollection {
* @param tryUserDir if true try the user directory if the file is not present
*/
public void addExisting(Path source, boolean tryUserDir) {
- File userDir = tryUserDir ? new File(System.getProperty("user.dir")) : null;
+ File userDir = (tryUserDir) ? new File(System.getProperty("user.dir"))
+ : null;
for (String name : source.list()) {
File f = resolveFile(getProject(), name);
http://git-wip-us.apache.org/repos/asf/ant/blob/551cb55e/src/main/org/apache/tools/ant/types/Permissions.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/types/Permissions.java b/src/main/org/apache/tools/ant/types/Permissions.java
index aa7f4b7..7dd0ec9 100644
--- a/src/main/org/apache/tools/ant/types/Permissions.java
+++ b/src/main/org/apache/tools/ant/types/Permissions.java
@@ -348,7 +348,7 @@ public class Permissions {
*/
@Override
public String toString() {
- return String.format("Permission: %s (\"%s\", \"%s\")", className, name, actions);
+ return ("Permission: " + className + " (\"" + name + "\", \"" + actions + "\")");
}
}
}
http://git-wip-us.apache.org/repos/asf/ant/blob/551cb55e/src/main/org/apache/tools/ant/types/RedirectorElement.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/types/RedirectorElement.java b/src/main/org/apache/tools/ant/types/RedirectorElement.java
index e814f46..c0b1bd5 100644
--- a/src/main/org/apache/tools/ant/types/RedirectorElement.java
+++ b/src/main/org/apache/tools/ant/types/RedirectorElement.java
@@ -342,7 +342,7 @@ public class RedirectorElement extends DataType {
if (isReference()) {
throw tooManyAttributes();
}
- this.append = append ? Boolean.TRUE : Boolean.FALSE;
+ this.append = ((append) ? Boolean.TRUE : Boolean.FALSE);
}
/**
@@ -356,7 +356,7 @@ public class RedirectorElement extends DataType {
if (isReference()) {
throw tooManyAttributes();
}
- this.alwaysLog = alwaysLog ? Boolean.TRUE : Boolean.FALSE;
+ this.alwaysLog = ((alwaysLog) ? Boolean.TRUE : Boolean.FALSE);
}
/**
@@ -368,7 +368,8 @@ public class RedirectorElement extends DataType {
if (isReference()) {
throw tooManyAttributes();
}
- this.createEmptyFiles = createEmptyFiles ? Boolean.TRUE : Boolean.FALSE;
+ this.createEmptyFiles = ((createEmptyFiles)
+ ? Boolean.TRUE : Boolean.FALSE);
}
/**
http://git-wip-us.apache.org/repos/asf/ant/blob/551cb55e/src/main/org/apache/tools/ant/types/resources/URLResource.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/types/resources/URLResource.java b/src/main/org/apache/tools/ant/types/resources/URLResource.java
index 54a0f26..3328356 100644
--- a/src/main/org/apache/tools/ant/types/resources/URLResource.java
+++ b/src/main/org/apache/tools/ant/types/resources/URLResource.java
@@ -145,15 +145,17 @@ public class URLResource extends Resource implements URLProvider {
if (isReference()) {
return ((URLResource) getCheckedRef()).getURL();
}
- if (url == null && baseURL != null) {
- if (relPath == null) {
- throw new BuildException("must provide relativePath"
- + " attribute when using baseURL.");
- }
- try {
- url = new URL(baseURL, relPath);
- } catch (MalformedURLException e) {
- throw new BuildException(e);
+ if (url == null) {
+ if (baseURL != null) {
+ if (relPath == null) {
+ throw new BuildException("must provide relativePath"
+ + " attribute when using baseURL.");
+ }
+ try {
+ url = new URL(baseURL, relPath);
+ } catch (MalformedURLException e) {
+ throw new BuildException(e);
+ }
}
}
return url;
http://git-wip-us.apache.org/repos/asf/ant/blob/551cb55e/src/main/org/apache/tools/ant/types/resources/ZipResource.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/types/resources/ZipResource.java b/src/main/org/apache/tools/ant/types/resources/ZipResource.java
index a27aa19..b1c1b90 100644
--- a/src/main/org/apache/tools/ant/types/resources/ZipResource.java
+++ b/src/main/org/apache/tools/ant/types/resources/ZipResource.java
@@ -137,12 +137,10 @@ public class ZipResource extends ArchiveResource {
+ getArchive());
}
return new FilterInputStream(z.getInputStream(ze)) {
- @Override
public void close() throws IOException {
FileUtils.close(in);
z.close();
}
- @Override
protected void finalize() throws Throwable {
try {
close();
http://git-wip-us.apache.org/repos/asf/ant/blob/551cb55e/src/main/org/apache/tools/ant/types/selectors/SelectorUtils.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/types/selectors/SelectorUtils.java b/src/main/org/apache/tools/ant/types/selectors/SelectorUtils.java
index 3c5f9bb..f8aba1d 100644
--- a/src/main/org/apache/tools/ant/types/selectors/SelectorUtils.java
+++ b/src/main/org/apache/tools/ant/types/selectors/SelectorUtils.java
@@ -278,8 +278,8 @@ public final class SelectorUtils {
}
// Find the pattern between padIdxStart & padIdxTmp in str between
// strIdxStart & strIdxEnd
- int patLength = patIdxTmp - patIdxStart - 1;
- int strLength = strIdxEnd - strIdxStart + 1;
+ int patLength = (patIdxTmp - patIdxStart - 1);
+ int strLength = (strIdxEnd - strIdxStart + 1);
int foundIdx = -1;
strLoop:
for (int i = 0; i <= strLength - patLength; i++) {
@@ -433,8 +433,8 @@ public final class SelectorUtils {
}
// Find the pattern between padIdxStart & padIdxTmp in str between
// strIdxStart & strIdxEnd
- int patLength = patIdxTmp - patIdxStart - 1;
- int strLength = strIdxEnd - strIdxStart + 1;
+ int patLength = (patIdxTmp - patIdxStart - 1);
+ int strLength = (strIdxEnd - strIdxStart + 1);
int foundIdx = -1;
strLoop:
for (int i = 0; i <= strLength - patLength; i++) {
http://git-wip-us.apache.org/repos/asf/ant/blob/551cb55e/src/main/org/apache/tools/ant/types/selectors/TokenizedPattern.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/types/selectors/TokenizedPattern.java b/src/main/org/apache/tools/ant/types/selectors/TokenizedPattern.java
index 994e1eb..03d5e3b 100644
--- a/src/main/org/apache/tools/ant/types/selectors/TokenizedPattern.java
+++ b/src/main/org/apache/tools/ant/types/selectors/TokenizedPattern.java
@@ -89,7 +89,6 @@ public class TokenizedPattern {
/**
* @return The pattern String
*/
- @Override
public String toString() {
return pattern;
}
@@ -103,13 +102,11 @@ public class TokenizedPattern {
*
* @param o Object
*/
- @Override
public boolean equals(Object o) {
return o instanceof TokenizedPattern
&& pattern.equals(((TokenizedPattern) o).pattern);
}
- @Override
public int hashCode() {
return pattern.hashCode();
}
http://git-wip-us.apache.org/repos/asf/ant/blob/551cb55e/src/main/org/apache/tools/ant/types/selectors/modifiedselector/EqualComparator.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/types/selectors/modifiedselector/EqualComparator.java b/src/main/org/apache/tools/ant/types/selectors/modifiedselector/EqualComparator.java
index a6cb93b..94fb935 100644
--- a/src/main/org/apache/tools/ant/types/selectors/modifiedselector/EqualComparator.java
+++ b/src/main/org/apache/tools/ant/types/selectors/modifiedselector/EqualComparator.java
@@ -38,7 +38,6 @@ public class EqualComparator implements Comparator<Object> {
* @param o2 the second object
* @return 0, if both are equal, otherwise 1
*/
- @Override
public int compare(Object o1, Object o2) {
if (o1 == null) {
if (o2 == null) {
@@ -46,14 +45,13 @@ public class EqualComparator implements Comparator<Object> {
}
return 0;
}
- return o1.equals(o2) ? 0 : 1;
+ return (o1.equals(o2)) ? 0 : 1;
}
/**
* Override Object.toString().
* @return information about this comparator
*/
- @Override
public String toString() {
return "EqualComparator";
}
http://git-wip-us.apache.org/repos/asf/ant/blob/551cb55e/src/main/org/apache/tools/ant/types/selectors/modifiedselector/HashvalueAlgorithm.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/types/selectors/modifiedselector/HashvalueAlgorithm.java b/src/main/org/apache/tools/ant/types/selectors/modifiedselector/HashvalueAlgorithm.java
index c765325..ab8849d 100644
--- a/src/main/org/apache/tools/ant/types/selectors/modifiedselector/HashvalueAlgorithm.java
+++ b/src/main/org/apache/tools/ant/types/selectors/modifiedselector/HashvalueAlgorithm.java
@@ -73,7 +73,6 @@ public class HashvalueAlgorithm implements Algorithm {
* Override Object.toString().
* @return information about this comparator
*/
- @Override
public String toString() {
return "HashvalueAlgorithm";
}
http://git-wip-us.apache.org/repos/asf/ant/blob/551cb55e/src/main/org/apache/tools/ant/types/selectors/modifiedselector/ModifiedSelector.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/types/selectors/modifiedselector/ModifiedSelector.java b/src/main/org/apache/tools/ant/types/selectors/modifiedselector/ModifiedSelector.java
index 3aa6b0a..181642c 100644
--- a/src/main/org/apache/tools/ant/types/selectors/modifiedselector/ModifiedSelector.java
+++ b/src/main/org/apache/tools/ant/types/selectors/modifiedselector/ModifiedSelector.java
@@ -459,7 +459,7 @@ public class ModifiedSelector extends BaseExtendSelector
+ resource.getName()
+ "' does not provide an InputStream, so it is not checked. "
+ "According to 'selres' attribute value it is "
- + (selectResourcesWithoutInputStream ? "" : " not")
+ + ((selectResourcesWithoutInputStream) ? "" : " not")
+ "selected.", Project.MSG_INFO);
return selectResourcesWithoutInputStream;
} catch (Exception e) {
http://git-wip-us.apache.org/repos/asf/ant/blob/551cb55e/src/main/org/apache/tools/ant/types/selectors/modifiedselector/PropertiesfileCache.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/types/selectors/modifiedselector/PropertiesfileCache.java b/src/main/org/apache/tools/ant/types/selectors/modifiedselector/PropertiesfileCache.java
index e8c8fd0..ae52dc9 100644
--- a/src/main/org/apache/tools/ant/types/selectors/modifiedselector/PropertiesfileCache.java
+++ b/src/main/org/apache/tools/ant/types/selectors/modifiedselector/PropertiesfileCache.java
@@ -118,7 +118,7 @@ public class PropertiesfileCache implements Cache {
*/
@Override
public boolean isValid() {
- return cachefile != null;
+ return (cachefile != null);
}
http://git-wip-us.apache.org/repos/asf/ant/blob/551cb55e/src/main/org/apache/tools/ant/util/Base64Converter.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/util/Base64Converter.java b/src/main/org/apache/tools/ant/util/Base64Converter.java
index 2a1740d..4f62b03 100644
--- a/src/main/org/apache/tools/ant/util/Base64Converter.java
+++ b/src/main/org/apache/tools/ant/util/Base64Converter.java
@@ -91,7 +91,7 @@ public class Base64Converter {
out[outIndex++] = ALPHABET[bits6];
bits6 = (bits24 & POS_1_MASK) >> POS_1_SHIFT;
out[outIndex++] = ALPHABET[bits6];
- bits6 = bits24 & POS_0_MASK;
+ bits6 = (bits24 & POS_0_MASK);
out[outIndex++] = ALPHABET[bits6];
}
if (octetString.length - i == 2) {
http://git-wip-us.apache.org/repos/asf/ant/blob/551cb55e/src/main/org/apache/tools/ant/util/DOMElementWriter.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/util/DOMElementWriter.java b/src/main/org/apache/tools/ant/util/DOMElementWriter.java
index 5c85b13..ebef59b 100644
--- a/src/main/org/apache/tools/ant/util/DOMElementWriter.java
+++ b/src/main/org/apache/tools/ant/util/DOMElementWriter.java
@@ -515,7 +515,7 @@ public class DOMElementWriter {
int prevEnd = 0;
int cdataEndPos = value.indexOf("]]>");
while (prevEnd < len) {
- final int end = cdataEndPos < 0 ? len : cdataEndPos;
+ final int end = (cdataEndPos < 0 ? len : cdataEndPos);
// Write out stretches of legal characters in the range [prevEnd, end).
int prevLegalCharPos = prevEnd;
while (prevLegalCharPos < end) {
http://git-wip-us.apache.org/repos/asf/ant/blob/551cb55e/src/main/org/apache/tools/ant/util/FileUtils.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/util/FileUtils.java b/src/main/org/apache/tools/ant/util/FileUtils.java
index 1d0e9a3..7764ceb 100644
--- a/src/main/org/apache/tools/ant/util/FileUtils.java
+++ b/src/main/org/apache/tools/ant/util/FileUtils.java
@@ -1181,7 +1181,7 @@ public class FileUtils {
if (!l.endsWith(File.separator)) {
l += File.separator;
}
- return p.startsWith(l) ? p.substring(l.length()) : p;
+ return (p.startsWith(l)) ? p.substring(l.length()) : p;
}
/**
http://git-wip-us.apache.org/repos/asf/ant/blob/551cb55e/src/main/org/apache/tools/ant/util/GlobPatternMapper.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/util/GlobPatternMapper.java b/src/main/org/apache/tools/ant/util/GlobPatternMapper.java
index 0b272fb..90dc037 100644
--- a/src/main/org/apache/tools/ant/util/GlobPatternMapper.java
+++ b/src/main/org/apache/tools/ant/util/GlobPatternMapper.java
@@ -198,8 +198,10 @@ public class GlobPatternMapper implements FileNameMapper {
if (!caseSensitive) {
name = name.toLowerCase();
}
- if (handleDirSep && name.contains("\\")) {
- name = name.replace('\\', '/');
+ if (handleDirSep) {
+ if (name.contains("\\")) {
+ name = name.replace('\\', '/');
+ }
}
return name;
}
http://git-wip-us.apache.org/repos/asf/ant/blob/551cb55e/src/main/org/apache/tools/ant/util/KeepAliveInputStream.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/util/KeepAliveInputStream.java b/src/main/org/apache/tools/ant/util/KeepAliveInputStream.java
index a27561e..58332b5 100644
--- a/src/main/org/apache/tools/ant/util/KeepAliveInputStream.java
+++ b/src/main/org/apache/tools/ant/util/KeepAliveInputStream.java
@@ -50,7 +50,6 @@ public class KeepAliveInputStream extends FilterInputStream {
* This method does nothing.
* @throws IOException as we are overriding FilterInputStream.
*/
- @Override
public void close() throws IOException {
// do not close the stream
}
http://git-wip-us.apache.org/repos/asf/ant/blob/551cb55e/src/main/org/apache/tools/ant/util/KeepAliveOutputStream.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/util/KeepAliveOutputStream.java b/src/main/org/apache/tools/ant/util/KeepAliveOutputStream.java
index 0bf4775..352b0ba 100644
--- a/src/main/org/apache/tools/ant/util/KeepAliveOutputStream.java
+++ b/src/main/org/apache/tools/ant/util/KeepAliveOutputStream.java
@@ -50,7 +50,6 @@ public class KeepAliveOutputStream extends FilterOutputStream {
* This method does nothing.
* @throws IOException as we are overriding FilterOutputStream.
*/
- @Override
public void close() throws IOException {
// do not close the stream
}
http://git-wip-us.apache.org/repos/asf/ant/blob/551cb55e/src/main/org/apache/tools/ant/util/LayoutPreservingProperties.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/util/LayoutPreservingProperties.java b/src/main/org/apache/tools/ant/util/LayoutPreservingProperties.java
index e463a7d..27a2205 100644
--- a/src/main/org/apache/tools/ant/util/LayoutPreservingProperties.java
+++ b/src/main/org/apache/tools/ant/util/LayoutPreservingProperties.java
@@ -294,9 +294,11 @@ public class LayoutPreservingProperties extends Properties {
boolean writtenSep = false;
for (LogicalLine line : logicalLines.subList(skipLines, totalLines)) {
if (line instanceof Pair) {
- if (((Pair) line).isNew() && !writtenSep) {
- osw.write(eol);
- writtenSep = true;
+ if (((Pair) line).isNew()) {
+ if (!writtenSep) {
+ osw.write(eol);
+ writtenSep = true;
+ }
}
osw.write(line.toString() + eol);
} else if (line != null) {
http://git-wip-us.apache.org/repos/asf/ant/blob/551cb55e/src/main/org/apache/tools/ant/util/LazyHashtable.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/util/LazyHashtable.java b/src/main/org/apache/tools/ant/util/LazyHashtable.java
index 0add0fd..e9632b8 100644
--- a/src/main/org/apache/tools/ant/util/LazyHashtable.java
+++ b/src/main/org/apache/tools/ant/util/LazyHashtable.java
@@ -55,7 +55,6 @@ public class LazyHashtable<K, V> extends Hashtable<K, V> {
* Get a enumeration over the elements.
* @return an enumeration.
*/
- @Override
public Enumeration<V> elements() {
initAll();
return super.elements();
@@ -65,7 +64,6 @@ public class LazyHashtable<K, V> extends Hashtable<K, V> {
* Check if the table is empty.
* @return true if it is.
*/
- @Override
public boolean isEmpty() {
initAll();
return super.isEmpty();
@@ -75,7 +73,6 @@ public class LazyHashtable<K, V> extends Hashtable<K, V> {
* Get the size of the table.
* @return the size.
*/
- @Override
public int size() {
initAll();
return super.size();
@@ -86,7 +83,6 @@ public class LazyHashtable<K, V> extends Hashtable<K, V> {
* @param value the value to look for.
* @return true if the table contains the value.
*/
- @Override
public boolean contains(Object value) {
initAll();
return super.contains(value);
@@ -97,7 +93,6 @@ public class LazyHashtable<K, V> extends Hashtable<K, V> {
* @param value the key to look for.
* @return true if the table contains key.
*/
- @Override
public boolean containsKey(Object value) {
initAll();
return super.containsKey(value);
@@ -108,7 +103,6 @@ public class LazyHashtable<K, V> extends Hashtable<K, V> {
* @param value the value to look for.
* @return true if the table contains the value.
*/
- @Override
public boolean containsValue(Object value) {
return contains(value);
}
@@ -117,7 +111,6 @@ public class LazyHashtable<K, V> extends Hashtable<K, V> {
* Get an enumeration over the keys.
* @return an enumeration.
*/
- @Override
public Enumeration<K> keys() {
initAll();
return super.keys();
http://git-wip-us.apache.org/repos/asf/ant/blob/551cb55e/src/main/org/apache/tools/ant/util/LinkedHashtable.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/util/LinkedHashtable.java b/src/main/org/apache/tools/ant/util/LinkedHashtable.java
index 7d1f621..5224ff8 100644
--- a/src/main/org/apache/tools/ant/util/LinkedHashtable.java
+++ b/src/main/org/apache/tools/ant/util/LinkedHashtable.java
@@ -59,7 +59,6 @@ public class LinkedHashtable<K, V> extends Hashtable<K, V> {
map = new LinkedHashMap<>(m);
}
- @Override
public synchronized void clear() {
map.clear();
}
http://git-wip-us.apache.org/repos/asf/ant/blob/551cb55e/src/main/org/apache/tools/ant/util/RegexpPatternMapper.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/util/RegexpPatternMapper.java b/src/main/org/apache/tools/ant/util/RegexpPatternMapper.java
index 9b4942d..98330a2 100644
--- a/src/main/org/apache/tools/ant/util/RegexpPatternMapper.java
+++ b/src/main/org/apache/tools/ant/util/RegexpPatternMapper.java
@@ -118,10 +118,13 @@ public class RegexpPatternMapper implements FileNameMapper {
if (sourceFileName == null) {
return null;
}
- if (handleDirSep && sourceFileName.contains("\\")) {
- sourceFileName = sourceFileName.replace('\\', '/');
+ if (handleDirSep) {
+ if (sourceFileName.contains("\\")) {
+ sourceFileName = sourceFileName.replace('\\', '/');
+ }
}
- if (reg == null || to == null || !reg.matches(sourceFileName, regexpOptions)) {
+ if (reg == null || to == null
+ || !reg.matches(sourceFileName, regexpOptions)) {
return null;
}
return new String[] {replaceReferences(sourceFileName)};
http://git-wip-us.apache.org/repos/asf/ant/blob/551cb55e/src/main/org/apache/tools/ant/util/StreamUtils.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/util/StreamUtils.java b/src/main/org/apache/tools/ant/util/StreamUtils.java
index 8a36daf..0f0950c 100644
--- a/src/main/org/apache/tools/ant/util/StreamUtils.java
+++ b/src/main/org/apache/tools/ant/util/StreamUtils.java
@@ -36,7 +36,6 @@ public class StreamUtils {
public static <T> Stream<T> enumerationAsStream(Enumeration<T> e) {
return StreamSupport.stream(
new Spliterators.AbstractSpliterator<T>(Long.MAX_VALUE, Spliterator.ORDERED) {
- @Override
public boolean tryAdvance(Consumer<? super T> action) {
if (e.hasMoreElements()) {
action.accept(e.nextElement());
@@ -44,7 +43,6 @@ public class StreamUtils {
}
return false;
}
- @Override
public void forEachRemaining(Consumer<? super T> action) {
while (e.hasMoreElements()) {
action.accept(e.nextElement());
http://git-wip-us.apache.org/repos/asf/ant/blob/551cb55e/src/main/org/apache/tools/ant/util/WorkerAnt.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/util/WorkerAnt.java b/src/main/org/apache/tools/ant/util/WorkerAnt.java
index e3ec214..b22be50 100644
--- a/src/main/org/apache/tools/ant/util/WorkerAnt.java
+++ b/src/main/org/apache/tools/ant/util/WorkerAnt.java
@@ -157,7 +157,6 @@ public class WorkerAnt extends Thread {
* Run the task, which is skipped if null.
* When invoked again, the task is re-run.
*/
- @Override
public void run() {
try {
if (task != null) {
http://git-wip-us.apache.org/repos/asf/ant/blob/551cb55e/src/main/org/apache/tools/bzip2/BZip2Constants.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/bzip2/BZip2Constants.java b/src/main/org/apache/tools/bzip2/BZip2Constants.java
index 7676e40..df32d95 100644
--- a/src/main/org/apache/tools/bzip2/BZip2Constants.java
+++ b/src/main/org/apache/tools/bzip2/BZip2Constants.java
@@ -42,7 +42,7 @@ public interface BZip2Constants {
int N_GROUPS = 6;
int G_SIZE = 50;
int N_ITERS = 4;
- int MAX_SELECTORS = 2 + 900000 / G_SIZE;
+ int MAX_SELECTORS = (2 + (900000 / G_SIZE));
int NUM_OVERSHOOT_BYTES = 20;
/**
http://git-wip-us.apache.org/repos/asf/ant/blob/551cb55e/src/main/org/apache/tools/bzip2/BlockSort.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/bzip2/BlockSort.java b/src/main/org/apache/tools/bzip2/BlockSort.java
index 14a4632..75c3ff2 100644
--- a/src/main/org/apache/tools/bzip2/BlockSort.java
+++ b/src/main/org/apache/tools/bzip2/BlockSort.java
@@ -686,17 +686,17 @@ class BlockSort {
i2 -= lastPlus1;
}
workDoneShadow++;
- } else if (quadrant[i1 + 3] > quadrant[i2 + 3]) {
+ } else if ((quadrant[i1 + 3] > quadrant[i2 + 3])) {
continue HAMMER;
} else {
break HAMMER;
}
- } else if ((block[i2 + 4] & 0xff) < (block[i1 + 4] & 0xff)) {
+ } else if ((block[i1 + 4] & 0xff) > (block[i2 + 4] & 0xff)) {
continue HAMMER;
} else {
break HAMMER;
}
- } else if (quadrant[i1 + 2] > quadrant[i2 + 2]) {
+ } else if ((quadrant[i1 + 2] > quadrant[i2 + 2])) {
continue HAMMER;
} else {
break HAMMER;
@@ -706,7 +706,7 @@ class BlockSort {
} else {
break HAMMER;
}
- } else if (quadrant[i1 + 1] > quadrant[i2 + 1]) {
+ } else if ((quadrant[i1 + 1] > quadrant[i2 + 1])) {
continue HAMMER;
} else {
break HAMMER;
@@ -716,7 +716,7 @@ class BlockSort {
} else {
break HAMMER;
}
- } else if (quadrant[i1] > quadrant[i2]) {
+ } else if ((quadrant[i1] > quadrant[i2])) {
continue HAMMER;
} else {
break HAMMER;
@@ -900,8 +900,8 @@ class BlockSort {
}
}
- private static final int SETMASK = 1 << 21;
- private static final int CLEARMASK = ~SETMASK;
+ private static final int SETMASK = (1 << 21);
+ private static final int CLEARMASK = (~SETMASK);
final void mainSort(final CBZip2OutputStream.Data dataShadow,
final int lastShadow) {
@@ -1024,7 +1024,7 @@ class BlockSort {
copy[j] = ftab[(j << 8) + ss] & CLEARMASK;
}
- for (int j = ftab[ss << 8] & CLEARMASK, hj = ftab[ss + 1 << 8] & CLEARMASK; j < hj; j++) {
+ for (int j = ftab[ss << 8] & CLEARMASK, hj = (ftab[(ss + 1) << 8] & CLEARMASK); j < hj; j++) {
final int fmap_j = fmap[j];
c1 = block[fmap_j] & 0xff;
if (!bigDone[c1]) {
http://git-wip-us.apache.org/repos/asf/ant/blob/551cb55e/src/main/org/apache/tools/bzip2/CBZip2OutputStream.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/bzip2/CBZip2OutputStream.java b/src/main/org/apache/tools/bzip2/CBZip2OutputStream.java
index 19eedda..ec438be 100644
--- a/src/main/org/apache/tools/bzip2/CBZip2OutputStream.java
+++ b/src/main/org/apache/tools/bzip2/CBZip2OutputStream.java
@@ -143,14 +143,14 @@ public class CBZip2OutputStream extends OutputStream
* purposes. If you don't know what it means then you don't need
* it.
*/
- protected static final int SETMASK = 1 << 21;
+ protected static final int SETMASK = (1 << 21);
/**
* This constant is accessible by subclasses for historical
* purposes. If you don't know what it means then you don't need
* it.
*/
- protected static final int CLEARMASK = ~SETMASK;
+ protected static final int CLEARMASK = (~SETMASK);
/**
* This constant is accessible by subclasses for historical
@@ -322,9 +322,14 @@ public class CBZip2OutputStream extends OutputStream
final int weight_n1 = weight[n1];
final int weight_n2 = weight[n2];
- weight[nNodes] = (weight_n1 & 0xffffff00) + (weight_n2 & 0xffffff00)
- | 1 + ((weight_n1 & 0x000000ff) > (weight_n2 & 0x000000ff)
- ? weight_n1 & 0x000000ff : weight_n2 & 0x000000ff);
+ weight[nNodes] = (((weight_n1 & 0xffffff00)
+ + (weight_n2 & 0xffffff00))
+ |
+ (1 + (((weight_n1 & 0x000000ff)
+ > (weight_n2 & 0x000000ff))
+ ? (weight_n1 & 0x000000ff)
+ : (weight_n2 & 0x000000ff))
+ ));
parent[nNodes] = -1;
nHeap++;
@@ -1560,7 +1565,7 @@ public class CBZip2OutputStream extends OutputStream
super();
final int n = blockSize100k * BZip2Constants.baseBlockSize;
- this.block = new byte[n + 1 + NUM_OVERSHOOT_BYTES];
+ this.block = new byte[(n + 1 + NUM_OVERSHOOT_BYTES)];
this.fmap = new int[n];
this.sfmap = new char[2 * n];
}
http://git-wip-us.apache.org/repos/asf/ant/blob/551cb55e/src/main/org/apache/tools/tar/TarBuffer.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/tar/TarBuffer.java b/src/main/org/apache/tools/tar/TarBuffer.java
index e8b68d1..252d88c 100644
--- a/src/main/org/apache/tools/tar/TarBuffer.java
+++ b/src/main/org/apache/tools/tar/TarBuffer.java
@@ -44,10 +44,10 @@ import java.util.Arrays;
public class TarBuffer {
/** Default record size */
- public static final int DEFAULT_RCDSIZE = 512;
+ public static final int DEFAULT_RCDSIZE = (512);
/** Default block size */
- public static final int DEFAULT_BLKSIZE = DEFAULT_RCDSIZE * 20;
+ public static final int DEFAULT_BLKSIZE = (DEFAULT_RCDSIZE * 20);
private InputStream inStream;
private OutputStream outStream;
@@ -123,7 +123,7 @@ public class TarBuffer {
this.debug = false;
this.blockSize = blockSize;
this.recordSize = recordSize;
- this.recsPerBlock = this.blockSize / this.recordSize;
+ this.recsPerBlock = (this.blockSize / this.recordSize);
this.blockBuffer = new byte[this.blockSize];
if (this.inStream != null) {
@@ -183,7 +183,8 @@ public class TarBuffer {
*/
public void skipRecord() throws IOException {
if (debug) {
- System.err.printf("SkipRecord: recIdx = %d blkIdx = %d%n", currRecIdx, currBlkIdx);
+ System.err.println("SkipRecord: recIdx = " + currRecIdx
+ + " blkIdx = " + currBlkIdx);
}
if (inStream == null) {
@@ -205,7 +206,8 @@ public class TarBuffer {
*/
public byte[] readRecord() throws IOException {
if (debug) {
- System.err.printf("ReadRecord: recIdx = %d blkIdx = %d%n", currRecIdx, currBlkIdx);
+ System.err.println("ReadRecord: recIdx = " + currRecIdx
+ + " blkIdx = " + currBlkIdx);
}
if (inStream == null) {
@@ -221,7 +223,9 @@ public class TarBuffer {
byte[] result = new byte[recordSize];
- System.arraycopy(blockBuffer, currRecIdx * recordSize, result, 0, recordSize);
+ System.arraycopy(blockBuffer,
+ (currRecIdx * recordSize), result, 0,
+ recordSize);
currRecIdx++;
@@ -246,7 +250,8 @@ public class TarBuffer {
int bytesNeeded = blockSize;
while (bytesNeeded > 0) {
- long numBytes = inStream.read(blockBuffer, offset, bytesNeeded);
+ long numBytes = inStream.read(blockBuffer, offset,
+ bytesNeeded);
//
// NOTE
@@ -282,9 +287,12 @@ public class TarBuffer {
offset += numBytes;
bytesNeeded -= numBytes;
- if (numBytes != blockSize && debug) {
- System.err.printf("ReadBlock: INCOMPLETE READ %d of %d bytes read.%n",
- numBytes, blockSize);
+ if (numBytes != blockSize) {
+ if (debug) {
+ System.err.println("ReadBlock: INCOMPLETE READ "
+ + numBytes + " of " + blockSize
+ + " bytes read.");
+ }
}
}
@@ -320,7 +328,8 @@ public class TarBuffer {
*/
public void writeRecord(byte[] record) throws IOException {
if (debug) {
- System.err.printf("WriteRecord: recIdx = %d blkIdx = %d%n", currRecIdx, currBlkIdx);
+ System.err.println("WriteRecord: recIdx = " + currRecIdx
+ + " blkIdx = " + currBlkIdx);
}
if (outStream == null) {
@@ -341,7 +350,9 @@ public class TarBuffer {
writeBlock();
}
- System.arraycopy(record, 0, blockBuffer, currRecIdx * recordSize, recordSize);
+ System.arraycopy(record, 0, blockBuffer,
+ (currRecIdx * recordSize),
+ recordSize);
currRecIdx++;
}
@@ -357,7 +368,8 @@ public class TarBuffer {
*/
public void writeRecord(byte[] buf, int offset) throws IOException {
if (debug) {
- System.err.printf("WriteRecord: recIdx = %d blkIdx = %d%n", currRecIdx, currBlkIdx);
+ System.err.println("WriteRecord: recIdx = " + currRecIdx
+ + " blkIdx = " + currBlkIdx);
}
if (outStream == null) {
@@ -378,7 +390,9 @@ public class TarBuffer {
writeBlock();
}
- System.arraycopy(buf, offset, blockBuffer, currRecIdx * recordSize, recordSize);
+ System.arraycopy(buf, offset, blockBuffer,
+ (currRecIdx * recordSize),
+ recordSize);
currRecIdx++;
}
@@ -433,7 +447,8 @@ public class TarBuffer {
if (outStream != null) {
flushBlock();
- if (outStream != System.out && outStream != System.err) {
+ if (outStream != System.out
+ && outStream != System.err) {
outStream.close();
outStream = null;
http://git-wip-us.apache.org/repos/asf/ant/blob/551cb55e/src/main/org/apache/tools/tar/TarInputStream.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/tar/TarInputStream.java b/src/main/org/apache/tools/tar/TarInputStream.java
index 423de75..151461e 100644
--- a/src/main/org/apache/tools/tar/TarInputStream.java
+++ b/src/main/org/apache/tools/tar/TarInputStream.java
@@ -215,7 +215,7 @@ public class TarInputStream extends FilterInputStream {
}
skip -= numRead;
}
- return numToSkip - skip;
+ return (numToSkip - skip);
}
/**
http://git-wip-us.apache.org/repos/asf/ant/blob/551cb55e/src/main/org/apache/tools/tar/TarUtils.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/tar/TarUtils.java b/src/main/org/apache/tools/tar/TarUtils.java
index 34a8b8f..fcb1127 100644
--- a/src/main/org/apache/tools/tar/TarUtils.java
+++ b/src/main/org/apache/tools/tar/TarUtils.java
@@ -493,8 +493,8 @@ public class TarUtils {
final long max = 1L << bits;
long val = Math.abs(value);
if (val >= max) {
- throw new IllegalArgumentException("Value " + value
- + " is too large for " + length + " byte field.");
+ throw new IllegalArgumentException("Value " + value +
+ " is too large for " + length + " byte field.");
}
if (negative) {
val ^= max - 1;
http://git-wip-us.apache.org/repos/asf/ant/blob/551cb55e/src/main/org/apache/tools/zip/Simple8BitZipEncoding.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/zip/Simple8BitZipEncoding.java b/src/main/org/apache/tools/zip/Simple8BitZipEncoding.java
index b584dbe..f75c2d8 100644
--- a/src/main/org/apache/tools/zip/Simple8BitZipEncoding.java
+++ b/src/main/org/apache/tools/zip/Simple8BitZipEncoding.java
@@ -58,7 +58,6 @@ class Simple8BitZipEncoding implements ZipEncoding {
this.unicode = unicode;
}
- @Override
public int compareTo(final Simple8BitChar a) {
return this.unicode - a.unicode;
}
http://git-wip-us.apache.org/repos/asf/ant/blob/551cb55e/src/main/org/apache/tools/zip/ZipEightByteInteger.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/zip/ZipEightByteInteger.java b/src/main/org/apache/tools/zip/ZipEightByteInteger.java
index 12e85bd..46ba932 100644
--- a/src/main/org/apache/tools/zip/ZipEightByteInteger.java
+++ b/src/main/org/apache/tools/zip/ZipEightByteInteger.java
@@ -136,7 +136,7 @@ public final class ZipEightByteInteger {
public static byte[] getBytes(BigInteger value) {
byte[] result = new byte[8];
long val = value.longValue();
- result[0] = (byte) (val & BYTE_MASK);
+ result[0] = (byte) ((val & BYTE_MASK));
result[BYTE_1] = (byte) ((val & BYTE_1_MASK) >> BYTE_1_SHIFT);
result[BYTE_2] = (byte) ((val & BYTE_2_MASK) >> BYTE_2_SHIFT);
result[BYTE_3] = (byte) ((val & BYTE_3_MASK) >> BYTE_3_SHIFT);