Author: wesleyhales Date: 2008-08-14 14:24:15 -0400 (Thu, 14 Aug 2008) New Revision: 11696 Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/CoordinationAction.java branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editCoordination.xhtml Log: coordination ui checkboxes and begin completing work on event bindings Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/CoordinationAction.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/CoordinationAction.java 2008-08-14 16:31:48 UTC (rev 11695) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/CoordinationAction.java 2008-08-14 18:24:15 UTC (rev 11696) @@ -48,6 +48,7 @@ import javax.faces.event.ValueChangeEvent; import javax.faces.model.SelectItem; import javax.xml.namespace.QName; +import java.util.ArrayList; import java.util.Collection; import java.util.Collections; import java.util.HashMap; @@ -59,7 +60,6 @@ import java.util.Set; import java.util.SortedSet; import java.util.TreeSet; -import java.util.ArrayList; /** * @author <a href="mailto:whales@redhat.com">Wesley Hales</a> @@ -83,7 +83,7 @@ private Map<String, String> aliasBindings; - private Map<String, Map<String,String>> windowBindings; + private Map<String, Map<String, String>> windowBindings; private String selectedRenderParameter; @@ -99,7 +99,7 @@ public PortalObjectId getSelectedObjectId() { - //since this bean is in session, always check for new object request + //since this backing bean is in session, always check for new object request String id = getFacesParam("id"); if (id != null) { @@ -287,11 +287,6 @@ { ParameterInfo pInfo = (ParameterInfo)o; availableRenderParameters.put(pInfo.getName().toString(), pInfo.getName().toString()); -// System.out.println("key---------" + pInfo.getName()); -// System.out.println("key---------" + pInfo.getId()); -// System.out.println("key---------" + pInfo.getDescription()); -// System.out.println("key---------" + pInfo.getAliases()); - } // retrieve metadata on events @@ -348,7 +343,7 @@ } /** - * Parse PortalObjectId for given portlet object. + * Util: Parse PortalObjectId for given portlet object. * * @param id * @return @@ -368,22 +363,37 @@ public boolean isExplicitEventsUsed() { - try + PortalObject portalObject = getSelectedObject(); + boolean enabled = false; + if (portalObject.getType() == PortalObject.TYPE_PAGE) { - Map<String, String> props = getSelectedObject().getProperties(); - if (props != null) - { - return !Boolean.valueOf(props.get("coordination.event.implicit_mode")); + Page page = (Page)portalObject; + if(pomb.getCoordinationService().isEventWiringImplicitModeEnabled(page) != null){ + enabled = pomb.getCoordinationService().isEventWiringImplicitModeEnabled(page); } + } - catch (Exception e) + return enabled; + } + + /** + * Listener for explicit event checkbox + * + * @param event + * @throws org.jboss.portal.core.controller.coordination.IllegalCoordinationException + */ + public void explicitEventsListener(ValueChangeEvent event)throws IllegalCoordinationException + { + PortalObject portalObject = getSelectedObject(); + String newValue = event.getNewValue().toString(); + if (portalObject.getType() == PortalObject.TYPE_PAGE) { - e.printStackTrace(); + Page page = (Page)portalObject; + pomb.getCoordinationService().setEventWiringImplicitMode(page,Boolean.parseBoolean(newValue)); } - - return false; } + public Map<String, EventWiringInfo> getEventWirings() { return eventWirings; @@ -452,15 +462,6 @@ throw new NotYetImplemented("renameWiring not yet implemented!"); } - /** - * Listener for explicit event checkbox - * - * @param event - */ - public void explicitEventsListener(ValueChangeEvent event) - { - } - public static class DisplayEventWiring implements Comparable { private String name; @@ -514,54 +515,6 @@ } } - public static class DisplayParameterBinding implements Comparable{ - - private String id; - - private QName name; - - private List<Window> windows; - - public String getId() - { - return id; - } - - public void setId(String id) - { - this.id = id; - } - - public QName getName() - { - return name; - } - - public void setName(QName name) - { - this.name = name; - } - - public List<Window> getWindows() - { - if(windows == null){ - windows = new ArrayList<Window>(); - } - return windows; - } - - public void setWindows(List<Window> windows) - { - this.windows = windows; - } - - public int compareTo(Object o) - { - DisplayParameterBinding other = (DisplayParameterBinding)o; - return id.compareTo(other.getId()); - } - } - public static class WindowSelectItem extends SelectItem implements Comparable { public WindowSelectItem(Window window) @@ -618,6 +571,90 @@ } } + // Parameter Binding + public boolean isParameterImplicitEnabled() + { + PortalObject portalObject = getSelectedObject(); + boolean enabled = false; + if (portalObject.getType() == PortalObject.TYPE_PAGE) + { + Page page = (Page)portalObject; + if(pomb.getCoordinationService().isParameterBindingImplicitModeEnabled(page) != null){ + enabled = pomb.getCoordinationService().isParameterBindingImplicitModeEnabled(page); + } + + } + return enabled; + } + + /** + * Listener for implicit parameter binding checkbox + * + * @param event + * @throws org.jboss.portal.core.controller.coordination.IllegalCoordinationException + */ + public void implicitParameterListener(ValueChangeEvent event) throws IllegalCoordinationException + { + PortalObject portalObject = getSelectedObject(); + String newValue = event.getNewValue().toString(); + if (portalObject.getType() == PortalObject.TYPE_PAGE) + { + Page page = (Page)portalObject; + pomb.getCoordinationService().setParameterBindingImplicitMode(page,Boolean.parseBoolean(newValue)); + } + } + + + public static class DisplayParameterBinding implements Comparable + { + + private String id; + + private QName name; + + private List<Window> windows; + + public String getId() + { + return id; + } + + public void setId(String id) + { + this.id = id; + } + + public QName getName() + { + return name; + } + + public void setName(QName name) + { + this.name = name; + } + + public List<Window> getWindows() + { + if (windows == null) + { + windows = new ArrayList<Window>(); + } + return windows; + } + + public void setWindows(List<Window> windows) + { + this.windows = windows; + } + + public int compareTo(Object o) + { + DisplayParameterBinding other = (DisplayParameterBinding)o; + return id.compareTo(other.getId()); + } + } + private List<DisplayParameterBinding> displayParameterBindings; public List<DisplayParameterBinding> getDisplayParameterBindings() @@ -635,39 +672,32 @@ PortalObject portalObject = getSelectedObject(); if (portalObject.getType() == PortalObject.TYPE_PAGE) { - Page page = (Page)portalObject; - //windowbindings prep for ui - //windowBindings = new LinkedHashMap<String, Map<String, String>>(); - displayParameterBindings = new ArrayList<DisplayParameterBinding>(); - for (Object o : pomb.getCoordinationService().getWindowBindings(page)) - { - WindowBindingInfo wbInfo = (WindowBindingInfo)o; - DisplayParameterBinding dpb = new DisplayParameterBinding(); - for (Object o1 : wbInfo.getWindows().entrySet()) + Page page = (Page)portalObject; + displayParameterBindings = new ArrayList<DisplayParameterBinding>(); + for (Object o : pomb.getCoordinationService().getWindowBindings(page)) { + WindowBindingInfo wbInfo = (WindowBindingInfo)o; + DisplayParameterBinding dpb = new DisplayParameterBinding(); + for (Object o1 : wbInfo.getWindows().entrySet()) + { - Map.Entry entry = (Map.Entry)o1; - Map tempMap = new LinkedHashMap<String,String>(); - Window paramName = (Window)entry.getKey(); - QName paramValue = (QName)entry.getValue(); - //quick filter for duplicate binding ids - dpb.getWindows().add(paramName); - if(dpb.getWindows().size() < 2){ - dpb.setId(wbInfo.getId()); - dpb.setName(paramValue); + Map.Entry entry = (Map.Entry)o1; + Window paramName = (Window)entry.getKey(); + QName paramValue = (QName)entry.getValue(); + //quick filter for duplicate binding ids + dpb.getWindows().add(paramName); + if (dpb.getWindows().size() < 2) + { + dpb.setId(wbInfo.getId()); + dpb.setName(paramValue); + } } - - - -// tempMap.put(paramValue.toString(), paramName.getName()); -// windowBindings.put(wbInfo.getId(),tempMap); + displayParameterBindings.add(dpb); } - displayParameterBindings.add(dpb); } - } } - public void createWindowBinding(ActionEvent event) + public void createWindowBinding(ActionEvent event) throws IllegalCoordinationException { Map<Window, QName> windowBinding = null; for (String window : selectedWindows) @@ -678,16 +708,10 @@ if (portalObject.getType() == PortalObject.TYPE_WINDOW) { windowBinding.put((Window)portalObject, QName.valueOf(selectedRenderParameter)); - try - { - pomb.getCoordinationService().setWindowBinding(windowBindingName, windowBinding); - } - catch (IllegalCoordinationException e) - { - e.printStackTrace(); //To change body of catch statement use File | Settings | File Templates. - } + pomb.getCoordinationService().setWindowBinding(windowBindingName, windowBinding); } } - loadWindowBindings(); + //refresh data + loadWindowBindings(); } } Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editCoordination.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editCoordination.xhtml 2008-08-14 16:31:48 UTC (rev 11695) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editCoordination.xhtml 2008-08-14 18:24:15 UTC (rev 11696) @@ -6,214 +6,180 @@ xmlns:fn="http://java.sun.com/jsp/jstl/functions" xmlns:pfc="http://www.jboss.com/portal/facelet/common" xmlns:c="http://java.sun.com/jstl/core"> - <ui:param name="portalObjectScreen" value="#{bundle.COORDINATION_COORDINATION}"/> - <ui:define name="content"> - <div class="tenpx-top-bottom"> - <h2 class="portlet-area-header">#{coordinationAction.selectedObject.name} #{bundle.COORDINATION_PARAMETER_BINDINGS}</h2> +<ui:param name="portalObjectScreen" value="#{bundle.COORDINATION_COORDINATION}"/> +<ui:define name="content"> - <!-- Create parameter binding --> - <h3 class="sectionTitle tenpx-top-bottom">#{bundle.COORDINATION_CREATE_PARAMETER_BINDING}</h3> - #{bundle.COORDINATION_PARAMETER_IMPLICIT_MODE} #{coordinationAction.selectedObject.properties['coordination.parameter.implicit_mode']} - <hr/> + <div class="tenpx-top-bottom"> + <h2 + class="portlet-area-header">#{coordinationAction.selectedObject.name} #{bundle.COORDINATION_PARAMETER_BINDINGS}</h2> - <h:form> - <h:messages /> + <!-- Create parameter binding --> + <h3 class="sectionTitle tenpx-top-bottom">#{bundle.COORDINATION_CREATE_PARAMETER_BINDING}</h3> - <div class="float-left quarter-width"> - Available Render Parameter Names - <h:selectOneListbox size="5" value="#{coordinationAction.selectedRenderParameter}"> - <f:selectItems value="#{coordinationAction.availableRenderParameters}"/> - </h:selectOneListbox> - </div> + <h:form> + <h:selectBooleanCheckbox id="useImplicitBinding" value="#{coordinationAction.parameterImplicitEnabled}" + onchange="this.form.submit()" + valueChangeListener="#{coordinationAction.implicitParameterListener}"/> + Enable #{bundle.COORDINATION_PARAMETER_IMPLICIT_MODE} + </h:form> + <hr/> + <h:form> + <h:messages/> - <div class="float-left quarter-width"> - #{bundle.COORDINATION_WINDOWS} - <h:selectManyListbox size="5" value="#{coordinationAction.selectedWindows}"> - <f:selectItems value="#{coordinationAction.windows}"/> - </h:selectManyListbox> + <div class="float-left quarter-width"> + Available Render Parameter Names + <h:selectOneListbox size="5" value="#{coordinationAction.selectedRenderParameter}"> + <f:selectItems value="#{coordinationAction.availableRenderParameters}"/> + </h:selectOneListbox> + </div> - </div> + <div class="float-left quarter-width"> + #{bundle.COORDINATION_WINDOWS} + <h:selectManyListbox size="5" value="#{coordinationAction.selectedWindows}"> + <f:selectItems value="#{coordinationAction.windows}"/> + </h:selectManyListbox> - <div class="float-left quarter-width"> - <h:inputText value="#{coordinationAction.windowBindingName}"/> - </div> - <h:commandButton actionListener="#{coordinationAction.createWindowBinding}" value="Create Binding" /> + </div> + + <div class="float-left quarter-width"> + <h:inputText value="#{coordinationAction.windowBindingName}"/> + </div> + + <h:commandButton actionListener="#{coordinationAction.createWindowBinding}" value="Create Binding"/> <br class="clear"/> - </h:form> - <!-- Manage existing parameter bindings --> - <h3 class="sectionTitle tenpx-top-bottom">Manage Existing Parameter Bindings</h3> + </h:form> + <!-- Manage existing parameter bindings --> + <h3 class="sectionTitle tenpx-top-bottom">Manage Existing Parameter Bindings</h3> - <div class="float-left full-width"> - <h:form> - <h:dataTable var="binding" value="#{coordinationAction.displayParameterBindings}" - rendered="true" - styleClass="objectList datatable" - rowClasses="portlet-section-body,portlet-section-alternate-blue" - columnClasses="objectNameColumn" - headerClass="portlet-section-header"> - <h:column> - <f:facet name="header"> - Binding Name - </f:facet> - #{binding.id} - </h:column> - <h:column> - <f:facet name="header"> - Original QName - </f:facet> - #{binding.name} - </h:column> - <h:column> - <f:facet name="header"> - Target Windows - </f:facet> - <ui:repeat var="window" value="#{binding.windows}"> - #{window.name}, - </ui:repeat> + <div class="float-left full-width"> + <h:form> + <h:dataTable var="binding" value="#{coordinationAction.displayParameterBindings}" + rendered="true" + styleClass="objectList datatable" + rowClasses="portlet-section-body,portlet-section-alternate-blue" + columnClasses="objectNameColumn" + headerClass="portlet-section-header"> + <h:column> + <f:facet name="header"> + Binding Name + </f:facet> + #{binding.id} + </h:column> + <h:column> + <f:facet name="header"> + Original QName + </f:facet> + #{binding.name} + </h:column> + <h:column> + <f:facet name="header"> + Target Windows + </f:facet> + <ui:repeat var="window" value="#{binding.windows}"> + #{window.name}, + </ui:repeat> - </h:column> + </h:column> - <h:column> - <f:facet name="header"> - Actions - </f:facet> - Delete | Rename - - </h:column> - </h:dataTable> - </h:form> - </div> + <h:column> + <f:facet name="header"> + Actions + </f:facet> + Delete | Rename - <br class="clear"/> + </h:column> + </h:dataTable> + </h:form> </div> - <!-- Event wirings --> - <h2 class="portlet-area-header">#{coordinationAction.selectedObject.name} #{bundle.COORDINATION_EVENT_WIRINGS}</h2> + <br class="clear"/> + </div> - <h:form> + <!-- Event wirings --> + <h2 class="portlet-area-header">#{coordinationAction.selectedObject.name} #{bundle.COORDINATION_EVENT_WIRINGS}</h2> - <h:selectBooleanCheckbox id="useExplicitEvents" value="#{coordinationAction.explicitEventsUsed}" - onchange="this.form.submit()" valueChangeListener="#{consumer.explicitEventsListener}" - immediate="true"/> #{bundle.COORDINATION_EVENT_EXPLICIT_MODE} - - </h:form> + <h:form> - <!-- Manage existing wirings --> - <h3 class="sectionTitle tenpx-top-bottom">#{bundle.COORDINATION_EVENT_MANAGE_EXISTING}</h3> - <h:form> - <h:dataTable var="wiring" value="#{coordinationAction.displayEventWirings}" - rendered="#{coordinationAction.explicitEventsUsed}" - styleClass="objectList datatable" - rowClasses="portlet-section-body,portlet-section-alternate-blue" - columnClasses="objectNameColumn, objectActionColumn" - headerClass="portlet-section-header"> - <h:column> - <f:facet name="header"> - <h:outputText value="#{bundle.COORDINATION_EVENT_EXISTING_NAME}"/> - </f:facet> - #{wiring.name} - </h:column> - <h:column> - <f:facet name="header"> - <h:outputText value="#{bundle.COORDINATION_EVENT_EXISTING_SOURCE_WINDOWS}"/> - </f:facet> - #{wiring.sourceWindows} - </h:column> - <h:column> - <f:facet name="header"> - <h:outputText value="#{bundle.COORDINATION_EVENT_EXISTING_SOURCE_EVENTS}"/> - </f:facet> - #{wiring.sourceEvents} - </h:column> - <h:column> - <f:facet name="header"> - <h:outputText value="#{bundle.COORDINATION_EVENT_EXISTING_DESTINATION_EVENTS}"/> - </f:facet> - #{wiring.destinationEvents} - </h:column> - <h:column> - <f:facet name="header"> - <h:outputText value="#{bundle.COORDINATION_EVENT_EXISTING_DESTINATION_WINDOWS}"/> - </f:facet> - #{wiring.destinationWindows} - </h:column> - <h:column> - <f:facet name="header"> - <h:outputText value="#{bundle.COORDINATION_EVENT_EXISTING_ACTIONS}"/> - </f:facet> + <h:selectBooleanCheckbox id="useExplicitEvents" value="#{coordinationAction.explicitEventsUsed}" + onchange="this.form.submit()" + valueChangeListener="#{coordinationAction.explicitEventsListener}" + immediate="true"/> Enable Event Implicit Mode - <h:commandLink action="#{coordinationAction.renameWiring}"> - <h:outputText styleClass="actionRename" value="#{bundle.RENAME}"/> - <f:param name="wiring" value="#{wiring.name}"/> - </h:commandLink> | - <h:commandLink action="#{coordinationAction.deleteWiring}"> - <h:outputText styleClass="actionDelete" value="#{bundle.COMMON_DELETE}"/> - <f:param name="wiring" value="#{wiring.name}"/> - </h:commandLink> - </h:column> - </h:dataTable> - </h:form> + </h:form> - <!-- Create new event wiring --> - <h3 class="sectionTitle tenpx-top-bottom">#{bundle.COORDINATION_EVENT_CREATE}</h3> - <h:form> - <h:selectManyListbox size="5" value="#{coordinationAction.selectedSourceEvents}"> - <f:selectItems value="#{coordinationAction.sourceEvents}"/> - </h:selectManyListbox> - </h:form> - - <ui:remove> - <h:selectManyListbox size="5" value="#{coordinationAction.stringStub}"> - <f:selectItems value="#{coordinationAction.eventWirings}"/> + <!-- Create new event wiring --> + <h3 class="sectionTitle tenpx-top-bottom">#{bundle.COORDINATION_EVENT_CREATE}</h3> + <h:form> + <h:selectManyListbox size="5" value="#{coordinationAction.selectedSourceEvents}"> + <f:selectItems value="#{coordinationAction.sourceEvents}"/> </h:selectManyListbox> - <br/> - <ui:repeat var="eventWirings" value="#{coordinationAction.eventWirings}"> - #{eventWirings} - </ui:repeat> - <hr/> + </h:form> - eventSources - <h:selectManyListbox size="5" value="#{coordinationAction.stringStub}"> - <f:selectItems value="#{coordinationAction.eventSources}"/> - </h:selectManyListbox> - <br/> - <ui:repeat var="eventSources" value="#{coordinationAction.eventSources}"> - #{eventSources} - </ui:repeat> + <ui:repeat var="eventWirings" value="#{coordinationAction.eventWirings}"> + #{eventWirings} + </ui:repeat> + <hr/> - <hr/> - eventDestinations - <h:selectManyListbox size="5" value="#{coordinationAction.stringStub}"> - <f:selectItems value="#{coordinationAction.eventDestinations}"/> - </h:selectManyListbox> - <br/> - <ui:repeat var="eventDestinations" value="#{coordinationAction.eventDestinations}"> - #{eventDestinations} - </ui:repeat> - <h:selectOneMenu id="locales" value="#{coordinationAction.stringStub}"> - <f:selectItems value="#{coordinationAction.pomb.portalItems}"/> - </h:selectOneMenu> - <br/> + <!-- Manage existing wirings --> + <h3 class="sectionTitle tenpx-top-bottom">#{bundle.COORDINATION_EVENT_MANAGE_EXISTING}</h3> + <h:form> + <h:dataTable var="wiring" value="#{coordinationAction.displayEventWirings}" + rendered="#{coordinationAction.explicitEventsUsed}" + styleClass="objectList datatable" + rowClasses="portlet-section-body,portlet-section-alternate-blue" + columnClasses="objectNameColumn, objectActionColumn" + headerClass="portlet-section-header"> + <h:column> + <f:facet name="header"> + <h:outputText value="#{bundle.COORDINATION_EVENT_EXISTING_NAME}"/> + </f:facet> + #{wiring.name} + </h:column> + <h:column> + <f:facet name="header"> + <h:outputText value="#{bundle.COORDINATION_EVENT_EXISTING_SOURCE_WINDOWS}"/> + </f:facet> + #{wiring.sourceWindows} + </h:column> + <h:column> + <f:facet name="header"> + <h:outputText value="#{bundle.COORDINATION_EVENT_EXISTING_SOURCE_EVENTS}"/> + </f:facet> + #{wiring.sourceEvents} + </h:column> + <h:column> + <f:facet name="header"> + <h:outputText value="#{bundle.COORDINATION_EVENT_EXISTING_DESTINATION_EVENTS}"/> + </f:facet> + #{wiring.destinationEvents} + </h:column> + <h:column> + <f:facet name="header"> + <h:outputText value="#{bundle.COORDINATION_EVENT_EXISTING_DESTINATION_WINDOWS}"/> + </f:facet> + #{wiring.destinationWindows} + </h:column> + <h:column> + <f:facet name="header"> + <h:outputText value="#{bundle.COORDINATION_EVENT_EXISTING_ACTIONS}"/> + </f:facet> - <h:selectOneMenu id="locales" value="#{coordinationAction.stringStub}"> - <f:selectItems value="#{coordinationAction.pomb.instanceItems}"/> - </h:selectOneMenu> - <br/> + <h:commandLink action="#{coordinationAction.renameWiring}"> + <h:outputText styleClass="actionRename" value="#{bundle.RENAME}"/> + <f:param name="wiring" value="#{wiring.name}"/> + </h:commandLink> | + <h:commandLink action="#{coordinationAction.deleteWiring}"> + <h:outputText styleClass="actionDelete" value="#{bundle.COMMON_DELETE}"/> + <f:param name="wiring" value="#{wiring.name}"/> + </h:commandLink> + </h:column> + </h:dataTable> + </h:form> - <h:selectOneMenu id="locales" value="#{coordinationAction.stringStub}"> - <f:selectItems value="#{coordinationAction.pomb.portalPageItems}"/> - </h:selectOneMenu> - <hr/> - #{bundle.COORDINATION_ALIAS_BINDINGS} - <h:selectManyListbox size="5" value="#{coordinationAction.stringStub}"> - <f:selectItems value="#{coordinationAction.aliasBindings}"/> - </h:selectManyListbox> - <br/> - </ui:remove> - </ui:define> +</ui:define> </ui:composition>