ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From co...@apache.org
Subject cvs commit: ant/src/main/org/apache/tools/ant/taskdefs/optional/extension Extension.java
Date Fri, 04 Jul 2003 11:36:32 GMT
conor       2003/07/04 04:36:32

  Modified:    .        check.xml
               src/etc/checkstyle checkstyle-config
               src/main/org/apache/tools/ant/taskdefs/optional/extension
                        Extension.java
  Log:
  Fix up style errors
  
  Revision  Changes    Path
  1.7       +8 -1      ant/check.xml
  
  Index: check.xml
  ===================================================================
  RCS file: /home/cvs/ant/check.xml,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -w -u -r1.6 -r1.7
  --- check.xml	3 Jul 2003 13:59:49 -0000	1.6
  +++ check.xml	4 Jul 2003 11:36:32 -0000	1.7
  @@ -1,5 +1,6 @@
   <?xml version="1.0"?>
  -<project default="htmlreport" name="CheckAnt">
  +<project default="checkstyle" name="CheckAnt">
  +
   <!--  <import file="build.xml"/> --> 
     <property name="src.dir" value="src"/>
     <property name="java.dir" value="${src.dir}/main"/>
  @@ -26,6 +27,7 @@
         <formatter type="xml" toFile="${checkstyle.raw}"/>
         <fileset dir="${java.dir}">
           <include name="${tocheck}"/>
  +        <exclude name="**/BZip2Constants.java"/>
         </fileset>
       </checkstyle>
     </target>
  @@ -51,6 +53,11 @@
       </style>
     </target>
   
  +  <target name="dumptext" depends="checkstyle, textreport">
  +    <concat>
  +      <filelist dir="${checkstyle.reportdir}" files="report.txt"/>
  +    </concat>
  +  </target>
     
   </project>
   
  
  
  
  1.2       +2 -4      ant/src/etc/checkstyle/checkstyle-config
  
  Index: checkstyle-config
  ===================================================================
  RCS file: /home/cvs/ant/src/etc/checkstyle/checkstyle-config,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -w -u -r1.1 -r1.2
  --- checkstyle-config	3 Jul 2003 13:59:50 -0000	1.1
  +++ checkstyle-config	4 Jul 2003 11:36:32 -0000	1.2
  @@ -17,10 +17,7 @@
       </module>        
       
       <!-- element naming -->
  -    <module name="PackageName">
  -      <!-- no uppercase letters, between 2 and 8 characters -->
  -      <property name="format" value="^[a-z]+(\.[a-z][a-z0-9]{1,7})*$"/>
  -    </module>
  +    <module name="PackageName"/>
       <module name="TypeName"/>
       <module name="ConstantName"/>
       <module name="LocalFinalVariableName"/>
  @@ -102,4 +99,5 @@
       <module name="TodoComment"/>
       <module name="UpperEll"/>
     </module>
  +  <module name="au.com.redhillconsulting.simian.SimianCheck"/>
   </module>
  
  
  
  1.8       +246 -295  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.7
  retrieving revision 1.8
  diff -u -w -u -r1.7 -r1.8
  --- Extension.java	22 Apr 2003 07:35:15 -0000	1.7
  +++ Extension.java	4 Jul 2003 11:36:32 -0000	1.8
  @@ -70,25 +70,17 @@
    * Java2 Standard Edition package, in file
    * <code>guide/extensions/versioning.html</code>.</p>
    *
  - * WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING
  - *  This file is from excalibur.extension package. Dont edit this file
  - * directly as there is no unit tests to make sure it is operational
  - * in ant. Edit file in excalibur and run tests there before changing
  - * ants file.
  - * WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING
  - *
    * @author <a href="mailto:craigmcc@apache.org">Craig R. McClanahan</a>
    * @author <a href="mailto:peter@apache.org">Peter Donald</a>
    * @version $Revision$ $Date$
    */
  -public final class Extension
  -{
  +public final class Extension {
       /**
        * Manifest Attribute Name object for EXTENSION_LIST.
        * @see Attributes.Name#EXTENSION_LIST
        */
  -    public static final Attributes.Name EXTENSION_LIST =
  -        new Attributes.Name( "Extension-List" );//Attributes.Name.EXTENSION_LIST;
  +    public static final Attributes.Name EXTENSION_LIST
  +        = new Attributes.Name("Extension-List");
   
       /**
        * <code>Name</code> object for <code>Optional-Extension-List</code>
  @@ -100,79 +92,83 @@
        * @see <a href="http://java.sun.com/j2se/1.3/docs/guide/extensions/spec.html#dependnecy">
        *      Installed extension dependency</a>
        */
  -    public static final Attributes.Name OPTIONAL_EXTENSION_LIST =
  -        new Attributes.Name( "Optional-Extension-List" );
  +    public static final Attributes.Name OPTIONAL_EXTENSION_LIST
  +        = new Attributes.Name("Optional-Extension-List");
   
       /**
        * Manifest Attribute Name object for EXTENSION_NAME.
        * @see Attributes.Name#EXTENSION_NAME
        */
       public static final Attributes.Name EXTENSION_NAME =
  -        new Attributes.Name( "Extension-Name" );//Attributes.Name.EXTENSION_NAME;
  +        new Attributes.Name("Extension-Name");
       /**
        * Manifest Attribute Name object for SPECIFICATION_VERSION.
        * @see Attributes.Name#SPECIFICATION_VERSION
        */
  -    public static final Attributes.Name SPECIFICATION_VERSION = Attributes.Name.SPECIFICATION_VERSION;
  +    public static final Attributes.Name SPECIFICATION_VERSION
  +        = Attributes.Name.SPECIFICATION_VERSION;
   
       /**
        * Manifest Attribute Name object for SPECIFICATION_VENDOR.
        * @see Attributes.Name#SPECIFICATION_VENDOR
        */
  -    public static final Attributes.Name SPECIFICATION_VENDOR = Attributes.Name.SPECIFICATION_VENDOR;
  +    public static final Attributes.Name SPECIFICATION_VENDOR
  +        = Attributes.Name.SPECIFICATION_VENDOR;
   
       /**
        * Manifest Attribute Name object for IMPLEMENTATION_VERSION.
        * @see Attributes.Name#IMPLEMENTATION_VERSION
        */
  -    public static final Attributes.Name IMPLEMENTATION_VERSION = Attributes.Name.IMPLEMENTATION_VERSION;
  +    public static final Attributes.Name IMPLEMENTATION_VERSION
  +        = Attributes.Name.IMPLEMENTATION_VERSION;
   
       /**
        * Manifest Attribute Name object for IMPLEMENTATION_VENDOR.
        * @see Attributes.Name#IMPLEMENTATION_VENDOR
        */
  -    public static final Attributes.Name IMPLEMENTATION_VENDOR = Attributes.Name.IMPLEMENTATION_VENDOR;
  +    public static final Attributes.Name IMPLEMENTATION_VENDOR
  +        = Attributes.Name.IMPLEMENTATION_VENDOR;
   
       /**
        * Manifest Attribute Name object for IMPLEMENTATION_URL.
        * @see Attributes.Name#IMPLEMENTATION_URL
        */
  -    public static final Attributes.Name IMPLEMENTATION_URL =
  -        new Attributes.Name( "Implementation-URL" );//Attributes.Name.IMPLEMENTATION_URL;
  +    public static final Attributes.Name IMPLEMENTATION_URL
  +        = new Attributes.Name("Implementation-URL");
   
       /**
        * Manifest Attribute Name object for IMPLEMENTATION_VENDOR_ID.
        * @see Attributes.Name#IMPLEMENTATION_VENDOR_ID
        */
  -    public static final Attributes.Name IMPLEMENTATION_VENDOR_ID =
  -        new Attributes.Name( "Implementation-Vendor-Id" );//Attributes.Name.IMPLEMENTATION_VENDOR_ID;
  +    public static final Attributes.Name IMPLEMENTATION_VENDOR_ID
  +        = new Attributes.Name("Implementation-Vendor-Id");
   
       /**
        * Enum indicating that extension is compatible with other extension.
        */
  -    public static final Compatibility COMPATIBLE =
  -        new Compatibility( "COMPATIBLE" );
  +    public static final Compatibility COMPATIBLE
  +        = new Compatibility("COMPATIBLE");
   
       /**
        * Enum indicating that extension requires an upgrade
        * of specification to be compatible with other extension.
        */
  -    public static final Compatibility REQUIRE_SPECIFICATION_UPGRADE =
  -        new Compatibility( "REQUIRE_SPECIFICATION_UPGRADE" );
  +    public static final Compatibility REQUIRE_SPECIFICATION_UPGRADE
  +        = new Compatibility("REQUIRE_SPECIFICATION_UPGRADE");
   
       /**
        * Enum indicating that extension requires a vendor
        * switch to be compatible with other extension.
        */
  -    public static final Compatibility REQUIRE_VENDOR_SWITCH =
  -        new Compatibility( "REQUIRE_VENDOR_SWITCH" );
  +    public static final Compatibility REQUIRE_VENDOR_SWITCH
  +        = new Compatibility("REQUIRE_VENDOR_SWITCH");
   
       /**
        * Enum indicating that extension requires an upgrade
        * of implementation to be compatible with other extension.
        */
  -    public static final Compatibility REQUIRE_IMPLEMENTATION_UPGRADE =
  -        new Compatibility( "REQUIRE_IMPLEMENTATION_UPGRADE" );
  +    public static final Compatibility REQUIRE_IMPLEMENTATION_UPGRADE
  +        = new Compatibility("REQUIRE_IMPLEMENTATION_UPGRADE");
   
       /**
        * Enum indicating that extension is incompatible with
  @@ -180,49 +176,49 @@
        * indicate). For example the other extension may have
        * a different ID.
        */
  -    public static final Compatibility INCOMPATIBLE =
  -        new Compatibility( "INCOMPATIBLE" );
  +    public static final Compatibility INCOMPATIBLE
  +        = new Compatibility("INCOMPATIBLE");
   
       /**
        * The name of the optional package being made available, or required.
        */
  -    private String m_extensionName;
  +    private String extensionName;
   
       /**
        * The version number (dotted decimal notation) of the specification
        * to which this optional package conforms.
        */
  -    private DeweyDecimal m_specificationVersion;
  +    private DeweyDecimal specificationVersion;
   
       /**
        * The name of the company or organization that originated the
        * specification to which this optional package conforms.
        */
  -    private String m_specificationVendor;
  +    private String specificationVendor;
   
       /**
        * The unique identifier of the company that produced the optional
        * package contained in this JAR file.
        */
  -    private String m_implementationVendorID;
  +    private String implementationVendorID;
   
       /**
        * The name of the company or organization that produced this
        * implementation of this optional package.
        */
  -    private String m_implementationVendor;
  +    private String implementationVendor;
   
       /**
        * The version number (dotted decimal notation) for this implementation
        * of the optional package.
        */
  -    private DeweyDecimal m_implementationVersion;
  +    private DeweyDecimal implementationVersion;
   
       /**
        * The URL from which the most recent version of this optional package
        * can be obtained if it is not already installed.
        */
  -    private String m_implementationURL;
  +    private String implementationURL;
   
       /**
        * Return an array of <code>Extension</code> objects representing optional
  @@ -233,34 +229,28 @@
        * @param manifest Manifest to be parsed
        * @return the "available" extensions in specified manifest
        */
  -    public static Extension[] getAvailable( final Manifest manifest )
  -    {
  -        if( null == manifest )
  -        {
  +    public static Extension[] getAvailable(final Manifest manifest) {
  +        if (null == manifest) {
               return new Extension[ 0 ];
           }
   
           final ArrayList results = new ArrayList();
   
           final Attributes mainAttributes = manifest.getMainAttributes();
  -        if( null != mainAttributes )
  -        {
  +        if (null != mainAttributes) {
               final Extension extension = getExtension( "", mainAttributes );
  -            if( null != extension )
  -            {
  +            if (null != extension) {
                   results.add( extension );
               }
           }
   
           final Map entries = manifest.getEntries();
           final Iterator keys = entries.keySet().iterator();
  -        while( keys.hasNext() )
  -        {
  +        while (keys.hasNext()) {
               final String key = (String)keys.next();
               final Attributes attributes = (Attributes)entries.get( key );
               final Extension extension = getExtension( "", attributes );
  -            if( null != extension )
  -            {
  +            if (null != extension) {
                   results.add( extension );
               }
           }
  @@ -277,9 +267,8 @@
        * @param manifest Manifest to be parsed
        * @return the dependencies that are specified in manifes
        */
  -    public static Extension[] getRequired( final Manifest manifest )
  -    {
  -        return getListed( manifest, EXTENSION_LIST );
  +    public static Extension[] getRequired(final Manifest manifest) {
  +        return getListed(manifest, Attributes.Name.EXTENSION_LIST);
       }
   
       /**
  @@ -290,8 +279,7 @@
        * @param manifest Manifest to be parsed
        * @return the optional dependencies that are specified in manifest
        */
  -    public static Extension[] getOptions( final Manifest manifest )
  -    {
  +    public static Extension[] getOptions(final Manifest manifest) {
           return getListed( manifest, OPTIONAL_EXTENSION_LIST );
       }
   
  @@ -302,8 +290,7 @@
        * @param extension the extension
        */
       public static void addExtension( final Extension extension,
  -                                     final Attributes attributes )
  -    {
  +                                     final Attributes attributes) {
           addExtension( extension, "", attributes );
       }
   
  @@ -318,49 +305,45 @@
        */
       public static void addExtension( final Extension extension,
                                        final String prefix,
  -                                     final Attributes attributes )
  -    {
  +                                     final Attributes attributes) {
           attributes.putValue( prefix + EXTENSION_NAME,
                                extension.getExtensionName() );
   
           final String specificationVendor = extension.getSpecificationVendor();
  -        if( null != specificationVendor )
  -        {
  +        if (null != specificationVendor) {
               attributes.putValue( prefix + SPECIFICATION_VENDOR,
                                    specificationVendor );
           }
   
  -        final DeweyDecimal specificationVersion = extension.getSpecificationVersion();
  -        if( null != specificationVersion )
  -        {
  +        final DeweyDecimal specificationVersion
  +            = extension.getSpecificationVersion();
  +        if (null != specificationVersion) {
               attributes.putValue( prefix + SPECIFICATION_VERSION,
                                    specificationVersion.toString() );
           }
   
  -        final String implementationVendorID = extension.getImplementationVendorID();
  -        if( null != implementationVendorID )
  -        {
  +        final String implementationVendorID
  +            = extension.getImplementationVendorID();
  +        if (null != implementationVendorID) {
               attributes.putValue( prefix + IMPLEMENTATION_VENDOR_ID,
                                    implementationVendorID );
           }
   
           final String implementationVendor = extension.getImplementationVendor();
  -        if( null != implementationVendor )
  -        {
  +        if (null != implementationVendor) {
               attributes.putValue( prefix + IMPLEMENTATION_VENDOR,
                                    implementationVendor );
           }
   
  -        final DeweyDecimal implementationVersion = extension.getImplementationVersion();
  -        if( null != implementationVersion )
  -        {
  +        final DeweyDecimal implementationVersion
  +            = extension.getImplementationVersion();
  +        if (null != implementationVersion) {
               attributes.putValue( prefix + IMPLEMENTATION_VERSION,
                                    implementationVersion.toString() );
           }
   
           final String implementationURL = extension.getImplementationURL();
  -        if( null != implementationURL )
  -        {
  +        if (null != implementationURL) {
               attributes.putValue( prefix + IMPLEMENTATION_URL,
                                    implementationURL );
           }
  @@ -385,45 +368,39 @@
                         final String implementationVersion,
                         final String implementationVendor,
                         final String implementationVendorId,
  -                      final String implementationURL )
  -    {
  -        m_extensionName = extensionName;
  -        m_specificationVendor = specificationVendor;
  -
  -        if( null != specificationVersion )
  -        {
  -            try
  -            {
  -                m_specificationVersion = new DeweyDecimal( specificationVersion );
  -            }
  -            catch( final NumberFormatException nfe )
  -            {
  -                final String error = "Bad specification version format '" + specificationVersion
+
  -                    "' in '" + extensionName + "'. (Reason: " + nfe + ")";
  +                      final String implementationURL) {
  +        this.extensionName = extensionName;
  +        this.specificationVendor = specificationVendor;
  +
  +        if (null != specificationVersion) {
  +            try {
  +                this.specificationVersion
  +                    = new DeweyDecimal(specificationVersion);
  +            } catch (final NumberFormatException nfe) {
  +                final String error = "Bad specification version format '"
  +                    + specificationVersion + "' in '" + extensionName
  +                    + "'. (Reason: " + nfe + ")";
                   throw new IllegalArgumentException( error );
               }
           }
   
  -        m_implementationURL = implementationURL;
  -        m_implementationVendor = implementationVendor;
  -        m_implementationVendorID = implementationVendorId;
  -
  -        if( null != implementationVersion )
  -        {
  -            try
  -            {
  -                m_implementationVersion = new DeweyDecimal( implementationVersion );
  -            }
  -            catch( final NumberFormatException nfe )
  -            {
  -                final String error = "Bad implementation version format '" + implementationVersion
+
  -                    "' in '" + extensionName + "'. (Reason: " + nfe + ")";
  +        this.implementationURL = implementationURL;
  +        this.implementationVendor = implementationVendor;
  +        this.implementationVendorID = implementationVendorId;
  +
  +        if (null != implementationVersion) {
  +            try {
  +                this.implementationVersion
  +                    = new DeweyDecimal(implementationVersion);
  +            } catch (final NumberFormatException nfe) {
  +                final String error = "Bad implementation version format '"
  +                    + implementationVersion + "' in '" + extensionName
  +                    + "'. (Reason: " + nfe + ")";
                   throw new IllegalArgumentException( error );
               }
           }
   
  -        if( null == m_extensionName )
  -        {
  +        if (null == this.extensionName) {
               throw new NullPointerException( "extensionName property is null" );
           }
       }
  @@ -433,9 +410,8 @@
        *
        * @return the name of the extension
        */
  -    public String getExtensionName()
  -    {
  -        return m_extensionName;
  +    public String getExtensionName() {
  +        return extensionName;
       }
   
       /**
  @@ -443,9 +419,8 @@
        *
        * @return the vendor of the extensions specification.
        */
  -    public String getSpecificationVendor()
  -    {
  -        return m_specificationVendor;
  +    public String getSpecificationVendor() {
  +        return specificationVendor;
       }
   
       /**
  @@ -453,9 +428,8 @@
        *
        * @return the version of the extensions specification.
        */
  -    public DeweyDecimal getSpecificationVersion()
  -    {
  -        return m_specificationVersion;
  +    public DeweyDecimal getSpecificationVersion() {
  +        return specificationVersion;
       }
   
       /**
  @@ -463,9 +437,8 @@
        *
        * @return the url of the extensions implementation.
        */
  -    public String getImplementationURL()
  -    {
  -        return m_implementationURL;
  +    public String getImplementationURL() {
  +        return implementationURL;
       }
   
       /**
  @@ -473,9 +446,8 @@
        *
        * @return the vendor of the extensions implementation.
        */
  -    public String getImplementationVendor()
  -    {
  -        return m_implementationVendor;
  +    public String getImplementationVendor() {
  +        return implementationVendor;
       }
   
       /**
  @@ -483,9 +455,8 @@
        *
        * @return the vendorID of the extensions implementation.
        */
  -    public String getImplementationVendorID()
  -    {
  -        return m_implementationVendorID;
  +    public String getImplementationVendorID() {
  +        return implementationVendorID;
       }
   
       /**
  @@ -493,9 +464,8 @@
        *
        * @return the version of the extensions implementation.
        */
  -    public DeweyDecimal getImplementationVersion()
  -    {
  -        return m_implementationVersion;
  +    public DeweyDecimal getImplementationVersion() {
  +        return implementationVersion;
       }
   
       /**
  @@ -506,43 +476,38 @@
        * @return the enum indicating the compatibility (or lack thereof)
        *         of specifed extension
        */
  -    public Compatibility getCompatibilityWith( final Extension required )
  -    {
  +    public Compatibility getCompatibilityWith(final Extension required) {
           // Extension Name must match
  -        if( !m_extensionName.equals( required.getExtensionName() ) )
  -        {
  +        if (!extensionName.equals(required.getExtensionName())) {
               return INCOMPATIBLE;
           }
   
           // Available specification version must be >= required
  -        final DeweyDecimal specificationVersion = required.getSpecificationVersion();
  -        if( null != specificationVersion )
  -        {
  -            if( null == m_specificationVersion ||
  -                !isCompatible( m_specificationVersion, specificationVersion ) )
  -            {
  +        final DeweyDecimal specificationVersion
  +            = required.getSpecificationVersion();
  +        if (null != specificationVersion) {
  +            if (null == specificationVersion
  +                || !isCompatible(specificationVersion, specificationVersion)) {
                   return REQUIRE_SPECIFICATION_UPGRADE;
               }
           }
   
           // Implementation Vendor ID must match
  -        final String implementationVendorId = required.getImplementationVendorID();
  -        if( null != implementationVendorId )
  -        {
  -            if( null == m_implementationVendorID ||
  -                !m_implementationVendorID.equals( implementationVendorId ) )
  -            {
  +        final String implementationVendorId
  +            = required.getImplementationVendorID();
  +        if (null != implementationVendorId) {
  +            if (null == implementationVendorID
  +                || !implementationVendorID.equals(implementationVendorId)) {
                   return REQUIRE_VENDOR_SWITCH;
               }
           }
   
           // Implementation version must be >= required
  -        final DeweyDecimal implementationVersion = required.getImplementationVersion();
  -        if( null != implementationVersion )
  -        {
  -            if( null == m_implementationVersion ||
  -                !isCompatible( m_implementationVersion, implementationVersion ) )
  -            {
  +        final DeweyDecimal implementationVersion
  +            = required.getImplementationVersion();
  +        if (null != implementationVersion) {
  +            if (null == implementationVersion
  +                || !isCompatible(implementationVersion, implementationVersion)) {
                   return REQUIRE_IMPLEMENTATION_UPGRADE;
               }
           }
  @@ -561,8 +526,7 @@
        * @param required Description of the required optional package
        * @return true if the specified extension is compatible with this extension
        */
  -    public boolean isCompatibleWith( final Extension required )
  -    {
  +    public boolean isCompatibleWith(final Extension required) {
           return ( COMPATIBLE == getCompatibilityWith( required ) );
       }
   
  @@ -571,61 +535,54 @@
        *
        * @return string representation of object.
        */
  -    public String toString()
  -    {
  +    public String toString() {
           final String lineSeparator = System.getProperty( "line.separator" );
           final String brace = ": ";
   
           final StringBuffer sb = new StringBuffer( EXTENSION_NAME.toString() );
           sb.append( brace );
  -        sb.append( m_extensionName );
  +        sb.append(extensionName);
           sb.append( lineSeparator );
   
  -        if( null != m_specificationVersion )
  -        {
  +        if (null != specificationVersion) {
               sb.append( SPECIFICATION_VERSION );
               sb.append( brace );
  -            sb.append( m_specificationVersion );
  +            sb.append(specificationVersion);
               sb.append( lineSeparator );
           }
   
  -        if( null != m_specificationVendor )
  -        {
  +        if (null != specificationVendor) {
               sb.append( SPECIFICATION_VENDOR );
               sb.append( brace );
  -            sb.append( m_specificationVendor );
  +            sb.append(specificationVendor);
               sb.append( lineSeparator );
           }
   
  -        if( null != m_implementationVersion )
  -        {
  +        if (null != implementationVersion) {
               sb.append( IMPLEMENTATION_VERSION );
               sb.append( brace );
  -            sb.append( m_implementationVersion );
  +            sb.append(implementationVersion);
               sb.append( lineSeparator );
           }
   
  -        if( null != m_implementationVendorID )
  -        {
  +        if (null != implementationVendorID) {
               sb.append( IMPLEMENTATION_VENDOR_ID );
               sb.append( brace );
  -            sb.append( m_implementationVendorID );
  +            sb.append(implementationVendorID);
               sb.append( lineSeparator );
           }
   
  -        if( null != m_implementationVendor )
  -        {
  +        if (null != implementationVendor) {
               sb.append( IMPLEMENTATION_VENDOR );
               sb.append( brace );
  -            sb.append( m_implementationVendor );
  +            sb.append(implementationVendor);
               sb.append( lineSeparator );
           }
   
  -        if( null != m_implementationURL )
  -        {
  +        if (null != implementationURL) {
               sb.append( IMPLEMENTATION_URL );
               sb.append( brace );
  -            sb.append( m_implementationURL );
  +            sb.append(implementationURL);
               sb.append( lineSeparator );
           }
   
  @@ -639,8 +596,8 @@
        * @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 );
       }
   
  @@ -654,20 +611,17 @@
        * @return the list of listed extensions
        */
       private static Extension[] getListed( final Manifest manifest,
  -                                          final Attributes.Name listKey )
  -    {
  +                                          final Attributes.Name listKey) {
           final ArrayList results = new ArrayList();
           final Attributes mainAttributes = manifest.getMainAttributes();
   
  -        if( null != mainAttributes )
  -        {
  +        if (null != mainAttributes) {
               getExtension( mainAttributes, results, listKey );
           }
   
           final Map entries = manifest.getEntries();
           final Iterator keys = entries.keySet().iterator();
  -        while( keys.hasNext() )
  -        {
  +        while (keys.hasNext()) {
               final String key = (String)keys.next();
               final Attributes attributes = (Attributes)entries.get( key );
               getExtension( attributes, results, listKey );
  @@ -677,7 +631,8 @@
       }
   
       /**
  -     * Add required optional packages defined in the specified attributes entry, if any.
  +     * Add required optional packages defined in the specified
  +     * attributes entry, if any.
        *
        * @param attributes Attributes to be parsed
        * @param required list to add required optional packages to
  @@ -686,22 +641,18 @@
        */
       private static void getExtension( final Attributes attributes,
                                        final ArrayList required,
  -                                     final Attributes.Name listKey )
  -    {
  +                                     final Attributes.Name listKey) {
           final String names = attributes.getValue( listKey );
  -        if( null == names )
  -        {
  +        if (null == names) {
               return;
           }
   
           final String[] extentions = split( names, " " );
  -        for( int i = 0; i < extentions.length; i++ )
  -        {
  +        for (int i = 0; i < extentions.length; i++) {
               final String prefix = extentions[ i ] + "-";
               final Extension extension = getExtension( prefix, attributes );
   
  -            if( null != extension )
  -            {
  +            if (null != extension) {
                   required.add( extension );
               }
           }
  @@ -714,13 +665,12 @@
        * @param onToken the token
        * @return the resultant array
        */
  -    private static final String[] split( final String string, final String onToken )
  -    {
  +    private static final String[] split(final String string,
  +                                        final String onToken) {
           final StringTokenizer tokenizer = new StringTokenizer( string, onToken );
           final String[] result = new String[ tokenizer.countTokens() ];
   
  -        for( int i = 0; i < result.length; i++ )
  -        {
  +        for (int i = 0; i < result.length; i++) {
               result[ i ] = tokenizer.nextToken();
           }
   
  @@ -731,36 +681,41 @@
        * Extract an Extension from Attributes.
        * Prefix indicates the prefix checked for each string.
        * Usually the prefix is <em>"&lt;extension&gt;-"</em> if looking
for a
  -     * <b>Required</b> extension. If you are looking for an <b>Available</b>
extension
  +     * <b>Required</b> extension. If you are looking for an
  +     * <b>Available</b> extension
        * then the prefix is <em>""</em>.
        *
        * @param prefix the prefix for each attribute name
        * @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)
           final String nameKey = prefix + EXTENSION_NAME;
           final String name = getTrimmedString( attributes.getValue( nameKey ) );
  -        if( null == name )
  -        {
  +        if (null == name) {
               return null;
           }
   
           final String specVendorKey = prefix + SPECIFICATION_VENDOR;
  -        final String specVendor = getTrimmedString( attributes.getValue( specVendorKey
) );
  +        final String specVendor
  +            = getTrimmedString(attributes.getValue(specVendorKey));
           final String specVersionKey = prefix + SPECIFICATION_VERSION;
  -        final String specVersion = getTrimmedString( attributes.getValue( specVersionKey
) );
  +        final String specVersion
  +            = getTrimmedString(attributes.getValue(specVersionKey));
   
           final String impVersionKey = prefix + IMPLEMENTATION_VERSION;
  -        final String impVersion = getTrimmedString( attributes.getValue( impVersionKey
) );
  +        final String impVersion
  +            = getTrimmedString(attributes.getValue(impVersionKey));
           final String impVendorKey = prefix + IMPLEMENTATION_VENDOR;
  -        final String impVendor = getTrimmedString( attributes.getValue( impVendorKey )
);
  +        final String impVendor
  +            = getTrimmedString(attributes.getValue(impVendorKey));
           final String impVendorIDKey = prefix + IMPLEMENTATION_VENDOR_ID;
  -        final String impVendorId = getTrimmedString( attributes.getValue( impVendorIDKey
) );
  +        final String impVendorId
  +            = getTrimmedString(attributes.getValue(impVendorIDKey));
           final String impURLKey = prefix + IMPLEMENTATION_URL;
           final String impURL = getTrimmedString( attributes.getValue( impURLKey ) );
   
  @@ -774,14 +729,10 @@
        * @param value the string to trim or null
        * @return the trimmed string or null
        */
  -    private static String getTrimmedString( final String value )
  -    {
  -        if( null == value )
  -        {
  +    private static String getTrimmedString(final String value) {
  +        if (null == value) {
               return null;
  -        }
  -        else
  -        {
  +        } else {
               return value.trim();
           }
       }
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@ant.apache.org
For additional commands, e-mail: dev-help@ant.apache.org


Mime
View raw message