cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cziege...@apache.org
Subject svn commit: r416683 - in /cocoon/trunk: blocks/cocoon-querybean/cocoon-querybean-impl/src/main/java/org/apache/cocoon/bean/query/ core/cocoon-core/src/main/java/org/apache/cocoon/ core/cocoon-core/src/main/java/org/apache/cocoon/components/treeprocesso...
Date Fri, 23 Jun 2006 11:46:14 GMT
Author: cziegeler
Date: Fri Jun 23 04:46:12 2006
New Revision: 416683

URL: http://svn.apache.org/viewvc?rev=416683&view=rev
Log:
Make constants final and fix potential problems

Modified:
    cocoon/trunk/blocks/cocoon-querybean/cocoon-querybean-impl/src/main/java/org/apache/cocoon/bean/query/SimpleLuceneQueryBean.java
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/ProcessingUtil.java
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/treeprocessor/variables/PreparedVariableResolver.java
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/environment/wrapper/EnvironmentWrapper.java
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/generation/ImageDirectoryGenerator.java
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/generation/MP3DirectoryGenerator.java
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/generation/XPathDirectoryGenerator.java

Modified: cocoon/trunk/blocks/cocoon-querybean/cocoon-querybean-impl/src/main/java/org/apache/cocoon/bean/query/SimpleLuceneQueryBean.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-querybean/cocoon-querybean-impl/src/main/java/org/apache/cocoon/bean/query/SimpleLuceneQueryBean.java?rev=416683&r1=416682&r2=416683&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-querybean/cocoon-querybean-impl/src/main/java/org/apache/cocoon/bean/query/SimpleLuceneQueryBean.java
(original)
+++ cocoon/trunk/blocks/cocoon-querybean/cocoon-querybean-impl/src/main/java/org/apache/cocoon/bean/query/SimpleLuceneQueryBean.java
Fri Jun 23 04:46:12 2006
@@ -50,27 +50,27 @@
 	 * 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 DEFAULT_PAGE of this bean.
 	 * ie. <code>0</code>
 	 */
-	public static Long DEFAULT_PAGE = new Long (0);
+	public static final Long DEFAULT_PAGE = new Long (0);
 
 	/**
 	 * 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/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/ProcessingUtil.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/ProcessingUtil.java?rev=416683&r1=416682&r2=416683&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/ProcessingUtil.java (original)
+++ cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/ProcessingUtil.java Fri
Jun 23 04:46:12 2006
@@ -35,19 +35,19 @@
 public class ProcessingUtil {
 
     /** Bean name for the Avalon context. */
-    public static String CONTEXT_ROLE = "org.apache.avalon.framework.context.Context";
+    public static final String CONTEXT_ROLE = "org.apache.avalon.framework.context.Context";
 
     /** Bean name for the logger. */
-    public static String LOGGER_ROLE = "org.apache.avalon.framework.logger.Logger";
+    public static final String LOGGER_ROLE = "org.apache.avalon.framework.logger.Logger";
 
     /** Bean name for the settings. */
-    public static String SETTINGS_ROLE = Settings.class.getName();
+    public static final String SETTINGS_ROLE = Settings.class.getName();
 
     /** Bean name for the service manager. */
-    public static String SERVICE_MANAGER_ROLE = "org.apache.avalon.framework.service.ServiceManager";
+    public static final String SERVICE_MANAGER_ROLE = "org.apache.avalon.framework.service.ServiceManager";
 
     /** Bean name for local source resolver. (TODO) */
