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/11/08 13:21:27 UTC
svn commit: r331794 - in /cocoon/blocks:
portal-sample/trunk/samples/skins/modern/css/page.css
portal/trunk/java/org/apache/cocoon/portal/layout/impl/DefaultLayoutFactory.java
Author: cziegeler
Date: Tue Nov 8 04:21:20 2005
New Revision: 331794
URL: http://svn.apache.org/viewcvs?rev=331794&view=rev
Log:
Change removal order
Modified:
cocoon/blocks/portal-sample/trunk/samples/skins/modern/css/page.css
cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/impl/DefaultLayoutFactory.java
Modified: cocoon/blocks/portal-sample/trunk/samples/skins/modern/css/page.css
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal-sample/trunk/samples/skins/modern/css/page.css?rev=331794&r1=331793&r2=331794&view=diff
==============================================================================
--- cocoon/blocks/portal-sample/trunk/samples/skins/modern/css/page.css (original)
+++ cocoon/blocks/portal-sample/trunk/samples/skins/modern/css/page.css Tue Nov 8 04:21:20 2005
@@ -149,4 +149,7 @@
color: #ffffff;
width: 100%;
height: 10px;
+}
+#cocoon-portal-header-logout {
+ float:right;
}
Modified: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/impl/DefaultLayoutFactory.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/impl/DefaultLayoutFactory.java?rev=331794&r1=331793&r2=331794&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/impl/DefaultLayoutFactory.java (original)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/impl/DefaultLayoutFactory.java Tue Nov 8 04:21:20 2005
@@ -281,10 +281,6 @@
this.remove( i.getLayout() );
}
}
- Item parent = layout.getParent();
- if ( parent != null && parent.getParent() != null) {
- parent.getParent().removeItem( parent );
- }
ProfileManager profileManager = this.portalService.getComponentManager().getProfileManager();
if ( layout instanceof CopletLayout ) {
@@ -299,6 +295,11 @@
}
CopletFactory factory = this.portalService.getComponentManager().getCopletFactory();
factory.remove( ((CopletLayout)layout).getCopletInstanceData());
+ }
+
+ Item parent = layout.getParent();
+ if ( parent != null && parent.getParent() != null) {
+ parent.getParent().removeItem( parent );
}
profileManager.unregister(layout);
}