Diff of /cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/tools/transformation/CheckAccessTransformer.java

Parent Directory | Revision Log | Patch

--- cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/tools/transformation/CheckAccessTransformer.java	2005/05/05 18:19:40	168365
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/tools/transformation/CheckAccessTransformer.java	2005/05/05 18:23:18	168366
@@ -1,12 +1,12 @@
 /*
  * Copyright 1999-2005 The Apache Software Foundation.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -27,22 +27,22 @@ import org.xml.sax.Attributes;
 import org.xml.sax.SAXException;
 
 /**
- * 
- * @version CVS $Id$
+ *
+ * @version $Id$
  */
-public class CheckAccessTransformer 
-extends AbstractSAXTransformer 
-implements Disposable {
+public class CheckAccessTransformer extends AbstractSAXTransformer
+                                    implements Disposable {
 
     public static final String RIGHTS_NAMESPACE_URI =
         "http://apache.org/cocoon/portal/tools/rights/1.0";
+
     public static final String ACCESS_TAG = "access";
     public static final String RIGHT_ID = "id";
-    
+
     private UserRightsService urs;
     private PortalToolManager ptm;
-    
-   /* (non-Javadoc)
+
+    /* (non-Javadoc)
      * @see org.apache.cocoon.transformation.AbstractSAXTransformer#service(org.apache.avalon.framework.service.ServiceManager)
      */
     public void service(ServiceManager manager) throws ServiceException {
@@ -50,23 +50,23 @@ implements Disposable {
         ptm = (PortalToolManager) this.manager.lookup(PortalToolManager.ROLE);
         urs = ptm.getUserRightsService();
     }
-    
+
     /* (non-Javadoc)
      * @see org.apache.cocoon.transformation.AbstractSAXTransformer#startElement(java.lang.String, java.lang.String, java.lang.String, org.xml.sax.Attributes)
      */
-    public void startElement(String uri, String name, String raw, Attributes attr) 
+    public void startElement(String uri, String name, String raw, Attributes attr)
     throws SAXException {
         if (RIGHTS_NAMESPACE_URI.equals(uri) && ACCESS_TAG.equals(name)) {
             String id = attr.getValue(RIGHT_ID);
             if(!urs.userIsAllowed(id, this.ptm.getPortalObjects().getProfileManager().getUser())) {
                 this.stack.push(new Boolean(false));
-            } 
+            }
             this.startRecording();
         } else {
             super.startElement(uri, name, raw, attr);
         }
     }
-    
+
     /* (non-Javadoc)
      * @see org.apache.cocoon.transformation.AbstractSAXTransformer#endElement(java.lang.String, java.lang.String, java.lang.String)
      */
@@ -86,11 +86,11 @@ implements Disposable {
      * @see org.apache.avalon.framework.activity.Disposable#dispose()
      */
     public void dispose() {
-        if ( this.manager != null ) {
+        if (this.manager != null) {
             this.manager.release(ptm);
             ptm = null;
             this.manager = null;
         }
+        super.dispose();
     }
-
 }