Remove extraneous casts and (un)boxing, tersify logic

2 files changed, 12 insertions, 24 deletions

diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/extension/ExtensionUtil.java b/src/main/org/apache/tools/ant/taskdefs/optional/extension/ExtensionUtil.java
index 12f2a161f..de559eca5 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/extension/ExtensionUtil.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/extension/ExtensionUtil.java
@@ -20,6 +20,7 @@ package org.apache.tools.ant.taskdefs.optional.extension;
 import java.io.File;
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 import java.util.jar.JarFile;
 import java.util.jar.Manifest;
@@ -66,9 +67,7 @@ public final class ExtensionUtil {
                                    final List<FileSet> fileset)
         throws BuildException {
         if (!fileset.isEmpty()) {
-            for (Extension extension : getExtensions(project, fileset)) {
-                libraries.add(extension);
-            }
+            Collections.addAll(libraries, getExtensions(project, fileset));
         }
     }
 
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/extension/Specification.java b/src/main/org/apache/tools/ant/taskdefs/optional/extension/Specification.java
index f1d33e29f..eb7e1fab7 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/extension/Specification.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/extension/Specification.java
@@ -332,33 +332,22 @@ public final class Specification {
         }
 
         // Available specification version must be >= required
-        final DeweyDecimal otherSpecificationVersion
-            = other.getSpecificationVersion();
-        if (null != specificationVersion) {
-            if (null == otherSpecificationVersion
-                || !isCompatible(specificationVersion, otherSpecificationVersion)) {
-                return REQUIRE_SPECIFICATION_UPGRADE;
-            }
+        final DeweyDecimal otherSpecificationVersion = other.getSpecificationVersion();
+        if (null != specificationVersion && (null == otherSpecificationVersion
+                || !isCompatible(specificationVersion, otherSpecificationVersion))) {
+            return REQUIRE_SPECIFICATION_UPGRADE;
         }
 
         // Implementation Vendor ID must match
-        final String otherImplementationVendor
-            = other.getImplementationVendor();
-        if (null != implementationVendor) {
-            if (null == otherImplementationVendor
-                || !implementationVendor.equals(otherImplementationVendor)) {
-                return REQUIRE_VENDOR_SWITCH;
-            }
+        if (null != implementationVendor
+                && !implementationVendor.equals(other.getImplementationVendor())) {
+            return REQUIRE_VENDOR_SWITCH;
         }
 
         // Implementation version must be >= required
-        final String otherImplementationVersion
-            = other.getImplementationVersion();
-        if (null != implementationVersion) {
-            if (null == otherImplementationVersion
-                || !implementationVersion.equals(otherImplementationVersion)) {
-                return REQUIRE_IMPLEMENTATION_CHANGE;
-            }
+        if (null != implementationVersion
+                && !implementationVersion.equals(other.getImplementationVersion())) {
+            return REQUIRE_IMPLEMENTATION_CHANGE;
         }
 
         // This available optional package satisfies the requirements