svnno****@sourc*****
svnno****@sourc*****
2008年 3月 10日 (月) 17:35:55 JST
Revision: 844
http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=844
Author: shinsuke
Date: 2008-03-10 17:35:55 +0900 (Mon, 10 Mar 2008)
Log Message:
-----------
set default value for decorators.
Modified Paths:
--------------
pal-admin/trunk/src/main/java/jp/sf/pal/admin/PALAdminConstants.java
pal-admin/trunk/src/main/java/jp/sf/pal/admin/service/SiteEditorService.java
pal-admin/trunk/src/main/java/jp/sf/pal/admin/util/PALAdminUtil.java
-------------- next part --------------
Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/PALAdminConstants.java
===================================================================
--- pal-admin/trunk/src/main/java/jp/sf/pal/admin/PALAdminConstants.java 2008-03-10 07:54:09 UTC (rev 843)
+++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/PALAdminConstants.java 2008-03-10 08:35:55 UTC (rev 844)
@@ -202,4 +202,12 @@
public static final String FALLBACK_LOOP = "loop";
+ public static final String PORTLET_DECORATOR = "portletDecorator";
+
+ public static final String DEFAULT_PORTLET_DECORATOR = "default";
+
+ public static final String PAGE_DECORATOR = "pageDecorator";
+
+ public static final String DEFAULT_PAGE_DECORATOR = "default";
+
}
Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/service/SiteEditorService.java
===================================================================
--- pal-admin/trunk/src/main/java/jp/sf/pal/admin/service/SiteEditorService.java 2008-03-10 07:54:09 UTC (rev 843)
+++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/service/SiteEditorService.java 2008-03-10 08:35:55 UTC (rev 844)
@@ -174,6 +174,9 @@
page.setDesktopThemeItems(getSiteEditorLogic()
.createDesktopPageDecorationsList());
+ // set default
+ page.setPageDecorator(PALAdminUtil.getPageDecoratorName());
+ page.setPortletDecorator(PALAdminUtil.getPortletDecoratorName());
}
public void loadPage(FolderOrderEditorPage page) throws CommonException {
Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/util/PALAdminUtil.java
===================================================================
--- pal-admin/trunk/src/main/java/jp/sf/pal/admin/util/PALAdminUtil.java 2008-03-10 07:54:09 UTC (rev 843)
+++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/util/PALAdminUtil.java 2008-03-10 08:35:55 UTC (rev 844)
@@ -239,4 +239,22 @@
}
return null;
}
+
+ public static String getPortletDecoratorName() {
+ String name = getPortletConfig().getInitParameter(
+ PALAdminConstants.PORTLET_DECORATOR);
+ if (name == null) {
+ return PALAdminConstants.DEFAULT_PORTLET_DECORATOR;
+ }
+ return name;
+ }
+
+ public static String getPageDecoratorName() {
+ String name = getPortletConfig().getInitParameter(
+ PALAdminConstants.PAGE_DECORATOR);
+ if (name == null) {
+ return PALAdminConstants.DEFAULT_PAGE_DECORATOR;
+ }
+ return name;
+ }
}