commons-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From adammurd...@apache.org
Subject cvs commit: jakarta-commons-sandbox/vfs/src/java/org/apache/commons/vfs/util Messages.java
Date Wed, 23 Oct 2002 13:09:10 GMT
adammurdoch    2002/10/23 06:09:10

  Modified:    vfs/src/java/org/apache/commons/vfs/provider/jar
                        JarFileObject.java JarFileSystem.java
               vfs/src/java/org/apache/commons/vfs/provider
                        DefaultFileContent.java
               vfs/src/java/org/apache/commons/vfs/util Messages.java
  Log:
  Fix checkstyle complaints.
  
  Revision  Changes    Path
  1.4       +9 -5      jakarta-commons-sandbox/vfs/src/java/org/apache/commons/vfs/provider/jar/JarFileObject.java
  
  Index: JarFileObject.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/vfs/src/java/org/apache/commons/vfs/provider/jar/JarFileObject.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- JarFileObject.java	23 Oct 2002 11:59:41 -0000	1.3
  +++ JarFileObject.java	23 Oct 2002 13:09:10 -0000	1.4
  @@ -78,10 +78,10 @@
   {
       private Attributes attributes;
   
  -    public JarFileObject( FileName name,
  -                          ZipEntry entry,
  -                          ZipFile zipFile,
  -                          JarFileSystem fs )
  +    public JarFileObject( final FileName name,
  +                          final ZipEntry entry,
  +                          final ZipFile zipFile,
  +                          final JarFileSystem fs )
       {
           super( name, entry, zipFile, fs );
       }
  @@ -89,7 +89,9 @@
       Manifest getManifest() throws IOException
       {
           if ( file == null )
  +        {
               return null;
  +        }
   
           return ( (JarFile)file ).getManifest();
       }
  @@ -146,7 +148,9 @@
       protected Certificate[] doGetCertificates()
       {
           if ( entry == null )
  +        {
               return null;
  +        }
   
           return ( (JarEntry)entry ).getCertificates();
       }
  
  
  
  1.5       +3 -3      jakarta-commons-sandbox/vfs/src/java/org/apache/commons/vfs/provider/jar/JarFileSystem.java
  
  Index: JarFileSystem.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/vfs/src/java/org/apache/commons/vfs/provider/jar/JarFileSystem.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- JarFileSystem.java	23 Oct 2002 11:59:41 -0000	1.4
  +++ JarFileSystem.java	23 Oct 2002 13:09:10 -0000	1.5
  @@ -93,7 +93,7 @@
           {
               return new JarFile( file );
           }
  -        catch( IOException ioe )
  +        catch ( IOException ioe )
           {
               throw new FileSystemException( "vfs.provider.jar/open-jar-file.error", new
Object[]{file}, ioe );
           }
  @@ -112,7 +112,7 @@
       {
           if ( attributes == null )
           {
  -            final Manifest man = ( (JarFile) zipFile).getManifest();
  +            final Manifest man = ( (JarFile)zipFile ).getManifest();
               if ( man == null )
               {
                   attributes = new Attributes( 1 );
  
  
  
  1.8       +5 -5      jakarta-commons-sandbox/vfs/src/java/org/apache/commons/vfs/provider/DefaultFileContent.java
  
  Index: DefaultFileContent.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/vfs/src/java/org/apache/commons/vfs/provider/DefaultFileContent.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- DefaultFileContent.java	23 Oct 2002 11:59:40 -0000	1.7
  +++ DefaultFileContent.java	23 Oct 2002 13:09:10 -0000	1.8
  @@ -304,7 +304,7 @@
        */
       private final class FileContentInputStream extends BufferedInputStream
       {
  -        private boolean _finished;
  +        private boolean finished;
   
           FileContentInputStream( InputStream instr )
           {
  @@ -316,7 +316,7 @@
            */
           public int read() throws IOException
           {
  -            if ( _finished )
  +            if ( finished )
               {
                   return -1;
               }
  @@ -338,7 +338,7 @@
           public int read( byte[] buffer, int offset, int length )
               throws IOException
           {
  -            if ( _finished )
  +            if ( finished )
               {
                   return -1;
               }
  @@ -359,7 +359,7 @@
            */
           public void close() throws IOException
           {
  -            if ( _finished )
  +            if ( finished )
               {
                   return;
               }
  @@ -385,7 +385,7 @@
                   exc = new IOException( e.getMessage() );
               }
   
  -            _finished = true;
  +            finished = true;
   
               if ( exc != null )
               {
  
  
  
  1.4       +2 -2      jakarta-commons-sandbox/vfs/src/java/org/apache/commons/vfs/util/Messages.java
  
  Index: Messages.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/vfs/src/java/org/apache/commons/vfs/util/Messages.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- Messages.java	23 Oct 2002 11:59:42 -0000	1.3
  +++ Messages.java	23 Oct 2002 13:09:10 -0000	1.4
  @@ -70,7 +70,7 @@
   public class Messages
   {
       /** Map from message code to MessageFormat object for the message. */
  -    private static final Map messages = new HashMap();
  +    private static Map messages = new HashMap();
       private static ResourceBundle resources;
   
       private Messages()
  
  
  

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


Mime
View raw message