-    public static String LOCAL_SOURCE_RESOLVER_ROLE = SourceResolver.ROLE + "/local";
+    public static final String LOCAL_SOURCE_RESOLVER_ROLE = SourceResolver.ROLE + "/local";
 
     /**
      * Avoid construction.

Modified: cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/treeprocessor/variables/PreparedVariableResolver.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/treeprocessor/variables/PreparedVariableResolver.java?rev=416683&r1=416682&r2=416683&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/treeprocessor/variables/PreparedVariableResolver.java
(original)
+++ cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/treeprocessor/variables/PreparedVariableResolver.java
Fri Jun 23 04:46:12 2006
@@ -53,10 +53,10 @@
     private static final int ROOT_SITEMAP_VARIABLE = 0;
     private static final int ANCHOR_VAR = -1;
 
-    protected static Token COLON_TOKEN = new Token(COLON);
-    protected static Token OPEN_TOKEN = new Token(OPEN);
-    protected static Token CLOSE_TOKEN = new Token(CLOSE);
-    protected static Token EMPTY_TOKEN = new Token(EXPR);
+    protected static final Token COLON_TOKEN = new Token(COLON);
+    protected static final Token OPEN_TOKEN = new Token(OPEN);
+    protected static final Token CLOSE_TOKEN = new Token(CLOSE);
+    protected static final Token EMPTY_TOKEN = new Token(EXPR);
 
     public PreparedVariableResolver(String expr, ServiceManager manager) throws PatternException
{
         super(expr);

Modified: cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/environment/wrapper/EnvironmentWrapper.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/environment/wrapper/EnvironmentWrapper.java?rev=416683&r1=416682&r2=416683&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/environment/wrapper/EnvironmentWrapper.java
(original)
+++ cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/environment/wrapper/EnvironmentWrapper.java
Fri Jun 23 04:46:12 2006
@@ -50,9 +50,6 @@
     /** The request object */
     protected final Request request;
 
-    /** The stream to output to */
-    protected OutputStream outputStream;
-    
     protected String contentType;
 
     protected boolean internalRedirect = false;

Modified: cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/generation/ImageDirectoryGenerator.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/generation/ImageDirectoryGenerator.java?rev=416683&r1=416682&r2=416683&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/generation/ImageDirectoryGenerator.java
(original)
+++ cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/generation/ImageDirectoryGenerator.java
Fri Jun 23 04:46:12 2006
@@ -44,9 +44,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 static final String IMAGE_WIDTH_ATTR_NAME = "width";
+    protected static final String IMAGE_HEIGHT_ATTR_NAME = "height";
+    protected static final String IMAGE_COMMENT_ATTR_NAME = "comment";
 
     /**
      * Extends the <code>setNodeAttributes</code> method from the

Modified: cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/generation/MP3DirectoryGenerator.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/generation/MP3DirectoryGenerator.java?rev=416683&r1=416682&r2=416683&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/generation/MP3DirectoryGenerator.java
(original)
+++ cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/generation/MP3DirectoryGenerator.java
Fri Jun 23 04:46:12 2006
@@ -50,18 +50,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 static final String MP3_FREQUENCY_ATTR_NAME = "frequency";
+    protected static final String MP3_BITRATE_ATTR_NAME   = "bitrate";
+    protected static final String MP3_MODE_ATTR_NAME      = "mode";
+    protected static final 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 static final String MP3_TITLE_ATTR_NAME   = "title";
+    protected static final String MP3_ARTIST_ATTR_NAME = "artist";
+    protected static final String MP3_ALBUM_ATTR_NAME   = "album";
+    protected static final String MP3_YEAR_ATTR_NAME    = "year";
+    protected static final String MP3_COMMENT_ATTR_NAME = "comment";
+    protected static final String MP3_TRACK_ATTR_NAME   = "track";
+    protected static final String MP3_GENRE_ATTR_NAME   = "genre";
 
     /**
      * Extends the <code>setNodeAttributes</code> method from the

Modified: cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/generation/XPathDirectoryGenerator.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/generation/XPathDirectoryGenerator.java?rev=416683&r1=416682&r2=416683&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/generation/XPathDirectoryGenerator.java
(original)
+++ cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/generation/XPathDirectoryGenerator.java
Fri Jun 23 04:46:12 2006
@@ -131,25 +131,25 @@
     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;
+    protected DOMParser parser;
 
     /** The document that should be parsed and (partly) included. */
-    protected Document doc = null;
+    protected Document doc;
 
     /** The PrefixResolver responsable for processing current request (if any). */
-    protected PrefixResolver prefixResolver = null;
+    protected PrefixResolver prefixResolver;
 
     /** The regular expression for the XML files pattern. */
-    protected RE xmlRE = null;
+    protected RE xmlRE;
 
     /** The XPath. */
-    protected String xpath = null;
+    protected String xpath;
 
     /** The XPath processor. */
-    protected XPathProcessor processor = null;
+    protected XPathProcessor processor;
 
     /**
      * Disposable



Mime
View raw message