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

Parent Directory | Revision Log | Patch

--- cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/tools/transformation/PortalToolsLayoutTransformer.java	2005/05/05 18:19:40	168365
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/tools/transformation/PortalToolsLayoutTransformer.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.
@@ -36,13 +36,14 @@ import org.xml.sax.SAXException;
 
 /**
  * Adds the navigation etc. to the document
- * 
- * @version CVS $Id$
+ *
+ * @version $Id$
  */
-public class PortalToolsLayoutTransformer extends AbstractSAXTransformer implements Disposable /*, Parameterizable */{
+public class PortalToolsLayoutTransformer extends AbstractSAXTransformer
+                                          implements Disposable /*, Parameterizable */ {
 
 	public static final String ROLE = PortalToolsLayoutTransformer.class.getName();
-	
+
 	private PortalToolManager pm;
 	private String selected;
 
@@ -72,13 +73,13 @@ public class PortalToolsLayoutTransforme
 	 * @see org.apache.avalon.framework.activity.Disposable#dispose()
 	 */
 	public void dispose() {
-        if ( this.manager != null ) {
-		    this.manager.release(pm);
-            pm = null;
-            this.manager = null;
+        if (this.manager != null) {
+            this.manager.release(pm);
+            this.pm = null;
         }
+        super.dispose();
 	}
-	
+
 
 	/* (non-Javadoc)
 	 * @see org.xml.sax.ContentHandler#startDocument()
@@ -86,7 +87,7 @@ public class PortalToolsLayoutTransforme
 	public void startDocument() throws SAXException {
 		super.startDocument();
 		AttributesImpl a = new AttributesImpl();
-		
+
 		// took the div-tag as root, because it does not matter in the output, if it passes the xsl transformation
 		super.startPrefixMapping("i18n", "http://apache.org/cocoon/i18n/2.1");
 		super.startElement("", "div","div", a);
@@ -125,7 +126,7 @@ public class PortalToolsLayoutTransforme
 	    }
 	}
 
-	
+
 	/* (non-Javadoc)
 	 * @see org.xml.sax.ContentHandler#endDocument()
 	 */