svnno****@sourc*****
svnno****@sourc*****
2007年 7月 15日 (日) 08:15:30 JST
Revision: 256
http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=256
Author: shinsuke
Date: 2007-07-15 08:15:30 +0900 (Sun, 15 Jul 2007)
Log Message:
-----------
code alignment.
Modified Paths:
--------------
pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/AbstractSiteEditorPage.java
pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/PageInfoEditorPage.java
-------------- next part --------------
Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/AbstractSiteEditorPage.java
===================================================================
--- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/AbstractSiteEditorPage.java 2007-07-14 23:12:43 UTC (rev 255)
+++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/AbstractSiteEditorPage.java 2007-07-14 23:15:30 UTC (rev 256)
@@ -7,8 +7,7 @@
import jp.sf.pal.admin.entity.NodeInfo;
import jp.sf.pal.admin.service.SiteEditorService;
-public abstract class AbstractSiteEditorPage
-{
+public abstract class AbstractSiteEditorPage {
private List<NodeInfo> nodeItems;
private int nodeIndex;
@@ -24,163 +23,140 @@
/**
* @return the name
*/
- public String getName()
- {
+ public String getName() {
return name;
}
/**
* @param name the name to set
*/
- public void setName(String name)
- {
+ public void setName(String name) {
this.name = name;
}
/**
* @return the nodeItems
*/
- public List<NodeInfo> getNodeItems()
- {
+ public List<NodeInfo> getNodeItems() {
return nodeItems;
}
/**
* @param nodeItems the nodeItems to set
*/
- public void setNodeItems(List<NodeInfo> nodeItems)
- {
+ public void setNodeItems(List<NodeInfo> nodeItems) {
this.nodeItems = nodeItems;
}
/**
* @return the nodeIndex
*/
- public int getNodeIndex()
- {
+ public int getNodeIndex() {
return nodeIndex;
}
/**
* @param nodeIndex the nodeIndex to set
*/
- public void setNodeIndex(int nodeIndex)
- {
+ public void setNodeIndex(int nodeIndex) {
this.nodeIndex = nodeIndex;
}
- public AbstractSiteEditorPage()
- {
+ public AbstractSiteEditorPage() {
super();
}
/**
* @return the path
*/
- public String getPath()
- {
+ public String getPath() {
return path;
}
/**
* @param path the path to set
*/
- public void setPath(String path)
- {
+ public void setPath(String path) {
this.path = path;
}
/**
* @return the returnPath
*/
- public String getReturnPath()
- {
+ public String getReturnPath() {
return returnPath;
}
/**
* @param returnPath the returnPath to set
*/
- public void setReturnPath(String returnPath)
- {
+ public void setReturnPath(String returnPath) {
this.returnPath = returnPath;
}
/**
* @return the siteEditorSerivce
*/
- public SiteEditorService getSiteEditorService()
- {
+ public SiteEditorService getSiteEditorService() {
return siteEditorService;
}
/**
* @param siteEditorSerivce the siteEditorSerivce to set
*/
- public void setSiteEditorService(SiteEditorService siteEditorService)
- {
+ public void setSiteEditorService(SiteEditorService siteEditorService) {
this.siteEditorService = siteEditorService;
}
- public String getJumpFolderInfoEditorStyle()
- {
+ public String getJumpFolderInfoEditorStyle() {
return getJumpEditorStyle();
}
- public String getJumpPageInfoEditorStyle()
- {
+ public String getJumpPageInfoEditorStyle() {
return getJumpEditorStyle();
}
- protected String getJumpEditorStyle()
- {
- StringBuffer buf = new StringBuffer("text-decoration: none;margin-left:");
+ protected String getJumpEditorStyle() {
+ StringBuffer buf = new StringBuffer(
+ "text-decoration: none;margin-left:");
NodeInfo entity = getNodeItems().get(getNodeIndex());
buf.append(entity.getDepth() * 10);
buf.append("px;");
return buf.toString();
}
- public String getFolderIconSrc()
- {
+ public String getFolderIconSrc() {
return getIconSrc();
}
- public String getPageIconSrc()
- {
+ public String getPageIconSrc() {
return getIconSrc();
}
- public String getIconSrc()
- {
+ public String getIconSrc() {
FacesContext facesContext = FacesContext.getCurrentInstance();
- StringBuffer buf = new StringBuffer(facesContext.getExternalContext().getRequestContextPath() + "/images/");
+ StringBuffer buf = new StringBuffer(facesContext.getExternalContext()
+ .getRequestContextPath()
+ + "/images/");
NodeInfo entity = getNodeItems().get(getNodeIndex());
- if (entity.getType() == NodeInfo.FOLDER)
- {
+ if (entity.getType() == NodeInfo.FOLDER) {
buf.append("folder");
- }
- else if (entity.getType() == NodeInfo.PAGE)
- {
+ } else if (entity.getType() == NodeInfo.PAGE) {
buf.append("page");
- }
- else
- {
+ } else {
buf.append("none");
}
buf.append(".png");
return buf.toString();
}
- public boolean isFolder()
- {
+ public boolean isFolder() {
NodeInfo entity = getNodeItems().get(getNodeIndex());
return entity.getType() == NodeInfo.FOLDER;
}
- public boolean isPage()
- {
+ public boolean isPage() {
NodeInfo entity = getNodeItems().get(getNodeIndex());
return entity.getType() == NodeInfo.PAGE;
}
Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/PageInfoEditorPage.java
===================================================================
--- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/PageInfoEditorPage.java 2007-07-14 23:12:43 UTC (rev 255)
+++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/PageInfoEditorPage.java 2007-07-14 23:15:30 UTC (rev 256)
@@ -12,8 +12,8 @@
import org.seasar.teeda.extension.annotation.takeover.TakeOver;
import org.seasar.teeda.extension.annotation.takeover.TakeOverType;
-public class PageInfoEditorPage extends AbstractSiteEditorPage implements Serializable
-{
+public class PageInfoEditorPage extends AbstractSiteEditorPage implements
+ Serializable {
/**
*
@@ -23,7 +23,8 @@
/**
* Logger for this class
*/
- private static final Logger logger = Logger.getLogger(PageInfoEditorPage.class);
+ private static final Logger logger = Logger
+ .getLogger(PageInfoEditorPage.class);
private String pageTitle;
@@ -46,170 +47,147 @@
/**
* @return the pageTitle
*/
- public String getPageTitle()
- {
+ public String getPageTitle() {
return pageTitle;
}
/**
* @param pageTitle the pageTitle to set
*/
- public void setPageTitle(String pageTitle)
- {
+ public void setPageTitle(String pageTitle) {
this.pageTitle = pageTitle;
}
/**
* @return the pageShortTitle
*/
- public String getPageShortTitle()
- {
+ public String getPageShortTitle() {
return pageShortTitle;
}
/**
* @param pageShortTitle the pageShortTitle to set
*/
- public void setPageShortTitle(String pageShortTitle)
- {
+ public void setPageShortTitle(String pageShortTitle) {
this.pageShortTitle = pageShortTitle;
}
/**
* @return the pageDecoratorItems
*/
- public List<Map<String, String>> getPageDecoratorItems()
- {
+ public List<Map<String, String>> getPageDecoratorItems() {
return pageDecoratorItems;
}
/**
* @param pageDecoratorItems the pageDecoratorItems to set
*/
- public void setPageDecoratorItems(List<Map<String, String>> pageDecoratorItems)
- {
+ public void setPageDecoratorItems(
+ List<Map<String, String>> pageDecoratorItems) {
this.pageDecoratorItems = pageDecoratorItems;
}
/**
* @return the pageDecorator
*/
- public String getPageDecorator()
- {
+ public String getPageDecorator() {
return pageDecorator;
}
/**
* @param pageDecorator the pageDecorator to set
*/
- public void setPageDecorator(String pageDecorator)
- {
+ public void setPageDecorator(String pageDecorator) {
this.pageDecorator = pageDecorator;
}
/**
* @return the portletDecoratorItems
*/
- public List<Map<String, String>> getPortletDecoratorItems()
- {
+ public List<Map<String, String>> getPortletDecoratorItems() {
return portletDecoratorItems;
}
/**
* @param portletDecoratorItems the portletDecoratorItems to set
*/
- public void setPortletDecoratorItems(List<Map<String, String>> portletDecoratorItems)
- {
+ public void setPortletDecoratorItems(
+ List<Map<String, String>> portletDecoratorItems) {
this.portletDecoratorItems = portletDecoratorItems;
}
/**
* @return the portletDecorator
*/
- public String getPortletDecorator()
- {
+ public String getPortletDecorator() {
return portletDecorator;
}
/**
* @param portletDecorator the portletDecorator to set
*/
- public void setPortletDecorator(String portletDecorator)
- {
+ public void setPortletDecorator(String portletDecorator) {
this.portletDecorator = portletDecorator;
}
/**
* @return the desktopItems
*/
- public List<Map<String, String>> getDesktopThemeItems()
- {
+ public List<Map<String, String>> getDesktopThemeItems() {
return desktopThemeItems;
}
/**
* @param desktopThemeItems the desktopItems to set
*/
- public void setDesktopThemeItems(List<Map<String, String>> desktopThemeItems)
- {
+ public void setDesktopThemeItems(List<Map<String, String>> desktopThemeItems) {
this.desktopThemeItems = desktopThemeItems;
}
/**
* @return the desktopTheme
*/
- public String getDesktopTheme()
- {
+ public String getDesktopTheme() {
return desktopTheme;
}
/**
* @param desktopTheme the desktopTheme to set
*/
- public void setDesktopTheme(String desktopTheme)
- {
+ public void setDesktopTheme(String desktopTheme) {
this.desktopTheme = desktopTheme;
}
/**
* @return the pageHidden
*/
- public boolean isPageHidden()
- {
+ public boolean isPageHidden() {
return pageHidden;
}
/**
* @param pageHidden the pageHidden to set
*/
- public void setPageHidden(boolean pageHidden)
- {
+ public void setPageHidden(boolean pageHidden) {
this.pageHidden = pageHidden;
}
- public Class<?> initialize()
- {
+ public Class<?> initialize() {
return null;
}
- public Class<?> prerender()
- {
- if (getPath() == null)
- {
+ public Class<?> prerender() {
+ if (getPath() == null) {
setPath("/default-page.psml");
}
- if (getReturnPath() == null)
- {
+ if (getReturnPath() == null) {
setReturnPath("/");
}
- try
- {
+ try {
getSiteEditorService().loadPage(this);
- }
- catch (CommonException e)
- {
+ } catch (CommonException e) {
FacesMessageUtil.addErrorMessage(e.getMessageId());
logger.log("EPA0001", new Object[] { this.toString() }, e);
}
@@ -218,21 +196,15 @@
}
@TakeOver(type = TakeOverType.INCLUDE, properties = "path,returnPath")
- public Class<?> doUpdate()
- {
- try
- {
+ public Class<?> doUpdate() {
+ try {
getSiteEditorService().updatePage(this);
FacesMessageUtil.addInfoMessage("updated.page");
return PageInfoEditorPage.class;
- }
- catch (CommonException e)
- {
+ } catch (CommonException e) {
FacesMessageUtil.addErrorMessage(e.getMessageId());
logger.log("EPA0002", new Object[] { this.toString() }, e);
- }
- catch (Exception e)
- {
+ } catch (Exception e) {
FacesMessageUtil.addErrorMessage("could.not.update.page");
logger.log("EPA0002", new Object[] { this.toString() }, e);
}