avalon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dona...@apache.org
Subject cvs commit: jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/tools/installer Installer.java
Date Fri, 10 May 2002 15:07:30 GMT
donaldp     02/05/10 08:07:30

  Modified:    src/java/org/apache/avalon/phoenix/tools/installer
                        Installer.java
  Log:
  Moved private methods below public methods
  
  Revision  Changes    Path
  1.33      +27 -27    jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/tools/installer/Installer.java
  
  Index: Installer.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/tools/installer/Installer.java,v
  retrieving revision 1.32
  retrieving revision 1.33
  diff -u -r1.32 -r1.33
  --- Installer.java	10 May 2002 02:43:04 -0000	1.32
  +++ Installer.java	10 May 2002 15:07:30 -0000	1.33
  @@ -34,7 +34,7 @@
    * and installing it as appropriate.
    *
    * @author <a href="mailto:peter@apache.org">Peter Donald</a>
  - * @version $Revision: 1.32 $ $Date: 2002/05/10 02:43:04 $
  + * @version $Revision: 1.33 $ $Date: 2002/05/10 15:07:30 $
    */
   public class Installer
       extends AbstractLogEnabled
  @@ -105,32 +105,6 @@
       }
   
       /**
  -     * Utility method to compute the checksum for a given file.
  -     * @param file the computed file.
  -     * @param checksum the checksum algorithm.
  -     */
  -    private void checksum( final File file, final Checksum checksum )
  -    {
  -        checksum.reset();
  -
  -        InputStream input = null;
  -        try
  -        {
  -            input = new CheckedInputStream( new FileInputStream( file ), checksum );
  -            IOUtil.toByteArray( input );
  -        }
  -        catch( final IOException ioe )
  -        {
  -            final String message = REZ.getString( "checksum-failure", file );
  -            getLogger().warn( message );
  -        }
  -        finally
  -        {
  -            IOUtil.shutdownStream( input );
  -        }
  -    }
  -
  -    /**
        * Install the Sar designated by url.
        *
        * @param url the url of instalation
  @@ -176,6 +150,32 @@
           finally
           {
               unlock();
  +        }
  +    }
  +
  +    /**
  +     * Utility method to compute the checksum for a given file.
  +     * @param file the computed file.
  +     * @param checksum the checksum algorithm.
  +     */
  +    private void checksum( final File file, final Checksum checksum )
  +    {
  +        checksum.reset();
  +
  +        InputStream input = null;
  +        try
  +        {
  +            input = new CheckedInputStream( new FileInputStream( file ), checksum );
  +            IOUtil.toByteArray( input );
  +        }
  +        catch( final IOException ioe )
  +        {
  +            final String message = REZ.getString( "checksum-failure", file );
  +            getLogger().warn( message );
  +        }
  +        finally
  +        {
  +            IOUtil.shutdownStream( input );
           }
       }
   
  
  
  

--
To unsubscribe, e-mail:   <mailto:avalon-cvs-unsubscribe@jakarta.apache.org>
For additional commands, e-mail: <mailto:avalon-cvs-help@jakarta.apache.org>


Mime
View raw message