You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by an...@apache.org on 2004/01/19 10:27:26 UTC

cvs commit: cocoon-2.1/src/blocks/fop/java/org/apache/cocoon/serialization FOPSerializer.java

antonio     2004/01/19 01:27:26

  Modified:    src/blocks/fop/java/org/apache/cocoon/components/renderer
                        RendererFactory.java
               src/blocks/fop/java/org/apache/cocoon/serialization
                        FOPSerializer.java
  Log:
  Formatting code
  
  Revision  Changes    Path
  1.2       +2 -2      cocoon-2.1/src/blocks/fop/java/org/apache/cocoon/components/renderer/RendererFactory.java
  
  Index: RendererFactory.java
  ===================================================================
  RCS file: /home/cvs//cocoon-2.1/src/blocks/fop/java/org/apache/cocoon/components/renderer/RendererFactory.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- RendererFactory.java	9 Mar 2003 00:03:50 -0000	1.1
  +++ RendererFactory.java	19 Jan 2004 09:27:26 -0000	1.2
  @@ -65,5 +65,5 @@
      * @param mimeType The MIME type of the destination format
      * @return A suitable renderer, or <code>null> if one cannot be found
      */
  -  Renderer createRenderer(String mimeType) ;
  +  Renderer createRenderer(String mimeType);
   }
  
  
  
  1.6       +5 -4      cocoon-2.1/src/blocks/fop/java/org/apache/cocoon/serialization/FOPSerializer.java
  
  Index: FOPSerializer.java
  ===================================================================
  RCS file: /home/cvs//cocoon-2.1/src/blocks/fop/java/org/apache/cocoon/serialization/FOPSerializer.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- FOPSerializer.java	6 May 2003 23:39:16 -0000	1.5
  +++ FOPSerializer.java	19 Jan 2004 09:27:26 -0000	1.6
  @@ -57,6 +57,7 @@
   import org.apache.avalon.framework.component.Composable;
   import org.apache.avalon.framework.component.ComponentManager;
   import org.apache.avalon.framework.component.ComponentException;
  +import org.apache.avalon.framework.logger.Logger;
   import org.apache.cocoon.caching.CacheableProcessingComponent;
   import org.apache.cocoon.components.renderer.ExtendableRendererFactory;
   import org.apache.cocoon.components.renderer.RendererFactory;
  @@ -119,7 +120,7 @@
       /**
        * This logger is used for FOP
        */
  -    protected org.apache.avalon.framework.logger.Logger logger;
  +    protected Logger logger;
   
       /**
        * It is used to make sure that default Options loaded only once.
  @@ -197,7 +198,7 @@
                   getLogger().warn("Cannot load configuration from " + configUrl);
                   throw new ConfigurationException("Cannot load configuration from " + configUrl, e);
               } finally {
  -                if ( null != resolver ) {
  +                if (resolver != null) {
                       resolver.release(configSource);
                       manager.release(resolver);
                   }
  @@ -258,7 +259,7 @@
                   this.renderer = (Renderer)ClassUtils.newInstance(this.rendererName);
               } catch (Exception e) {
                   if (getLogger().isWarnEnabled()) {
  -                    getLogger().warn("Cannot load  class " + this.rendererName, e);
  +                    getLogger().warn("Cannot load class " + this.rendererName, e);
                   }
                   throw new CascadingRuntimeException("Cannot load class " + this.rendererName, e);
               }