cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From anto...@apache.org
Subject svn commit: r124685 - in cocoon/branches/BRANCH_2_1_X/src: blocks/axis/java/org/apache/cocoon/components/axis/providers blocks/bsf/java/org/apache/cocoon/generation blocks/chaperon/java/org/apache/cocoon/transformation blocks/databases/java/org/apache/cocoon/components/source/impl blocks/databases/java/org/apache/cocoon/transformation blocks/forms/java/org/apache/cocoon/forms/transformation blocks/javaflow/java/org/apache/cocoon/samples/flow/java blocks/lucene/java/org/apache/cocoon/transformation blocks/mail/java/org/apache/cocoon/mail blocks/naming/java/org/apache/cocoon/transformation blocks/paranoid/java/org/apache/cocoon/servlet blocks/portal/java/org/apache/cocoon/portal/impl blocks/portal/java/org/apache/cocoon/portal/layout/renderer/aspect/impl blocks/portal/java/org/apache/cocoon/portal/profile/impl blocks/portal/java/org/apache/cocoon/portal/transformation blocks/profiler/java/org/apache/cocoon/components/profiler blocks/qdox/java/org/apache/cocoon/components/source/impl blocks/repository/java/org/apache/cocoon/generation blocks/scratchpad/java/org/apache/cocoon/acting blocks/scratchpad/java/org/apache/cocoon/components/source/impl blocks/scratchpad/java/org/apache/cocoon/selection blocks/scratchpad/java/org/apache/cocoon/servlet blocks/scratchpad/java/org/apache/cocoon/transformation/constrained blocks/scratchpad/java/org/apache/cocoon/util blocks/session-fw/java/org/apache/cocoon/webapps/session/components blocks/taglib/java/org/apache/cocoon/taglib/core java/org/apache/cocoon/acting java/org/apache/cocoon/bean/helpers java/org/apache/cocoon/components/flow java/org/apache/cocoon/components/modules/input java/org/apache/cocoon/environment/commandline java/org/apache/cocoon/environment/wrapper java/org/apache/cocoon/generation java/org/apache/cocoon/sitemap java/org/apache/cocoon/transformation java/org/apache/cocoon/transformation/helpers java/org/apache/cocoon/util java/org/apache/cocoon/xml/dom
Date Sat, 08 Jan 2005 22:20:58 GMT
Author: antonio
Date: Sat Jan  8 14:20:56 2005
New Revision: 124685

URL: http://svn.apache.org/viewcvs?view=rev&rev=124685
Log:
inner classes -> nested classes
Modified:
   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/bsf/java/org/apache/cocoon/generation/ScriptGenerator.java
   cocoon/branches/BRANCH_2_1_X/src/blocks/chaperon/java/org/apache/cocoon/transformation/ExtendedParserTransformer.java
   cocoon/branches/BRANCH_2_1_X/src/blocks/chaperon/java/org/apache/cocoon/transformation/LexicalTransformer.java
   cocoon/branches/BRANCH_2_1_X/src/blocks/chaperon/java/org/apache/cocoon/transformation/ParserTransformer.java
   cocoon/branches/BRANCH_2_1_X/src/blocks/chaperon/java/org/apache/cocoon/transformation/PatternTransformer.java
   cocoon/branches/BRANCH_2_1_X/src/blocks/databases/java/org/apache/cocoon/components/source/impl/BlobSource.java
   cocoon/branches/BRANCH_2_1_X/src/blocks/databases/java/org/apache/cocoon/transformation/SQLTransformer.java
   cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/transformation/EffectPipe.java
   cocoon/branches/BRANCH_2_1_X/src/blocks/javaflow/java/org/apache/cocoon/samples/flow/java/PersistenceFlow.java
   cocoon/branches/BRANCH_2_1_X/src/blocks/lucene/java/org/apache/cocoon/transformation/LuceneIndexTransformer.java
   cocoon/branches/BRANCH_2_1_X/src/blocks/mail/java/org/apache/cocoon/mail/MailMessageSender.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/paranoid/java/org/apache/cocoon/servlet/ParanoidCocoonServlet.java
   cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/impl/DefaultLinkService.java
   cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/FrameAspect.java
   cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/ParameterAspect.java
   cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/PortletWindowAspect.java
   cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/WindowAspect.java
   cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/XSLTAspect.java
   cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/profile/impl/AuthenticationProfileManager.java
   cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/transformation/RSSTransformer.java
   cocoon/branches/BRANCH_2_1_X/src/blocks/profiler/java/org/apache/cocoon/components/profiler/ProfilerData.java
   cocoon/branches/BRANCH_2_1_X/src/blocks/qdox/java/org/apache/cocoon/components/source/impl/QDoxSourceFactory.java
   cocoon/branches/BRANCH_2_1_X/src/blocks/repository/java/org/apache/cocoon/generation/XPathTraversableGenerator.java
   cocoon/branches/BRANCH_2_1_X/src/blocks/scratchpad/java/org/apache/cocoon/acting/SectionCutterAction.java
   cocoon/branches/BRANCH_2_1_X/src/blocks/scratchpad/java/org/apache/cocoon/components/source/impl/DelayRefresher.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/blocks/scratchpad/java/org/apache/cocoon/transformation/constrained/AbstractConstrainedTransformer.java
   cocoon/branches/BRANCH_2_1_X/src/blocks/scratchpad/java/org/apache/cocoon/util/SoftSourceCache.java
   cocoon/branches/BRANCH_2_1_X/src/blocks/session-fw/java/org/apache/cocoon/webapps/session/components/DefaultTransactionManager.java
   cocoon/branches/BRANCH_2_1_X/src/blocks/taglib/java/org/apache/cocoon/taglib/core/ForEachSupport.java
   cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/acting/PropagatorAction.java
   cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/acting/RequestParameterExistsAction.java
   cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/bean/helpers/Crawler.java
   cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/flow/CompilingInterpreter.java
   cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/flow/ContinuationsManagerImpl.java
   cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/modules/input/SimpleMappingMetaModule.java
   cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/modules/input/XMLFileModule.java
   cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/environment/commandline/CommandLineRequest.java
   cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/environment/wrapper/RequestParameters.java
   cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/environment/wrapper/RequestWrapper.java
   cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/generation/JXTemplateGenerator.java
   cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/generation/LinkStatusGenerator.java
   cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/sitemap/ContentAggregator.java
   cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/transformation/EncodeURLTransformer.java
   cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/transformation/SimpleFormInstanceExtractionTransformer.java
   cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/transformation/SimpleFormTransformer.java
   cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/transformation/helpers/DefaultIncludeCacheManager.java
   cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/util/PostInputStream.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/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=124685&p1=cocoon/branches/BRANCH_2_1_X/src/blocks/axis/java/org/apache/cocoon/components/axis/providers/AvalonProvider.java&r1=124684&p2=cocoon/branches/BRANCH_2_1_X/src/blocks/axis/java/org/apache/cocoon/components/axis/providers/AvalonProvider.java&r2=124685
==============================================================================
--- 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	Sat Jan  8 14:20:56 2005
@@ -234,7 +234,7 @@
      *  on the scope of the service (ie. Request, Session & Application).
      * </p>
      */
