Author: thomas.heute(a)jboss.com Date: 2008-10-27 14:47:36 -0400 (Mon, 27 Oct 2008) New Revision: 12189 Modified: tags/JBoss_Portal_2_7_0/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/ParameterBindingManagerBean.java tags/JBoss_Portal_2_7_0/core-admin/src/resources/portal-admin-war/jsf/editCoordination.xhtml Log: - JBPORTAL-2213: always display creation form (when data exists) so that fallback handling can be properly supported. - Fixed NPE. - Sort parameter names in parameter binding creation form. Modified: tags/JBoss_Portal_2_7_0/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/ParameterBindingManagerBean.java =================================================================== --- tags/JBoss_Portal_2_7_0/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/ParameterBindingManagerBean.java 2008-10-27 17:34:56 UTC (rev 12188) +++ tags/JBoss_Portal_2_7_0/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/ParameterBindingManagerBean.java 2008-10-27 18:47:36 UTC (rev 12189) @@ -40,6 +40,7 @@ import java.util.Arrays; import java.util.Collection; import java.util.Collections; +import java.util.Comparator; import java.util.HashMap; import java.util.LinkedList; import java.util.List; @@ -68,6 +69,11 @@ public List<? extends SelectItem> getAvailableParameterWindowPairs() { + if(availableParameterWindowPairs == null || availableParameterWindowPairs.isEmpty()) + { + return Collections.emptyList(); + } + List<WindowSelectItemGroup> result = new LinkedList<WindowSelectItemGroup>(availableParameterWindowPairs.values()); Collections.sort(result); return result; @@ -348,8 +354,18 @@ { List<SelectItem> items = new ArrayList<SelectItem>(Arrays.asList(existing)); items.add(parameterWindowSelectItem); + Collections.sort(items, COMP); setSelectItems(items.toArray(new SelectItem[items.size()])); } } } + + static class ParameterWindowSelectItemComparator implements Comparator<SelectItem> + { + public int compare(SelectItem o1, SelectItem o2) + { + return o1.getLabel().compareTo(o2.getLabel()); + } + } + private final static Comparator<SelectItem> COMP = new ParameterWindowSelectItemComparator(); } Modified: tags/JBoss_Portal_2_7_0/core-admin/src/resources/portal-admin-war/jsf/editCoordination.xhtml =================================================================== --- tags/JBoss_Portal_2_7_0/core-admin/src/resources/portal-admin-war/jsf/editCoordination.xhtml 2008-10-27 17:34:56 UTC (rev 12188) +++ tags/JBoss_Portal_2_7_0/core-admin/src/resources/portal-admin-war/jsf/editCoordination.xhtml 2008-10-27 18:47:36 UTC (rev 12189) @@ -86,12 +86,7 @@ </ul> </div> </h:column> - <ui:remove> <h:column> - <f:facet name="header">#{bundle.COORDINATION_ALIAS_EXISTING_ORIGINAL}</f:facet> - </h:column> - </ui:remove> - <h:column> <f:facet name="header">#{bundle.COORDINATION_ALIAS_EXISTING_ACTIONS}</f:facet> <h:panelGrid columns="2" cellpadding="0" cellspacing="0" border="0"> <h:commandLink action="renameCoordination" actionListener="#{coordinationManager.select}"> @@ -123,95 +118,92 @@ #{bundle.COORDINATION_PARAMETER_EXPLICIT_MODE} </h:form> - <h:panelGroup rendered="#{coordinationManager.explicitParametersUsed || !empty parameterManager.displayParameterBindings}"> - <hr/> + <hr/> - <!-- Create parameter binding --> - <h3 class="sectionTitle tenpx-top-bottom">#{bundle.COORDINATION_PARAMETER_CREATE}</h3> - <h:outputText value="#{bundle.COORDINATION_PARAMETER_CREATE_NO_PAIRS}" rendered="#{empty parameterManager.availableParameterWindowPairs}"/> - <h:form rendered="#{!empty parameterManager.availableParameterWindowPairs}"> - <div class="float-left tenpx-right"> - <h4>#{bundle.COORDINATION_PARAMETER_CREATE_STEP1}</h4> - <h:selectManyListbox id="parameterWindowPair" size="5" value="#{parameterManager.selectedParameterWindowPairs}" - immediate="true" onchange="this.form.submit()"> - <f:selectItems value="#{parameterManager.availableParameterWindowPairs}"/> - </h:selectManyListbox> - </div> + <!-- Create parameter binding --> + <h3 class="sectionTitle tenpx-top-bottom">#{bundle.COORDINATION_PARAMETER_CREATE}</h3> + <h:outputText value="#{bundle.COORDINATION_PARAMETER_CREATE_NO_PAIRS}" rendered="#{empty parameterManager.availableParameterWindowPairs}"/> + <h:form rendered="#{!empty parameterManager.availableParameterWindowPairs}"> + <div class="float-left tenpx-right"> + <h4>#{bundle.COORDINATION_PARAMETER_CREATE_STEP1}</h4> + <h:selectManyListbox id="parameterWindowPair" size="5" value="#{parameterManager.selectedParameterWindowPairs}" + immediate="true" onchange="this.form.submit()"> + <f:selectItems value="#{parameterManager.availableParameterWindowPairs}"/> + </h:selectManyListbox> + </div> - <h:panelGroup rendered="#{!empty parameterManager.selectedParameterWindowPairs}"> - <div class="float-left paramBinding-step2"> - <h4>#{bundle.COORDINATION_PARAMETER_CREATE_STEP2}</h4> - <div class="full-width"> - <span><h:inputText id="bindingName" value="#{parameterManager.windowBindingName}"/></span> - <span> - <h:commandButton value="#{bundle.COORDINATION_PARAMETER_CREATE_CREATE}" - action="#{parameterManager.create}" styleClass="portlet-form-button"/> - <h:commandButton value="#{bundle.COMMON_CANCEL}" action="#{parameterManager.cancel}" - styleClass="portlet-form-button"/> - </span> - </div> + <h:panelGroup rendered="#{!empty parameterManager.selectedParameterWindowPairs}"> + <div class="float-left paramBinding-step2"> + <h4>#{bundle.COORDINATION_PARAMETER_CREATE_STEP2}</h4> + <div class="full-width"> + <span><h:inputText id="bindingName" value="#{parameterManager.windowBindingName}"/></span> + <span> + <h:commandButton value="#{bundle.COORDINATION_PARAMETER_CREATE_CREATE}" + action="#{parameterManager.create}" styleClass="portlet-form-button"/> + <h:commandButton value="#{bundle.COMMON_CANCEL}" action="#{parameterManager.cancel}" + styleClass="portlet-form-button"/> + </span> </div> - </h:panelGroup> + </div> + </h:panelGroup> - <br class="clear"/> - </h:form> + <br class="clear"/> + </h:form> - <!-- Manage existing parameter bindings --> - <h3 class="sectionTitle tenpx-top-bottom">#{bundle.COORDINATION_PARAMETER_MANAGE_EXISTING}</h3> - <div class="float-left full-width"> - <h:outputText value="#{bundle.COORDINATION_PARAMETER_EXISTING_NONE}" rendered="#{empty parameterManager.displayParameterBindings}"/> - <h:form rendered="#{!empty parameterManager.displayParameterBindings}"> - <h:dataTable var="binding" value="#{parameterManager.displayParameterBindings}" - rendered="true" styleClass="objectList datatable full-width" - rowClasses="portlet-section-body,portlet-section-alternate-blue" - columnClasses="ten-percent-width,half-width,quarter-width" - headerClass="portlet-section-header"> - <h:column> - <f:facet name="header">#{bundle.COORDINATION_PARAMETER_EXISTING_NAME}</f:facet> - <h4>#{binding.name}</h4> - </h:column> - <h:column> - <f:facet name="header">#{bundle.COORDINATION_PARAMETER_EXISTING_PAIRS}</f:facet> - <div class="full-width"> - <ui:repeat var="pair" value="#{binding.parameterWindowPairs}"> - <div class="float-left pad5"> - <div class="paramList-header">#{pair.window.name}</div> - <ul class="paramList"> - <c:set var="pairname" value="#{fn:split(pair.name, ';')}" /> - <ui:repeat var="name" value="#{pairname}"> - <li>#{name}</li> - </ui:repeat> - </ul> - </div> - </ui:repeat> - </div> + <!-- Manage existing parameter bindings --> + <h3 class="sectionTitle tenpx-top-bottom">#{bundle.COORDINATION_PARAMETER_MANAGE_EXISTING}</h3> + <div class="float-left full-width"> + <h:outputText value="#{bundle.COORDINATION_PARAMETER_EXISTING_NONE}" rendered="#{empty parameterManager.displayParameterBindings}"/> + <h:form rendered="#{!empty parameterManager.displayParameterBindings}"> + <h:dataTable var="binding" value="#{parameterManager.displayParameterBindings}" + rendered="true" styleClass="objectList datatable full-width" + rowClasses="portlet-section-body,portlet-section-alternate-blue" + columnClasses="ten-percent-width,half-width,quarter-width" + headerClass="portlet-section-header"> + <h:column> + <f:facet name="header">#{bundle.COORDINATION_PARAMETER_EXISTING_NAME}</f:facet> + <h4>#{binding.name}</h4> + </h:column> + <h:column> + <f:facet name="header">#{bundle.COORDINATION_PARAMETER_EXISTING_PAIRS}</f:facet> + <div class="full-width"> + <ui:repeat var="pair" value="#{binding.parameterWindowPairs}"> + <div class="float-left pad5"> + <div class="paramList-header">#{pair.window.name}</div> + <ul class="paramList"> + <c:set var="pairname" value="#{fn:split(pair.name, ';')}" /> + <ui:repeat var="name" value="#{pairname}"> + <li>#{name}</li> + </ui:repeat> + </ul> + </div> + </ui:repeat> + </div> - </h:column> - <h:column> - <f:facet name="header">#{bundle.COORDINATION_PARAMETER_EXISTING_ACTIONS}</f:facet> - <h:panelGrid columns="2" cellpadding="0" cellspacing="0" border="0"> - <h:commandLink action="renameCoordination" actionListener="#{coordinationManager.select}"> - <h:outputText styleClass="actionRename" value="#{bundle.RENAME}"/> - <f:param name="name" value="#{binding.name}"/> - <f:param name="type" value="parameter"/> - </h:commandLink> - <h:commandLink action="confirmCoordinationDeletion" actionListener="#{coordinationManager.select}"> - <h:outputText styleClass="actionDelete" value="#{bundle.COMMON_DELETE}"/> - <f:param name="name" value="#{binding.name}"/> - <f:param name="type" value="parameter"/> - </h:commandLink> - </h:panelGrid> - </h:column> - </h:dataTable> - </h:form> - </div> - </h:panelGroup> + </h:column> + <h:column> + <f:facet name="header">#{bundle.COORDINATION_PARAMETER_EXISTING_ACTIONS}</f:facet> + <h:panelGrid columns="2" cellpadding="0" cellspacing="0" border="0"> + <h:commandLink action="renameCoordination" actionListener="#{coordinationManager.select}"> + <h:outputText styleClass="actionRename" value="#{bundle.RENAME}"/> + <f:param name="name" value="#{binding.name}"/> + <f:param name="type" value="parameter"/> + </h:commandLink> + <h:commandLink action="confirmCoordinationDeletion" actionListener="#{coordinationManager.select}"> + <h:outputText styleClass="actionDelete" value="#{bundle.COMMON_DELETE}"/> + <f:param name="name" value="#{binding.name}"/> + <f:param name="type" value="parameter"/> + </h:commandLink> + </h:panelGrid> + </h:column> + </h:dataTable> + </h:form> + </div> <br class="clear"/> </div> </div> <!-- Event wirings --> - <h2 class="portlet-area-header" onclick="toggle_visibility('eventWirings');" style="cursor: pointer"><a name="#{bundle.COORDINATION_EVENT_WIRINGS}"/>#{bundle.COORDINATION_EVENT_WIRINGS}</h2> <div id="eventWirings"> <h:form> @@ -219,189 +211,188 @@ onchange="this.form.submit()" immediate="true"/>#{bundle.COORDINATION_EVENT_EXPLICIT_MODE} </h:form> - <h:panelGroup rendered="#{coordinationManager.explicitEventsUsed || !empty eventManager.displayEventWirings}"> - <hr/> - <!-- Create new event wiring --> - <h3 class="sectionTitle tenpx-top-bottom">#{bundle.COORDINATION_EVENT_CREATE}</h3> - <h:outputText value="#{bundle.COORDINATION_EVENT_CREATE_NO_EVENTS}" rendered="#{empty eventManager.sourceEvents}"/> - <h:form rendered="#{!empty eventManager.sourceEvents}"> - <div class="half-width float-left"> + <hr/> + + <!-- Create new event wiring --> + <h3 class="sectionTitle tenpx-top-bottom">#{bundle.COORDINATION_EVENT_CREATE}</h3> + <h:outputText value="#{bundle.COORDINATION_EVENT_CREATE_NO_EVENTS}" rendered="#{empty eventManager.sourceEvents}"/> + <h:form rendered="#{!empty eventManager.sourceEvents}"> + <div class="half-width float-left"> + <div class="full-width pad5"> + <h4>#{bundle.COORDINATION_EVENT_CREATE_STEP1}</h4> + <h:selectOneListbox id="sourceEvent" size="5" value="#{eventManager.selectedSourceEvent}" immediate="true" + onchange="this.form.submit()"> + <f:selectItems value="#{eventManager.sourceEvents}"/> + </h:selectOneListbox> + </div> + + <f:subview id="COORDINATION_EVENT_CREATE_STEP2" rendered="#{!empty eventManager.selectedSourceEvent}"> <div class="full-width pad5"> - <h4>#{bundle.COORDINATION_EVENT_CREATE_STEP1}</h4> - <h:selectOneListbox id="sourceEvent" size="5" value="#{eventManager.selectedSourceEvent}" immediate="true" + <h4>#{bundle.COORDINATION_EVENT_CREATE_STEP2}</h4> + <div class="pad5"><h:graphicImage url="/img/jbp-icon-set/event_source.gif"/> #{eventManager.selectedSourceEvent}</div> + <h:selectManyListbox id="sourceWindows" size="5" value="#{eventManager.selectedSourceWindows}" immediate="true" + onchange="this.form.submit()"> + <f:selectItems value="#{eventManager.sourceWindows}"/> + </h:selectManyListbox> + </div> + </f:subview> + + <f:subview id="COORDINATION_EVENT_CREATE_STEP3" rendered="#{!empty eventManager.selectedSourceWindows}"> + <div class="full-width pad5"> + <h4>#{bundle.COORDINATION_EVENT_CREATE_STEP3}</h4> + <h:selectOneListbox id="destEvent" size="5" value="#{eventManager.selectedDestinationEvent}" immediate="true" onchange="this.form.submit()"> - <f:selectItems value="#{eventManager.sourceEvents}"/> + <f:selectItems value="#{eventManager.destinationEvents}"/> </h:selectOneListbox> </div> + </f:subview> - <f:subview id="COORDINATION_EVENT_CREATE_STEP2" rendered="#{!empty eventManager.selectedSourceEvent}"> - <div class="full-width pad5"> - <h4>#{bundle.COORDINATION_EVENT_CREATE_STEP2}</h4> - <div class="pad5"><h:graphicImage url="/img/jbp-icon-set/event_source.gif"/> #{eventManager.selectedSourceEvent}</div> - <h:selectManyListbox id="sourceWindows" size="5" value="#{eventManager.selectedSourceWindows}" immediate="true" - onchange="this.form.submit()"> - <f:selectItems value="#{eventManager.sourceWindows}"/> - </h:selectManyListbox> - </div> - </f:subview> + <f:subview id="COORDINATION_EVENT_CREATE_STEP4" rendered="#{!empty eventManager.selectedDestinationEvent}"> + <div class="full-width pad5"> + <h4>#{bundle.COORDINATION_EVENT_CREATE_STEP4}</h4> + <div class="pad5"><h:graphicImage url="/img/jbp-icon-set/event_dest.gif"/>#{eventManager.selectedDestinationEvent}</div> + <h:selectManyListbox id="destWindows" size="5" value="#{eventManager.selectedDestinationWindows}" immediate="true" + onchange="this.form.submit()"> + <f:selectItems value="#{eventManager.destinationWindows}"/> + </h:selectManyListbox> + </div> + </f:subview> - <f:subview id="COORDINATION_EVENT_CREATE_STEP3" rendered="#{!empty eventManager.selectedSourceWindows}"> - <div class="full-width pad5"> - <h4>#{bundle.COORDINATION_EVENT_CREATE_STEP3}</h4> - <h:selectOneListbox id="destEvent" size="5" value="#{eventManager.selectedDestinationEvent}" immediate="true" - onchange="this.form.submit()"> - <f:selectItems value="#{eventManager.destinationEvents}"/> - </h:selectOneListbox> - </div> - </f:subview> + <br class="clear"/> + </div> - <f:subview id="COORDINATION_EVENT_CREATE_STEP4" rendered="#{!empty eventManager.selectedDestinationEvent}"> - <div class="full-width pad5"> - <h4>#{bundle.COORDINATION_EVENT_CREATE_STEP4}</h4> - <div class="pad5"><h:graphicImage url="/img/jbp-icon-set/event_dest.gif"/>#{eventManager.selectedDestinationEvent}</div> - <h:selectManyListbox id="destWindows" size="5" value="#{eventManager.selectedDestinationWindows}" immediate="true" - onchange="this.form.submit()"> - <f:selectItems value="#{eventManager.destinationWindows}"/> - </h:selectManyListbox> - </div> - </f:subview> + <div class="half-width float-left event-wiring-preview"> + <f:subview id="sourceEventUI" rendered="#{!empty eventManager.selectedSourceEvent}"> + <h4>#{bundle.COORDINATION_EVENT_CREATE_PREVIEW}</h4> + <p>#{bundle.COORDINATION_EVENT_CREATE_PREVIEW_STEP1}</p> + <ul class="sourceEventList"> + <li>#{eventManager.selectedSourceEvent}</li> + </ul> + </f:subview> + <f:subview id="sourceWindowUI" rendered="#{!empty eventManager.selectedSourceWindows}" > + <p>#{bundle.COORDINATION_EVENT_CREATE_PREVIEW_STEP2}</p> + <ul class="sourceWindowList"> + <ui:repeat var="window" value="#{eventManager.selectedSourceWindows}"> + <li>#{window}</li> + </ui:repeat> + </ul> + </f:subview> + <f:subview id="destEventUI" rendered="#{!empty eventManager.selectedDestinationEvent}"> + <hr/> + <p>#{bundle.COORDINATION_EVENT_CREATE_PREVIEW_STEP3}</p> + <ul class="destEventList"> + <li>#{eventManager.selectedDestinationEvent}</li> + </ul> + </f:subview> + <f:subview id="destWindowUI" rendered="#{!empty eventManager.selectedDestinationWindows}"> + <p>#{bundle.COORDINATION_EVENT_CREATE_PREVIEW_STEP4}</p> + <ul class="destWindowList"> + <ui:repeat var="window" value="#{eventManager.selectedDestinationWindows}"> + <li>#{window}</li> + </ui:repeat> + </ul> + </f:subview> - <br class="clear"/> - </div> - - <div class="half-width float-left event-wiring-preview"> - <f:subview id="sourceEventUI" rendered="#{!empty eventManager.selectedSourceEvent}"> - <h4>#{bundle.COORDINATION_EVENT_CREATE_PREVIEW}</h4> - <p>#{bundle.COORDINATION_EVENT_CREATE_PREVIEW_STEP1}</p> - <ul class="sourceEventList"> - <li>#{eventManager.selectedSourceEvent}</li> - </ul> - </f:subview> - <f:subview id="sourceWindowUI" rendered="#{!empty eventManager.selectedSourceWindows}" > - <p>#{bundle.COORDINATION_EVENT_CREATE_PREVIEW_STEP2}</p> - <ul class="sourceWindowList"> - <ui:repeat var="window" value="#{eventManager.selectedSourceWindows}"> - <li>#{window}</li> - </ui:repeat> - </ul> - </f:subview> - <f:subview id="destEventUI" rendered="#{!empty eventManager.selectedDestinationEvent}"> - <hr/> - <p>#{bundle.COORDINATION_EVENT_CREATE_PREVIEW_STEP3}</p> - <ul class="destEventList"> - <li>#{eventManager.selectedDestinationEvent}</li> - </ul> - </f:subview> - <f:subview id="destWindowUI" rendered="#{!empty eventManager.selectedDestinationWindows}"> - <p>#{bundle.COORDINATION_EVENT_CREATE_PREVIEW_STEP4}</p> - <ul class="destWindowList"> - <ui:repeat var="window" value="#{eventManager.selectedDestinationWindows}"> - <li>#{window}</li> - </ui:repeat> - </ul> - </f:subview> - - <f:subview id="COORDINATION_EVENT_CREATE_STEP5" rendered="#{!empty eventManager.selectedDestinationWindows}"> - <div class="full-width createwiring-box"> - <div class="margin10"> - <h4>#{bundle.COORDINATION_EVENT_CREATE_STEP5}</h4> - <h:inputText id="wiringName" value="#{eventManager.wiringName}"/> - <h:commandButton value="#{bundle.COORDINATION_EVENT_CREATE_CREATE}" action="#{eventManager.create}" - styleClass="portlet-form-button"/> - <h:commandButton value="#{bundle.COMMON_CANCEL}" action="#{eventManager.cancel}" - styleClass="portlet-form-button"/> - </div> + <f:subview id="COORDINATION_EVENT_CREATE_STEP5" rendered="#{!empty eventManager.selectedDestinationWindows}"> + <div class="full-width createwiring-box"> + <div class="margin10"> + <h4>#{bundle.COORDINATION_EVENT_CREATE_STEP5}</h4> + <h:inputText id="wiringName" value="#{eventManager.wiringName}"/> + <h:commandButton value="#{bundle.COORDINATION_EVENT_CREATE_CREATE}" action="#{eventManager.create}" + styleClass="portlet-form-button"/> + <h:commandButton value="#{bundle.COMMON_CANCEL}" action="#{eventManager.cancel}" + styleClass="portlet-form-button"/> </div> - </f:subview> + </div> + </f:subview> - <br class="clear"/> - </div> + <br class="clear"/> + </div> - </h:form> + </h:form> - <br class="clear"/> + <br class="clear"/> - <!-- Manage existing wirings --> - <h3 class="sectionTitle tenpx-top-bottom">#{bundle.COORDINATION_EVENT_MANAGE_EXISTING}</h3> - <h:outputText value="#{bundle.COORDINATION_EVENT_EXISTING_NONE}" rendered="#{empty eventManager.displayEventWirings}"/> - <h:form rendered="#{!empty eventManager.displayEventWirings}"> - <h:dataTable var="wiring" value="#{eventManager.displayEventWirings}" - styleClass="objectList datatable" - rowClasses="portlet-section-body,portlet-section-alternate-blue" - columnClasses="ten-percent-width,quarter-width,quarter-width,ten-percent-width" - headerClass="portlet-section-header"> - <h:column> - <f:facet name="header"> - #{bundle.COORDINATION_EVENT_EXISTING_NAME} - </f:facet> - #{wiring.name} - </h:column> + <!-- Manage existing wirings --> + <h3 class="sectionTitle tenpx-top-bottom">#{bundle.COORDINATION_EVENT_MANAGE_EXISTING}</h3> + <h:outputText value="#{bundle.COORDINATION_EVENT_EXISTING_NONE}" rendered="#{empty eventManager.displayEventWirings}"/> + <h:form rendered="#{!empty eventManager.displayEventWirings}"> + <h:dataTable var="wiring" value="#{eventManager.displayEventWirings}" + styleClass="objectList datatable" + rowClasses="portlet-section-body,portlet-section-alternate-blue" + columnClasses="ten-percent-width,quarter-width,quarter-width,ten-percent-width" + headerClass="portlet-section-header"> + <h:column> + <f:facet name="header"> + #{bundle.COORDINATION_EVENT_EXISTING_NAME} + </f:facet> + #{wiring.name} + </h:column> - <h:column> - <f:facet name="header"> - #{bundle.COORDINATION_EVENT_EXISTING_SOURCE_WINDOWS} &#8658; #{bundle.COORDINATION_EVENT_EXISTING_SOURCE_EVENTS} - </f:facet> - <ul class="sourceWindowList"> - <ui:repeat var="window" value="#{wiring.sourceWindows}"> - <li> - <h:commandLink action="#{portalobjectmgr.selectObject}" styleClass="objectName"> - <f:param name="id" value="#{window.id}"/> - #{window.name} - </h:commandLink> - </li> - </ui:repeat> - </ul> - <span style="display: block; text-align:center;">&#8659;</span> - <ul class="sourceEventList"> - <ui:repeat var="event" value="#{wiring.sourceEvents}"> - <li>#{event}</li> - </ui:repeat> - </ul> - </h:column> - <h:column> - <f:facet name="header"> - #{bundle.COORDINATION_EVENT_EXISTING_DESTINATION_WINDOWS} &#8656; #{bundle.COORDINATION_EVENT_EXISTING_DESTINATION_EVENTS} - </f:facet> + <h:column> + <f:facet name="header"> + #{bundle.COORDINATION_EVENT_EXISTING_SOURCE_WINDOWS} &#8658; #{bundle.COORDINATION_EVENT_EXISTING_SOURCE_EVENTS} + </f:facet> + <ul class="sourceWindowList"> + <ui:repeat var="window" value="#{wiring.sourceWindows}"> + <li> + <h:commandLink action="#{portalobjectmgr.selectObject}" styleClass="objectName"> + <f:param name="id" value="#{window.id}"/> + #{window.name} + </h:commandLink> + </li> + </ui:repeat> + </ul> + <span style="display: block; text-align:center;">&#8659;</span> + <ul class="sourceEventList"> + <ui:repeat var="event" value="#{wiring.sourceEvents}"> + <li>#{event}</li> + </ui:repeat> + </ul> + </h:column> + <h:column> + <f:facet name="header"> + #{bundle.COORDINATION_EVENT_EXISTING_DESTINATION_WINDOWS} &#8656; #{bundle.COORDINATION_EVENT_EXISTING_DESTINATION_EVENTS} + </f:facet> - <ul class="destWindowList"> - <ui:repeat var="window" value="#{wiring.destinationWindows}"> - <li> - <h:commandLink action="#{portalobjectmgr.selectObject}" styleClass="objectName"> - <f:param name="id" value="#{window.id}"/> - #{window.name} - </h:commandLink> - </li> - </ui:repeat> - </ul> - <span style="display: block; text-align:center;">&#8657;</span> - <ul class="destEventList"> - <ui:repeat var="event" value="#{wiring.destinationEvents}"> - <li>#{event}</li> - </ui:repeat> - </ul> + <ul class="destWindowList"> + <ui:repeat var="window" value="#{wiring.destinationWindows}"> + <li> + <h:commandLink action="#{portalobjectmgr.selectObject}" styleClass="objectName"> + <f:param name="id" value="#{window.id}"/> + #{window.name} + </h:commandLink> + </li> + </ui:repeat> + </ul> + <span style="display: block; text-align:center;">&#8657;</span> + <ul class="destEventList"> + <ui:repeat var="event" value="#{wiring.destinationEvents}"> + <li>#{event}</li> + </ui:repeat> + </ul> - </h:column> - <h:column> - <f:facet name="header"> - #{bundle.COORDINATION_EVENT_EXISTING_ACTIONS} - </f:facet> - <h:panelGrid columns="2" cellpadding="0" cellspacing="0" border="0"> - <h:commandLink action="renameCoordination" actionListener="#{coordinationManager.select}"> - <h:outputText styleClass="actionRename" value="#{bundle.RENAME}"/> - <f:param name="name" value="#{wiring.name}"/> - <f:param name="type" value="wiring"/> - </h:commandLink> - <h:commandLink action="confirmCoordinationDeletion" actionListener="#{coordinationManager.select}"> - <h:outputText styleClass="actionDelete" value="#{bundle.COMMON_DELETE}"/> - <f:param name="name" value="#{wiring.name}"/> - <f:param name="type" value="wiring"/> - </h:commandLink> - </h:panelGrid> - </h:column> - </h:dataTable> - </h:form> - </h:panelGroup> + </h:column> + <h:column> + <f:facet name="header"> + #{bundle.COORDINATION_EVENT_EXISTING_ACTIONS} + </f:facet> + <h:panelGrid columns="2" cellpadding="0" cellspacing="0" border="0"> + <h:commandLink action="renameCoordination" actionListener="#{coordinationManager.select}"> + <h:outputText styleClass="actionRename" value="#{bundle.RENAME}"/> + <f:param name="name" value="#{wiring.name}"/> + <f:param name="type" value="wiring"/> + </h:commandLink> + <h:commandLink action="confirmCoordinationDeletion" actionListener="#{coordinationManager.select}"> + <h:outputText styleClass="actionDelete" value="#{bundle.COMMON_DELETE}"/> + <f:param name="name" value="#{wiring.name}"/> + <f:param name="type" value="wiring"/> + </h:commandLink> + </h:panelGrid> + </h:column> + </h:dataTable> + </h:form> </div> </ui:define>