You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by cz...@apache.org on 2005/10/21 14:03:36 UTC

svn commit: r327158 - in /cocoon/branches/BRANCH_2_1_X: src/blocks/portal/java/org/apache/cocoon/portal/layout/impl/DefaultLayoutFactory.java status.xml

Author: cziegeler
Date: Fri Oct 21 05:03:28 2005
New Revision: 327158

URL: http://svn.apache.org/viewcvs?rev=327158&view=rev
Log:
Only remove layout if a layout remove event is fired (and not with each layout event).

Modified:
    cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/layout/impl/DefaultLayoutFactory.java
    cocoon/branches/BRANCH_2_1_X/status.xml

Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/layout/impl/DefaultLayoutFactory.java
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/layout/impl/DefaultLayoutFactory.java?rev=327158&r1=327157&r2=327158&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/layout/impl/DefaultLayoutFactory.java (original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/layout/impl/DefaultLayoutFactory.java Fri Oct 21 05:03:28 2005
@@ -48,6 +48,7 @@
 import org.apache.cocoon.portal.event.LayoutEvent;
 import org.apache.cocoon.portal.event.Receiver;
 import org.apache.cocoon.portal.event.impl.FullScreenCopletEvent;
+import org.apache.cocoon.portal.event.impl.LayoutRemoveEvent;
 import org.apache.cocoon.portal.layout.CompositeLayout;
 import org.apache.cocoon.portal.layout.Item;
 import org.apache.cocoon.portal.layout.Layout;
@@ -391,10 +392,12 @@
      */
     public void inform(LayoutEvent event, PortalService service) {
         Layout layout = (Layout)event.getTarget();
-        try {
-            this.remove( layout );
-        } catch (ProcessingException pe) {
-            throw new CascadingRuntimeException("Exception during removal.", pe);
+        if ( event instanceof LayoutRemoveEvent ) {
+            try {
+                this.remove( layout );
+            } catch (ProcessingException pe) {
+                throw new CascadingRuntimeException("Exception during removal.", pe);
+            }
         }
     }
 

Modified: cocoon/branches/BRANCH_2_1_X/status.xml
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/status.xml?rev=327158&r1=327157&r2=327158&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/status.xml (original)
+++ cocoon/branches/BRANCH_2_1_X/status.xml Fri Oct 21 05:03:28 2005
@@ -175,6 +175,9 @@
 
   <changes>
   <release version="@version@" date="@date@">
+    <action dev="CZ" type="fix">
+      Portal Block: Only remove layout if a layout remove event is fired (and not with each layout event).
+    </action>
     <action dev="CZ" type="fix" fixes-bug="36471" due-to="Armaz Mellati" due-to-email="armaz@uninett.no">
       Fix bug with session:getxml when path is a text-element and IncludeXMLConsumer
       when including text nodes.