-    final class Handler implements InvocationHandler
+    final static class Handler implements InvocationHandler
     {
         // Constants describing the ServiceLifecycle.destroy method
         private final static String SL_DESTROY = "destroy";

Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/bsf/java/org/apache/cocoon/generation/ScriptGenerator.java
Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/bsf/java/org/apache/cocoon/generation/ScriptGenerator.java?view=diff&rev=124685&p1=cocoon/branches/BRANCH_2_1_X/src/blocks/bsf/java/org/apache/cocoon/generation/ScriptGenerator.java&r1=124684&p2=cocoon/branches/BRANCH_2_1_X/src/blocks/bsf/java/org/apache/cocoon/generation/ScriptGenerator.java&r2=124685
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/bsf/java/org/apache/cocoon/generation/ScriptGenerator.java	(original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/bsf/java/org/apache/cocoon/generation/ScriptGenerator.java	Sat Jan  8 14:20:56 2005
@@ -55,11 +55,11 @@
  * </pre>
  *
  * @author <a href="mailto:jafoster@engmail.uwaterloo.ca">Jason Foster</a>
- * @version CVS $Id: ScriptGenerator.java,v 1.7 2004/04/15 08:39:30 bdelacretaz Exp $
+ * @version CVS $Id$
  */
 public class ScriptGenerator extends ServiceableGenerator implements Configurable {
 
-    protected class BSFLanguage {
+    protected static class BSFLanguage {
         public String name;
         public String engineSrc;
         public String[] extensions;

Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/chaperon/java/org/apache/cocoon/transformation/ExtendedParserTransformer.java
Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/chaperon/java/org/apache/cocoon/transformation/ExtendedParserTransformer.java?view=diff&rev=124685&p1=cocoon/branches/BRANCH_2_1_X/src/blocks/chaperon/java/org/apache/cocoon/transformation/ExtendedParserTransformer.java&r1=124684&p2=cocoon/branches/BRANCH_2_1_X/src/blocks/chaperon/java/org/apache/cocoon/transformation/ExtendedParserTransformer.java&r2=124685
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/chaperon/java/org/apache/cocoon/transformation/ExtendedParserTransformer.java	(original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/chaperon/java/org/apache/cocoon/transformation/ExtendedParserTransformer.java	Sat Jan  8 14:20:56 2005
@@ -56,7 +56,7 @@
 
 /**
  * @author <a href="mailto:stephan@apache.org">Stephan Michels </a>
- * @version CVS $Id: ExtendedParserTransformer.java,v 1.6 2004/03/05 13:01:48 bdelacretaz Exp $
+ * @version CVS $Id$
  */
 public class ExtendedParserTransformer extends ExtendedDirectParserProcessor
         implements Transformer, LogEnabled, Serviceable, Parameterizable,
@@ -254,8 +254,7 @@
   /**
    * This class represent a entry in a store to cache the parser automaton.
    */
-  public class GrammarEntry implements Serializable
-  {
+  public static class GrammarEntry implements Serializable {
     private SourceValidity validity = null;
     private ExtendedGrammar grammar = null;
 

Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/chaperon/java/org/apache/cocoon/transformation/LexicalTransformer.java
Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/chaperon/java/org/apache/cocoon/transformation/LexicalTransformer.java?view=diff&rev=124685&p1=cocoon/branches/BRANCH_2_1_X/src/blocks/chaperon/java/org/apache/cocoon/transformation/LexicalTransformer.java&r1=124684&p2=cocoon/branches/BRANCH_2_1_X/src/blocks/chaperon/java/org/apache/cocoon/transformation/LexicalTransformer.java&r2=124685
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/chaperon/java/org/apache/cocoon/transformation/LexicalTransformer.java	(original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/chaperon/java/org/apache/cocoon/transformation/LexicalTransformer.java	Sat Jan  8 14:20:56 2005
@@ -78,7 +78,7 @@
  * </pre>
  *
  * @author <a href="mailto:stephan@apache.org">Stephan Michels </a>
- * @version CVS $Id: LexicalTransformer.java,v 1.12 2004/03/05 13:01:48 bdelacretaz Exp $
+ * @version CVS $Id$
  */
 public class LexicalTransformer extends LexicalProcessor
         implements Transformer, LogEnabled, Serviceable, Recyclable, Disposable,
@@ -266,8 +266,7 @@
   /**
    * This class represent a entry in a store to cache the lexical automaton.
    */
-  public class LexicalAutomatonEntry implements Serializable
-  {
+  public static class LexicalAutomatonEntry implements Serializable {
     private SourceValidity validity = null;
     private LexicalAutomaton automaton = null;
 

Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/chaperon/java/org/apache/cocoon/transformation/ParserTransformer.java
Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/chaperon/java/org/apache/cocoon/transformation/ParserTransformer.java?view=diff&rev=124685&p1=cocoon/branches/BRANCH_2_1_X/src/blocks/chaperon/java/org/apache/cocoon/transformation/ParserTransformer.java&r1=124684&p2=cocoon/branches/BRANCH_2_1_X/src/blocks/chaperon/java/org/apache/cocoon/transformation/ParserTransformer.java&r2=124685
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/chaperon/java/org/apache/cocoon/transformation/ParserTransformer.java	(original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/chaperon/java/org/apache/cocoon/transformation/ParserTransformer.java	Sat Jan  8 14:20:56 2005
@@ -78,7 +78,7 @@
  * </pre>
  *
  * @author <a href="mailto:stephan@apache.org">Stephan Michels </a>
- * @version CVS $Id: ParserTransformer.java,v 1.12 2004/03/05 13:01:48 bdelacretaz Exp $
+ * @version CVS $Id$
  */
 public class ParserTransformer extends ParserProcessor
         implements Transformer, LogEnabled, Serviceable, Parameterizable,
@@ -274,8 +274,7 @@
   /**
    * This class represent a entry in a store to cache the parser automaton.
    */
-  public class ParserAutomatonEntry implements Serializable
-  {
+  public static class ParserAutomatonEntry implements Serializable {
     private SourceValidity validity = null;
     private ParserAutomaton automaton = null;
 

Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/chaperon/java/org/apache/cocoon/transformation/PatternTransformer.java
Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/chaperon/java/org/apache/cocoon/transformation/PatternTransformer.java?view=diff&rev=124685&p1=cocoon/branches/BRANCH_2_1_X/src/blocks/chaperon/java/org/apache/cocoon/transformation/PatternTransformer.java&r1=124684&p2=cocoon/branches/BRANCH_2_1_X/src/blocks/chaperon/java/org/apache/cocoon/transformation/PatternTransformer.java&r2=124685
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/chaperon/java/org/apache/cocoon/transformation/PatternTransformer.java	(original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/chaperon/java/org/apache/cocoon/transformation/PatternTransformer.java	Sat Jan  8 14:20:56 2005
@@ -79,7 +79,7 @@
  * </pre>
  *
  * @author <a href="mailto:stephan@apache.org">Stephan Michels</a>
- * @version CVS $Id: PatternTransformer.java,v 1.9 2004/03/05 13:01:48 bdelacretaz Exp $
+ * @version CVS $Id$
  */
 public class PatternTransformer extends AbstractTransformer implements LogEnabled, Serviceable,
                                                                        Recyclable, Disposable,
@@ -460,7 +460,7 @@
   /**
    * This class represent a entry in a store to cache the lexical automaton.
    */
-  public class LexicalAutomatonEntry implements Serializable
+  public static class LexicalAutomatonEntry implements Serializable
   {
     private SourceValidity validity = null;
     private LexicalAutomaton automaton = null;

Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/databases/java/org/apache/cocoon/components/source/impl/BlobSource.java
Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/databases/java/org/apache/cocoon/components/source/impl/BlobSource.java?view=diff&rev=124685&p1=cocoon/branches/BRANCH_2_1_X/src/blocks/databases/java/org/apache/cocoon/components/source/impl/BlobSource.java&r1=124684&p2=cocoon/branches/BRANCH_2_1_X/src/blocks/databases/java/org/apache/cocoon/components/source/impl/BlobSource.java&r2=124685
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/databases/java/org/apache/cocoon/components/source/impl/BlobSource.java	(original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/databases/java/org/apache/cocoon/components/source/impl/BlobSource.java	Sat Jan  8 14:20:56 2005
@@ -302,7 +302,7 @@
         return new EmptyIterator();
     }
 
-    class EmptyIterator implements Iterator {
+    static class EmptyIterator implements Iterator {
         public boolean hasNext() { return false; }
         public Object next() { return null; }
         public void remove() {}

Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/databases/java/org/apache/cocoon/transformation/SQLTransformer.java
Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/databases/java/org/apache/cocoon/transformation/SQLTransformer.java?view=diff&rev=124685&p1=cocoon/branches/BRANCH_2_1_X/src/blocks/databases/java/org/apache/cocoon/transformation/SQLTransformer.java&r1=124684&p2=cocoon/branches/BRANCH_2_1_X/src/blocks/databases/java/org/apache/cocoon/transformation/SQLTransformer.java&r2=124685
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/databases/java/org/apache/cocoon/transformation/SQLTransformer.java	(original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/databases/java/org/apache/cocoon/transformation/SQLTransformer.java	Sat Jan  8 14:20:56 2005
@@ -1338,7 +1338,7 @@
         }
     }
 
-    private class AncestorValue {
+    private static class AncestorValue {
         protected int level;
         protected String name;
 

Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/transformation/EffectPipe.java
Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/transformation/EffectPipe.java?view=diff&rev=124685&p1=cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/transformation/EffectPipe.java&r1=124684&p2=cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/transformation/EffectPipe.java&r2=124685
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/transformation/EffectPipe.java	(original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/transformation/EffectPipe.java	Sat Jan  8 14:20:56 2005
@@ -57,7 +57,7 @@
     protected static final int EVENT_END_CDATA              =17;
     protected static final int EVENT_COMMENT                =18;
 
-    protected class Element {
+    protected static class Element {
         public final String prefix;
         public final String uri;
         public final String loc;

Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/javaflow/java/org/apache/cocoon/samples/flow/java/PersistenceFlow.java
Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/javaflow/java/org/apache/cocoon/samples/flow/java/PersistenceFlow.java?view=diff&rev=124685&p1=cocoon/branches/BRANCH_2_1_X/src/blocks/javaflow/java/org/apache/cocoon/samples/flow/java/PersistenceFlow.java&r1=124684&p2=cocoon/branches/BRANCH_2_1_X/src/blocks/javaflow/java/org/apache/cocoon/samples/flow/java/PersistenceFlow.java&r2=124685
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/javaflow/java/org/apache/cocoon/samples/flow/java/PersistenceFlow.java	(original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/javaflow/java/org/apache/cocoon/samples/flow/java/PersistenceFlow.java	Sat Jan  8 14:20:56 2005
@@ -132,7 +132,7 @@
         sendPage("page/employee-result", new VarMap().add("employee", results));
     }
 
-    public class EmployeeComparator implements Comparator, Continuable {
+    public static class EmployeeComparator implements Comparator, Continuable {
         public int compare(Object o1, Object o2) {
             return ((Employee)o1).getId()-((Employee)o2).getId();
         }

Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/lucene/java/org/apache/cocoon/transformation/LuceneIndexTransformer.java
Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/lucene/java/org/apache/cocoon/transformation/LuceneIndexTransformer.java?view=diff&rev=124685&p1=cocoon/branches/BRANCH_2_1_X/src/blocks/lucene/java/org/apache/cocoon/transformation/LuceneIndexTransformer.java&r1=124684&p2=cocoon/branches/BRANCH_2_1_X/src/blocks/lucene/java/org/apache/cocoon/transformation/LuceneIndexTransformer.java&r2=124685
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/lucene/java/org/apache/cocoon/transformation/LuceneIndexTransformer.java	(original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/lucene/java/org/apache/cocoon/transformation/LuceneIndexTransformer.java	Sat Jan  8 14:20:56 2005
@@ -58,7 +58,7 @@
  *
  * @author <a href="mailto:vgritsenko@apache.org">Vadim Gritsenko</a>
  * @author <a href="mailto:conal@nzetc.org">Conal Tuohy</a>
- * @version CVS $Id: LuceneIndexTransformer.java,v 1.13 2004/03/28 20:51:24 antonio Exp $
+ * @version CVS $Id$
  */
 public class LuceneIndexTransformer extends AbstractTransformer
     implements CacheableProcessingComponent, Configurable, Contextualizable {
@@ -442,8 +442,7 @@
         this.bodyDocument = null;
      }
 
-    class IndexHelperField
-    {
+    static class IndexHelperField {
         String localName;
         StringBuffer text;
         Attributes attributes;
@@ -471,7 +470,7 @@
         }
     }
 
-    class IndexerConfiguration {
+    static class IndexerConfiguration {
         String analyzerClassname;
         String indexDirectory;
         int mergeFactor;

Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/mail/java/org/apache/cocoon/mail/MailMessageSender.java
Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/mail/java/org/apache/cocoon/mail/MailMessageSender.java?view=diff&rev=124685&p1=cocoon/branches/BRANCH_2_1_X/src/blocks/mail/java/org/apache/cocoon/mail/MailMessageSender.java&r1=124684&p2=cocoon/branches/BRANCH_2_1_X/src/blocks/mail/java/org/apache/cocoon/mail/MailMessageSender.java&r2=124685
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/mail/java/org/apache/cocoon/mail/MailMessageSender.java	(original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/mail/java/org/apache/cocoon/mail/MailMessageSender.java	Sat Jan  8 14:20:56 2005
@@ -101,7 +101,7 @@
      * @author haul
      * @since 2.1
      */
-    private class Attachment {
+    private static class Attachment {
         private Object obj = null;
         private String type = null;
         private String name = null;

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=124685&p1=cocoon/branches/BRANCH_2_1_X/src/blocks/naming/java/org/apache/cocoon/transformation/LDAPTransformer.java&r1=124684&p2=cocoon/branches/BRANCH_2_1_X/src/blocks/naming/java/org/apache/cocoon/transformation/LDAPTransformer.java&r2=124685
==============================================================================
--- 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	Sat Jan  8 14:20:56 2005
@@ -836,7 +836,7 @@
         return getLogger();
     }
 
-    class LDAPQuery {
+    static class LDAPQuery {
 
         /** What index are you in daddy's queries list */
         protected int query_index;

Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/paranoid/java/org/apache/cocoon/servlet/ParanoidCocoonServlet.java
Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/paranoid/java/org/apache/cocoon/servlet/ParanoidCocoonServlet.java?view=diff&rev=124685&p1=cocoon/branches/BRANCH_2_1_X/src/blocks/paranoid/java/org/apache/cocoon/servlet/ParanoidCocoonServlet.java&r1=124684&p2=cocoon/branches/BRANCH_2_1_X/src/blocks/paranoid/java/org/apache/cocoon/servlet/ParanoidCocoonServlet.java&r2=124685
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/paranoid/java/org/apache/cocoon/servlet/ParanoidCocoonServlet.java	(original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/paranoid/java/org/apache/cocoon/servlet/ParanoidCocoonServlet.java	Sat Jan  8 14:20:56 2005
@@ -337,7 +337,7 @@
         super.destroy();
     }
 
-    private class JarFileFilter implements FilenameFilter {
+    private static class JarFileFilter implements FilenameFilter {
         public boolean accept(File dir, String name) {
             return name.endsWith(".zip") || name.endsWith(".jar");
         }

Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/impl/DefaultLinkService.java
Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/impl/DefaultLinkService.java?view=diff&rev=124685&p1=cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/impl/DefaultLinkService.java&r1=124684&p2=cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/impl/DefaultLinkService.java&r2=124685
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/impl/DefaultLinkService.java	(original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/impl/DefaultLinkService.java	Sat Jan  8 14:20:56 2005
@@ -53,7 +53,7 @@
     /**
      * Helper class containing the information about the request uri
      */
-    class Info {
+    static class Info {
         StringBuffer  linkBase = new StringBuffer();
         boolean       hasParameters = false;
         ArrayList     comparableEvents = new ArrayList(5);

Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/FrameAspect.java
Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/FrameAspect.java?view=diff&rev=124685&p1=cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/FrameAspect.java&r1=124684&p2=cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/FrameAspect.java&r2=124685
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/FrameAspect.java	(original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/FrameAspect.java	Sat Jan  8 14:20:56 2005
@@ -50,7 +50,7 @@
  * @author <a href="mailto:cziegeler@s-und-n.de">Carsten Ziegeler</a>
  * @author <a href="mailto:volker.schmitt@basf-it-services.com">Volker Schmitt</a>
  * 
- * @version CVS $Id: FrameAspect.java,v 1.8 2004/04/25 20:09:34 haul Exp $
+ * @version CVS $Id$
  */
 public class FrameAspect extends AbstractCIncludeAspect {
 
@@ -70,7 +70,7 @@
         this.createCInclude(source, handler);
     }
 
-    protected class PreparedConfiguration {
+    protected static class PreparedConfiguration {
         public String aspectName;
         public String store;
         

Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/ParameterAspect.java
Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/ParameterAspect.java?view=diff&rev=124685&p1=cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/ParameterAspect.java&r1=124684&p2=cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/ParameterAspect.java&r2=124685
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/ParameterAspect.java	(original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/ParameterAspect.java	Sat Jan  8 14:20:56 2005
@@ -54,7 +54,7 @@
  * 
  * @author <a href="mailto:volker.schmitt@basf-it-services.com">Volker Schmitt</a>
  * 
- * @version CVS $Id: ParameterAspect.java,v 1.3 2004/04/25 20:09:34 haul Exp $
+ * @version CVS $Id$
  */
 public final class ParameterAspect extends AbstractAspect {
 
@@ -87,7 +87,7 @@
         XMLUtils.endElement(contenthandler, config.tagName);
     }
 
-    protected class PreparedConfiguration {
+    protected static class PreparedConfiguration {
         public String tagName;
         
         public void takeValues(PreparedConfiguration from) {

Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/PortletWindowAspect.java
Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/PortletWindowAspect.java?view=diff&rev=124685&p1=cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/PortletWindowAspect.java&r1=124684&p2=cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/PortletWindowAspect.java&r2=124685
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/PortletWindowAspect.java	(original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/PortletWindowAspect.java	Sat Jan  8 14:20:56 2005
@@ -204,7 +204,7 @@
         }
     }
 
-    protected class PreparedConfiguration {
+    protected static class PreparedConfiguration {
         public String tagName;
         public boolean rootTag;
         

Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/WindowAspect.java
Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/WindowAspect.java?view=diff&rev=124685&p1=cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/WindowAspect.java&r1=124684&p2=cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/WindowAspect.java&r2=124685
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/WindowAspect.java	(original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/WindowAspect.java	Sat Jan  8 14:20:56 2005
@@ -80,7 +80,7 @@
         }
     }
 
-    protected class PreparedConfiguration {
+    protected static class PreparedConfiguration {
         public String tagName;
         public boolean rootTag;
         

Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/XSLTAspect.java
Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/XSLTAspect.java?view=diff&rev=124685&p1=cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/XSLTAspect.java&r1=124684&p2=cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/XSLTAspect.java&r2=124685
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/XSLTAspect.java	(original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/XSLTAspect.java	Sat Jan  8 14:20:56 2005
@@ -201,7 +201,7 @@
     }
 
 
-    protected class PreparedConfiguration {
+    protected static class PreparedConfiguration {
         public VariableResolver stylesheet;
         public String xsltRole;
         public Map parameters = new HashMap();

Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/profile/impl/AuthenticationProfileManager.java
Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/profile/impl/AuthenticationProfileManager.java?view=diff&rev=124685&p1=cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/profile/impl/AuthenticationProfileManager.java&r1=124684&p2=cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/profile/impl/AuthenticationProfileManager.java&r2=124685
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/profile/impl/AuthenticationProfileManager.java	(original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/profile/impl/AuthenticationProfileManager.java	Sat Jan  8 14:20:56 2005
@@ -477,7 +477,7 @@
         return key;
     }
 
-    class ReadWriteLock {
+    static class ReadWriteLock {
     	private Thread activeWriter = null;
     	private HashSet activeReaders = new HashSet();
     	private int waitingWriters = 0;

Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/transformation/RSSTransformer.java
Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/transformation/RSSTransformer.java?view=diff&rev=124685&p1=cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/transformation/RSSTransformer.java&r1=124684&p2=cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/transformation/RSSTransformer.java&r2=124685
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/transformation/RSSTransformer.java	(original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/transformation/RSSTransformer.java	Sat Jan  8 14:20:56 2005
@@ -133,7 +133,7 @@
         }
     }
 
-   class HTMLFilter extends IncludeXMLConsumer {
+   static class HTMLFilter extends IncludeXMLConsumer {
        
        int bodyCount = 0;
        

Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/profiler/java/org/apache/cocoon/components/profiler/ProfilerData.java
Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/profiler/java/org/apache/cocoon/components/profiler/ProfilerData.java?view=diff&rev=124685&p1=cocoon/branches/BRANCH_2_1_X/src/blocks/profiler/java/org/apache/cocoon/components/profiler/ProfilerData.java&r1=124684&p2=cocoon/branches/BRANCH_2_1_X/src/blocks/profiler/java/org/apache/cocoon/components/profiler/ProfilerData.java&r2=124685
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/profiler/java/org/apache/cocoon/components/profiler/ProfilerData.java	(original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/profiler/java/org/apache/cocoon/components/profiler/ProfilerData.java	Sat Jan  8 14:20:56 2005
@@ -25,14 +25,14 @@
  * @author <a href="mailto:vgritsenko@apache.org">Vadim Gritsenko</a>
  * @author <a href="mailto:bruno@outerthought.org">Bruno Dumon</a>
  * @author <a href="mailto:stephan@apache.org">Stephan Michels</a>
- * @version CVS $Id: ProfilerData.java,v 1.4 2004/03/05 13:02:20 bdelacretaz Exp $
+ * @version CVS $Id$
  */
 public class ProfilerData {
 
     /**
      * Entry, which stores the role and source of a component from a pipeline.
      */
-    public class Entry {
+    public static class Entry {
 
         public String role;
         public String source;

Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/qdox/java/org/apache/cocoon/components/source/impl/QDoxSourceFactory.java
Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/qdox/java/org/apache/cocoon/components/source/impl/QDoxSourceFactory.java?view=diff&rev=124685&p1=cocoon/branches/BRANCH_2_1_X/src/blocks/qdox/java/org/apache/cocoon/components/source/impl/QDoxSourceFactory.java&r1=124684&p2=cocoon/branches/BRANCH_2_1_X/src/blocks/qdox/java/org/apache/cocoon/components/source/impl/QDoxSourceFactory.java&r2=124685
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/qdox/java/org/apache/cocoon/components/source/impl/QDoxSourceFactory.java	(original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/qdox/java/org/apache/cocoon/components/source/impl/QDoxSourceFactory.java	Sat Jan  8 14:20:56 2005
@@ -107,7 +107,7 @@
      * <p>Using this class, the QDoxSourceFactory can quickly find the right SourceRoot URI given a specified
      * package.</p>
      */
-    protected final class SourceRoot {
+    protected static final class SourceRoot {
         private List packages;
         private String sourceRootUri;
         

Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/repository/java/org/apache/cocoon/generation/XPathTraversableGenerator.java
Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/repository/java/org/apache/cocoon/generation/XPathTraversableGenerator.java?view=diff&rev=124685&p1=cocoon/branches/BRANCH_2_1_X/src/blocks/repository/java/org/apache/cocoon/generation/XPathTraversableGenerator.java&r1=124684&p2=cocoon/branches/BRANCH_2_1_X/src/blocks/repository/java/org/apache/cocoon/generation/XPathTraversableGenerator.java&r2=124685
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/repository/java/org/apache/cocoon/generation/XPathTraversableGenerator.java	(original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/repository/java/org/apache/cocoon/generation/XPathTraversableGenerator.java	Sat Jan  8 14:20:56 2005
@@ -93,7 +93,7 @@
  *
  * @author <a href="mailto:gianugo@apache.org">Gianugo Rabellino</a>
  * @author <a href="mailto:d.madama@pro-netics.com">Daniele Madama</a>
- * @version CVS $Id: XPathTraversableGenerator.java,v 1.7 2004/03/27 15:41:50 unico Exp $
+ * @version CVS $Id$
  */
 public class XPathTraversableGenerator extends TraversableGenerator {
 
@@ -255,7 +255,7 @@
      * 
      */
     
-    class XPathPrefixResolver implements PrefixResolver {
+    static class XPathPrefixResolver implements PrefixResolver {
     	
     	private Map params;
 

Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/scratchpad/java/org/apache/cocoon/acting/SectionCutterAction.java
Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/scratchpad/java/org/apache/cocoon/acting/SectionCutterAction.java?view=diff&rev=124685&p1=cocoon/branches/BRANCH_2_1_X/src/blocks/scratchpad/java/org/apache/cocoon/acting/SectionCutterAction.java&r1=124684&p2=cocoon/branches/BRANCH_2_1_X/src/blocks/scratchpad/java/org/apache/cocoon/acting/SectionCutterAction.java&r2=124685
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/scratchpad/java/org/apache/cocoon/acting/SectionCutterAction.java	(original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/scratchpad/java/org/apache/cocoon/acting/SectionCutterAction.java	Sat Jan  8 14:20:56 2005
@@ -41,7 +41,7 @@
  *  variable in the Map.
  *
  * @author     <a href="mailto:sergio.carvalho@acm.org">Sergio Carvalho</a>
- * @version CVS $Id: SectionCutterAction.java,v 1.3 2004/03/05 10:07:25 bdelacretaz Exp $
+ * @version CVS $Id$
  */
 
 public class SectionCutterAction extends ConfigurableServiceableAction implements ThreadSafe {
@@ -126,7 +126,7 @@
      * @author     subzero
      * @version
      */
-    class Section extends Object {
+    static class Section extends Object {
         String matchExpression;
         Dictionary mapVars = new Hashtable();
 

Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/scratchpad/java/org/apache/cocoon/components/source/impl/DelayRefresher.java
Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/scratchpad/java/org/apache/cocoon/components/source/impl/DelayRefresher.java?view=diff&rev=124685&p1=cocoon/branches/BRANCH_2_1_X/src/blocks/scratchpad/java/org/apache/cocoon/components/source/impl/DelayRefresher.java&r1=124684&p2=cocoon/branches/BRANCH_2_1_X/src/blocks/scratchpad/java/org/apache/cocoon/components/source/impl/DelayRefresher.java&r2=124685
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/scratchpad/java/org/apache/cocoon/components/source/impl/DelayRefresher.java	(original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/scratchpad/java/org/apache/cocoon/components/source/impl/DelayRefresher.java	Sat Jan  8 14:20:56 2005
@@ -348,7 +348,7 @@
 	/**
 	 * Configuration data holder for scheduled targets.
 	 */
-	class TargetConfiguration {
+	static class TargetConfiguration {
         
         final Map map;
 		Parameters parameters;

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=124685&p1=cocoon/branches/BRANCH_2_1_X/src/blocks/scratchpad/java/org/apache/cocoon/selection/DateSelector.java&r1=124684&p2=cocoon/branches/BRANCH_2_1_X/src/blocks/scratchpad/java/org/apache/cocoon/selection/DateSelector.java&r2=124685
==============================================================================
--- 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	Sat Jan  8 14:20:56 2005
@@ -333,7 +333,7 @@
      *  reducing the comparsion effort.
      * </p>
      */
-    private class DateSelectorContext {
+    private static class DateSelectorContext {
         Date now;
         HashSet set;
         Logger logger;

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=124685&p1=cocoon/branches/BRANCH_2_1_X/src/blocks/scratchpad/java/org/apache/cocoon/servlet/CocoonFilterGeneratorImpl.java&r1=124684&p2=cocoon/branches/BRANCH_2_1_X/src/blocks/scratchpad/java/org/apache/cocoon/servlet/CocoonFilterGeneratorImpl.java&r2=124685
==============================================================================
--- 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	Sat Jan  8 14:20:56 2005
@@ -401,7 +401,7 @@
      * @author     HuberB1
      * @version
      */
-    class CocoonFilterGeneratorRequestWrapper extends HttpServletRequestWrapper {
+    static class CocoonFilterGeneratorRequestWrapper extends HttpServletRequestWrapper {
         /**
          * put xml-data into request-attribute under this name, ie. org.apache.cocoon.xml-data
          *
@@ -450,7 +450,7 @@
      * @author     HuberB1
      * @version
      */
-    class CocoonFilterGeneratorConfig implements ServletConfig {
+    static class CocoonFilterGeneratorConfig implements ServletConfig {
         ServletContext c;
 
 
@@ -610,7 +610,7 @@
      * @author     HuberB1
      * @version
      */
-    class CocoonFilterGeneratorOutputStream extends ServletOutputStream {
+    static class CocoonFilterGeneratorOutputStream extends ServletOutputStream {
 
         private DataOutputStream stream;
 

Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/scratchpad/java/org/apache/cocoon/transformation/constrained/AbstractConstrainedTransformer.java
Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/scratchpad/java/org/apache/cocoon/transformation/constrained/AbstractConstrainedTransformer.java?view=diff&rev=124685&p1=cocoon/branches/BRANCH_2_1_X/src/blocks/scratchpad/java/org/apache/cocoon/transformation/constrained/AbstractConstrainedTransformer.java&r1=124684&p2=cocoon/branches/BRANCH_2_1_X/src/blocks/scratchpad/java/org/apache/cocoon/transformation/constrained/AbstractConstrainedTransformer.java&r2=124685
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/scratchpad/java/org/apache/cocoon/transformation/constrained/AbstractConstrainedTransformer.java	(original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/scratchpad/java/org/apache/cocoon/transformation/constrained/AbstractConstrainedTransformer.java	Sat Jan  8 14:20:56 2005
@@ -275,7 +275,7 @@
 	 *@author     Nicola Ken Barozzi
 	 *@since      14 May 2002
 	 */
-	public class RipperListener extends ElementEventAdapter {
+	public static class RipperListener extends ElementEventAdapter {
 
 		public void elementValueRecieved(ElementValueEvent e) {
 			//do nothing so that element doesn't pass through

Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/scratchpad/java/org/apache/cocoon/util/SoftSourceCache.java
Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/scratchpad/java/org/apache/cocoon/util/SoftSourceCache.java?view=diff&rev=124685&p1=cocoon/branches/BRANCH_2_1_X/src/blocks/scratchpad/java/org/apache/cocoon/util/SoftSourceCache.java&r1=124684&p2=cocoon/branches/BRANCH_2_1_X/src/blocks/scratchpad/java/org/apache/cocoon/util/SoftSourceCache.java&r2=124685
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/scratchpad/java/org/apache/cocoon/util/SoftSourceCache.java	(original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/scratchpad/java/org/apache/cocoon/util/SoftSourceCache.java	Sat Jan  8 14:20:56 2005
@@ -36,7 +36,7 @@
  * 
  * @since 2.1.4
  * @author <a href="mailto:haul@apache.org">Christian Haul</a>
- * @version CVS $Id: SoftSourceCache.java,v 1.4 2004/03/05 10:07:26 bdelacretaz Exp $
+ * @version CVS $Id$
  */
 public class SoftSourceCache implements SourceCache {
 
@@ -111,7 +111,7 @@
 	 * Private helper to hold source validities and cached objects.
 	 * @author <a href="mailto:haul@apache.org">Christian Haul</a>
 	 */
-	private class CacheEntry {
+	private static class CacheEntry {
 		public SourceValidity validity = null;
 		public Object object = null;
 

Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/session-fw/java/org/apache/cocoon/webapps/session/components/DefaultTransactionManager.java
Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/session-fw/java/org/apache/cocoon/webapps/session/components/DefaultTransactionManager.java?view=diff&rev=124685&p1=cocoon/branches/BRANCH_2_1_X/src/blocks/session-fw/java/org/apache/cocoon/webapps/session/components/DefaultTransactionManager.java&r1=124684&p2=cocoon/branches/BRANCH_2_1_X/src/blocks/session-fw/java/org/apache/cocoon/webapps/session/components/DefaultTransactionManager.java&r2=124685
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/session-fw/java/org/apache/cocoon/webapps/session/components/DefaultTransactionManager.java	(original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/session-fw/java/org/apache/cocoon/webapps/session/components/DefaultTransactionManager.java	Sat Jan  8 14:20:56 2005
@@ -35,7 +35,7 @@
  * This is the default implementation for the transaction manager.
  * 
  * @author <a href="mailto:cziegeler@apache.org">Carsten Ziegeler</a>
- * @version CVS $Id: DefaultTransactionManager.java,v 1.4 2004/03/05 13:02:22 bdelacretaz Exp $
+ * @version CVS $Id$
 */
 public final class DefaultTransactionManager
 extends AbstractLogEnabled
@@ -62,7 +62,7 @@
         return state;
     }
 
-    private class TransactionState {
+    private static class TransactionState {
         /** number readers reading*/
         public int nr=0;
         /** number of readers total (reading or waiting to read)*/

Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/taglib/java/org/apache/cocoon/taglib/core/ForEachSupport.java
Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/taglib/java/org/apache/cocoon/taglib/core/ForEachSupport.java?view=diff&rev=124685&p1=cocoon/branches/BRANCH_2_1_X/src/blocks/taglib/java/org/apache/cocoon/taglib/core/ForEachSupport.java&r1=124684&p2=cocoon/branches/BRANCH_2_1_X/src/blocks/taglib/java/org/apache/cocoon/taglib/core/ForEachSupport.java&r2=124685
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/taglib/java/org/apache/cocoon/taglib/core/ForEachSupport.java	(original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/taglib/java/org/apache/cocoon/taglib/core/ForEachSupport.java	Sat Jan  8 14:20:56 2005
@@ -98,7 +98,7 @@
      * an Iterator.  This is appropriate for cases where hasNext() and
      * next() don't need to throw SAXException.  Such cases are common.core.
      */
-    protected class SimpleForEachIterator implements ForEachIterator {
+    protected static class SimpleForEachIterator implements ForEachIterator {
         private Iterator i;
         public SimpleForEachIterator(Iterator i) {
             this.i = i;

Modified: cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/acting/PropagatorAction.java
Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/acting/PropagatorAction.java?view=diff&rev=124685&p1=cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/acting/PropagatorAction.java&r1=124684&p2=cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/acting/PropagatorAction.java&r2=124685
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/acting/PropagatorAction.java	(original)
+++ cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/acting/PropagatorAction.java	Sat Jan  8 14:20:56 2005
@@ -152,7 +152,7 @@
      * A private helper holding default parameter entries.
      * 
      */
-	private class Entry {
+	private static class Entry {
 		public String key = null;
 		public String value = null;
 

Modified: cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/acting/RequestParameterExistsAction.java
Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/acting/RequestParameterExistsAction.java?view=diff&rev=124685&p1=cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/acting/RequestParameterExistsAction.java&r1=124684&p2=cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/acting/RequestParameterExistsAction.java&r2=124685
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/acting/RequestParameterExistsAction.java	(original)
+++ cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/acting/RequestParameterExistsAction.java	Sat Jan  8 14:20:56 2005
@@ -49,17 +49,17 @@
  * "name_1" must also exist and vice versa.</p>
  *
  * @author <a href="mailto:haul@apache.org">Christian Haul</a>
- * @version CVS $Id: RequestParameterExistsAction.java,v 1.3 2004/03/05 13:02:43 bdelacretaz Exp $
+ * @version CVS $Id$
  */
 public class RequestParameterExistsAction extends AbstractConfigurableAction
 {
 
-    protected class StringParts {
+    protected static class StringParts {
         String prefix = null;
         String pstfix = null;
         int count = 0;
 
-        public StringParts ( String pre, String post ) {
+        public StringParts (String pre, String post) {
             prefix = pre;
             pstfix = post;
         }

Modified: cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/bean/helpers/Crawler.java
Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/bean/helpers/Crawler.java?view=diff&rev=124685&p1=cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/bean/helpers/Crawler.java&r1=124684&p2=cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/bean/helpers/Crawler.java&r2=124685
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/bean/helpers/Crawler.java	(original)
+++ cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/bean/helpers/Crawler.java	Sat Jan  8 14:20:56 2005
@@ -28,7 +28,7 @@
  *   A simple Cocoon crawler
  *
  * @author <a href="mailto:uv@upaya.co.uk">Upayavira</a>
- * @version CVS $Id: Crawler.java,v 1.4 2004/03/05 13:02:45 bdelacretaz Exp $
+ * @version CVS $Id$
  */
 
 public class Crawler {
@@ -91,7 +91,7 @@
         return new CrawlingIterator(visitedAlready, stillNotVisited);
     }
     
-    public class CrawlingIterator implements Iterator {
+    public static class CrawlingIterator implements Iterator {
 
         private Map stillNotVisited;
         private Set visitedAlready;

Modified: cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/flow/CompilingInterpreter.java
Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/flow/CompilingInterpreter.java?view=diff&rev=124685&p1=cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/flow/CompilingInterpreter.java&r1=124684&p2=cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/flow/CompilingInterpreter.java&r2=124685
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/flow/CompilingInterpreter.java	(original)
+++ cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/flow/CompilingInterpreter.java	Sat Jan  8 14:20:56 2005
@@ -84,7 +84,7 @@
     protected abstract Script compileScript(Context context,
                                             Scriptable scope,
                                             Source source) throws Exception;
-
+    // This class cannot be static 
     protected class ScriptSourceEntry {
         final private Source source;
         private Script script;

Modified: cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/flow/ContinuationsManagerImpl.java
Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/flow/ContinuationsManagerImpl.java?view=diff&rev=124685&p1=cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/flow/ContinuationsManagerImpl.java&r1=124684&p2=cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/flow/ContinuationsManagerImpl.java&r2=124685
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/flow/ContinuationsManagerImpl.java	(original)
+++ cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/flow/ContinuationsManagerImpl.java	Sat Jan  8 14:20:56 2005
@@ -573,7 +573,7 @@
      * holder. This information is needed to cleanup a proper holder after
      * continuation's expiration time.
      */
-    private class HolderAwareWebContinuation extends WebContinuation {
+    private static class HolderAwareWebContinuation extends WebContinuation {
         private WebContinuationsHolder continuationsHolder;
 
         public HolderAwareWebContinuation(String id, Object continuation,

Modified: cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/modules/input/SimpleMappingMetaModule.java
Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/modules/input/SimpleMappingMetaModule.java?view=diff&rev=124685&p1=cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/modules/input/SimpleMappingMetaModule.java&r1=124684&p2=cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/modules/input/SimpleMappingMetaModule.java&r2=124685
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/modules/input/SimpleMappingMetaModule.java	(original)
+++ cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/modules/input/SimpleMappingMetaModule.java	Sat Jan  8 14:20:56 2005
@@ -48,7 +48,7 @@
  * attribute name.</p>
  *
  * @author <a href="mailto:haul@apache.org">Christian Haul</a>
- * @version CVS $Id: SimpleMappingMetaModule.java,v 1.5 2004/03/05 13:02:48 bdelacretaz Exp $
+ * @version CVS $Id$
  */
 public class SimpleMappingMetaModule extends AbstractMetaModule implements ThreadSafe {
 
@@ -58,7 +58,7 @@
     String rmSuffix = null;
     Mapping mapping = null;
 
-    protected class Mapping {
+    protected static class Mapping {
         Map toMap = null;
         Map fromMap = null;
 

Modified: cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/modules/input/XMLFileModule.java
Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/modules/input/XMLFileModule.java?view=diff&rev=124685&p1=cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/modules/input/XMLFileModule.java&r1=124684&p2=cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/modules/input/XMLFileModule.java&r2=124685
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/modules/input/XMLFileModule.java	(original)
+++ cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/modules/input/XMLFileModule.java	Sat Jan  8 14:20:56 2005
@@ -114,7 +114,7 @@
     /**
      * Takes care of (re-)loading and caching of sources.
      */
-    protected class DocumentHelper {
+    protected static class DocumentHelper {
         private boolean reloadable;
         private boolean cacheable;
         /** Source location */

Modified: cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/environment/commandline/CommandLineRequest.java
Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/environment/commandline/CommandLineRequest.java?view=diff&rev=124685&p1=cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/environment/commandline/CommandLineRequest.java&r1=124684&p2=cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/environment/commandline/CommandLineRequest.java&r2=124685
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/environment/commandline/CommandLineRequest.java	(original)
+++ cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/environment/commandline/CommandLineRequest.java	Sat Jan  8 14:20:56 2005
@@ -44,7 +44,7 @@
  */
 public class CommandLineRequest implements Request {
 
-    private class EmptyEnumeration implements Enumeration {
+    private static class EmptyEnumeration implements Enumeration {
         public boolean hasMoreElements() {
             return false;
         }

Modified: cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/environment/wrapper/RequestParameters.java
Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/environment/wrapper/RequestParameters.java?view=diff&rev=124685&p1=cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/environment/wrapper/RequestParameters.java&r1=124684&p2=cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/environment/wrapper/RequestParameters.java&r2=124685
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/environment/wrapper/RequestParameters.java	(original)
+++ cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/environment/wrapper/RequestParameters.java	Sat Jan  8 14:20:56 2005
@@ -29,7 +29,7 @@
  * for the <code>Request</code> object.
  *
  * @author <a href="mailto:cziegeler@apache.org">Carsten Ziegeler</a>
- * @version CVS $Id: RequestParameters.java,v 1.5 2004/03/05 13:02:55 bdelacretaz Exp $
+ * @version CVS $Id$
  */
 public final class RequestParameters
 implements Serializable {
@@ -167,7 +167,7 @@
         return new EnumerationFromIterator(names.keySet().iterator());
     }
 
-    final class EnumerationFromIterator implements Enumeration {
+    final static class EnumerationFromIterator implements Enumeration {
         private Iterator iter;
         EnumerationFromIterator(Iterator iter) {
             this.iter = iter;

Modified: cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/environment/wrapper/RequestWrapper.java
Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/environment/wrapper/RequestWrapper.java?view=diff&rev=124685&p1=cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/environment/wrapper/RequestWrapper.java&r1=124684&p2=cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/environment/wrapper/RequestWrapper.java&r2=124685
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/environment/wrapper/RequestWrapper.java	(original)
+++ cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/environment/wrapper/RequestWrapper.java	Sat Jan  8 14:20:56 2005
@@ -35,7 +35,7 @@
  * are different.
  *
  * @author <a href="mailto:cziegeler@apache.org">Carsten Ziegeler</a>
- * @version CVS $Id: RequestWrapper.java,v 1.7 2004/03/11 14:21:56 cziegeler Exp $
+ * @version CVS $Id$
  */
 public final class RequestWrapper implements Request {
 
@@ -144,7 +144,7 @@
         }
     }
 
-    final class EnumerationFromIterator implements Enumeration {
+    static final class EnumerationFromIterator implements Enumeration {
         private Iterator iter;
         EnumerationFromIterator(Iterator iter) {
             this.iter = iter;

Modified: cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/generation/JXTemplateGenerator.java
Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/generation/JXTemplateGenerator.java?view=diff&rev=124685&p1=cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/generation/JXTemplateGenerator.java&r1=124684&p2=cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/generation/JXTemplateGenerator.java&r2=124685
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/generation/JXTemplateGenerator.java	(original)
+++ cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/generation/JXTemplateGenerator.java	Sat Jan  8 14:20:56 2005
@@ -190,7 +190,7 @@
      * Facade to the Locator to be set on the consumer prior to
      * sending other events, location member changeable
      */
-    public class LocatorFacade implements Locator {
+    public static class LocatorFacade implements Locator {
         private Locator locator;
 
         public LocatorFacade(Locator initialLocator) {

Modified: cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/generation/LinkStatusGenerator.java
Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/generation/LinkStatusGenerator.java?view=diff&rev=124685&p1=cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/generation/LinkStatusGenerator.java&r1=124684&p2=cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/generation/LinkStatusGenerator.java&r2=124685
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/generation/LinkStatusGenerator.java	(original)
+++ cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/generation/LinkStatusGenerator.java	Sat Jan  8 14:20:56 2005
@@ -187,7 +187,7 @@
     /**
      * Stores links to process and the referrer links
      */
-    private class Link {
+    private static class Link {
         private URL url;
         private String referrer;
 

Modified: cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/sitemap/ContentAggregator.java
Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/sitemap/ContentAggregator.java?view=diff&rev=124685&p1=cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/sitemap/ContentAggregator.java&r1=124684&p2=cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/sitemap/ContentAggregator.java&r2=124685
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/sitemap/ContentAggregator.java	(original)
+++ cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/sitemap/ContentAggregator.java	Sat Jan  8 14:20:56 2005
@@ -46,7 +46,7 @@
  *
  * @author <a href="mailto:giacomo@apache.org">Giacomo Pati</a>
  * @author <a href="mailto:cziegeler@apache.org">Carsten Ziegeler</a>
- * @version CVS $Id: ContentAggregator.java,v 1.7 2004/03/28 20:51:24 antonio Exp $
+ * @version CVS $Id$
  */
 public class ContentAggregator
 extends ContentHandlerWrapper
@@ -74,7 +74,7 @@
     protected ServiceManager manager;
     
     /** This object holds the part parts :) */
-    protected final class Part {
+    protected static final class Part {
         public String uri;
         public Element element;
         public Source source;
@@ -88,7 +88,7 @@
     }
 
     /** This object holds an element definition */
-    protected final class Element {
+    protected static final class Element {
         public String namespace;
         public String prefix;
         public String name;

Modified: cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/transformation/EncodeURLTransformer.java
Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/transformation/EncodeURLTransformer.java?view=diff&rev=124685&p1=cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/transformation/EncodeURLTransformer.java&r1=124684&p2=cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/transformation/EncodeURLTransformer.java&r2=124685
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/transformation/EncodeURLTransformer.java	(original)
+++ cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/transformation/EncodeURLTransformer.java	Sat Jan  8 14:20:56 2005
@@ -324,7 +324,7 @@
      * @author     <a href="mailto:bh22351@i-one.at">Bernhard Huber</a>
      * @version    CVS $Id$
      */
-    public class ElementAttributeMatching {
+    public static class ElementAttributeMatching {
         /**
          * Regular expression of including patterns
          *

Modified: cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/transformation/SimpleFormInstanceExtractionTransformer.java
Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/transformation/SimpleFormInstanceExtractionTransformer.java?view=diff&rev=124685&p1=cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/transformation/SimpleFormInstanceExtractionTransformer.java&r1=124684&p2=cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/transformation/SimpleFormInstanceExtractionTransformer.java&r2=124685
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/transformation/SimpleFormInstanceExtractionTransformer.java	(original)
+++ cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/transformation/SimpleFormInstanceExtractionTransformer.java	Sat Jan  8 14:20:56 2005
@@ -60,7 +60,7 @@
 public class SimpleFormInstanceExtractionTransformer extends AbstractExtractionTransformer 
     implements Configurable, Serviceable, Recyclable {
 
-    protected class ElementData {
+    protected static class ElementData {
         public String uri = null;
         public String loc = null;
         public String raw = null;

Modified: cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/transformation/SimpleFormTransformer.java
Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/transformation/SimpleFormTransformer.java?view=diff&rev=124685&p1=cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/transformation/SimpleFormTransformer.java&r1=124684&p2=cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/transformation/SimpleFormTransformer.java&r2=124685
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/transformation/SimpleFormTransformer.java	(original)
+++ cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/transformation/SimpleFormTransformer.java	Sat Jan  8 14:20:56 2005
@@ -279,7 +279,7 @@
     /**
      * Keep track of repeater status.
      */
-    protected class RepeaterStatus {
+    protected static class RepeaterStatus {
         public String var = null;
         public String expr = null;
         public int count = 0;

Modified: cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/transformation/helpers/DefaultIncludeCacheManager.java
Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/transformation/helpers/DefaultIncludeCacheManager.java?view=diff&rev=124685&p1=cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/transformation/helpers/DefaultIncludeCacheManager.java&r1=124684&p2=cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/transformation/helpers/DefaultIncludeCacheManager.java&r2=124685
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/transformation/helpers/DefaultIncludeCacheManager.java	(original)
+++ cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/transformation/helpers/DefaultIncludeCacheManager.java	Sat Jan  8 14:20:56 2005
@@ -457,7 +457,7 @@
         }
     }
 
-    final class PreemptiveBooter implements Runnable {
+    final static class PreemptiveBooter implements Runnable {
 
         private final String uri;
         

Modified: cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/util/PostInputStream.java
Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/util/PostInputStream.java?view=diff&rev=124685&p1=cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/util/PostInputStream.java&r1=124684&p2=cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/util/PostInputStream.java&r2=124685
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/util/PostInputStream.java	(original)
+++ cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/util/PostInputStream.java	Sat Jan  8 14:20:56 2005
@@ -22,7 +22,7 @@
  * It allows to control read operation, restricting the number of bytes read to the value returned by getContentLen() method.
  *
  * @author <a href="mailto:Kinga_Dziembowski@hp.com">Kinga Dziembowski</a>
- * @version CVS $Id: PostInputStream.java,v 1.3 2004/03/05 13:03:00 bdelacretaz Exp $
+ * @version CVS $Id$
  */
 
 public class PostInputStream extends InputStream {
@@ -92,13 +92,14 @@
         }
         init(input, len);
     }
+
     /**
     * Returns the underlying input stream.
     *
     * @return inputStream the underlying InputStream.
     */
-    public InputStream getInputStream() {
-        return( m_inputStream );
+    public synchronized InputStream getInputStream() {
+        return m_inputStream;
     }
 
     /**

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=124685&p1=cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/xml/dom/DOMStreamer.java&r1=124684&p2=cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/xml/dom/DOMStreamer.java&r2=124685
==============================================================================
--- 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	Sat Jan  8 14:20:56 2005
@@ -184,7 +184,7 @@
      * @author Bruno Dumon (bruno at outerthought dot org)
      * @author Xalan team
      */
-    public class NamespaceNormalizingDOMStreamer extends AbstractXMLProducer {
+    public static class NamespaceNormalizingDOMStreamer extends AbstractXMLProducer {
         /**
          * Information about the current element. Used to remember the localName, qName
          * and namespaceURI for generating the endElement event, and holds the namespaces
@@ -598,7 +598,7 @@
             }
         }
 
-        public class ElementInfo {
+        public static class ElementInfo {
             public String localName;
             public String namespaceURI;
             public String qName;
@@ -689,7 +689,7 @@
      * @author <a href="mailto:pier@apache.org">Pierpaolo Fumagalli</a>
      *         (Apache Software Foundation)
      */
-    public class DefaultDOMStreamer extends AbstractXMLProducer {
+    public static class DefaultDOMStreamer extends AbstractXMLProducer {
 
         /** The private transformer for this instance */
         protected Transformer transformer;

Mime
View raw message