ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bode...@apache.org
Subject cvs commit: ant/src/main/org/apache/tools/ant/taskdefs/optional/extension Specification.java
Date Mon, 15 Nov 2004 14:51:23 GMT
bodewig     2004/11/15 06:51:22

  Modified:    src/main/org/apache/tools/ant/taskdefs/optional/extension
                        Specification.java
  Log:
  fix self-comparision
  
  Revision  Changes    Path
  1.11      +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.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- Specification.java	12 Nov 2004 11:07:12 -0000	1.10
  +++ Specification.java	15 Nov 2004 14:51:22 -0000	1.11
  @@ -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: dev-unsubscribe@ant.apache.org
For additional commands, e-mail: dev-help@ant.apache.org


Mime
View raw message