cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From anto...@apache.org
Subject svn commit: r123810 - in cocoon/branches/BRANCH_2_1_X/src: blocks/asciiart/java/org/apache/cocoon/generation/asciiart blocks/axis/java/org/apache/cocoon/components/axis/providers blocks/lucene/java/org/apache/cocoon/components/search blocks/midi/java/org/apache/cocoon/serialization blocks/naming/java/org/apache/cocoon/transformation blocks/scratchpad/java/org/apache/cocoon/selection blocks/scratchpad/java/org/apache/cocoon/servlet java/org/apache/cocoon/xml/dom
Date Fri, 31 Dec 2004 17:07:33 GMT
Author: antonio
Date: Fri Dec 31 09:07:31 2004
New Revision: 123810

URL: http://svn.apache.org/viewcvs?view=rev&rev=123810
Log:
Define static fields
Modified:
   cocoon/branches/BRANCH_2_1_X/src/blocks/asciiart/java/org/apache/cocoon/generation/asciiart/AsciiArtPad.java
   cocoon/branches/BRANCH_2_1_X/src/blocks/asciiart/java/org/apache/cocoon/generation/asciiart/AsciiArtSVGGenerator.java
   cocoon/branches/BRANCH_2_1_X/src/blocks/axis/java/org/apache/cocoon/components/axis/providers/AvalonProvider.java
   cocoon/branches/BRANCH_2_1_X/src/blocks/lucene/java/org/apache/cocoon/components/search/SimpleLuceneXMLIndexerImpl.java
   cocoon/branches/BRANCH_2_1_X/src/blocks/midi/java/org/apache/cocoon/serialization/XMidiSerializer.java
   cocoon/branches/BRANCH_2_1_X/src/blocks/naming/java/org/apache/cocoon/transformation/LDAPTransformer.java
   cocoon/branches/BRANCH_2_1_X/src/blocks/scratchpad/java/org/apache/cocoon/selection/DateSelector.java
   cocoon/branches/BRANCH_2_1_X/src/blocks/scratchpad/java/org/apache/cocoon/servlet/CocoonFilterGeneratorImpl.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/asciiart/java/org/apache/cocoon/generation/asciiart/AsciiArtPad.java
Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/asciiart/java/org/apache/cocoon/generation/asciiart/AsciiArtPad.java?view=diff&rev=123810&p1=cocoon/branches/BRANCH_2_1_X/src/blocks/asciiart/java/org/apache/cocoon/generation/asciiart/AsciiArtPad.java&r1=123809&p2=cocoon/branches/BRANCH_2_1_X/src/blocks/asciiart/java/org/apache/cocoon/generation/asciiart/AsciiArtPad.java&r2=123810
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/asciiart/java/org/apache/cocoon/generation/asciiart/AsciiArtPad.java
(original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/asciiart/java/org/apache/cocoon/generation/asciiart/AsciiArtPad.java
Fri Dec 31 09:07:31 2004
@@ -26,7 +26,7 @@
  *
  * @author huber@apache.org
  * @since 18. Dezember 2002
- * @version CVS $Id: AsciiArtPad.java,v 1.5 2004/03/05 13:01:38 bdelacretaz Exp $
+ * @version CVS $Id$
  */
 public class AsciiArtPad {
 
@@ -708,13 +708,13 @@
         private AsciiArtPad asciiArtPad;
         private AsciiArt aa;
 
-        final String EDGE_GROUP = "[+\\\\/]";
-        final String HLINE_GROUP = "[\\-~=+]";
-        final String VLINE_GROUP = "[|+]";
-
-        final String STRING_SUFFIX_GROUP = "[^\\-|~=\\/+ \\\\]";
-        //final String STRING_PREFIX_GROUP = "[a-zA-Z0-9_\\*;\\.#]";
-        final String STRING_PREFIX_GROUP = STRING_SUFFIX_GROUP;
+        final static String EDGE_GROUP = "[+\\\\/]";
+        final static String HLINE_GROUP = "[\\-~=+]";
+        final static String VLINE_GROUP = "[|+]";
+
+        final static String STRING_SUFFIX_GROUP = "[^\\-|~=\\/+ \\\\]";
+        //final static String STRING_PREFIX_GROUP = "[a-zA-Z0-9_\\*;\\.#]";
+        final static String STRING_PREFIX_GROUP = STRING_SUFFIX_GROUP;
 
 
         /**

Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/asciiart/java/org/apache/cocoon/generation/asciiart/AsciiArtSVGGenerator.java
Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/asciiart/java/org/apache/cocoon/generation/asciiart/AsciiArtSVGGenerator.java?view=diff&rev=123810&p1=cocoon/branches/BRANCH_2_1_X/src/blocks/asciiart/java/org/apache/cocoon/generation/asciiart/AsciiArtSVGGenerator.java&r1=123809&p2=cocoon/branches/BRANCH_2_1_X/src/blocks/asciiart/java/org/apache/cocoon/generation/asciiart/AsciiArtSVGGenerator.java&r2=123810
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/asciiart/java/org/apache/cocoon/generation/asciiart/AsciiArtSVGGenerator.java
(original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/asciiart/java/org/apache/cocoon/generation/asciiart/AsciiArtSVGGenerator.java
Fri Dec 31 09:07:31 2004
@@ -44,7 +44,7 @@
  * A simple AsciiArt text SVG XML generator.
  *
  * @author <a href="mailto:huber@apache.org">Bernhard Huber</a>
- * @version CVS $Id: AsciiArtSVGGenerator.java,v 1.6 2004/06/11 20:32:19 vgritsenko Exp $
+ * @version CVS $Id$
  * @since Cocoon 2.1, 22 December 2002
  */
 public class AsciiArtSVGGenerator
@@ -59,24 +59,24 @@
     private AttributesImpl attributes = null;
     private AsciiArtPad asciiArtPad;
 
-    //private String PREFIX = "svg";
+    //private String static PREFIX = "svg";
     private String PREFIX = "";
     private String URI = "http://www.w3.org/2000/svg";
 
     /** default SVG line attributes
      */
-    private final String DEFAULT_LINE_ATTRIBUTE = "stroke:black; stroke-width:1.5";
+    private final static String DEFAULT_LINE_ATTRIBUTE = "stroke:black; stroke-width:1.5";
 
     /** default SVG text attribute
      */
-    private final String DEFAULT_TEXT_ATTRIBUTE = "font-size: 12; font-family:Times Roman;
fill:blue;";
+    private final static String DEFAULT_TEXT_ATTRIBUTE = "font-size: 12; font-family:Times
Roman; fill:blue;";
 
     private String lineAttribute = DEFAULT_LINE_ATTRIBUTE;
     private String textAttribute = DEFAULT_TEXT_ATTRIBUTE;
 
 
-    final int DEFAULT_X_GRID = 10;
-    final int DEFAULT_Y_GRID = 12;
+    final static int DEFAULT_X_GRID = 10;
+    final static int DEFAULT_Y_GRID = 12;
     private int xGrid = DEFAULT_X_GRID;
     private int yGrid = DEFAULT_Y_GRID;
 

Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/axis/java/org/apache/cocoon/components/axis/providers/AvalonProvider.java
Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/axis/java/org/apache/cocoon/components/axis/providers/AvalonProvider.java?view=diff&rev=123810&p1=cocoon/branches/BRANCH_2_1_X/src/blocks/axis/java/org/apache/cocoon/components/axis/providers/AvalonProvider.java&r1=123809&p2=cocoon/branches/BRANCH_2_1_X/src/blocks/axis/java/org/apache/cocoon/components/axis/providers/AvalonProvider.java&r2=123810
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/axis/java/org/apache/cocoon/components/axis/providers/AvalonProvider.java
(original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/axis/java/org/apache/cocoon/components/axis/providers/AvalonProvider.java
Fri Dec 31 09:07:31 2004
@@ -84,7 +84,7 @@
  * </p>
  *
  * @author <a href="mailto:crafterm@apache.org">Marcus Crafter</a>
- * @version CVS $Id: AvalonProvider.java,v 1.5 2004/03/05 13:01:42 bdelacretaz Exp $
+ * @version CVS $Id$
  */
 public class AvalonProvider extends RPCProvider
 {
@@ -237,7 +237,7 @@
     final class Handler implements InvocationHandler
     {
         // Constants describing the ServiceLifecycle.destroy method
-        private final String SL_DESTROY = "destroy";
+        private final static String SL_DESTROY = "destroy";
         private final Class  SL_CLASS = ServiceLifecycle.class;
 
         // Component & ComponentManager references

Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/lucene/java/org/apache/cocoon/components/search/SimpleLuceneXMLIndexerImpl.java
Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/lucene/java/org/apache/cocoon/components/search/SimpleLuceneXMLIndexerImpl.java?view=diff&rev=123810&p1=cocoon/branches/BRANCH_2_1_X/src/blocks/lucene/java/org/apache/cocoon/components/search/SimpleLuceneXMLIndexerImpl.java&r1=123809&p2=cocoon/branches/BRANCH_2_1_X/src/blocks/lucene/java/org/apache/cocoon/components/search/SimpleLuceneXMLIndexerImpl.java&r2=123810
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/lucene/java/org/apache/cocoon/components/search/SimpleLuceneXMLIndexerImpl.java
(original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/lucene/java/org/apache/cocoon/components/search/SimpleLuceneXMLIndexerImpl.java
Fri Dec 31 09:07:31 2004
@@ -64,7 +64,7 @@
  *
  * @author <a href="mailto:berni_huber@a1.net">Bernhard Huber</a>
  * @author <a href="mailto:jeremy@apache.org">Jeremy Quinn</a>
- * @version CVS $Id: SimpleLuceneXMLIndexerImpl.java,v 1.8 2004/03/28 14:28:04 antonio Exp
$
+ * @version CVS $Id$
  */
 public class SimpleLuceneXMLIndexerImpl extends AbstractLogEnabled
          implements LuceneXMLIndexer, Configurable, Serviceable, ThreadSafe {
@@ -94,7 +94,7 @@
      * @since
      */
     
-    final String CONTENT_VIEW_QUERY_DEFAULT = "cocoon-view=content";
+    final static String CONTENT_VIEW_QUERY_DEFAULT = "cocoon-view=content";
 
     /**
      * Config element name specifying the tags to be added as Stored, Untokenised, Unindexed
Fields.

Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/midi/java/org/apache/cocoon/serialization/XMidiSerializer.java
Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/midi/java/org/apache/cocoon/serialization/XMidiSerializer.java?view=diff&rev=123810&p1=cocoon/branches/BRANCH_2_1_X/src/blocks/midi/java/org/apache/cocoon/serialization/XMidiSerializer.java&r1=123809&p2=cocoon/branches/BRANCH_2_1_X/src/blocks/midi/java/org/apache/cocoon/serialization/XMidiSerializer.java&r2=123810
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/midi/java/org/apache/cocoon/serialization/XMidiSerializer.java
(original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/midi/java/org/apache/cocoon/serialization/XMidiSerializer.java
Fri Dec 31 09:07:31 2004
@@ -40,15 +40,15 @@
 public class XMidiSerializer extends AbstractSerializer {
     private final static String mimeType = "audio/x-midi";
 
-    private final int OUTSIDE_XMIDI = 0;
-    private final int INSIDE_XMIDI = 1;
-    private final int INSIDE_CHUNK = 2;
-    private final int INSIDE_MTHD = 3;
-    private final int INSIDE_MTRK = 4;
-    private final int INSIDE_DELTA = 5;
-    private final int INSIDE_STATUS = 6;
-    private final int INSIDE_DELTA_CHANNEL = 7;
-    private final int INSIDE_STATUS_CHANNEL = 8;
+    private final static int OUTSIDE_XMIDI = 0;
+    private final static int INSIDE_XMIDI = 1;
+    private final static int INSIDE_CHUNK = 2;
+    private final static int INSIDE_MTHD = 3;
+    private final static int INSIDE_MTRK = 4;
+    private final static int INSIDE_DELTA = 5;
+    private final static int INSIDE_STATUS = 6;
+    private final static int INSIDE_DELTA_CHANNEL = 7;
+    private final static int INSIDE_STATUS_CHANNEL = 8;
 
     private int expectedBytes;
     private boolean preventDataWrite;

Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/naming/java/org/apache/cocoon/transformation/LDAPTransformer.java
Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/naming/java/org/apache/cocoon/transformation/LDAPTransformer.java?view=diff&rev=123810&p1=cocoon/branches/BRANCH_2_1_X/src/blocks/naming/java/org/apache/cocoon/transformation/LDAPTransformer.java&r1=123809&p2=cocoon/branches/BRANCH_2_1_X/src/blocks/naming/java/org/apache/cocoon/transformation/LDAPTransformer.java&r2=123810
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/naming/java/org/apache/cocoon/transformation/LDAPTransformer.java
(original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/naming/java/org/apache/cocoon/transformation/LDAPTransformer.java
Fri Dec 31 09:07:31 2004
@@ -1449,7 +1449,7 @@
         protected String version = "2";
         protected String scope = "ONELEVEL_SCOPE";
         protected String authentication = "simple";
-        private final String LDAP_ENCODING = "ISO-8859-1"; 
+        private final static String LDAP_ENCODING = "ISO-8859-1"; 
         protected String encoding = LDAP_ENCODING;
 
         /** LDAP environment information */

Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/scratchpad/java/org/apache/cocoon/selection/DateSelector.java
Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/scratchpad/java/org/apache/cocoon/selection/DateSelector.java?view=diff&rev=123810&p1=cocoon/branches/BRANCH_2_1_X/src/blocks/scratchpad/java/org/apache/cocoon/selection/DateSelector.java&r1=123809&p2=cocoon/branches/BRANCH_2_1_X/src/blocks/scratchpad/java/org/apache/cocoon/selection/DateSelector.java&r2=123810
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/scratchpad/java/org/apache/cocoon/selection/DateSelector.java
(original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/scratchpad/java/org/apache/cocoon/selection/DateSelector.java
Fri Dec 31 09:07:31 2004
@@ -275,20 +275,22 @@
         /** the configured date value
          */
         private Date date;
+
         /** indicator if after comparison should be performed
          */
         private boolean isCompareAfter;
+
         /** indicator if before comparison shoulde be performed
          */
         private boolean isCompareBefore;
+
+        final static String AFTER_COMPARATOR_MODE = "after";
+        final static String BEFORE_COMPARATOR_MODE = "before";
         
-        final String AFTER_COMPARATOR_MODE = "after";
-        final String BEFORE_COMPARATOR_MODE = "before";
-        
-        public DateComparator( Date d, String comparator ) {
+        public DateComparator(Date d, String comparator) {
             this.date = d;
-            this.isCompareAfter = AFTER_COMPARATOR_MODE.equalsIgnoreCase( comparator );
-            this.isCompareBefore = BEFORE_COMPARATOR_MODE.equalsIgnoreCase( comparator );
+            this.isCompareAfter = AFTER_COMPARATOR_MODE.equalsIgnoreCase(comparator);
+            this.isCompareBefore = BEFORE_COMPARATOR_MODE.equalsIgnoreCase(comparator);
         }
         public Date getDate() {
             return this.date;
@@ -312,13 +314,13 @@
          *   <code>now.after( date)</code>, or <code>now.before( date )</code>
          *   yield true
          */
-        public boolean compareTo( Date now ) {
+        public boolean compareTo(Date now) {
             if (isCompareAfter) {
-                return now.after( date );
+                return now.after(date);
             } else if (isCompareBefore) {
-                return now.before( date );
+                return now.before(date);
             } else {
-                return now.compareTo( date) == 0;
+                return now.compareTo(date) == 0;
             }
         }
     }

Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/scratchpad/java/org/apache/cocoon/servlet/CocoonFilterGeneratorImpl.java
Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/scratchpad/java/org/apache/cocoon/servlet/CocoonFilterGeneratorImpl.java?view=diff&rev=123810&p1=cocoon/branches/BRANCH_2_1_X/src/blocks/scratchpad/java/org/apache/cocoon/servlet/CocoonFilterGeneratorImpl.java&r1=123809&p2=cocoon/branches/BRANCH_2_1_X/src/blocks/scratchpad/java/org/apache/cocoon/servlet/CocoonFilterGeneratorImpl.java&r2=123810
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/scratchpad/java/org/apache/cocoon/servlet/CocoonFilterGeneratorImpl.java
(original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/scratchpad/java/org/apache/cocoon/servlet/CocoonFilterGeneratorImpl.java
Fri Dec 31 09:07:31 2004
@@ -115,7 +115,7 @@
  * </p>
  *
  * @author <a href="mailto:berni_huber@a1.net">Bernhard Huber</a>
- * @version CVS $Id: CocoonFilterGeneratorImpl.java,v 1.4 2004/05/07 17:32:58 joerg Exp $
+ * @version CVS $Id$
  *
  */
 public class CocoonFilterGeneratorImpl implements Filter {
@@ -141,13 +141,13 @@
      *
      * @since 1.0
      */
-    final String VERBOSE_PARAM = "verbose";
+    final static String VERBOSE_PARAM = "verbose";
     /**
      * Default verbose mode, ie <code>true</code>.
      *
      * @since 1.0
      */
-    final boolean VERBOSE_DEFAULT = true;
+    final static boolean VERBOSE_DEFAULT = true;
 
     /**
      * Currently active verbose mode

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=123810&p1=cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/xml/dom/DOMStreamer.java&r1=123809&p2=cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/xml/dom/DOMStreamer.java&r2=123810
==============================================================================
--- 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	Fri Dec
31 09:07:31 2004
@@ -61,12 +61,12 @@
  * @author <a href="mailto:cziegeler@apache.org">Carsten Ziegeler</a>
  * @author <a href="mailto:pier@apache.org">Pierpaolo Fumagalli</a>
  *         (Apache Software Foundation)
- * @version CVS $Id: DOMStreamer.java,v 1.15 2004/03/28 23:57:41 antonio Exp $
+ * @version CVS $Id$
  */
 public class DOMStreamer implements XMLProducer {
 
     /** Default value for normalizeNamespaces. */
-    private final boolean DEFAULT_NORMALIZE_NAMESPACES = true;
+    private final static boolean DEFAULT_NORMALIZE_NAMESPACES = true;
 
     /** Indicates whether namespace normalization should happen. */
     protected boolean normalizeNamespaces = DEFAULT_NORMALIZE_NAMESPACES;

Mime
View raw message