Author: julien(a)jboss.com Date: 2007-02-27 05:34:41 -0500 (Tue, 27 Feb 2007) New Revision: 6420 Modified: trunk/core-admin/src/main/org/jboss/portal/core/portlet/management/PortalObjectManagerBean.java trunk/core-admin/src/main/org/jboss/portal/core/portlet/management/actions/AddWindowAction.java trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/pageNavigation.xhtml Log: use a combo box to select the region to add a window to instead of lot of submit buttons Modified: trunk/core-admin/src/main/org/jboss/portal/core/portlet/management/PortalObjectManagerBean.java =================================================================== --- trunk/core-admin/src/main/org/jboss/portal/core/portlet/management/PortalObjectManagerBean.java 2007-02-27 10:10:26 UTC (rev 6419) +++ trunk/core-admin/src/main/org/jboss/portal/core/portlet/management/PortalObjectManagerBean.java 2007-02-27 10:34:41 UTC (rev 6420) @@ -889,6 +889,20 @@ return regions; } + public List getRegionItems() throws Exception + { + List list = getCols(); + for (int i = 0;i < list.size();i++) + { + String regionName = (String)list.get(i); + SelectItem regionItem = new SelectItem(); + regionItem.setValue(regionName); + regionItem.setLabel(regionName); + list.set(i, regionItem); + } + return list; + } + /** Return an array of <Region,Window>Map on the selected object which must be a page. */ public Map[] getRows() throws Exception { Modified: trunk/core-admin/src/main/org/jboss/portal/core/portlet/management/actions/AddWindowAction.java =================================================================== --- trunk/core-admin/src/main/org/jboss/portal/core/portlet/management/actions/AddWindowAction.java 2007-02-27 10:10:26 UTC (rev 6419) +++ trunk/core-admin/src/main/org/jboss/portal/core/portlet/management/actions/AddWindowAction.java 2007-02-27 10:34:41 UTC (rev 6420) @@ -31,7 +31,6 @@ import javax.faces.application.FacesMessage; import javax.faces.component.UIComponent; import javax.faces.context.FacesContext; -import javax.faces.el.ValueBinding; import javax.faces.validator.ValidatorException; /** @@ -47,6 +46,9 @@ /** . */ private String windowName; + /** . */ + private String regionName; + public PortalObjectManagerBean getPortalObjectManager() { return pomgr; @@ -67,6 +69,16 @@ this.windowName = windowName; } + public String getRegionName() + { + return regionName; + } + + public void setRegionName(String regionName) + { + this.regionName = regionName; + } + /** * Checks for duplicate window names on the page. Blank window names are not allowed and are controlled by the * required attribute in the presentation page. @@ -101,9 +113,6 @@ { try { - FacesContext ctx = FacesContext.getCurrentInstance(); - ValueBinding vb = ctx.getApplication().createValueBinding("#{col}"); - String region = (String)vb.getValue(ctx); Page page = (Page)pomgr.getSelectedObject(); // @@ -112,7 +121,7 @@ // Window window = page.createWindow(windowName, contentType, contentURI); - window.setDeclaredProperty(ThemeConstants.PORTAL_PROP_REGION, region); + window.setDeclaredProperty(ThemeConstants.PORTAL_PROP_REGION, regionName); window.setDeclaredProperty(ThemeConstants.PORTAL_PROP_ORDER, "" + Integer.MAX_VALUE); } catch (Exception e) Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/pageNavigation.xhtml =================================================================== --- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/pageNavigation.xhtml 2007-02-27 10:10:26 UTC (rev 6419) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/pageNavigation.xhtml 2007-02-27 10:34:41 UTC (rev 6420) @@ -84,17 +84,12 @@ <ct:content contentType="#{portalobjectmgr.selectedContentType}" contentURI="#{portalobjectmgr.selectedContentURI}"/> + <br/> - <t:dataTable - id="data" - var="row" - value="#{portalobjectmgr.rows}"> - <t:columns value="#{portalobjectmgr.cols}" var="col"> - <f:facet name="footer"> - <h:commandButton value="Add #{col}" action="#{addWindowAction.execute}" styleClass="portlet-form-button"/> - </f:facet> - </t:columns> - </t:dataTable> + <h:selectOneMenu value="#{addWindowAction.regionName}"> + <f:selectItems value="#{portalobjectmgr.regionItems}"></f:selectItems> + </h:selectOneMenu> + <h:commandButton value="Add window" action="#{addWindowAction.execute}" styleClass="portlet-form-button"/> </h:form>