avalon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pro...@apache.org
Subject cvs commit: jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/tools/xdoclet BlockInfoSubTask.java ManifestSubTask.java
Date Mon, 15 Jul 2002 16:16:31 GMT
proyal      2002/07/15 09:16:31

  Modified:    src/java/org/apache/avalon/phoenix/tools/configuration
                        DTDResolver.java
               src/java/org/apache/avalon/phoenix/tools/tasks Sar.java
               src/java/org/apache/avalon/phoenix/tools/xdoclet
                        BlockInfoSubTask.java ManifestSubTask.java
  Log:
  Fixed checkstyle errors
  
  Revision  Changes    Path
  1.4       +4 -4      jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/tools/configuration/DTDResolver.java
  
  Index: DTDResolver.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/tools/configuration/DTDResolver.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- DTDResolver.java	20 May 2002 11:40:11 -0000	1.3
  +++ DTDResolver.java	15 Jul 2002 16:16:30 -0000	1.4
  @@ -54,12 +54,12 @@
           {
               final DTDInfo info = m_dtdInfos[ i ];
   
  -            if( ( publicId != null && publicId.equals( info.getPublicId() ) ) ||
  -                ( systemId != null && systemId.equals( info.getSystemId() ) ) )
  +            if( ( publicId != null && publicId.equals( info.getPublicId() ) )
  +              || ( systemId != null && systemId.equals( info.getSystemId() ) )
)
               {
                   final ClassLoader classLoader = getClassLoader();
                   final InputStream inputStream =
  -                    classLoader.getResourceAsStream( info.getResource() );
  +                  classLoader.getResourceAsStream( info.getResource() );
                   return new InputSource( inputStream );
               }
           }
  
  
  
  1.14      +4 -4      jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/tools/tasks/Sar.java
  
  Index: Sar.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/tools/tasks/Sar.java,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- Sar.java	20 May 2002 11:39:52 -0000	1.13
  +++ Sar.java	15 Jul 2002 16:16:31 -0000	1.14
  @@ -78,15 +78,15 @@
   
           if( !m_environment.exists() )
           {
  -            final String message = "Environment descriptor: " +
  -                m_environment + " does not exist.";
  +            final String message = "Environment descriptor: "
  +              + m_environment + " does not exist.";
               throw new BuildException( message );
           }
   
           if( !m_environment.isFile() )
           {
  -            final String message = "Environment descriptor: " +
  -                m_environment + " is not a file.";
  +            final String message = "Environment descriptor: "
  +              + m_environment + " is not a file.";
               throw new BuildException( message );
           }
       }
  
  
  
  1.8       +4 -4      jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/tools/xdoclet/BlockInfoSubTask.java
  
  Index: BlockInfoSubTask.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/tools/xdoclet/BlockInfoSubTask.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- BlockInfoSubTask.java	20 May 2002 10:23:35 -0000	1.7
  +++ BlockInfoSubTask.java	15 Jul 2002 16:16:31 -0000	1.8
  @@ -92,9 +92,9 @@
   
           if( -1 == getClassPattern().indexOf( "{0}" ) )
           {
  -            throw new XDocletException( "'pattern' parameter does not have a " +
  -                                        "'{0}' in it. '{0}' is replaced by Block " +
  -                                        "name of the class under processing." );
  +            throw new XDocletException( "'pattern' parameter does not have a "
  +                                        + "'{0}' in it. '{0}' is replaced by Block "
  +                                        + "name of the class under processing." );
           }
       }
   
  
  
  
  1.6       +5 -5      jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/tools/xdoclet/ManifestSubTask.java
  
  Index: ManifestSubTask.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/tools/xdoclet/ManifestSubTask.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- ManifestSubTask.java	27 Jun 2002 00:53:40 -0000	1.5
  +++ ManifestSubTask.java	15 Jul 2002 16:16:31 -0000	1.6
  @@ -84,14 +84,14 @@
               throw new XDocletException( "'manifestFile' attribute is missing ." );
           }
   
  -        if( null == getDestinationFile() ||
  -            getDestinationFile().trim().equals( "" ) )
  +        if( null == getDestinationFile()
  +          || getDestinationFile().trim().equals( "" ) )
           {
               throw new XDocletException( "Error with the 'manifestFile' attribute." );
           }
   
  -        if( null == getClassPattern() ||
  -            getClassPattern().trim().equals( "" ) )
  +        if( null == getClassPattern()
  +          || getClassPattern().trim().equals( "" ) )
           {
               throw new XDocletException( "'pattern' parameter missing or empty." );
           }
  
  
  

--
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