Author: julien(a)jboss.com
Date: 2007-03-15 10:36:24 -0400 (Thu, 15 Mar 2007)
New Revision: 6689
Modified:
trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/ThemePropertyAction.java
trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/dashboard/DashboardBean.java
Log:
better handling of themes&layout in the dashboard editor
Modified:
trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/ThemePropertyAction.java
===================================================================
---
trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/ThemePropertyAction.java 2007-03-15
14:13:44 UTC (rev 6688)
+++
trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/ThemePropertyAction.java 2007-03-15
14:36:24 UTC (rev 6689)
@@ -137,49 +137,20 @@
{
boolean successful = true;
- // Get actual values
- String layoutName =
portalObject.getDeclaredProperty(ThemeConstants.PORTAL_PROP_LAYOUT);
- String themeName =
portalObject.getDeclaredProperty(ThemeConstants.PORTAL_PROP_THEME);
- String renderSetName =
portalObject.getDeclaredProperty(ThemeConstants.PORTAL_PROP_RENDERSET);
- String windowRendererName =
portalObject.getDeclaredProperty(ThemeConstants.PORTAL_PROP_WINDOW_RENDERER);
- String decorationRendererName =
portalObject.getDeclaredProperty(ThemeConstants.PORTAL_PROP_DECORATION_RENDERER);
- String portletRendererName =
portalObject.getDeclaredProperty(ThemeConstants.PORTAL_PROP_PORTLET_RENDERER);
-
//
switch(portalObject.getType())
{
case PortalObject.TYPE_PORTAL:
case PortalObject.TYPE_PAGE:
- if (this.layoutName == null || !this.layoutName.equals(layoutName))
- {
- this.portalObject.setDeclaredProperty(ThemeConstants.PORTAL_PROP_LAYOUT,
this.layoutName);
- }
- if (this.themeName == null || !this.themeName.equals(themeName))
- {
- this.portalObject.setDeclaredProperty(ThemeConstants.PORTAL_PROP_THEME,
this.themeName);
- }
- if (this.renderSetName == null || !this.renderSetName.equals(renderSetName))
- {
-
this.portalObject.setDeclaredProperty(ThemeConstants.PORTAL_PROP_RENDERSET,
this.renderSetName);
- }
- if (this.windowRendererName == null ||
!this.windowRendererName.equals(windowRendererName))
- {
- this.portalObject.setDeclaredProperty(ThemeConstants.PORTAL_PROP_STRATEGY,
this.windowRendererName);
- }
+ portalObject.setDeclaredProperty(ThemeConstants.PORTAL_PROP_LAYOUT,
this.layoutName);
+ portalObject.setDeclaredProperty(ThemeConstants.PORTAL_PROP_THEME,
this.themeName);
+ portalObject.setDeclaredProperty(ThemeConstants.PORTAL_PROP_RENDERSET,
this.renderSetName);
+ portalObject.setDeclaredProperty(ThemeConstants.PORTAL_PROP_STRATEGY,
this.windowRendererName);
break;
case PortalObject.TYPE_WINDOW:
- if (this.windowRendererName == null ||
!this.windowRendererName.equals(windowRendererName))
- {
-
this.portalObject.setDeclaredProperty(ThemeConstants.PORTAL_PROP_WINDOW_RENDERER,
this.windowRendererName);
- }
- if (this.decorationRendererName == null ||
!this.decorationRendererName.equals(decorationRendererName))
- {
-
this.portalObject.setDeclaredProperty(ThemeConstants.PORTAL_PROP_DECORATION_RENDERER,
this.decorationRendererName);
- }
- if (this.portletRendererName == null ||
!this.portletRendererName.equals(portletRendererName))
- {
-
this.portalObject.setDeclaredProperty(ThemeConstants.PORTAL_PROP_PORTLET_RENDERER,
this.portletRendererName);
- }
+ portalObject.setDeclaredProperty(ThemeConstants.PORTAL_PROP_WINDOW_RENDERER,
this.windowRendererName);
+
portalObject.setDeclaredProperty(ThemeConstants.PORTAL_PROP_DECORATION_RENDERER,
this.decorationRendererName);
+ portalObject.setDeclaredProperty(ThemeConstants.PORTAL_PROP_PORTLET_RENDERER,
this.portletRendererName);
break;
default:
successful = false;
Modified:
trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/dashboard/DashboardBean.java
===================================================================
---
trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/dashboard/DashboardBean.java 2007-03-15
14:13:44 UTC (rev 6688)
+++
trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/dashboard/DashboardBean.java 2007-03-15
14:36:24 UTC (rev 6689)
@@ -159,26 +159,28 @@
refresh();
//
- selectedPageTheme =
pageManager.page.getProperty(ThemeConstants.PORTAL_PROP_THEME);
- selectedPageLayout =
pageManager.page.getProperty(ThemeConstants.PORTAL_PROP_LAYOUT);
+ selectedPageTheme =
userPortal.getDeclaredProperty(ThemeConstants.PORTAL_PROP_THEME);
+ if (selectedPageTheme == null)
+ {
+ selectedPageTheme = "";
+ }
+
+ //
+ selectedPageLayout =
userPortal.getDeclaredProperty(ThemeConstants.PORTAL_PROP_LAYOUT);
+ if (selectedPageLayout == null)
+ {
+ selectedPageLayout = "";
+ }
}
public void updateTheme()
{
- String previousTheme = userPortal.getProperty(ThemeConstants.PORTAL_PROP_THEME);
- if (!selectedPageTheme.equals(previousTheme))
- {
- userPortal.setDeclaredProperty(ThemeConstants.PORTAL_PROP_THEME,
selectedPageTheme);
- }
+ userPortal.setDeclaredProperty(ThemeConstants.PORTAL_PROP_THEME,
"".equals(selectedPageTheme) ? null : selectedPageTheme);
}
public void updateLayout()
{
- String previousLayout = userPortal.getProperty(ThemeConstants.PORTAL_PROP_LAYOUT);
- if (!selectedPageLayout.equals(previousLayout))
- {
- userPortal.setDeclaredProperty(ThemeConstants.PORTAL_PROP_LAYOUT,
selectedPageLayout);
- }
+ userPortal.setDeclaredProperty(ThemeConstants.PORTAL_PROP_LAYOUT,
"".equals(selectedPageLayout) ? null : selectedPageLayout);
}
public void destroyPage()
Show replies by date