Author: chris.laprun(a)jboss.com Date: 2008-10-21 15:29:59 -0400 (Tue, 21 Oct 2008) New Revision: 12122 Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/EventWiringManagerBean.java branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editCoordination.xhtml Log: - JBPORTAL-1919: finishing touches: + Do not include duplicates in source or destination events when displaying a wiring + Now using arrows to convey connection between windows and events in wirings list + Cleaned-up markup and fixed an improper style attribute instead of class Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/EventWiringManagerBean.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/EventWiringManagerBean.java 2008-10-21 18:40:41 UTC (rev 12121) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/EventWiringManagerBean.java 2008-10-21 19:29:59 UTC (rev 12122) @@ -42,6 +42,7 @@ import java.util.Map; import java.util.SortedSet; import java.util.TreeSet; +import java.util.HashSet; /** * @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a> @@ -352,11 +353,11 @@ Map<Window, QName> sources = eventInfo.getSources(); sourceWindows = new ArrayList<Window>(sources.keySet()); - sourceEvents = new ArrayList<QName>(sources.values()); + sourceEvents = new ArrayList<QName>(new HashSet<QName>(sources.values())); Map<Window, QName> destinations = eventInfo.getDestinations(); destinationWindows = new ArrayList<Window>(destinations.keySet()); - destinationEvents = new ArrayList<QName>(destinations.values()); + destinationEvents = new ArrayList<QName>(new HashSet<QName>(destinations.values())); } public EventWiringInfo getEventInfo() 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-10-21 18:40:41 UTC (rev 12121) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editCoordination.xhtml 2008-10-21 19:29:59 UTC (rev 12122) @@ -41,26 +41,25 @@ </h:selectManyListbox> </div> <div class="float-left aliasBinding-step2"> - <h:panelGroup rendered="#{!empty aliasManager.originalQNames}"> + <h:panelGroup rendered="#{!empty aliasManager.originalQNames}"> <h4>#{bundle.COORDINATION_ALIAS_CREATE_STEP2}</h4> - <div style="full-width"> - <span><h:inputText id="aliasName" value="#{aliasManager.aliasName}"/></span> + <div class="full-width"> + <span><h:inputText id="aliasName" value="#{aliasManager.aliasName}"/></span> <span> <h:commandButton value="#{bundle.COORDINATION_ALIAS_CREATE_CREATE}" - action="#{aliasManager.create}" styleClass="portlet-form-button"/> + action="#{aliasManager.create}" styleClass="portlet-form-button"/> <h:commandButton value="#{bundle.COMMON_CANCEL}" action="#{aliasManager.cancel}" - styleClass="portlet-form-button"/> + styleClass="portlet-form-button"/> </span> </div> <div> <ul class="bindingList"> <ui:repeat var="selectedQNames" value="#{aliasManager.originalQNames}"> - <li>#{selectedQNames}</li> + <li>#{selectedQNames}</li> </ui:repeat> </ul> </div> - - </h:panelGroup> + </h:panelGroup> </div> <br class="clear"/> </h:form> @@ -94,16 +93,16 @@ <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}"> - <h:outputText styleClass="actionRename" value="#{bundle.RENAME}"/> - <f:param name="name" value="#{binding.name}"/> - <f:param name="type" value="alias"/> - </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="alias"/> - </h:commandLink> + <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="alias"/> + </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="alias"/> + </h:commandLink> </h:panelGrid> </h:column> </h:dataTable> @@ -174,19 +173,13 @@ <div class="full-width"> <ui:repeat var="pair" value="#{binding.parameterWindowPairs}"> <div class="float-left pad5"> - <div class="paramList-header">#{pair.window.name}</div> + <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> + <c:set var="pairname" value="#{fn:split(pair.name, ';')}" /> + <ui:repeat var="name" value="#{pairname}"> + <li>#{name}</li> + </ui:repeat> </ul> - <ui:remove> - <!--<h:commandLink action="#{portalobjectmgr.selectObject}" styleClass="objectName">--> - <!--<f:param name="id" value="#{pair.window.id}"/>--> - <!--#{pair.window.name}--> - <!--</h:commandLink>--> - </ui:remove> </div> </ui:repeat> </div> @@ -337,14 +330,14 @@ headerClass="portlet-section-header"> <h:column> <f:facet name="header"> - <h4>#{bundle.COORDINATION_EVENT_EXISTING_NAME}</h4> + #{bundle.COORDINATION_EVENT_EXISTING_NAME} </f:facet> #{wiring.name} </h:column> <h:column> <f:facet name="header"> - #{bundle.COORDINATION_EVENT_EXISTING_SOURCE_WINDOWS} / #{bundle.COORDINATION_EVENT_EXISTING_SOURCE_EVENTS} + #{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}"> @@ -356,28 +349,16 @@ </li> </ui:repeat> </ul> - <hr/> + <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> - <ui:remove> - <!--<h:column>--> - <!--<f:facet name="header">--> - <!--<h:outputText value="#{bundle.COORDINATION_EVENT_EXISTING_SOURCE_EVENTS}"/>--> - <!--</f:facet>--> - <!--<ul class="sourceEventList">--> - <!--<ui:repeat var="event" value="#{wiring.sourceEvents}">--> - <!--<li>#{event}</li>--> - <!--</ui:repeat>--> - <!--</ul>--> - <!--</h:column>--> - </ui:remove> <h:column> <f:facet name="header"> - #{bundle.COORDINATION_EVENT_EXISTING_DESTINATION_WINDOWS} / #{bundle.COORDINATION_EVENT_EXISTING_DESTINATION_EVENTS} + #{bundle.COORDINATION_EVENT_EXISTING_DESTINATION_WINDOWS} &#8656; #{bundle.COORDINATION_EVENT_EXISTING_DESTINATION_EVENTS} </f:facet> <ul class="destWindowList"> @@ -390,7 +371,7 @@ </li> </ui:repeat> </ul> - <hr/> + <span style="display: block; text-align:center;">&#8657;</span> <ul class="destEventList"> <ui:repeat var="event" value="#{wiring.destinationEvents}"> <li>#{event}</li> @@ -399,23 +380,6 @@ </h:column> - <ui:remove> - <!--<h:column>--> - <!--<f:facet name="header">--> - <!--<h:outputText value="#{bundle.COORDINATION_EVENT_EXISTING_DESTINATION_WINDOWS}"/>--> - <!--</f:facet>--> - <!--<ul class="destEventList">--> - <!--<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>--> - <!--</h:column>--> - </ui:remove> <h:column> <f:facet name="header"> #{bundle.COORDINATION_EVENT_EXISTING_ACTIONS}