cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From anto...@apache.org
Subject svn commit: r123903 - in cocoon/branches/BRANCH_2_1_X/src: blocks/batik/java/org/apache/cocoon/components/transcoder blocks/batik/java/org/apache/cocoon/components/url blocks/fop/java/org/apache/cocoon/components/renderer blocks/fop/java/org/apache/cocoon/serialization blocks/portal/java/org/apache/cocoon/portal/impl blocks/portal/java/org/apache/cocoon/portal/pluto blocks/scratchpad/java/org/apache/cocoon/generation java/org/apache/cocoon/components/classloader java/org/apache/cocoon/generation java/org/apache/cocoon/xml/dom
Date Sun, 02 Jan 2005 21:27:00 GMT
Author: antonio
Date: Sun Jan  2 13:26:59 2005
New Revision: 123903

URL: http://svn.apache.org/viewcvs?view=rev&rev=123903
Log:
Set static variable as final
Modified:
   cocoon/branches/BRANCH_2_1_X/src/blocks/batik/java/org/apache/cocoon/components/transcoder/ExtendableTranscoderFactory.java
   cocoon/branches/BRANCH_2_1_X/src/blocks/batik/java/org/apache/cocoon/components/url/SourceProtocolHandler.java
   cocoon/branches/BRANCH_2_1_X/src/blocks/fop/java/org/apache/cocoon/components/renderer/ExtendableRendererFactory.java
   cocoon/branches/BRANCH_2_1_X/src/blocks/fop/java/org/apache/cocoon/serialization/FOPSerializer.java
   cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/impl/PortletPortalManager.java
   cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/DynamicInformationProviderImpl.java
   cocoon/branches/BRANCH_2_1_X/src/blocks/scratchpad/java/org/apache/cocoon/generation/GarbageGenerator.java
   cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/classloader/ClassLoaderManagerImpl.java
   cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/generation/XPathDirectoryGenerator.java
   cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/xml/dom/DOMStreamer.java

Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/batik/java/org/apache/cocoon/components/transcoder/ExtendableTranscoderFactory.java
Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/batik/java/org/apache/cocoon/components/transcoder/ExtendableTranscoderFactory.java?view=diff&rev=123903&p1=cocoon/branches/BRANCH_2_1_X/src/blocks/batik/java/org/apache/cocoon/components/transcoder/ExtendableTranscoderFactory.java&r1=123902&p2=cocoon/branches/BRANCH_2_1_X/src/blocks/batik/java/org/apache/cocoon/components/transcoder/ExtendableTranscoderFactory.java&r2=123903
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/batik/java/org/apache/cocoon/components/transcoder/ExtendableTranscoderFactory.java
(original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/batik/java/org/apache/cocoon/components/transcoder/ExtendableTranscoderFactory.java
Sun Jan  2 13:26:59 2005
@@ -30,11 +30,11 @@
  * be added at runtime.
  *
  * @author <a href="mailto:rossb@apache.org">Ross Burton</a>
- * @version CVS $Id: ExtendableTranscoderFactory.java,v 1.2 2004/03/05 13:01:45 bdelacretaz
Exp $
+ * @version CVS $Id$
  */
 public class ExtendableTranscoderFactory implements TranscoderFactory {
 
-    protected static Map transcoders = new HashMap();
+    protected final static Map transcoders = new HashMap();
 
     protected final static TranscoderFactory singleton = new ExtendableTranscoderFactory();
 

Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/batik/java/org/apache/cocoon/components/url/SourceProtocolHandler.java
Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/batik/java/org/apache/cocoon/components/url/SourceProtocolHandler.java?view=diff&rev=123903&p1=cocoon/branches/BRANCH_2_1_X/src/blocks/batik/java/org/apache/cocoon/components/url/SourceProtocolHandler.java&r1=123902&p2=cocoon/branches/BRANCH_2_1_X/src/blocks/batik/java/org/apache/cocoon/components/url/SourceProtocolHandler.java&r2=123903
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/batik/java/org/apache/cocoon/components/url/SourceProtocolHandler.java
(original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/batik/java/org/apache/cocoon/components/url/SourceProtocolHandler.java
Sun Jan  2 13:26:59 2005
@@ -34,15 +34,15 @@
  * &lt;svg:image xlink:href="..."/> to use any of the protocols handled by Cocoon.
  * 
  * @author <a href="http://www.apache.org/~sylvain/">Sylvain Wallez</a>
- * @version CVS $Id: SourceProtocolHandler.java,v 1.3 2004/03/28 05:29:04 antonio Exp $
+ * @version CVS $Id$
  */
 public class SourceProtocolHandler extends AbstractParsedURLProtocolHandler {
 
     /** Thread-local source resolver */
-    protected static InheritableThreadLocal localResolver = new InheritableThreadLocal();
+    protected final static InheritableThreadLocal localResolver = new InheritableThreadLocal();
 
     /** Batik's original default handler */        
-    protected static ParsedURLProtocolHandler defaultHandler;
+    protected final static ParsedURLProtocolHandler defaultHandler = ParsedURL.getHandler(null);
// Keep the default handler, if any
 
     /**
      * Change the default handler used by Batik to resolve URLs to a handler
@@ -56,9 +56,6 @@
      * @param logger the logger for logging.
      */
     static {        
-        // Keep the default handler, if any
-        SourceProtocolHandler.defaultHandler = ParsedURL.getHandler(null);
-
         // Set the default handler to our handler
         ParsedURL.registerHandler(new SourceProtocolHandler(null));
 

Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/fop/java/org/apache/cocoon/components/renderer/ExtendableRendererFactory.java
Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/fop/java/org/apache/cocoon/components/renderer/ExtendableRendererFactory.java?view=diff&rev=123903&p1=cocoon/branches/BRANCH_2_1_X/src/blocks/fop/java/org/apache/cocoon/components/renderer/ExtendableRendererFactory.java&r1=123902&p2=cocoon/branches/BRANCH_2_1_X/src/blocks/fop/java/org/apache/cocoon/components/renderer/ExtendableRendererFactory.java&r2=123903
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/fop/java/org/apache/cocoon/components/renderer/ExtendableRendererFactory.java
(original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/fop/java/org/apache/cocoon/components/renderer/ExtendableRendererFactory.java
Sun Jan  2 13:26:59 2005
@@ -29,11 +29,11 @@
  * type. This factory is extendable as new <code>Renderer</code>s can
  * be added at runtime.
  * @author <a href="mailto:dims@yahoo.com">Davanum Srinivas</a>
- * @version CVS $Id: ExtendableRendererFactory.java,v 1.2 2004/03/05 13:01:56 bdelacretaz
Exp $
+ * @version CVS $Id$
  */
 public class ExtendableRendererFactory implements RendererFactory {
 
-  protected static Map renderers = new HashMap();
+  protected final static Map renderers = new HashMap();
 
   protected final static RendererFactory singleton = new ExtendableRendererFactory();
 

Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/fop/java/org/apache/cocoon/serialization/FOPSerializer.java
Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/fop/java/org/apache/cocoon/serialization/FOPSerializer.java?view=diff&rev=123903&p1=cocoon/branches/BRANCH_2_1_X/src/blocks/fop/java/org/apache/cocoon/serialization/FOPSerializer.java&r1=123902&p2=cocoon/branches/BRANCH_2_1_X/src/blocks/fop/java/org/apache/cocoon/serialization/FOPSerializer.java&r2=123903
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/fop/java/org/apache/cocoon/serialization/FOPSerializer.java
(original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/fop/java/org/apache/cocoon/serialization/FOPSerializer.java
Sun Jan  2 13:26:59 2005
@@ -48,7 +48,7 @@
 /**
  * @author ?
  * @author <a href="mailto:vgritsenko@apache.org">Vadim Gritsenko</a>
- * @version CVS $Id: FOPSerializer.java,v 1.11 2004/03/28 20:51:24 antonio Exp $
+ * @version CVS $Id$
  */
 public class FOPSerializer extends AbstractSerializer implements
   Configurable, CacheableProcessingComponent, Serviceable/*, Disposable */{
@@ -58,7 +58,7 @@
     /**
      * The Renderer Factory to use
      */
-    protected static RendererFactory factory = ExtendableRendererFactory.getRendererFactoryImplementation();
+    protected final static RendererFactory factory = ExtendableRendererFactory.getRendererFactoryImplementation();
 
     /**
      * The <code>Driver</code> which is FOP.

Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/impl/PortletPortalManager.java
Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/impl/PortletPortalManager.java?view=diff&rev=123903&p1=cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/impl/PortletPortalManager.java&r1=123902&p2=cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/impl/PortletPortalManager.java&r2=123903
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/impl/PortletPortalManager.java
(original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/impl/PortletPortalManager.java
Sun Jan  2 13:26:59 2005
@@ -68,7 +68,7 @@
 	extends PortalManagerImpl
 	implements Initializable, Contextualizable, Disposable, Subscriber {
 
-    public static ThreadLocal copletInstanceData = new InheritableThreadLocal();
+    public static final ThreadLocal copletInstanceData = new InheritableThreadLocal();
     
     /** The servlet configuration for pluto */
     protected ServletConfig servletConfig;

Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/DynamicInformationProviderImpl.java
Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/DynamicInformationProviderImpl.java?view=diff&rev=123903&p1=cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/DynamicInformationProviderImpl.java&r1=123902&p2=cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/DynamicInformationProviderImpl.java&r2=123903
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/DynamicInformationProviderImpl.java
(original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/DynamicInformationProviderImpl.java
Sun Jan  2 13:26:59 2005
@@ -125,10 +125,9 @@
         return "text/html";
     }
 
-    static protected HashSet responseMimeTypes;
+    static protected final HashSet responseMimeTypes = new HashSet();
     
     static {
-        responseMimeTypes = new HashSet();
         responseMimeTypes.add("text/html");        
     }
     

Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/scratchpad/java/org/apache/cocoon/generation/GarbageGenerator.java
Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/scratchpad/java/org/apache/cocoon/generation/GarbageGenerator.java?view=diff&rev=123903&p1=cocoon/branches/BRANCH_2_1_X/src/blocks/scratchpad/java/org/apache/cocoon/generation/GarbageGenerator.java&r1=123902&p2=cocoon/branches/BRANCH_2_1_X/src/blocks/scratchpad/java/org/apache/cocoon/generation/GarbageGenerator.java&r2=123903
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/scratchpad/java/org/apache/cocoon/generation/GarbageGenerator.java
(original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/scratchpad/java/org/apache/cocoon/generation/GarbageGenerator.java
Sun Jan  2 13:26:59 2005
@@ -40,7 +40,7 @@
 public class GarbageGenerator extends ServiceableGenerator {
 
     // FIXME - We should not use a static variable here: use a component instead
-    protected static Map cache = new HashMap();
+    protected final static Map cache = new HashMap();
 
     protected JXPathContext jxpathContext;
     protected Source source;

Modified: cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/classloader/ClassLoaderManagerImpl.java
Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/classloader/ClassLoaderManagerImpl.java?view=diff&rev=123903&p1=cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/classloader/ClassLoaderManagerImpl.java&r1=123902&p2=cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/classloader/ClassLoaderManagerImpl.java&r2=123903
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/classloader/ClassLoaderManagerImpl.java
(original)
+++ cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/classloader/ClassLoaderManagerImpl.java
Sun Jan  2 13:26:59 2005
@@ -36,7 +36,7 @@
    */
   protected static RepositoryClassLoader instance = null;
 
-  protected static Set fileSet = Collections.synchronizedSet(new HashSet());
+  protected final static Set fileSet = Collections.synchronizedSet(new HashSet());
 
   /**
    * A constructor that ensures only a single class loader instance exists

Modified: cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/generation/XPathDirectoryGenerator.java
Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/generation/XPathDirectoryGenerator.java?view=diff&rev=123903&p1=cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/generation/XPathDirectoryGenerator.java&r1=123902&p2=cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/generation/XPathDirectoryGenerator.java&r2=123903
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/generation/XPathDirectoryGenerator.java
(original)
+++ cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/generation/XPathDirectoryGenerator.java
Sun Jan  2 13:26:59 2005
@@ -134,7 +134,7 @@
     protected static final String QUERY_ATTR_NAME = "query";
 
     /** All the mapping files lastmodified dates */
-    protected static Map mappingFiles = new HashMap();
+    protected static final Map mappingFiles = new HashMap();
 
     /** The parser for the XML snippets to be included. */
     protected DOMParser parser = null;

Modified: cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/xml/dom/DOMStreamer.java
Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/xml/dom/DOMStreamer.java?view=diff&rev=123903&p1=cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/xml/dom/DOMStreamer.java&r1=123902&p2=cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/xml/dom/DOMStreamer.java&r2=123903
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/xml/dom/DOMStreamer.java	(original)
+++ cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/xml/dom/DOMStreamer.java	Sun Jan
 2 13:26:59 2005
@@ -78,7 +78,7 @@
     protected DefaultDOMStreamer defaultDOMStreamer = new DefaultDOMStreamer();
 
     /** The transformer factory shared by all instances (only used by DefaultDOMStreamer)
*/
-    protected static TransformerFactory factory = TransformerFactory.newInstance();
+    protected final static TransformerFactory factory = TransformerFactory.newInstance();
 
     /**
      * Create a new <code>DOMStreamer</code> instance.

Mime
View raw message