bodewig 2004/11/05 07:03:33
Modified: . Tag: ANT_16_BRANCH CONTRIBUTORS
src/main/org/apache/tools/ant/taskdefs/optional/extension
Tag: ANT_16_BRANCH Extension.java
Log:
merge
Revision Changes Path
No revision
No revision
1.1.2.26 +1 -0 ant/CONTRIBUTORS
Index: CONTRIBUTORS
===================================================================
RCS file: /home/cvs/ant/CONTRIBUTORS,v
retrieving revision 1.1.2.25
retrieving revision 1.1.2.26
diff -u -r1.1.2.25 -r1.1.2.26
--- CONTRIBUTORS 26 Oct 2004 14:57:26 -0000 1.1.2.25
+++ CONTRIBUTORS 5 Nov 2004 15:03:30 -0000 1.1.2.26
@@ -41,6 +41,7 @@
Davanum Srinivas
David A. Herman
David Crossley
+David G�rtner
David Kavanagh
David Maclean
David Rees
No revision
No revision
1.8.2.5 +10 -10
ant/src/main/org/apache/tools/ant/taskdefs/optional/extension/Extension.java
Index: Extension.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/extension/Extension.java,v
retrieving revision 1.8.2.4
retrieving revision 1.8.2.5
diff -u -r1.8.2.4 -r1.8.2.5
--- Extension.java 9 Mar 2004 17:01:45 -0000 1.8.2.4
+++ Extension.java 5 Nov 2004 15:03:30 -0000 1.8.2.5
@@ -444,31 +444,31 @@
}
// Available specification version must be >= required
- final DeweyDecimal specificationVersion
+ final DeweyDecimal requiredSpecificationVersion
= required.getSpecificationVersion();
- if (null != specificationVersion) {
+ if (null != requiredSpecificationVersion) {
if (null == specificationVersion
- || !isCompatible(specificationVersion,
specificationVersion)) {
+ || !isCompatible(specificationVersion,
requiredSpecificationVersion)) {
return REQUIRE_SPECIFICATION_UPGRADE;
}
}
// Implementation Vendor ID must match
- final String implementationVendorId
+ final String requiredImplementationVendorID
= required.getImplementationVendorID();
- if (null != implementationVendorId) {
+ if (null != requiredImplementationVendorID) {
if (null == implementationVendorID
- || !implementationVendorID.equals(implementationVendorId)) {
+ ||
!implementationVendorID.equals(requiredImplementationVendorID)) {
return REQUIRE_VENDOR_SWITCH;
}
}
// Implementation version must be >= required
- final DeweyDecimal implementationVersion
+ final DeweyDecimal requiredImplementationVersion
= required.getImplementationVersion();
- if (null != implementationVersion) {
+ if (null != requiredImplementationVersion) {
if (null == implementationVersion
- || !isCompatible(implementationVersion,
implementationVersion)) {
+ || !isCompatible(implementationVersion,
requiredImplementationVersion)) {
return REQUIRE_IMPLEMENTATION_UPGRADE;
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
