cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From blorit...@locus.apache.org
Subject cvs commit: xml-cocoon/src/org/apache/cocoon/xml/xlink XLinkHandler.java
Date Mon, 11 Dec 2000 16:07:06 GMT
bloritsch    00/12/11 08:07:05

  Modified:    lib      Tag: xml-cocoon2 avalonapi.jar
               src/org/apache/cocoon Tag: xml-cocoon2 CodeFactory.java
                        ComponentFactory.java Notificable.java
                        Processor.java
               src/org/apache/cocoon/components/classloader Tag:
                        xml-cocoon2 ClassLoaderManager.java
                        RepositoryClassLoader.java
               src/org/apache/cocoon/components/language/generator Tag:
                        xml-cocoon2 ProgramGenerator.java
               src/org/apache/cocoon/components/language/markup Tag:
                        xml-cocoon2 MarkupCodeGenerator.java
                        MarkupLanguage.java
               src/org/apache/cocoon/components/language/programming Tag:
                        xml-cocoon2 CodeFormatter.java
                        ProgrammingLanguage.java
               src/org/apache/cocoon/components/parser Tag: xml-cocoon2
                        Parser.java
               src/org/apache/cocoon/components/store Tag: xml-cocoon2
                        Store.java
               src/org/apache/cocoon/environment Tag: xml-cocoon2
                        Environment.java
               src/org/apache/cocoon/generation Tag: xml-cocoon2
                        Generator.java
               src/org/apache/cocoon/matching Tag: xml-cocoon2 Matcher.java
               src/org/apache/cocoon/reading Tag: xml-cocoon2 Reader.java
               src/org/apache/cocoon/selection Tag: xml-cocoon2
                        Selector.java
               src/org/apache/cocoon/sitemap Tag: xml-cocoon2 Sitemap.java
                        SitemapModelComponent.java
                        SitemapOutputComponent.java
               src/org/apache/cocoon/xml Tag: xml-cocoon2
                        NamespacesTable.java XMLProducer.java
               src/org/apache/cocoon/xml/dom Tag: xml-cocoon2
                        DOMBuilder.java DOMFactory.java
               src/org/apache/cocoon/xml/xlink Tag: xml-cocoon2
                        XLinkHandler.java
  Log:
  Updated AvalonApi, removed all "public" scopes from interfaces--it is semantically
  incorrect.  Fixed SecurityException reporting in RepositoryClassLoader.
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.8   +372 -253  xml-cocoon/lib/Attic/avalonapi.jar
  
  	<<Binary file>>
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.4   +23 -23    xml-cocoon/src/org/apache/cocoon/Attic/CodeFactory.java
  
  Index: CodeFactory.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/Attic/CodeFactory.java,v
  retrieving revision 1.1.2.3
  retrieving revision 1.1.2.4
  diff -u -r1.1.2.3 -r1.1.2.4
  --- CodeFactory.java	2000/10/30 23:02:43	1.1.2.3
  +++ CodeFactory.java	2000/12/11 16:06:26	1.1.2.4
  @@ -1,37 +1,37 @@
  -/***************************************************************************** 
  - * Copyright (C) The Apache Software Foundation. All rights reserved.        * 
  - * ------------------------------------------------------------------------- * 
  - * This software is published under the terms of the Apache Software License * 
  - * version 1.1, a copy of which has been included  with this distribution in * 
  - * the LICENSE file.                                                         * 
  - *****************************************************************************/ 
  - 
  -package org.apache.cocoon; 
  +/*****************************************************************************
  + * Copyright (C) The Apache Software Foundation. All rights reserved.        *
  + * ------------------------------------------------------------------------- *
  + * This software is published under the terms of the Apache Software License *
  + * version 1.1, a copy of which has been included  with this distribution in *
  + * the LICENSE file.                                                         *
  + *****************************************************************************/
   
  +package org.apache.cocoon;
  +
   import org.apache.avalon.ConfigurationException;
   
   import org.w3c.dom.traversal.NodeIterator;
  - 
  -/** 
  - * Interface a class has to implement that produces java source code 
  - * representing logic for class methods. The 
  - * returned source code will be directly integrated into a method of the 
  - * generated sitemap code. 
  - * This <code>CodeFactory</code>s generate method will be called during 
  +
  +/**
  + * Interface a class has to implement that produces java source code
  + * representing logic for class methods. The
  + * returned source code will be directly integrated into a method of the
  + * generated sitemap code.
  + * This <code>CodeFactory</code>s generate method will be called during
    * sitemap code generation.
  - * 
  - * @author <a href="mailto:stefano@apache.org">Stefano Mazzocchi</a> 
  + *
  + * @author <a href="mailto:stefano@apache.org">Stefano Mazzocchi</a>
    * @author <a href="mailto:bloritsch@apache.org">Berin Loritsch</a>
  - * @version CVS $Revision: 1.1.2.3 $ $Date: 2000/10/30 23:02:43 $ 
  - */ 
  + * @version CVS $Revision: 1.1.2.4 $ $Date: 2000/12/11 16:06:26 $
  + */
   
   public interface CodeFactory {
  -    public String generateParameterSource (NodeIterator conf)
  +    String generateParameterSource (NodeIterator conf)
       throws ConfigurationException;
   
  -    public String generateClassSource (String prefix, String test, NodeIterator conf)
  +    String generateClassSource (String prefix, String test, NodeIterator conf)
       throws ConfigurationException;
   
  -    public String generateMethodSource (NodeIterator conf)
  +    String generateMethodSource (NodeIterator conf)
       throws ConfigurationException;
   }
  
  
  
  1.1.2.5   +42 -42    xml-cocoon/src/org/apache/cocoon/Attic/ComponentFactory.java
  
  Index: ComponentFactory.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/Attic/ComponentFactory.java,v
  retrieving revision 1.1.2.4
  retrieving revision 1.1.2.5
  diff -u -r1.1.2.4 -r1.1.2.5
  --- ComponentFactory.java	2000/12/02 13:40:05	1.1.2.4
  +++ ComponentFactory.java	2000/12/11 16:06:26	1.1.2.5
  @@ -22,54 +22,54 @@
   
   /** Factory for Cocoon components.
    * @author <a href="mailto:paul@luminas.co.uk">Paul Russell</a>
  - * @version CVS $Revision: 1.1.2.4 $ $Date: 2000/12/02 13:40:05 $
  + * @version CVS $Revision: 1.1.2.5 $ $Date: 2000/12/11 16:06:26 $
    */
   public class ComponentFactory implements ObjectFactory, ThreadSafe {
       private Logger log = LogKit.getLoggerFor("cocoon");
  -	
  -	/** The class which this <code>ComponentFactory</code>
  -	 * should create.
  -	 */
  -	private Class componentClass;
  -
  -	/** The configuration for this component.
  -	 */
  -	private Configuration conf;
  -
  -	/** The component manager for this component.
  -	 */
  -	private ComponentManager manager;
  -
  -	/** Construct a new component factory for the specified component.
  -	 * @param componentClass the class to instantiate (must have a default constructor).
  -	 * @param config the <code>Configuration</code> object to pass to new instances.
  -	 * @param manager the component manager to pass to <code>Composer</code>s.
  -	 */
  -	public ComponentFactory(Class componentClass, Configuration config, ComponentManager manager) {
  -		this.componentClass = componentClass;
  -		this.conf = config;
  -		this.manager = manager;
  -	}
   
  -	public Poolable newInstance() throws Exception {
  -		Poolable comp = (Poolable)componentClass.newInstance();
  +    /** The class which this <code>ComponentFactory</code>
  +     * should create.
  +     */
  +    private Class componentClass;
  +
  +    /** The configuration for this component.
  +     */
  +    private Configuration conf;
  +
  +    /** The component manager for this component.
  +     */
  +    private ComponentManager manager;
  +
  +    /** Construct a new component factory for the specified component.
  +     * @param componentClass the class to instantiate (must have a default constructor).
  +     * @param config the <code>Configuration</code> object to pass to new instances.
  +     * @param manager the component manager to pass to <code>Composer</code>s.
  +     */
  +    public ComponentFactory(Class componentClass, Configuration config, ComponentManager manager) {
  +        this.componentClass = componentClass;
  +        this.conf = config;
  +        this.manager = manager;
  +    }
   
  +    public Poolable newInstance() throws Exception {
  +        Poolable comp = (Poolable)componentClass.newInstance();
  +
           log.debug("ComponentFactory creating new instance of "
               + componentClass.getName() + "."
           );
  -		
  -		if ( comp instanceof Configurable ) {
  -			((Configurable)comp).configure(this.conf);
  -		}
  -
  -		if ( comp instanceof Composer) {
  -			((Composer)comp).compose(this.manager);
  -		}
  -
  -		return comp;
  -	}
  -	
  -	public Class getCreatedClass() {
  -		return componentClass;
  -	}
  +
  +        if ( comp instanceof Configurable ) {
  +            ((Configurable)comp).configure(this.conf);
  +        }
  +
  +        if ( comp instanceof Composer) {
  +            ((Composer)comp).compose(this.manager);
  +        }
  +
  +        return comp;
  +    }
  +
  +    public final Class getCreatedClass() {
  +        return componentClass;
  +    }
   }
  
  
  
  1.1.2.2   +7 -7      xml-cocoon/src/org/apache/cocoon/Attic/Notificable.java
  
  Index: Notificable.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/Attic/Notificable.java,v
  retrieving revision 1.1.2.1
  retrieving revision 1.1.2.2
  diff -u -r1.1.2.1 -r1.1.2.2
  --- Notificable.java	2000/08/31 15:59:52	1.1.2.1
  +++ Notificable.java	2000/12/11 16:06:27	1.1.2.2
  @@ -22,35 +22,35 @@
       /**
        *  Gets the Type attribute of the Notificable object
        */
  -    public String getType();
  +    String getType();
   
       /**
        *  Gets the Title attribute of the Notificable object
        */
  -    public String getTitle();
  +    String getTitle();
   
       /**
        *  Gets the Source attribute of the Notificable object
        */
  -    public String getSource();
  +    String getSource();
   
       /**
        *  Gets the Sender attribute of the Notificable object
        */
  -    public String getSender();
  +    String getSender();
   
       /**
        *  Gets the Message attribute of the Notificable object
        */
  -    public String getMessage();
  +    String getMessage();
   
       /**
        *  Gets the Description attribute of the Notificable object
        */
  -    public String getDescription();
  +    String getDescription();
   
       /**
        *  Gets the ExtraDescriptions attribute of the Notificable object
        */
  -    public HashMap getExtraDescriptions();
  +    HashMap getExtraDescriptions();
   }
  
  
  
  1.1.2.7   +2 -2      xml-cocoon/src/org/apache/cocoon/Attic/Processor.java
  
  Index: Processor.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/Attic/Processor.java,v
  retrieving revision 1.1.2.6
  retrieving revision 1.1.2.7
  diff -u -r1.1.2.6 -r1.1.2.7
  --- Processor.java	2000/08/04 21:11:04	1.1.2.6
  +++ Processor.java	2000/12/11 16:06:27	1.1.2.7
  @@ -18,12 +18,12 @@
    *
    * @author <a href="mailto:fumagalli@exoffice.com">Pierpaolo Fumagalli</a>
    *         (Apache Software Foundation, Exoffice Technologies)
  - * @version CVS $Revision: 1.1.2.6 $ $Date: 2000/08/04 21:11:04 $
  + * @version CVS $Revision: 1.1.2.7 $ $Date: 2000/12/11 16:06:27 $
    */
   public interface Processor {
       /**
        * Process the given <code>Environment</code> producing the output
        */
  -    public boolean process(Environment environment)
  +    boolean process(Environment environment)
       throws Exception;
   }
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.6   +21 -21    xml-cocoon/src/org/apache/cocoon/components/classloader/Attic/ClassLoaderManager.java
  
  Index: ClassLoaderManager.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/components/classloader/Attic/ClassLoaderManager.java,v
  retrieving revision 1.1.2.5
  retrieving revision 1.1.2.6
  diff -u -r1.1.2.5 -r1.1.2.6
  --- ClassLoaderManager.java	2000/12/07 17:10:34	1.1.2.5
  +++ ClassLoaderManager.java	2000/12/11 16:06:30	1.1.2.6
  @@ -19,29 +19,29 @@
    * that it can be safely reinstantiated for dynamic class reloading
    *
    * @author <a href="mailto:ricardo@apache.org">Ricardo Rocha</a>
  - * @version CVS $Revision: 1.1.2.5 $ $Date: 2000/12/07 17:10:34 $
  + * @version CVS $Revision: 1.1.2.6 $ $Date: 2000/12/11 16:06:30 $
    */
   public interface ClassLoaderManager extends Component {
  -  /**
  -   * Add a directory to the proxied class loader
  -   *
  -   * @param directoryName The repository name
  -   * @exception IOException If the directory is invalid
  -   */
  -  public void addDirectory(File directoryName) throws IOException;
  +    /**
  +    * Add a directory to the proxied class loader
  +    *
  +    * @param directoryName The repository name
  +    * @exception IOException If the directory is invalid
  +    */
  +    void addDirectory(File directoryName) throws IOException;
   
  -  /**
  -   * Load a class through the proxied class loader
  -   *
  -   * @param className The name of the class to be loaded
  -   * @return The loaded class
  -   * @exception ClassNotFoundException If the class is not found
  -   */
  -  public Class loadClass(String className) throws ClassNotFoundException;
  +    /**
  +    * Load a class through the proxied class loader
  +    *
  +    * @param className The name of the class to be loaded
  +    * @return The loaded class
  +    * @exception ClassNotFoundException If the class is not found
  +    */
  +    Class loadClass(String className) throws ClassNotFoundException;
   
  -  /**
  -   * Reinstantiate the proxied class loader to allow for class reloading
  -   *
  -   */
  -  public void reinstantiate();
  +    /**
  +    * Reinstantiate the proxied class loader to allow for class reloading
  +    *
  +    */
  +    void reinstantiate();
   }
  
  
  
  1.1.2.9   +19 -15    xml-cocoon/src/org/apache/cocoon/components/classloader/Attic/RepositoryClassLoader.java
  
  Index: RepositoryClassLoader.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/components/classloader/Attic/RepositoryClassLoader.java,v
  retrieving revision 1.1.2.8
  retrieving revision 1.1.2.9
  diff -u -r1.1.2.8 -r1.1.2.9
  --- RepositoryClassLoader.java	2000/12/11 15:05:49	1.1.2.8
  +++ RepositoryClassLoader.java	2000/12/11 16:06:30	1.1.2.9
  @@ -24,7 +24,7 @@
    * A class loader with a growable list of path search directories
    *
    * @author <a href="mailto:ricardo@apache.org">Ricardo Rocha</a>
  - * @version CVS $Revision: 1.1.2.8 $ $Date: 2000/12/11 15:05:49 $
  + * @version CVS $Revision: 1.1.2.9 $ $Date: 2000/12/11 16:06:30 $
    */
   class RepositoryClassLoader extends ClassLoader {
     /**
  @@ -64,6 +64,10 @@
     public void addDirectory(File repository) throws IOException {
       String fullFilename = null;
   
  +    if (repository == null) {
  +        throw new IOException("You cannot add a null directory");
  +    }
  +
       // Ensure the same directory isn't specified twice
       try {
           int count = this.repositories.size();
  @@ -75,24 +79,24 @@
                   return;
               }
           }
  -    } catch (SecurityException se) {
  -        log.debug("RepositoryClassLoader:SecurityException", se);
  -        throw new IOException("Cannot access directory" + fullFilename);
  -    }
   
  -    if (!repository.exists()) {
  -      throw new IOException("Non-existent: " + fullFilename);
  -    }
  +        if (!repository.exists()) {
  +          throw new IOException("Non-existent: " + fullFilename);
  +        }
   
  -    if (!repository.isDirectory()) {
  -      throw new IOException("Not a directory: " + fullFilename);
  -    }
  +        if (!repository.isDirectory()) {
  +          throw new IOException("Not a directory: " + fullFilename);
  +        }
   
  -    if (!(repository.canRead() && repository.canWrite())) {
  -      throw new IOException("Not readable/writable: " + fullFilename);
  -    }
  +        if (!(repository.canRead() && repository.canWrite())) {
  +          throw new IOException("Not readable/writable: " + fullFilename);
  +        }
   
  -    this.repositories.addElement(repository);
  +        this.repositories.addElement(repository);
  +    } catch (SecurityException se) {
  +        log.debug("RepositoryClassLoader:SecurityException", se);
  +        throw new IOException("Cannot access directory" + fullFilename);
  +    }
     }
   
     /**
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.7   +2 -2      xml-cocoon/src/org/apache/cocoon/components/language/generator/Attic/ProgramGenerator.java
  
  Index: ProgramGenerator.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/components/language/generator/Attic/ProgramGenerator.java,v
  retrieving revision 1.1.2.6
  retrieving revision 1.1.2.7
  diff -u -r1.1.2.6 -r1.1.2.7
  --- ProgramGenerator.java	2000/08/04 21:11:08	1.1.2.6
  +++ ProgramGenerator.java	2000/12/11 16:06:37	1.1.2.7
  @@ -17,7 +17,7 @@
    * documents writeen in a <code>MarkupLanguage</code>
    *
    * @author <a href="mailto:ricardo@apache.org">Ricardo Rocha</a>
  - * @version CVS $Revision: 1.1.2.6 $ $Date: 2000/08/04 21:11:08 $
  + * @version CVS $Revision: 1.1.2.7 $ $Date: 2000/12/11 16:06:37 $
    */
   public interface ProgramGenerator extends Component {
     /**
  @@ -32,7 +32,7 @@
      * @return The loaded object
      * @exception Exception If an error occurs during generation or loading
      */
  -  public Object load(
  +  Object load(
       File file, String markupLanguage, String programmingLanguage,
       EntityResolver resolver
     ) throws Exception;
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.5   +2 -2      xml-cocoon/src/org/apache/cocoon/components/language/markup/Attic/MarkupCodeGenerator.java
  
  Index: MarkupCodeGenerator.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/components/language/markup/Attic/MarkupCodeGenerator.java,v
  retrieving revision 1.1.2.4
  retrieving revision 1.1.2.5
  diff -u -r1.1.2.4 -r1.1.2.5
  --- MarkupCodeGenerator.java	2000/10/12 16:43:16	1.1.2.4
  +++ MarkupCodeGenerator.java	2000/12/11 16:06:39	1.1.2.5
  @@ -14,7 +14,7 @@
    * This interfaces defines the functionality of a source code generator
    *
    * @author <a href="mailto:ricardo@apache.org">Ricardo Rocha</a>
  - * @version CVS $Revision: 1.1.2.4 $ $Date: 2000/10/12 16:43:16 $
  + * @version CVS $Revision: 1.1.2.5 $ $Date: 2000/12/11 16:06:39 $
    */
   public interface MarkupCodeGenerator {
       /**
  @@ -27,6 +27,6 @@
       * @return The generated source code
       * @exception Exception If an error occurs during code generation
       */
  -    public String generateCode(XMLReader reader, InputSource input, String filename)
  +    String generateCode(XMLReader reader, InputSource input, String filename)
           throws Exception;
   }
  
  
  
  1.1.2.8   +3 -3      xml-cocoon/src/org/apache/cocoon/components/language/markup/Attic/MarkupLanguage.java
  
  Index: MarkupLanguage.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/components/language/markup/Attic/MarkupLanguage.java,v
  retrieving revision 1.1.2.7
  retrieving revision 1.1.2.8
  diff -u -r1.1.2.7 -r1.1.2.8
  --- MarkupLanguage.java	2000/10/19 14:43:17	1.1.2.7
  +++ MarkupLanguage.java	2000/12/11 16:06:41	1.1.2.8
  @@ -22,7 +22,7 @@
    * document augmenting it with dynamic content
    *
    * @author <a href="mailto:ricardo@apache.org">Ricardo Rocha</a>
  - * @version CVS $Revision: 1.1.2.7 $ $Date: 2000/10/19 14:43:17 $
  + * @version CVS $Revision: 1.1.2.8 $ $Date: 2000/12/11 16:06:41 $
    */
   public interface MarkupLanguage extends Component {
       /**
  @@ -32,7 +32,7 @@
       *
       * @return The input document's encoding
       */
  -    public String getEncoding();
  +    String getEncoding();
   
       /**
       * Generate source code from the input source for the target
  @@ -44,7 +44,7 @@
       * @return The generated source code
       * @exception Exception If an error occurs during code generation
       */
  -    public String generateCode(
  +    String generateCode(
           InputSource input, String filename,
           ProgrammingLanguage programmingLanguage,
           EntityResolver resolver
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.4   +3 -3      xml-cocoon/src/org/apache/cocoon/components/language/programming/Attic/CodeFormatter.java
  
  Index: CodeFormatter.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/components/language/programming/Attic/CodeFormatter.java,v
  retrieving revision 1.1.2.3
  retrieving revision 1.1.2.4
  diff -u -r1.1.2.3 -r1.1.2.4
  --- CodeFormatter.java	2000/07/29 18:30:30	1.1.2.3
  +++ CodeFormatter.java	2000/12/11 16:06:42	1.1.2.4
  @@ -11,16 +11,16 @@
    * This interface defines source beautifying formatting
    *
    * @author <a href="mailto:ricardo@apache.org">Ricardo Rocha</a>
  - * @version CVS $Revision: 1.1.2.3 $ $Date: 2000/07/29 18:30:30 $
  + * @version CVS $Revision: 1.1.2.4 $ $Date: 2000/12/11 16:06:42 $
    */
   public interface CodeFormatter {
     /**
  -   * Format and beautify a <code>String</code> containing source code 
  +   * Format and beautify a <code>String</code> containing source code
      *
      * @param code The input source code
      * @param encoding The encoding used for constant strings embedded in the
      * source code
      * @return The formatted source code
      */
  -  public String format(String code, String encoding);
  +  String format(String code, String encoding);
   }
  
  
  
  1.1.2.7   +9 -9      xml-cocoon/src/org/apache/cocoon/components/language/programming/Attic/ProgrammingLanguage.java
  
  Index: ProgrammingLanguage.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/components/language/programming/Attic/ProgrammingLanguage.java,v
  retrieving revision 1.1.2.6
  retrieving revision 1.1.2.7
  diff -u -r1.1.2.6 -r1.1.2.7
  --- ProgrammingLanguage.java	2000/12/07 17:10:49	1.1.2.6
  +++ ProgrammingLanguage.java	2000/12/11 16:06:43	1.1.2.7
  @@ -17,7 +17,7 @@
    * This interface states the functionality of a programming language processor
    *
    * @author <a href="mailto:ricardo@apache.org">Ricardo Rocha</a>
  - * @version CVS $Revision: 1.1.2.6 $ $Date: 2000/12/07 17:10:49 $
  + * @version CVS $Revision: 1.1.2.7 $ $Date: 2000/12/11 16:06:43 $
    */
   public interface ProgrammingLanguage extends Component {
     /**
  @@ -25,7 +25,7 @@
      *
      * @return The canonical source file extension
      */
  -  public String getSourceExtension();
  +  String getSourceExtension();
   
     /**
      * Load a program from a file
  @@ -37,7 +37,7 @@
      * @return The loaded program
      * @exception LanguageException If an error occurs during loading
      */
  -  public Object load(String filename, File baseDirectory, String encoding)
  +  Object load(String filename, File baseDirectory, String encoding)
       throws LanguageException;
   
     /**
  @@ -47,7 +47,7 @@
      * @return A new program type instance
      * @exception LanguageException If an instantiation error occurs
      */
  -  public Object instantiate(Object program) throws LanguageException;
  +  Object instantiate(Object program) throws LanguageException;
   
     /**
      * Unload from memory and invalidate a given program
  @@ -57,7 +57,7 @@
      * @param baseDirectory The directory containing the program file
      * @exception LanguageException If an error occurs
      */
  -  public void unload (Object program, String filename, File baseDirectory)
  +  void unload (Object program, String filename, File baseDirectory)
       throws LanguageException;
   
     /**
  @@ -67,7 +67,7 @@
      * @return The code formatter object or <code>null</code> if none is
      * available
      */
  -  public CodeFormatter getCodeFormatter();
  +  CodeFormatter getCodeFormatter();
   
     /**
      * Escape a <code>String</code> according to the programming language's
  @@ -76,19 +76,19 @@
      * @param constant The string to be escaped
      * @return The escaped string
      */
  -  public String quoteString(String constant);
  +  String quoteString(String constant);
   
     /**
      * Set Language Name
      *
      * @param name The name of the language
      */
  -  public void setLanguageName(String name);
  +  void setLanguageName(String name);
   
     /**
      * Get Language Name
      *
      * @return The name of the language
      */
  -  public String getLanguageName();
  +  String getLanguageName();
   }
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.11  +2 -2      xml-cocoon/src/org/apache/cocoon/components/parser/Attic/Parser.java
  
  Index: Parser.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/components/parser/Attic/Parser.java,v
  retrieving revision 1.1.2.10
  retrieving revision 1.1.2.11
  diff -u -r1.1.2.10 -r1.1.2.11
  --- Parser.java	2000/11/30 21:41:29	1.1.2.10
  +++ Parser.java	2000/12/11 16:06:44	1.1.2.11
  @@ -18,9 +18,9 @@
    *
    * @author <a href="mailto:fumagalli@exoffice.com">Pierpaolo Fumagalli</a>
    *         (Apache Software Foundation, Exoffice Technologies)
  - * @version CVS $Revision: 1.1.2.10 $ $Date: 2000/11/30 21:41:29 $
  + * @version CVS $Revision: 1.1.2.11 $ $Date: 2000/12/11 16:06:44 $
    */
   public interface Parser extends Component, XMLProducer, DOMFactory {
   
  -    public void parse(InputSource in) throws SAXException, IOException;
  +    void parse(InputSource in) throws SAXException, IOException;
   }
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.7   +14 -14    xml-cocoon/src/org/apache/cocoon/components/store/Attic/Store.java
  
  Index: Store.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/components/store/Attic/Store.java,v
  retrieving revision 1.1.2.6
  retrieving revision 1.1.2.7
  diff -u -r1.1.2.6 -r1.1.2.7
  --- Store.java	2000/07/29 18:30:33	1.1.2.6
  +++ Store.java	2000/12/11 16:06:46	1.1.2.7
  @@ -18,42 +18,42 @@
    *         (Apache Software Foundation)
    * @author <a href="mailto:fumagalli@exoffice.com">Pierpaolo Fumagalli</a>
    *         (Apache Software Foundation, Exoffice Technologies)
  - * @version CVS $Revision: 1.1.2.6 $ $Date: 2000/07/29 18:30:33 $
  + * @version CVS $Revision: 1.1.2.7 $ $Date: 2000/12/11 16:06:46 $
    */
   public interface Store extends Component {
   
       /**
        * Get the object associated to the given unique key.
        */
  -    public Object get(Object key);
  -    
  +    Object get(Object key);
  +
       /**
        * Store the given object in a persistent state. It is up to the
        * caller to ensure that the key has a persistent state across
        * different JVM executions.
  -     */ 
  -    public void store(Object key, Object value);
  +     */
  +    void store(Object key, Object value);
   
       /**
        * Holds the given object in a volatile state. This means
        * the object store will discard held objects if the
        * virtual machine is restarted or some error happens.
  -     */ 
  -    public void hold(Object key, Object value);
  -    
  +     */
  +    void hold(Object key, Object value);
  +
       /**
        * Remove the object associated to the given key.
        */
  -    public void remove(Object key);
  -    
  +    void remove(Object key);
  +
       /**
        * Indicates if the given key is associated to a contained object.
        */
  -    public boolean containsKey(Object key);
  -    
  +    boolean containsKey(Object key);
  +
       /**
        * Returns the list of used keys as an Enumeration of Objects.
        */
  -    public Enumeration keys();
  -    
  +    Enumeration keys();
  +
   }
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.12  +9 -9      xml-cocoon/src/org/apache/cocoon/environment/Attic/Environment.java
  
  Index: Environment.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/environment/Attic/Environment.java,v
  retrieving revision 1.1.2.11
  retrieving revision 1.1.2.12
  diff -u -r1.1.2.11 -r1.1.2.12
  --- Environment.java	2000/09/02 21:12:35	1.1.2.11
  +++ Environment.java	2000/12/11 16:06:47	1.1.2.12
  @@ -20,7 +20,7 @@
    * Base interface for an environment abstraction
    *
    * @author <a href="mailto:Giacomo.Pati@pwr.ch">Giacomo Pati</a>
  - * @version CVS $Revision: 1.1.2.11 $ $Date: 2000/09/02 21:12:35 $
  + * @version CVS $Revision: 1.1.2.12 $ $Date: 2000/12/11 16:06:47 $
    */
   
   public interface Environment extends EntityResolver {
  @@ -28,42 +28,42 @@
       /**
        * Get the URI to process
        */
  -    public String getUri();
  +    String getUri();
   
       /**
        * Get the view to process
        */
  -    public String getView();
  +    String getView();
   
       /**
        * Change the context from uriprefix to context
        */
  -    public void changeContext(String uriprefix, String context) throws MalformedURLException;
  +    void changeContext(String uriprefix, String context) throws MalformedURLException;
   
       /**
        * Redirect to the given URL
        */
  -    public void redirect(String url) throws IOException;
  +    void redirect(String url) throws IOException;
   
       /**
        * Set the content type of the generated resource
        */
  -    public void setContentType(String mimeType);
  +    void setContentType(String mimeType);
   
       /**
        * Set the response status code
        */
  -    public void setStatus(int statusCode); 
  +    void setStatus(int statusCode);
   
       /**
        * Get the output stream where to write the generated resource.
        */
  -    public OutputStream getOutputStream() throws IOException;
  +    OutputStream getOutputStream() throws IOException;
   
       /**
        * Get the underlying object model
        */
  -    public Map getObjectModel();
  +    Map getObjectModel();
   
   }
   
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.5   +2 -2      xml-cocoon/src/org/apache/cocoon/generation/Attic/Generator.java
  
  Index: Generator.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/generation/Attic/Generator.java,v
  retrieving revision 1.1.2.4
  retrieving revision 1.1.2.5
  diff -u -r1.1.2.4 -r1.1.2.5
  --- Generator.java	2000/08/04 21:11:44	1.1.2.4
  +++ Generator.java	2000/12/11 16:06:49	1.1.2.5
  @@ -19,10 +19,10 @@
    *
    * @author <a href="mailto:fumagalli@exoffice.com">Pierpaolo Fumagalli</a>
    *         (Apache Software Foundation, Exoffice Technologies)
  - * @version CVS $Revision: 1.1.2.4 $ $Date: 2000/08/04 21:11:44 $
  + * @version CVS $Revision: 1.1.2.5 $ $Date: 2000/12/11 16:06:49 $
    */
   public interface Generator extends XMLProducer, SitemapModelComponent {
   
  -    public void generate()
  +    void generate()
       throws IOException, SAXException, ProcessingException;
   }
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.8   +5 -5      xml-cocoon/src/org/apache/cocoon/matching/Attic/Matcher.java
  
  Index: Matcher.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/matching/Attic/Matcher.java,v
  retrieving revision 1.1.2.7
  retrieving revision 1.1.2.8
  diff -u -r1.1.2.7 -r1.1.2.8
  --- Matcher.java	2000/09/02 21:12:37	1.1.2.7
  +++ Matcher.java	2000/12/11 16:06:51	1.1.2.8
  @@ -15,25 +15,25 @@
   /**
    *
    * @author <a href="mailto:Giacomo.Pati@pwr.ch">Giacomo Pati</a>
  - * @version CVS $Revision: 1.1.2.7 $ $Date: 2000/09/02 21:12:37 $
  + * @version CVS $Revision: 1.1.2.8 $ $Date: 2000/12/11 16:06:51 $
    */
   public interface Matcher extends Component {
       /**
        * Matches the pattern against some <code>Request</code> values
        * and returns a <code>Map</code> object with replacements
  -     * for wildcards contained in the pattern. 
  +     * for wildcards contained in the pattern.
        * @param pattern     The pattern to match against. Depending on the
        *                    implementation the pattern can contain wildcards
        *                    or regular expressions.
  -     * @param objectModel The <code>Map</code> with object of the 
  +     * @param objectModel The <code>Map</code> with object of the
        *                    calling environment which can be used
        *                    to select values this matchers matches against.
        * @return Map        The returned <code>Map</code> object with
  -     *                    replacements for wildcards/regular-expressions 
  +     *                    replacements for wildcards/regular-expressions
        *                    contained in the pattern.
        *                    If the return value is null there was no match.
        */
  -    public List match (String pattern, Map objectModel);
  +    List match (String pattern, Map objectModel);
   }
   
   
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.4   +2 -2      xml-cocoon/src/org/apache/cocoon/reading/Attic/Reader.java
  
  Index: Reader.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/reading/Attic/Reader.java,v
  retrieving revision 1.1.2.3
  retrieving revision 1.1.2.4
  diff -u -r1.1.2.3 -r1.1.2.4
  --- Reader.java	2000/08/04 21:11:56	1.1.2.3
  +++ Reader.java	2000/12/11 16:06:52	1.1.2.4
  @@ -18,10 +18,10 @@
   /**
    *
    * @author <a href="mailto:Giacomo.Pati@pwr.ch">Giacomo Pati</a>
  - * @version CVS $Revision: 1.1.2.3 $ $Date: 2000/08/04 21:11:56 $
  + * @version CVS $Revision: 1.1.2.4 $ $Date: 2000/12/11 16:06:52 $
    */
   public interface Reader extends SitemapModelComponent, SitemapOutputComponent {
   
  -    public void generate()
  +    void generate()
       throws IOException, SAXException, ProcessingException;
   }
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.7   +3 -3      xml-cocoon/src/org/apache/cocoon/selection/Attic/Selector.java
  
  Index: Selector.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/selection/Attic/Selector.java,v
  retrieving revision 1.1.2.6
  retrieving revision 1.1.2.7
  diff -u -r1.1.2.6 -r1.1.2.7
  --- Selector.java	2000/09/02 21:12:39	1.1.2.6
  +++ Selector.java	2000/12/11 16:06:54	1.1.2.7
  @@ -14,19 +14,19 @@
   /**
    *
    * @author <a href="mailto:Giacomo.Pati@pwr.ch">Giacomo Pati</a>
  - * @version CVS $Revision: 1.1.2.6 $ $Date: 2000/09/02 21:12:39 $
  + * @version CVS $Revision: 1.1.2.7 $ $Date: 2000/12/11 16:06:54 $
    */
   public interface Selector extends Component {
       /**
        * Selectors test pattern against some objects in a <code>Map</code>
        * model and signals success with the returned boolean value
        * @param expression  The expression to test.
  -     * @param objectModel The <code>Map</code> containing object of the 
  +     * @param objectModel The <code>Map</code> containing object of the
        *                    calling environment which may be used
        *                    to select values to test the expression.
        * @return boolean    Signals successfull test.
        */
  -    public boolean select (String expression, Map objectModel);
  +    boolean select (String expression, Map objectModel);
   }
   
   
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.1.4.11  +6 -6      xml-cocoon/src/org/apache/cocoon/sitemap/Attic/Sitemap.java
  
  Index: Sitemap.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/sitemap/Attic/Sitemap.java,v
  retrieving revision 1.1.4.10
  retrieving revision 1.1.4.11
  diff -u -r1.1.4.10 -r1.1.4.11
  --- Sitemap.java	2000/10/13 04:14:43	1.1.4.10
  +++ Sitemap.java	2000/12/11 16:06:56	1.1.4.11
  @@ -7,9 +7,9 @@
    *****************************************************************************/
   package org.apache.cocoon.sitemap;
   
  -import org.apache.avalon.Composer; 
  -import org.apache.avalon.Modifiable; 
  -import org.apache.avalon.Configurable; 
  +import org.apache.avalon.Composer;
  +import org.apache.avalon.Modifiable;
  +import org.apache.avalon.Configurable;
   import org.apache.avalon.Configuration;
   import org.apache.avalon.ComponentManager;
   
  @@ -19,8 +19,8 @@
    * Base interface for generated <code>Sitemap</code> classes
    *
    * @author <a href="mailto:Giacomo.Pati@pwr.ch">Giacomo Pati</a>
  - * @version CVS $Revision: 1.1.4.10 $ $Date: 2000/10/13 04:14:43 $
  + * @version CVS $Revision: 1.1.4.11 $ $Date: 2000/12/11 16:06:56 $
    */
   public interface Sitemap extends Composer, Configurable, Processor, Modifiable {
  -    public void setParentSitemapComponentManager (ComponentManager sitemapComponentManager);
  -} 
  +    void setParentSitemapComponentManager (ComponentManager sitemapComponentManager);
  +}
  
  
  
  1.1.2.4   +2 -2      xml-cocoon/src/org/apache/cocoon/sitemap/Attic/SitemapModelComponent.java
  
  Index: SitemapModelComponent.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/sitemap/Attic/SitemapModelComponent.java,v
  retrieving revision 1.1.2.3
  retrieving revision 1.1.2.4
  diff -u -r1.1.2.3 -r1.1.2.4
  --- SitemapModelComponent.java	2000/10/19 14:44:24	1.1.2.3
  +++ SitemapModelComponent.java	2000/12/11 16:06:56	1.1.2.4
  @@ -21,7 +21,7 @@
    *
    * @author <a href="mailto:fumagalli@exoffice.com">Pierpaolo Fumagalli</a>
    *         (Apache Software Foundation, Exoffice Technologies)
  - * @version CVS $Revision: 1.1.2.3 $ $Date: 2000/10/19 14:44:24 $
  + * @version CVS $Revision: 1.1.2.4 $ $Date: 2000/12/11 16:06:56 $
    */
   public interface SitemapModelComponent extends Component {
   
  @@ -29,6 +29,6 @@
        * Set the <code>EntityResolver</code>, objectModel <code>Map</code>,
        * the source and sitemap <code>Parameters</code> used to process the request.
        */
  -    public void setup(EntityResolver resolver, Map objectModel, String src, Parameters par)
  +    void setup(EntityResolver resolver, Map objectModel, String src, Parameters par)
       throws ProcessingException, SAXException, IOException;
   }
  
  
  
  1.1.2.3   +4 -4      xml-cocoon/src/org/apache/cocoon/sitemap/Attic/SitemapOutputComponent.java
  
  Index: SitemapOutputComponent.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/sitemap/Attic/SitemapOutputComponent.java,v
  retrieving revision 1.1.2.2
  retrieving revision 1.1.2.3
  diff -u -r1.1.2.2 -r1.1.2.3
  --- SitemapOutputComponent.java	2000/08/16 05:08:19	1.1.2.2
  +++ SitemapOutputComponent.java	2000/12/11 16:06:57	1.1.2.3
  @@ -15,18 +15,18 @@
   /**
    *
    * @author <a href="mailto:Giacomo.Pati@pwr.ch">Giacomo Pati</a>
  - * @version CVS $Revision: 1.1.2.2 $ $Date: 2000/08/16 05:08:19 $
  + * @version CVS $Revision: 1.1.2.3 $ $Date: 2000/12/11 16:06:57 $
    */
   public interface SitemapOutputComponent extends Component {
   
       /**
  -     * Set the <code>OutputStream</code> where the requested resource should 
  +     * Set the <code>OutputStream</code> where the requested resource should
        * be serialized.
        */
  -    public void setOutputStream(OutputStream out) throws IOException;
  +    void setOutputStream(OutputStream out) throws IOException;
   
       /**
        * Get the mime-type of the output of this <code>Component</code>.
        */
  -    public String getMimeType();
  +    String getMimeType();
   }
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.3   +12 -12    xml-cocoon/src/org/apache/cocoon/xml/Attic/NamespacesTable.java
  
  Index: NamespacesTable.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/xml/Attic/NamespacesTable.java,v
  retrieving revision 1.1.2.2
  retrieving revision 1.1.2.3
  diff -u -r1.1.2.2 -r1.1.2.3
  --- NamespacesTable.java	2000/10/27 07:36:01	1.1.2.2
  +++ NamespacesTable.java	2000/12/11 16:06:59	1.1.2.3
  @@ -5,7 +5,7 @@
    * version 1.1, a copy of which has been included  with this distribution in *
    * the LICENSE file.                                                         *
    *****************************************************************************/
  - 
  +
   package org.apache.cocoon.xml;
   
   import org.xml.sax.SAXException;
  @@ -16,7 +16,7 @@
    *
    * @author <a href="mailto:fumagalli@exoffice.com">Pierpaolo Fumagalli</a>
    *         (Apache Software Foundation, Exoffice Technologies)
  - * @version CVS $Revision: 1.1.2.2 $ $Date: 2000/10/27 07:36:01 $
  + * @version CVS $Revision: 1.1.2.3 $ $Date: 2000/12/11 16:06:59 $
    */
   public class NamespacesTable {
       /** The initial namespace declaration. */
  @@ -114,7 +114,7 @@
        * The array length might be <b>zero</b> if no prefixes are associated with
        * the specified uri.
        *
  -     * @return A <b>non-null</b> <code>String</code> array. 
  +     * @return A <b>non-null</b> <code>String</code> array.
        */
       public String[] getPrefixes(String uri) {
           int hash=uri.hashCode();
  @@ -215,8 +215,8 @@
               else uri=temp;
           }
           NameImpl name=new NameImpl();
  -		if (uri.length() > 0) name.uri=uri;
  -		else name.uri=null;
  +        if (uri.length() > 0) name.uri=uri;
  +        else name.uri=null;
           name.raw=raw;
           name.prefix=prefix;
           name.local=local;
  @@ -268,7 +268,7 @@
           private String local=null;
           /** The namespace raw name. */
           private String raw=null;
  -        
  +
           /** Return the namespace URI. */
           public String getUri() { return(this.uri); }
           /** Return the namespace prefix. */
  @@ -285,13 +285,13 @@
        */
       public static interface Name {
           /** Return the namespace URI. */
  -        public String getUri();
  +        String getUri();
           /** Return the namespace prefix. */
  -        public String getPrefix();
  +        String getPrefix();
           /** Return the namespace local name. */
  -        public String getLocalName();
  +        String getLocalName();
           /** Return the namespace raw name. */
  -        public String getQName();
  +        String getQName();
       }
   
       /**
  @@ -300,8 +300,8 @@
        */
       public static interface Declaration {
           /** Return the namespace URI. */
  -        public String getUri();
  +        String getUri();
           /** Return the namespace prefix. */
  -        public String getPrefix();
  +        String getPrefix();
       }
   }
  
  
  
  1.1.2.6   +5 -5      xml-cocoon/src/org/apache/cocoon/xml/Attic/XMLProducer.java
  
  Index: XMLProducer.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/xml/Attic/XMLProducer.java,v
  retrieving revision 1.1.2.5
  retrieving revision 1.1.2.6
  diff -u -r1.1.2.5 -r1.1.2.6
  --- XMLProducer.java	2000/08/17 17:09:38	1.1.2.5
  +++ XMLProducer.java	2000/12/11 16:06:59	1.1.2.6
  @@ -12,7 +12,7 @@
   
   /**
    * This interfaces identifies classes that produce XML data, sending SAX
  - * events to the configured <code>XMLConsumer</code> (or SAX 
  + * events to the configured <code>XMLConsumer</code> (or SAX
    * <code>ContentHandler</code> and <code>LexicalHandler</code>).
    * <br>
    * It's beyond the scope of this interface to specify a way in which the XML
  @@ -20,22 +20,22 @@
    *
    * @author <a href="mailto:fumagalli@exoffice.com">Pierpaolo Fumagalli</a>
    *         (Apache Software Foundation, Exoffice Technologies)
  - * @version CVS $Revision: 1.1.2.5 $ $Date: 2000/08/17 17:09:38 $
  + * @version CVS $Revision: 1.1.2.6 $ $Date: 2000/12/11 16:06:59 $
    */
   public interface XMLProducer {
   
       /**
        * Set the <code>XMLConsumer</code> that will receive XML data.
        */
  -    public void setConsumer(XMLConsumer consumer);
  +    void setConsumer(XMLConsumer consumer);
   
       /**
        * Set the <code>ContentHandler</code> that will receive XML data.
        */
  -    public void setContentHandler(ContentHandler content);
  +    void setContentHandler(ContentHandler content);
   
       /**
        * Set the <code>LexicalHandler</code> that will receive XML data.
        */
  -    public void setLexicalHandler(LexicalHandler lexical);
  +    void setLexicalHandler(LexicalHandler lexical);
   }
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.5   +26 -26    xml-cocoon/src/org/apache/cocoon/xml/dom/Attic/DOMBuilder.java
  
  Index: DOMBuilder.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/xml/dom/Attic/DOMBuilder.java,v
  retrieving revision 1.1.2.4
  retrieving revision 1.1.2.5
  diff -u -r1.1.2.4 -r1.1.2.5
  --- DOMBuilder.java	2000/11/10 22:38:56	1.1.2.4
  +++ DOMBuilder.java	2000/12/11 16:07:01	1.1.2.5
  @@ -5,7 +5,7 @@
    * version 1.1, a copy of which has been included  with this distribution in *
    * the LICENSE file.                                                         *
    *****************************************************************************/
  - 
  +
   package org.apache.cocoon.xml.dom;
   
   import java.util.Vector;
  @@ -36,7 +36,7 @@
   
   /**
    * The <code>DOMBuilder</code> is a utility cl		Object hint = null;
  -		String className = null;
  +        String className = null;
   
                   try {
   ass that will generate a W3C
  @@ -44,7 +44,7 @@
    *
    * @author <a href="mailto:fumagalli@exoffice.com">Pierpaolo Fumagalli</a>
    *         (Apache Software Foundation, Exoffice Technologies)
  - * @version CVS $Revision: 1.1.2.4 $ $Date: 2000/11/10 22:38:56 $
  + * @version CVS $Revision: 1.1.2.5 $ $Date: 2000/12/11 16:07:01 $
    */
   public class DOMBuilder implements XMLConsumer {
       protected Logger log = LogKit.getLoggerFor("cocoon");
  @@ -62,7 +62,7 @@
       private static final String stateName[]={
           "Available", "DTD Processing", "Document", "Body", "CDATA Section"
       };
  -    
  +
       /** The current state */
       private int state=S_AVAIL;
       /** The locator */
  @@ -161,7 +161,7 @@
       }
   
       /**
  -     * Report the start of DTD declarations, if any. 
  +     * Report the start of DTD declarations, if any.
        *
        * @param name The document type name.
        * @param publicId The declared public identifier for the external DTD
  @@ -170,7 +170,7 @@
        *                 subset, or null if none was declared.
        * @exception SAXException If this method was not called appropriately.
        */
  -    public void startDTD(String name, String publicId, String systemId) 
  +    public void startDTD(String name, String publicId, String systemId)
       throws SAXException {
           // This method can be called only at DOCUMENT level
           if(state!=S_DOC) throw new SAXException("Invalid state"+location());
  @@ -195,14 +195,14 @@
       }
   
       /**
  -     * Report the end of DTD declarations. 
  +     * Report the end of DTD declarations.
        *
        * @param chars The characters from the XML document.
        * @param start The start position in the array.
        * @param len The number of characters to read from the array.
        * @exception SAXException If this method was not called appropriately.
        */
  -    public void endDTD() 
  +    public void endDTD()
       throws SAXException {
           // This method can be called only at DTD level
           if(state!=S_DTD) throw new SAXException("Invalid state"+location());
  @@ -324,7 +324,7 @@
       }
   
       /**
  -     * Begin the scope of a prefix-URI Namespace mapping. 
  +     * Begin the scope of a prefix-URI Namespace mapping.
        *
        * @param pre The Namespace prefix being declared.
        * @param uri The Namespace URI the prefix is mapped to.
  @@ -340,7 +340,7 @@
       }
   
       /**
  -     * End the scope of a prefix-URI mapping. 
  +     * End the scope of a prefix-URI mapping.
        *
        * @param prefix The Namespace prefix that was being mapped.
        */
  @@ -356,11 +356,11 @@
       }
   
       /**
  -     * Report the start of a CDATA section. 
  +     * Report the start of a CDATA section.
        *
        * @exception SAXException If this method was not called appropriately.
        */
  -    public void startCDATA() 
  +    public void startCDATA()
       throws SAXException {
           // This method can only called at BODY level
           if(state!=S_BODY) throw new SAXException("Invalid state"+location());
  @@ -368,21 +368,21 @@
           // Set the CDATASection as the current element
           this.current.appendChild(cdata);
           this.current=cdata;
  -        // Do a state change        
  +        // Do a state change
           state=S_CDATA;
       }
   
       /**
  -     * Report the end of a CDATA section. 
  +     * Report the end of a CDATA section.
        *
        * @exception SAXException If this method was not called appropriately.
        */
  -    public void endCDATA() 
  +    public void endCDATA()
       throws SAXException {
           // This method can only called at BODY level
           if(state!=S_CDATA) throw new SAXException("Invalid state"+location());
           // Set the parent of the CDATASection as the current element
  -        // We don't need to check the node type because in CDATA state the 
  +        // We don't need to check the node type because in CDATA state the
           // current element can be ONLY a CDATASection node
           this.current=this.current.getParentNode();
           if (this.current==null) throw new SAXException("No parent"+location());
  @@ -391,14 +391,14 @@
       }
   
       /**
  -     * Report the beginning of an entity. 
  +     * Report the beginning of an entity.
        *
        * @param chars The characters from the XML document.
        * @param start The start position in the array.
        * @param len The number of characters to read from the array.
        * @exception SAXException If this method was not called appropriately.
        */
  -    public void startEntity(java.lang.String name) 
  +    public void startEntity(java.lang.String name)
       throws SAXException {
           // This method can only called at BODY level
           if((state!=S_BODY)&&(state!=S_DTD))
  @@ -410,14 +410,14 @@
       }
   
       /**
  -     * Report the end of an entity. 
  +     * Report the end of an entity.
        *
        * @param chars The characters from the XML document.
        * @param start The start position in the array.
        * @param len The number of characters to read from the array.
        * @exception SAXException If this method was not called appropriately.
        */
  -    public void endEntity(java.lang.String name) 
  +    public void endEntity(java.lang.String name)
       throws SAXException {
           // This method can only called at BODY level
           if(state!=S_BODY) throw new SAXException("Invalid state"+location());
  @@ -450,7 +450,7 @@
           // This method can only called at BODY or CDATA levels
           if(state<S_BODY) throw new SAXException("Invalid state "+location());
           // Check if we are in the CDATA state
  -        String data=new String(chars,start,len);        
  +        String data=new String(chars,start,len);
           if(state==S_CDATA) {
               ((CDATASection)this.current).appendData(data);
           } else {
  @@ -504,14 +504,14 @@
       }
   
       /**
  -     * Report an XML comment anywhere in the document. 
  +     * Report an XML comment anywhere in the document.
        *
        * @param chars The characters from the XML document.
        * @param start The start position in the array.
        * @param len The number of characters to read from the array.
        * @exception SAXException If this method was not called appropriately.
        */
  -    public void comment(char chars[], int start, int len) 
  +    public void comment(char chars[], int start, int len)
       throws SAXException {
           // This is because Xerces reports comments inside DTDs
           if(state==S_DTD) return;
  @@ -524,7 +524,7 @@
       }
   
       /**
  -     * Receive notification of a skipped entity. 
  +     * Receive notification of a skipped entity.
        *
        * @param name The name of the skipped entity. If it is a parameter entity,
        *             the name will begin with '%'.
  @@ -566,11 +566,11 @@
        * be notified of a successful DOM tree generation.
        */
       public static interface Listener {
  -    
  +
           /**
            * Receive notification of a successfully completed DOM tree generation.
            */
  -        public void notify(Document doc)
  +        void notify(Document doc)
           throws SAXException;
       }
   }
  
  
  
  1.1.2.2   +9 -9      xml-cocoon/src/org/apache/cocoon/xml/dom/Attic/DOMFactory.java
  
  Index: DOMFactory.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/xml/dom/Attic/DOMFactory.java,v
  retrieving revision 1.1.2.1
  retrieving revision 1.1.2.2
  diff -u -r1.1.2.1 -r1.1.2.2
  --- DOMFactory.java	2000/09/05 17:25:31	1.1.2.1
  +++ DOMFactory.java	2000/12/11 16:07:01	1.1.2.2
  @@ -5,7 +5,7 @@
    * version 1.1, a copy of which has been included  with this distribution in *
    * the LICENSE file.                                                         *
    *****************************************************************************/
  - 
  +
   package org.apache.cocoon.xml.dom;
   
   import org.w3c.dom.Document;
  @@ -16,22 +16,22 @@
    *
    * @author <a href="mailto:fumagalli@exoffice.com">Pierpaolo Fumagalli</a>
    *         (Apache Software Foundation, Exoffice Technologies)
  - * @version CVS $Revision: 1.1.2.1 $ $Date: 2000/09/05 17:25:31 $
  + * @version CVS $Revision: 1.1.2.2 $ $Date: 2000/12/11 16:07:01 $
    */
   public interface DOMFactory {
  -    /** 
  +    /**
        * Create a new Document object.
        */
  -    public Document newDocument();
  +    Document newDocument();
   
  -    /** 
  +    /**
        * Create a new Document object with a specified DOCTYPE.
        */
  -    public Document newDocument(String name);
  +    Document newDocument(String name);
   
  -    /** 
  -     * Create a new Document object with a specified DOCTYPE, public ID and 
  +    /**
  +     * Create a new Document object with a specified DOCTYPE, public ID and
        * system ID.
        */
  -    public Document newDocument(String name, String publicId, String systemId);
  +    Document newDocument(String name, String publicId, String systemId);
   }
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.3   +21 -21    xml-cocoon/src/org/apache/cocoon/xml/xlink/Attic/XLinkHandler.java
  
  Index: XLinkHandler.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/xml/xlink/Attic/XLinkHandler.java,v
  retrieving revision 1.1.2.2
  retrieving revision 1.1.2.3
  diff -u -r1.1.2.2 -r1.1.2.3
  --- XLinkHandler.java	2000/09/25 14:48:21	1.1.2.2
  +++ XLinkHandler.java	2000/12/11 16:07:04	1.1.2.3
  @@ -12,31 +12,31 @@
   import org.xml.sax.SAXException;
   
   /**
  - * This interface indicates an XLinkHandler that uses the same 
  + * This interface indicates an XLinkHandler that uses the same
    * event driven design patterns that SAX enforces.
    *
    * @author <a href="mailto:stefano@apache.org">Stefano Mazzocchi</a>
  - * @version CVS $Revision: 1.1.2.2 $ $Date: 2000/09/25 14:48:21 $
  + * @version CVS $Revision: 1.1.2.3 $ $Date: 2000/12/11 16:07:04 $
    */
   public interface XLinkHandler  {
  -    
  -    public void simpleLink(String href, String role, String arcrole, String title, String show, String actuate, String uri, String name, String raw, Attributes attr) throws SAXException;
  -    
  -    public void startExtendedLink(String role, String title, String uri, String name, String raw, Attributes attr) throws SAXException;
  -    
  -    public void endExtendedLink(String uri, String name, String raw) throws SAXException;
  -    
  -    public void startLocator(String href, String role, String title, String label, String uri, String name, String raw, Attributes attr) throws SAXException;
  -
  -    public void endLocator(String uri, String name, String raw) throws SAXException;
  -    
  -    public void startArc(String arcrole, String title, String show, String actuate, String from, String to, String uri, String name, String raw, Attributes attr) throws SAXException;
  -    
  -    public void endArc(String uri, String name, String raw) throws SAXException;
  -
  -    public void linkResource(String role, String title, String label, String uri, String name, String raw, Attributes attr) throws SAXException;
  -    
  -    public void linkTitle(String uri, String name, String raw, Attributes attr) throws SAXException;
  -    
  +
  +    void simpleLink(String href, String role, String arcrole, String title, String show, String actuate, String uri, String name, String raw, Attributes attr) throws SAXException;
  +
  +    void startExtendedLink(String role, String title, String uri, String name, String raw, Attributes attr) throws SAXException;
  +
  +    void endExtendedLink(String uri, String name, String raw) throws SAXException;
  +
  +    void startLocator(String href, String role, String title, String label, String uri, String name, String raw, Attributes attr) throws SAXException;
  +
  +    void endLocator(String uri, String name, String raw) throws SAXException;
  +
  +    void startArc(String arcrole, String title, String show, String actuate, String from, String to, String uri, String name, String raw, Attributes attr) throws SAXException;
  +
  +    void endArc(String uri, String name, String raw) throws SAXException;
  +
  +    void linkResource(String role, String title, String label, String uri, String name, String raw, Attributes attr) throws SAXException;
  +
  +    void linkTitle(String uri, String name, String raw, Attributes attr) throws SAXException;
  +
   }
   
  
  
  

Mime
View raw message