You are viewing a plain text version of this content. The canonical link for it is here.
Posted to slide-dev@jakarta.apache.org by ju...@apache.org on 2001/02/26 13:49:20 UTC

cvs commit: jakarta-slide/src/share/org/apache/slide/common NamespaceAccessTokenImpl.java

juergen     01/02/26 04:49:20

  Modified:    src/share/org/apache/slide/common
                        NamespaceAccessTokenImpl.java
  Log:
  nothing changed
  
  Revision  Changes    Path
  1.12      +72 -71    jakarta-slide/src/share/org/apache/slide/common/NamespaceAccessTokenImpl.java
  
  Index: NamespaceAccessTokenImpl.java
  ===================================================================
  RCS file: /home/cvs/jakarta-slide/src/share/org/apache/slide/common/NamespaceAccessTokenImpl.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- NamespaceAccessTokenImpl.java	2001/01/10 18:49:33	1.11
  +++ NamespaceAccessTokenImpl.java	2001/02/26 12:49:20	1.12
  @@ -1,13 +1,13 @@
   /*
  - * $Header: /home/cvs/jakarta-slide/src/share/org/apache/slide/common/NamespaceAccessTokenImpl.java,v 1.11 2001/01/10 18:49:33 remm Exp $
  - * $Revision: 1.11 $
  - * $Date: 2001/01/10 18:49:33 $
  + * $Header: /home/cvs/jakarta-slide/src/share/org/apache/slide/common/NamespaceAccessTokenImpl.java,v 1.12 2001/02/26 12:49:20 juergen Exp $
  + * $Revision: 1.12 $
  + * $Date: 2001/02/26 12:49:20 $
    *
    * ====================================================================
    *
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 1999 The Apache Software Foundation.  All rights 
  + * Copyright (c) 1999 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  @@ -15,7 +15,7 @@
    * are met:
    *
    * 1. Redistributions of source code must retain the above copyright
  - *    notice, this list of conditions and the following disclaimer. 
  + *    notice, this list of conditions and the following disclaimer.
    *
    * 2. Redistributions in binary form must reproduce the above copyright
    *    notice, this list of conditions and the following disclaimer in
  @@ -23,15 +23,15 @@
    *    distribution.
    *
    * 3. The end-user documentation included with the redistribution, if
  - *    any, must include the following acknowlegement:  
  - *       "This product includes software developed by the 
  + *    any, must include the following acknowlegement:
  + *       "This product includes software developed by the
    *        Apache Software Foundation (http://www.apache.org/)."
    *    Alternately, this acknowlegement may appear in the software itself,
    *    if and wherever such third-party acknowlegements normally appear.
    *
    * 4. The names "The Jakarta Project", "Tomcat", and "Apache Software
    *    Foundation" must not be used to endorse or promote products derived
  - *    from this software without prior written permission. For written 
  + *    from this software without prior written permission. For written
    *    permission, please contact apache@apache.org.
    *
    * 5. Products derived from this software may not be called "Apache"
  @@ -59,7 +59,7 @@
    *
    * [Additional notices, if required by prior licensing conditions]
    *
  - */ 
  + */
   
   package org.apache.slide.common;
   
  @@ -104,9 +104,9 @@
   
   /**
    * Namespace access token implementation.
  - * 
  + *
    * @author <a href="mailto:remm@apache.org">Remy Maucherat</a>
  - * @version $Revision: 1.11 $
  + * @version $Revision: 1.12 $
    */
   public final class NamespaceAccessTokenImpl implements NamespaceAccessToken {
       
  @@ -116,26 +116,26 @@
       
       /**
        * Constructor.
  -     * 
  +     *
        * @param namespace Namespace which can be accessed through this token
        */
       NamespaceAccessTokenImpl(Namespace namespace) {
           this.namespace = namespace;
           securityHelper = new SecurityImpl(namespace, namespace.getConfig());
  -        lockHelper = 
  +        lockHelper =
               new LockImpl(namespace, namespace.getConfig(), securityHelper);
  -        structureHelper = 
  -            new StructureImpl(namespace, namespace.getConfig(), 
  +        structureHelper =
  +            new StructureImpl(namespace, namespace.getConfig(),
                                 securityHelper, lockHelper);
  -        contentHelper = 
  -            new ContentImpl(namespace, namespace.getConfig(), securityHelper, 
  +        contentHelper =
  +            new ContentImpl(namespace, namespace.getConfig(), securityHelper,
                               structureHelper, lockHelper);
  -        macroHelper = 
  -            new MacroImpl(namespace, namespace.getConfig(), securityHelper, 
  +        macroHelper =
  +            new MacroImpl(namespace, namespace.getConfig(), securityHelper,
                             contentHelper, structureHelper);
       }
  +     
       
  -    
       // ----------------------------------------------------- Instance Variables
       
       
  @@ -180,7 +180,7 @@
       
       /**
        * Get the structure helper.
  -     * 
  +     *
        * @return Structure helper
        */
       public Structure getStructureHelper() {
  @@ -190,7 +190,7 @@
       
       /**
        * Get the content helper.
  -     * 
  +     *
        * @return Content helper
        */
       public Content getContentHelper() {
  @@ -200,7 +200,7 @@
       
       /**
        * Get the lock helper.
  -     * 
  +     *
        * @return Lock Lock helper
        */
       public Lock getLockHelper() {
  @@ -210,7 +210,7 @@
       
       /**
        * Get the security helper.
  -     * 
  +     *
        * @return Security Security helper
        */
       public Security getSecurityHelper() {
  @@ -220,7 +220,7 @@
       
       /**
        * Get the macro helper.
  -     * 
  +     *
        * @return Macro Macro helper
        */
       public Macro getMacroHelper() {
  @@ -230,7 +230,7 @@
       
       /**
        * Retrive the namespace configuration.
  -     * 
  +     *
        * @return NamespaceConfig Namespace configuration
        */
       public NamespaceConfig getNamespaceConfig() {
  @@ -243,16 +243,16 @@
       
       /**
        * Import data from Avalon configuration object.
  -     * 
  +     *
        * @param token SlideToken, used for access to the namespace
        * @param dataConfiguration Configuration object
  -     * @exception ConfigurationException Something went wrong during the 
  +     * @exception ConfigurationException Something went wrong during the
        * reading of the XML
        * @exception UnknownObjectClassException Object class not found
        * @exception ServiceAccessException Error accessing service
        */
  -    public void importData(SlideToken token, Configuration dataConfiguration) 
  -        throws ConfigurationException, UnknownObjectClassException, 
  +    public void importData(SlideToken token, Configuration dataConfiguration)
  +        throws ConfigurationException, UnknownObjectClassException,
           ServiceAccessException {
           
           XMLUnmarshaller.unmarshal(this, token, dataConfiguration);
  @@ -262,16 +262,16 @@
       
       /**
        * Import data from reader.
  -     * 
  +     *
        * @param token SlideToken, used for access to the namespace
        * @param reader Reader
  -     * @exception ConfigurationException Something went wrong during the 
  +     * @exception ConfigurationException Something went wrong during the
        * reading of the XML
        * @exception UnknownObjectClassException Object class not found
        * @exception ServiceAccessException Error accessing service
        */
  -    public void importData(SlideToken token, Reader reader) 
  -        throws ConfigurationException, UnknownObjectClassException, 
  +    public void importData(SlideToken token, Reader reader)
  +        throws ConfigurationException, UnknownObjectClassException,
           ServiceAccessException, SAXException, IOException {
   
           try {
  @@ -300,9 +300,9 @@
   
       /**
        * Saves Slide Data to XML.
  -     * 
  -     * @param writer Writer 
  -     * @exception SlideException 
  +     *
  +     * @param writer Writer
  +     * @exception SlideException
        */
       public void exportData(SlideToken token, Writer writer)
           throws SlideException {
  @@ -312,12 +312,12 @@
       
       /**
        * Saves Slide Data to XML.
  -     * 
  -     * @param writer Writer 
  +     *
  +     * @param writer Writer
        * @param startNode Start generating XML from this node of the Slide tree
  -     * @exception SlideException 
  +     * @exception SlideException
        */
  -    public void exportData(SlideToken token, Writer writer, 
  +    public void exportData(SlideToken token, Writer writer,
                              String startNode)
           throws SlideException {
           
  @@ -340,7 +340,7 @@
       
       /**
        * Get namespace name.
  -     * 
  +     *
        * @return String namespace name.
        */
       public String getName() {
  @@ -353,9 +353,9 @@
       
       /**
        * Create a new transaction and associate it with the current thread.
  -     * 
  -     * @exception NotSupportedException Thrown if the thread is already 
  -     * associated with a transaction and the Transaction Manager 
  +     *
  +     * @exception NotSupportedException Thrown if the thread is already
  +     * associated with a transaction and the Transaction Manager
        * implementation does not support nested transactions.
        * @exception SystemException Thrown if the transaction manager encounters
        * an unexpected error condition.
  @@ -367,26 +367,26 @@
       
       
       /**
  -     * Complete the transaction associated with the current thread. When this 
  +     * Complete the transaction associated with the current thread. When this
        * method completes, the thread becomes associated with no transaction.
  -     * 
  -     * @exception RollbackException Thrown to indicate that the transaction 
  +     *
  +     * @exception RollbackException Thrown to indicate that the transaction
        * has been rolled back rather than committed.
  -     * @exception HeuristicMixedException Thrown to indicate that a heuristic 
  -     * decision was made and that some relevant updates have been committed 
  +     * @exception HeuristicMixedException Thrown to indicate that a heuristic
  +     * decision was made and that some relevant updates have been committed
        * while others have been rolled back.
  -     * @exception HeuristicRollbackException Thrown to indicate that a 
  -     * heuristic decision was made and that some relevant updates have been 
  +     * @exception HeuristicRollbackException Thrown to indicate that a
  +     * heuristic decision was made and that some relevant updates have been
        * rolled back.
  -     * @exception SecurityException Thrown to indicate that the thread is not 
  +     * @exception SecurityException Thrown to indicate that the thread is not
        * allowed to commit the transaction.
  -     * @exception IllegalStateException Thrown if the current thread is not 
  +     * @exception IllegalStateException Thrown if the current thread is not
        * associated with a transaction.
        * @exception SystemException Thrown if the transaction manager encounters
        * an unexpected error condition.
        */
       public void commit()
  -        throws RollbackException, HeuristicMixedException, 
  +        throws RollbackException, HeuristicMixedException,
           HeuristicRollbackException, SecurityException, IllegalStateException,
           SystemException {
           namespace.getTransactionManager().commit();
  @@ -394,13 +394,13 @@
       
       
       /**
  -     * Roll back the transaction associated with the current thread. When 
  -     * this method completes, the thread becomes associated with no 
  +     * Roll back the transaction associated with the current thread. When
  +     * this method completes, the thread becomes associated with no
        * transaction.
  -     * 
  -     * @exception SecurityException Thrown to indicate that the thread is not 
  +     *
  +     * @exception SecurityException Thrown to indicate that the thread is not
        * allowed to commit the transaction.
  -     * @exception IllegalStateException Thrown if the current thread is not 
  +     * @exception IllegalStateException Thrown if the current thread is not
        * associated with a transaction.
        * @exception SystemException Thrown if the transaction manager encounters
        * an unexpected error condition.
  @@ -412,11 +412,11 @@
       
       
       /**
  -     * Modify the transaction associated with the current thread such that 
  -     * the only possible outcome of the transaction is to roll back the 
  +     * Modify the transaction associated with the current thread such that
  +     * the only possible outcome of the transaction is to roll back the
        * transaction.
  -     * 
  -     * @exception IllegalStateException Thrown if the current thread is not 
  +     *
  +     * @exception IllegalStateException Thrown if the current thread is not
        * associated with a transaction.
        * @exception SystemException Thrown if the transaction manager encounters
        * an unexpected error condition.
  @@ -429,10 +429,10 @@
       
       /**
        * Obtain the status of the transaction associated with the current thread.
  -     * 
  +     *
        * @exception SystemException Thrown if the transaction manager encounters
        * an unexpected error condition.
  -     * @return The transaction status. If no transaction is associated with 
  +     * @return The transaction status. If no transaction is associated with
        * the current thread, this method returns the Status.NoTransaction value.
        */
       public int getStatus()
  @@ -442,13 +442,13 @@
       
       
       /**
  -     * Modify the value of the timeout value that is associated with the 
  -     * transactions started by the current thread with the begin method. 
  +     * Modify the value of the timeout value that is associated with the
  +     * transactions started by the current thread with the begin method.
        * <p>
  -     * If an application has not called this method, the transaction service 
  +     * If an application has not called this method, the transaction service
        * uses some default value for the transaction timeout.
  -     * 
  -     * @param seconds The value of the timeout in seconds. If the value is 
  +     *
  +     * @param seconds The value of the timeout in seconds. If the value is
        * zero, the transaction service restores the default value.
        * @exception SystemException Thrown if the transaction manager encounters
        * an unexpected error condition.
  @@ -460,3 +460,4 @@
       
       
   }
  +