[portal-commits] JBoss Portal SVN: r6553 - in trunk/core-admin/src: main/org/jboss/portal/core/faces and 1 other directories.

Author: julien(a)jboss.com Date: 2007-03-06 11:41:28 -0500 (Tue, 06 Mar 2007) New Revision: 6553 Modified: trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/portlet/PortletContentEditorPortlet.java trunk/core-admin/src/main/org/jboss/portal/core/faces/UIPortlet.java trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPageLayout.xhtml Log: - use edit_content mode for the portlet - correct a few bugs 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-06 16:26:19 UTC (rev 6552) +++ trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/portlet/PortletContentEditorPortlet.java 2007-03-06 16:41:28 UTC (rev 6553) @@ -39,6 +39,7 @@ import javax.portlet.ActionRequest; import javax.portlet.ActionResponse; import javax.portlet.PortletURL; +import javax.portlet.PortletMode; import java.io.IOException; import java.io.PrintWriter; import java.util.List; @@ -51,6 +52,9 @@ { /** . */ + private static final PortletMode EDIT_CONTENT = new PortletMode("edit_content"); + + /** . */ private InstanceContainer instanceContainer; public void init() throws PortletException @@ -61,80 +65,86 @@ public void processAction(ActionRequest req, ActionResponse resp) throws PortletException, PortletSecurityException, IOException { - String uri = req.getParameter("uri"); - if (uri != null) + if (req.getPortletMode().equals(EDIT_CONTENT)) { - resp.setRenderParameter("uri", uri); + String uri = req.getParameter("uri"); + if (uri != null) + { + resp.setRenderParameter("uri", uri); + } } } public void render(RenderRequest req, RenderResponse resp) throws PortletException, PortletSecurityException, IOException { - String selectedURI = req.getParameter("uri"); - - // - PortletURL actionURL = resp.createActionURL(); - - // - resp.setContentType("text/html"); - PrintWriter writer = resp.getWriter(); - - // load insances this user has access to. - List available_instances = (List)instanceContainer.getDefinitions(); - Instance selectedInstance = null; - writer.print("<form action=\""); - writer.print(actionURL); - writer.print("\" method=\"post\">\n"); - writer.println("<select name=\"uri\"size=\"20\">\n"); - for (int i = 0; i < available_instances.size(); i++) + if (req.getPortletMode().equals(EDIT_CONTENT)) { - Instance instance = (Instance)available_instances.get(i); + String selectedURI = req.getParameter("uri"); // - writer.print("<option value=\""); - writer.print(instance.getId()); - writer.print("\""); + PortletURL actionURL = resp.createActionURL(); // - if (instance.getId().equals(selectedURI)) + resp.setContentType("text/html"); + PrintWriter writer = resp.getWriter(); + + // load insances this user has access to. + List available_instances = (List)instanceContainer.getDefinitions(); + Instance selectedInstance = null; + writer.print("<form action=\""); + writer.print(actionURL); + writer.print("\" method=\"post\">\n"); + writer.println("<select name=\"uri\"size=\"20\">\n"); + for (int i = 0; i < available_instances.size(); i++) { - selectedInstance = instance; - writer.print(" selected=\"selected\""); + Instance instance = (Instance)available_instances.get(i); + + // + writer.print("<option value=\""); + writer.print(instance.getId()); + writer.print("\""); + + // + if (instance.getId().equals(selectedURI)) + { + selectedInstance = instance; + writer.print(" selected=\"selected\""); + } + + // + writer.print(">"); + writer.print(instance.getId()); + writer.println("</option>\n"); } + writer.println("</select>"); + writer.println("<input name=\"select\" value=\"Select\" type=\"submit\"/>"); + writer.print("</form>"); // - writer.print(">"); - writer.print(instance.getId()); - writer.println("</option>\n"); - } - writer.println("</select>"); - writer.println("<input name=\"select\" value=\"Select\" type=\"submit\"/>"); - writer.print("</form>"); - - // - if (selectedInstance != null) - { - writer.print("<div class=\"portlet-font\" style=\"float:left\">"); - writer.print("<div><span class=\"portlet-form-field-label\">Portlet instance:</span>" + selectedURI + "</div>"); - try + if (selectedInstance != null) { - Portlet portlet = selectedInstance.getPortlet(); - if (portlet != null) + writer.print("<div class=\"portlet-font\" style=\"float:left\">"); + writer.print("<div><span class=\"portlet-form-field-label\">Portlet instance:</span>" + selectedURI + "</div>"); + try { - MetaInfo metaInfo = portlet.getInfo().getMeta(); - writer.print("<div><span class=\"portlet-form-field-label\">Portlet name:</span>" + metaInfo.getMetaValue(MetaInfo.DISPLAY_NAME).getDefaultString() + "</div>"); - writer.print("<div><span class=\"portlet-form-field-label\">Portlet description:</span>" + metaInfo.getMetaValue(MetaInfo.DESCRIPTION).getDefaultString() + "</div>"); - writer.print("<div><span class=\"portlet-form-field-label\">Portlet title:</span>" + metaInfo.getMetaValue(MetaInfo.TITLE).getDefaultString() + "</div>"); - writer.print("<div><span class=\"portlet-form-field-label\">Portlet keywords:</span>" + metaInfo.getMetaValue(MetaInfo.KEYWORDS).getDefaultString() + "</div>"); + Portlet portlet = selectedInstance.getPortlet(); + if (portlet != null) + { + MetaInfo metaInfo = portlet.getInfo().getMeta(); + writer.print("<div><span class=\"portlet-form-field-label\">Portlet name:</span>" + metaInfo.getMetaValue(MetaInfo.DISPLAY_NAME).getDefaultString() + "</div>"); + writer.print("<div><span class=\"portlet-form-field-label\">Portlet description:</span>" + metaInfo.getMetaValue(MetaInfo.DESCRIPTION).getDefaultString() + "</div>"); + writer.print("<div><span class=\"portlet-form-field-label\">Portlet title:</span>" + metaInfo.getMetaValue(MetaInfo.TITLE).getDefaultString() + "</div>"); + writer.print("<div><span class=\"portlet-form-field-label\">Portlet keywords:</span>" + metaInfo.getMetaValue(MetaInfo.KEYWORDS).getDefaultString() + "</div>"); + } } + catch (PortletInvokerException e) + { + e.printStackTrace(); + } } - catch (PortletInvokerException e) - { - e.printStackTrace(); - } + + // + writer.close(); } - - // - writer.close(); } } Modified: trunk/core-admin/src/main/org/jboss/portal/core/faces/UIPortlet.java =================================================================== --- trunk/core-admin/src/main/org/jboss/portal/core/faces/UIPortlet.java 2007-03-06 16:26:19 UTC (rev 6552) +++ trunk/core-admin/src/main/org/jboss/portal/core/faces/UIPortlet.java 2007-03-06 16:41:28 UTC (rev 6553) @@ -326,12 +326,17 @@ } // - Object values[] = new Object[5]; + Object values[] = new Object[10]; values[0] = super.saveState(faces); values[1] = instanceId; values[2] = opaqueValue; values[3] = saveAttachedState(faces, portletListener); - values[4] = supportedModes; + values[4] = supportedWindowStates; + values[5] = supportedModes; + values[6] = initialWindowState; + values[7] = initialMode; + values[8] = internalNavState; + values[9] = internalMode; return values; } @@ -345,7 +350,12 @@ instanceId = (String)values[1]; internalNavState = serializedNavState != null ? new PortletParametersStateString(serializedNavState).getParameters() : null; portletListener = (MethodBinding)restoreAttachedState(faces, values[3]); - supportedModes = (Set)values[4]; + supportedWindowStates = (Set)values[4]; + supportedModes = (Set)values[5]; + initialWindowState = (String)values[6]; + initialMode = (String)values[7]; + internalNavState = (PortletParameters)values[8]; + internalMode = (Mode)values[9]; } public void decode(FacesContext faces) 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-06 16:26:19 UTC (rev 6552) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPageLayout.xhtml 2007-03-06 16:41:28 UTC (rev 6553) @@ -103,9 +103,9 @@ <jbp:portlet instanceId="#{portalobjectmgr.selectedContentEditorInstance}" actionListener="#{portalobjectmgr.processEvent}" - supportedModes="view" + supportedModes="edit_content" supportedWindowStates="normal" - initialMode="view" + initialMode="edit_content" initialWindowState="normal"/> </div>