Author: julien(a)jboss.com Date: 2007-03-10 15:33:28 -0500 (Sat, 10 Mar 2007) New Revision: 6624 Modified: trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/portlet/PortletContentEditorPortlet.java trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPageLayout.xhtml trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editWindow.xhtml trunk/core-cms/src/main/org/jboss/portal/core/cms/ui/CMSPortlet.java trunk/core-cms/src/main/org/jboss/portal/core/cms/ui/admin/CMSContentEditorPortlet.java trunk/widget/src/main/org/jboss/portal/widget/WidgetPortlet.java Log: resurrect edit_content portlet mode as it is better to use it to distinguish between preferences and content editing Modified: trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/portlet/PortletContentEditorPortlet.java =================================================================== --- trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/portlet/PortletContentEditorPortlet.java 2007-03-10 19:16:04 UTC (rev 6623) +++ trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/portlet/PortletContentEditorPortlet.java 2007-03-10 20:33:28 UTC (rev 6624) @@ -51,6 +51,9 @@ { /** . */ + private final PortletMode EDIT_CONTENT = new PortletMode("edit_content"); + + /** . */ private InstanceContainer instanceContainer; public void init() throws PortletException @@ -61,7 +64,7 @@ public void processAction(ActionRequest req, ActionResponse resp) throws PortletException, PortletSecurityException, IOException { - if (req.getPortletMode().equals(PortletMode.EDIT)) + if (req.getPortletMode().equals(EDIT_CONTENT)) { String uri = req.getParameter("uri"); if (uri != null) @@ -71,8 +74,20 @@ } } - protected void doEdit(RenderRequest req, RenderResponse resp) throws PortletException, PortletSecurityException, IOException + protected void doDispatch(RenderRequest req, RenderResponse resp) throws PortletException, PortletSecurityException, IOException { + if (EDIT_CONTENT.equals(req.getPortletMode())) + { + doEditContent(req, resp); + } + else + { + super.doDispatch(req, resp); + } + } + + protected void doEditContent(RenderRequest req, RenderResponse resp) throws PortletException, PortletSecurityException, IOException + { String selectedURI = req.getParameter("uri"); // Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPageLayout.xhtml =================================================================== --- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPageLayout.xhtml 2007-03-10 19:16:04 UTC (rev 6623) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPageLayout.xhtml 2007-03-10 20:33:28 UTC (rev 6624) @@ -104,9 +104,9 @@ <jbp:portlet instanceId="#{portalobjectmgr.selectedContentEditorInstance}" actionListener="#{portalobjectmgr.processEvent}" - supportedModes="edit" + supportedModes="edit_content" supportedWindowStates="normal" - initialMode="edit" + initialMode="edit_content" initialWindowState="normal" onClick="url.setParameter('windowName', document.getElementById('layoutForm:windowName').value).setParameter('targetRegion', document.getElementById('layoutForm:targetRegion').value);"/> </div> Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editWindow.xhtml =================================================================== --- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editWindow.xhtml 2007-03-10 19:16:04 UTC (rev 6623) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editWindow.xhtml 2007-03-10 20:33:28 UTC (rev 6624) @@ -15,9 +15,9 @@ actionListener="#{portalobjectmgr.processEvent}" instanceId="#{portalobjectmgr.selectedContentEditorInstance}" renderParameters="#{portalobjectmgr.renderParameters}" - supportedModes="edit" + supportedModes="edit_content" supportedWindowStates="normal" - initialMode="edit" + initialMode="edit_content" initialWindowState="normal"/> </div> Modified: trunk/core-cms/src/main/org/jboss/portal/core/cms/ui/CMSPortlet.java =================================================================== --- trunk/core-cms/src/main/org/jboss/portal/core/cms/ui/CMSPortlet.java 2007-03-10 19:16:04 UTC (rev 6623) +++ trunk/core-cms/src/main/org/jboss/portal/core/cms/ui/CMSPortlet.java 2007-03-10 20:33:28 UTC (rev 6624) @@ -40,6 +40,7 @@ import javax.portlet.PortletConfig; import javax.portlet.ActionRequest; import javax.portlet.ActionResponse; +import javax.portlet.PortletMode; import org.apache.log4j.Logger; import org.jboss.portal.cms.CMS; @@ -135,6 +136,9 @@ public static final String REQUEST_PROPERTY_USE_GLOBAL_URLS = "cms.use_global_urls"; /** . */ + private static final PortletMode EDIT_CONTENT = new PortletMode("edit_content"); + + /** . */ private CMS CMSService; /** . */ @@ -309,14 +313,30 @@ prd.include(req, resp); } + protected void doDispatch(RenderRequest req, RenderResponse resp) throws PortletException, PortletSecurityException, IOException + { + if (EDIT_CONTENT.equals(req.getPortletMode())) + { + doEditContent(req, resp); + } + else + { + super.doDispatch(req, resp); + } + } + + protected void doEditContent(RenderRequest req, RenderResponse resp) throws IOException, PortletException + { + hack.render(req, resp); + } + public void doEdit(RenderRequest req, RenderResponse resp) throws IOException, PortletException { -// resp.setContentType("text/html"); -// resp.setTitle("Edit"); + resp.setContentType("text/html"); + resp.setTitle("Edit"); // // TODO: Allow users to modify start page preferences. -// PortletRequestDispatcher prd = getPortletContext().getRequestDispatcher(CMS_JSP_PATH + "/edit.jsp"); -// prd.include(req, resp); - hack.render(req, resp); + PortletRequestDispatcher prd = getPortletContext().getRequestDispatcher(CMS_JSP_PATH + "/edit.jsp"); + prd.include(req, resp); } /** Modified: trunk/core-cms/src/main/org/jboss/portal/core/cms/ui/admin/CMSContentEditorPortlet.java =================================================================== --- trunk/core-cms/src/main/org/jboss/portal/core/cms/ui/admin/CMSContentEditorPortlet.java 2007-03-10 19:16:04 UTC (rev 6623) +++ trunk/core-cms/src/main/org/jboss/portal/core/cms/ui/admin/CMSContentEditorPortlet.java 2007-03-10 20:33:28 UTC (rev 6624) @@ -47,6 +47,9 @@ /** . */ private CMS cmsService; + + /** . */ + private static final PortletMode EDIT_CONTENT = new PortletMode("edit_content"); public void init() throws PortletException { @@ -55,7 +58,7 @@ public void processAction(ActionRequest req, ActionResponse resp) throws PortletException, PortletSecurityException, IOException { - if (req.getPortletMode().equals(PortletMode.EDIT)) + if (req.getPortletMode().equals(EDIT_CONTENT)) { String uri = req.getParameter("uri"); String path = req.getParameter("path"); @@ -71,8 +74,20 @@ } } - protected void doEdit(RenderRequest req, RenderResponse resp) throws PortletException, PortletSecurityException, IOException + protected void doDispatch(RenderRequest req, RenderResponse resp) throws PortletException, PortletSecurityException, IOException { + if (EDIT_CONTENT.equals(req.getPortletMode())) + { + doEditContent(req, resp); + } + else + { + super.doDispatch(req, resp); + } + } + + protected void doEditContent(RenderRequest req, RenderResponse resp) throws PortletException, PortletSecurityException, IOException + { resp.setContentType("text/html"); String sPath = req.getParameter("path"); Modified: trunk/widget/src/main/org/jboss/portal/widget/WidgetPortlet.java =================================================================== --- trunk/widget/src/main/org/jboss/portal/widget/WidgetPortlet.java 2007-03-10 19:16:04 UTC (rev 6623) +++ trunk/widget/src/main/org/jboss/portal/widget/WidgetPortlet.java 2007-03-10 20:33:28 UTC (rev 6624) @@ -34,6 +34,7 @@ import javax.portlet.ActionRequest; import javax.portlet.ActionResponse; import javax.portlet.PortletRequestDispatcher; +import javax.portlet.PortletMode; import java.io.IOException; import java.io.PrintWriter; @@ -45,6 +46,9 @@ { /** . */ + private final PortletMode EDIT_CONTENT = new PortletMode("edit_content"); + + /** . */ private GGProvider provider = new GGProvider(); public void init() throws PortletException @@ -75,8 +79,20 @@ } - protected void doEdit(RenderRequest req, RenderResponse resp) throws PortletException, PortletSecurityException, IOException + protected void doDispatch(RenderRequest req, RenderResponse resp) throws PortletException, PortletSecurityException, IOException { + if (EDIT_CONTENT.equals(req.getPortletMode())) + { + doEditContent(req, resp); + } + else + { + super.doDispatch(req, resp); + } + } + + protected void doEditContent(RenderRequest req, RenderResponse resp) throws PortletException, PortletSecurityException, IOException + { resp.setContentType("text/html"); //