You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jetspeed-dev@portals.apache.org by sm...@apache.org on 2007/10/26 02:11:22 UTC
svn commit: r588431 -
/portals/jetspeed-2/branches/JETSPEED-2.1.3/components/portal/src/java/org/apache/jetspeed/decoration/PageTheme.java
Author: smilek
Date: Thu Oct 25 17:11:21 2007
New Revision: 588431
URL: http://svn.apache.org/viewvc?rev=588431&view=rev
Log:
fixed to prevent default decoration for nested layout fragments from being added as a portlet decoration
Modified:
portals/jetspeed-2/branches/JETSPEED-2.1.3/components/portal/src/java/org/apache/jetspeed/decoration/PageTheme.java
Modified: portals/jetspeed-2/branches/JETSPEED-2.1.3/components/portal/src/java/org/apache/jetspeed/decoration/PageTheme.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/branches/JETSPEED-2.1.3/components/portal/src/java/org/apache/jetspeed/decoration/PageTheme.java?rev=588431&r1=588430&r2=588431&view=diff
==============================================================================
--- portals/jetspeed-2/branches/JETSPEED-2.1.3/components/portal/src/java/org/apache/jetspeed/decoration/PageTheme.java (original)
+++ portals/jetspeed-2/branches/JETSPEED-2.1.3/components/portal/src/java/org/apache/jetspeed/decoration/PageTheme.java Thu Oct 25 17:11:21 2007
@@ -89,33 +89,35 @@
{
// setup fragment decorations
Decoration decoration = decorationFactory.getDecoration( page, fragment, requestContext );
-
- String commonStyleSheet = decoration.getStyleSheet();
- if ( commonStyleSheet != null )
+ if ( decoration != null )
{
- styleSheets.add( commonStyleSheet );
- }
- if ( isDesktopEnabled )
- {
- String desktopStyleSheet = decoration.getStyleSheetDesktop();
- if ( desktopStyleSheet != null )
- {
- styleSheets.add( desktopStyleSheet );
- }
- }
- else
- {
- String portalStyleSheet = decoration.getStyleSheetPortal();
- if ( portalStyleSheet != null )
- {
- styleSheets.add( portalStyleSheet );
- }
- }
-
- fragmentDecorations.put( fragment.getId(), decoration );
- if ( fragment.getType().equals( Fragment.PORTLET ) )
- {
- portletDecorationNames.put( decoration.getName(), decoration.getName() );
+ String commonStyleSheet = decoration.getStyleSheet();
+ if ( commonStyleSheet != null )
+ {
+ styleSheets.add( commonStyleSheet );
+ }
+ if ( isDesktopEnabled )
+ {
+ String desktopStyleSheet = decoration.getStyleSheetDesktop();
+ if ( desktopStyleSheet != null )
+ {
+ styleSheets.add( desktopStyleSheet );
+ }
+ }
+ else
+ {
+ String portalStyleSheet = decoration.getStyleSheetPortal();
+ if ( portalStyleSheet != null )
+ {
+ styleSheets.add( portalStyleSheet );
+ }
+ }
+
+ fragmentDecorations.put( fragment.getId(), decoration );
+ if ( fragment.getType().equals( Fragment.PORTLET ) )
+ {
+ portletDecorationNames.put( decoration.getName(), decoration.getName() );
+ }
}
// setup nested fragment decorations
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org