Author: antonio Date: Fri Dec 31 10:37:57 2004 New Revision: 123812 URL: http://svn.apache.org/viewcvs?view=rev&rev=123812 Log: static variables should be final Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/lucene/java/org/apache/cocoon/bean/query/SimpleLuceneQueryBean.java cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/transformation/ProxyTransformer.java cocoon/branches/BRANCH_2_1_X/src/blocks/scratchpad/java/org/apache/cocoon/components/jxdom/DocumentAdapter.java cocoon/branches/BRANCH_2_1_X/src/blocks/scratchpad/java/org/apache/cocoon/components/source/impl/ZipSourceFactory.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/components/modules/input/LocateResource.java cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/generation/ImageDirectoryGenerator.java cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/generation/MP3DirectoryGenerator.java
Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/lucene/java/org/apache/cocoon/bean/query/SimpleLuceneQueryBean.java Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/lucene/java/org/apache/cocoon/bean/query/SimpleLuceneQueryBean.java?view=diff&rev=123812&p1=cocoon/branches/BRANCH_2_1_X/src/blocks/lucene/java/org/apache/cocoon/bean/query/SimpleLuceneQueryBean.java&r1=123811&p2=cocoon/branches/BRANCH_2_1_X/src/blocks/lucene/java/org/apache/cocoon/bean/query/SimpleLuceneQueryBean.java&r2=123812 ============================================================================== --- cocoon/branches/BRANCH_2_1_X/src/blocks/lucene/java/org/apache/cocoon/bean/query/SimpleLuceneQueryBean.java (original) +++ cocoon/branches/BRANCH_2_1_X/src/blocks/lucene/java/org/apache/cocoon/bean/query/SimpleLuceneQueryBean.java Fri Dec 31 10:37:57 2004 @@ -49,21 +49,21 @@ * The DEFAULT_PAGE_SIZE of this bean. * ie. <code>20</code> */ - public static Long DEFAULT_PAGE_SIZE = new Long (20); + public static final Long DEFAULT_PAGE_SIZE = new Long (20); /** * The SCORE_FIELD of this bean. * This is the key of the Lucene Score as output by this Bean in each hit. * ie. <code>_lucene-score_</code> */ - public static String SCORE_FIELD = "_lucene-score_"; + public static final String SCORE_FIELD = "_lucene-score_"; /** * The INDEX_FIELD of this bean. * This is the key of the hit index as output by this Bean in each hit. * ie. <code>_lucene-index_</code> */ - public static String INDEX_FIELD = "_lucene-index_"; + public static final String INDEX_FIELD = "_lucene-index_"; /** * The date this Query was created. Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/transformation/ProxyTransformer.java Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/transformation/ProxyTransformer.java?view=diff&rev=123812&p1=cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/transformation/ProxyTransformer.java&r1=123811&p2=cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/transformation/ProxyTransformer.java&r2=123812 ============================================================================== --- cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/transformation/ProxyTransformer.java (original) +++ cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/transformation/ProxyTransformer.java Fri Dec 31 10:37:57 2004 @@ -71,7 +71,7 @@ /** * Parameter for specifying the envelope tag */ - public static String ENVELOPE_TAG_PARAMETER = "envelope-tag"; + public static final String ENVELOPE_TAG_PARAMETER = "envelope-tag"; public static final String PORTALNAME = "cocoon-portal-portalname"; public static final String COPLETID = "cocoon-portal-copletid"; @@ -90,7 +90,7 @@ /** * Parameter for specifying the java protocol handler (used for https) */ - public static String PROTOCOL_HANDLER_PARAMETER = "protocol-handler"; + public static final String PROTOCOL_HANDLER_PARAMETER = "protocol-handler"; /** * The document base uri Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/scratchpad/java/org/apache/cocoon/components/jxdom/DocumentAdapter.java Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/scratchpad/java/org/apache/cocoon/components/jxdom/DocumentAdapter.java?view=diff&rev=123812&p1=cocoon/branches/BRANCH_2_1_X/src/blocks/scratchpad/java/org/apache/cocoon/components/jxdom/DocumentAdapter.java&r1=123811&p2=cocoon/branches/BRANCH_2_1_X/src/blocks/scratchpad/java/org/apache/cocoon/components/jxdom/DocumentAdapter.java&r2=123812 ============================================================================== --- cocoon/branches/BRANCH_2_1_X/src/blocks/scratchpad/java/org/apache/cocoon/components/jxdom/DocumentAdapter.java (original) +++ cocoon/branches/BRANCH_2_1_X/src/blocks/scratchpad/java/org/apache/cocoon/components/jxdom/DocumentAdapter.java Fri Dec 31 10:37:57 2004 @@ -46,7 +46,7 @@ /** * DOM Wrapper for Java Beans and JavaScript objects utilizing Apache JXPath's Introspector. * - * @version CVS $ID$ + * @version CVS $Id$ */ public class DocumentAdapter implements Document { @@ -58,7 +58,7 @@ protected static final CompiledExpression GET_CHILD_NODES = JXPathContext.compile("*"); - protected static NamedNodeMap EMPTY_NODE_MAP = new NamedNodeMap() { + protected final static NamedNodeMap EMPTY_NODE_MAP = new NamedNodeMap() { public Node getNamedItem(String name) { return null; } Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/scratchpad/java/org/apache/cocoon/components/source/impl/ZipSourceFactory.java Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/scratchpad/java/org/apache/cocoon/components/source/impl/ZipSourceFactory.java?view=diff&rev=123812&p1=cocoon/branches/BRANCH_2_1_X/src/blocks/scratchpad/java/org/apache/cocoon/components/source/impl/ZipSourceFactory.java&r1=123811&p2=cocoon/branches/BRANCH_2_1_X/src/blocks/scratchpad/java/org/apache/cocoon/components/source/impl/ZipSourceFactory.java&r2=123812 ============================================================================== --- cocoon/branches/BRANCH_2_1_X/src/blocks/scratchpad/java/org/apache/cocoon/components/source/impl/ZipSourceFactory.java (original) +++ cocoon/branches/BRANCH_2_1_X/src/blocks/scratchpad/java/org/apache/cocoon/components/source/impl/ZipSourceFactory.java Fri Dec 31 10:37:57 2004 @@ -37,14 +37,14 @@ * zip://[EMAIL PROTECTED] (zip://[EMAIL PROTECTED]) * * @author <a href="http://apache.org/~reinhard";>Reinhard Poetz</a> - * @version CVS $Id: ZipSourceFactory.java,v 1.2 2004/03/05 10:07:25 bdelacretaz Exp $ + * @version CVS $Id$ * @since 2.1.4 */ public class ZipSourceFactory extends AbstractLogEnabled implements SourceFactory, ThreadSafe, Serviceable { protected ServiceManager manager; - public static String ZIP_SOURCE_SCHEME = "zip:"; + public final static String ZIP_SOURCE_SCHEME = "zip:"; public Source getSource(String location, Map parameters) throws IOException, MalformedURLException { 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=123812&p1=cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/classloader/ClassLoaderManagerImpl.java&r1=123811&p2=cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/classloader/ClassLoaderManagerImpl.java&r2=123812 ============================================================================== --- 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 Fri Dec 31 10:37:57 2004 @@ -28,7 +28,7 @@ * A singleton-like implementation of <code>ClassLoaderManager</code> * * @author <a href="mailto:[EMAIL PROTECTED]">Ricardo Rocha</a> - * @version CVS $Id: ClassLoaderManagerImpl.java,v 1.2 2004/03/05 13:02:46 bdelacretaz Exp $ + * @version CVS $Id$ */ public class ClassLoaderManagerImpl implements ClassLoaderManager, ThreadSafe { /** Modified: cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/modules/input/LocateResource.java Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/modules/input/LocateResource.java?view=diff&rev=123812&p1=cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/modules/input/LocateResource.java&r1=123811&p2=cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/modules/input/LocateResource.java&r2=123812 ============================================================================== --- cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/modules/input/LocateResource.java (original) +++ cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/modules/input/LocateResource.java Fri Dec 31 10:37:57 2004 @@ -54,14 +54,11 @@ * getAttributeNames() will return an Iterator to an empty collection.</p> * * @author <a href="mailto:[EMAIL PROTECTED]">Christian Haul</a> - * @version CVS $Id: LocateResource.java,v 1.3 2004/03/05 13:02:48 bdelacretaz Exp $ + * @version CVS $Id$ */ public class LocateResource extends AbstractInputModule implements Composable, ThreadSafe { - protected static Collection col = null; - static { - col = new TreeSet(); - } + protected static final Collection col = new TreeSet(); protected ComponentManager manager = null; Modified: cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/generation/ImageDirectoryGenerator.java Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/generation/ImageDirectoryGenerator.java?view=diff&rev=123812&p1=cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/generation/ImageDirectoryGenerator.java&r1=123811&p2=cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/generation/ImageDirectoryGenerator.java&r2=123812 ============================================================================== --- cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/generation/ImageDirectoryGenerator.java (original) +++ cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/generation/ImageDirectoryGenerator.java Fri Dec 31 10:37:57 2004 @@ -48,9 +48,9 @@ */ final public class ImageDirectoryGenerator extends DirectoryGenerator { - protected static String IMAGE_WIDTH_ATTR_NAME = "width"; - protected static String IMAGE_HEIGHT_ATTR_NAME = "height"; - protected static String IMAGE_COMMENT_ATTR_NAME = "comment"; + protected final static String IMAGE_WIDTH_ATTR_NAME = "width"; + protected final static String IMAGE_HEIGHT_ATTR_NAME = "height"; + protected final static String IMAGE_COMMENT_ATTR_NAME = "comment"; /** * Extends the <code>setNodeAttributes</code> method from the Modified: cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/generation/MP3DirectoryGenerator.java Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/generation/MP3DirectoryGenerator.java?view=diff&rev=123812&p1=cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/generation/MP3DirectoryGenerator.java&r1=123811&p2=cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/generation/MP3DirectoryGenerator.java&r2=123812 ============================================================================== --- cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/generation/MP3DirectoryGenerator.java (original) +++ cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/generation/MP3DirectoryGenerator.java Fri Dec 31 10:37:57 2004 @@ -51,18 +51,18 @@ // private static final int VBR_SCALE_FLAG = 8; // Attributes - protected static String MP3_FREQUENCY_ATTR_NAME = "frequency"; - protected static String MP3_BITRATE_ATTR_NAME = "bitrate"; - protected static String MP3_MODE_ATTR_NAME = "mode"; - protected static String MP3_VBR_ATTR_NAME = "variable-rate"; + protected final static String MP3_FREQUENCY_ATTR_NAME = "frequency"; + protected final static String MP3_BITRATE_ATTR_NAME = "bitrate"; + protected final static String MP3_MODE_ATTR_NAME = "mode"; + protected final static String MP3_VBR_ATTR_NAME = "variable-rate"; - protected static String MP3_TITLE_ATTR_NAME = "title"; - protected static String MP3_ARTIST_ATTR_NAME = "artist"; - protected static String MP3_ALBUM_ATTR_NAME = "album"; - protected static String MP3_YEAR_ATTR_NAME = "year"; - protected static String MP3_COMMENT_ATTR_NAME = "comment"; - protected static String MP3_TRACK_ATTR_NAME = "track"; - protected static String MP3_GENRE_ATTR_NAME = "genre"; + protected final static String MP3_TITLE_ATTR_NAME = "title"; + protected final static String MP3_ARTIST_ATTR_NAME = "artist"; + protected final static String MP3_ALBUM_ATTR_NAME = "album"; + protected final static String MP3_YEAR_ATTR_NAME = "year"; + protected final static String MP3_COMMENT_ATTR_NAME = "comment"; + protected final static String MP3_TRACK_ATTR_NAME = "track"; + protected final static String MP3_GENRE_ATTR_NAME = "genre"; /** * Extends the <code>setNodeAttributes</code> method from the
