bodewig 2004/11/15 06:52:01
Modified: src/main/org/apache/tools/ant/taskdefs/optional/extension
Tag: ANT_16_BRANCH Specification.java
Log:
merge
Revision Changes Path
No revision
No revision
1.4.2.7 +12 -10
ant/src/main/org/apache/tools/ant/taskdefs/optional/extension/Specification.java
Index: Specification.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/extension/Specification.java,v
retrieving revision 1.4.2.6
retrieving revision 1.4.2.7
diff -u -r1.4.2.6 -r1.4.2.7
--- Specification.java 12 Nov 2004 11:08:01 -0000 1.4.2.6
+++ Specification.java 15 Nov 2004 14:52:00 -0000 1.4.2.7
@@ -343,29 +343,31 @@
}
// Available specification version must be >= required
- final DeweyDecimal specificationVersion
+ final DeweyDecimal otherSpecificationVersion
= other.getSpecificationVersion();
if (null != specificationVersion) {
- if (null == specificationVersion
- || !isCompatible(specificationVersion,
specificationVersion)) {
+ if (null == otherSpecificationVersion
+ || !isCompatible(specificationVersion,
otherSpecificationVersion)) {
return REQUIRE_SPECIFICATION_UPGRADE;
}
}
// Implementation Vendor ID must match
- final String implementationVendor = other.getImplementationVendor();
+ final String otherImplementationVendor
+ = other.getImplementationVendor();
if (null != implementationVendor) {
- if (null == implementationVendor
- || !implementationVendor.equals(implementationVendor)) {
+ if (null == otherImplementationVendor
+ || !implementationVendor.equals(otherImplementationVendor)) {
return REQUIRE_VENDOR_SWITCH;
}
}
// Implementation version must be >= required
- final String implementationVersion =
other.getImplementationVersion();
+ final String otherImplementationVersion
+ = other.getImplementationVersion();
if (null != implementationVersion) {
- if (null == implementationVersion
- || !implementationVersion.equals(implementationVersion)) {
+ if (null == otherImplementationVersion
+ ||
!implementationVersion.equals(otherImplementationVersion)) {
return REQUIRE_IMPLEMENTATION_CHANGE;
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
