Author: wesleyhales Date: 2008-08-15 21:49:08 -0400 (Fri, 15 Aug 2008) New Revision: 11697 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 work on event wirings 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 18:24:15 UTC (rev 11696) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/CoordinationAction.java 2008-08-16 01:49:08 UTC (rev 11697) @@ -60,6 +60,7 @@ import java.util.Set; import java.util.SortedSet; import java.util.TreeSet; +import java.util.Iterator; /** * @author <a href="mailto:whales@redhat.com">Wesley Hales</a> @@ -234,27 +235,7 @@ try { - //eventwirings prep for ui - Collection<EventWiringInfo> wiringInfos = pomb.getCoordinationService().getEventWirings(page); - if (!wiringInfos.isEmpty()) - { - if (eventWirings == null) - { - eventWirings = new HashMap<String, EventWiringInfo>(wiringInfos.size()); - } - - if (displayEventWirings == null) - { - displayEventWirings = new HashMap<String, DisplayEventWiring>(); - } - - for (EventWiringInfo ewInfo : wiringInfos) - { - eventWirings.put(ewInfo.getName(), ewInfo); - displayEventWirings.put(ewInfo.getName(), new DisplayEventWiring(ewInfo)); - } - } - + loadEventWirings(); loadWindowBindings(); //aliasbindings prep for ui @@ -359,8 +340,36 @@ FacesContext.getCurrentInstance().renderResponse(); } + // Event Wirings methods + private void loadEventWirings() + { + PortalObject portalObject = getSelectedObject(); + if (portalObject.getType() == PortalObject.TYPE_PAGE) + { + Page page = (Page)portalObject; + Collection<EventWiringInfo> wiringInfos = pomb.getCoordinationService().getEventWirings(page); + if (!wiringInfos.isEmpty()) + { + if (eventWirings == null) + { + eventWirings = new HashMap<String, EventWiringInfo>(wiringInfos.size()); + } + if (displayEventWirings == null) + { + displayEventWirings = new HashMap<String, DisplayEventWiring>(); + } + + for (EventWiringInfo ewInfo : wiringInfos) + { + eventWirings.put(ewInfo.getName(), ewInfo); + displayEventWirings.put(ewInfo.getName(), new DisplayEventWiring(ewInfo)); + } + } + } + } + public boolean isExplicitEventsUsed() { PortalObject portalObject = getSelectedObject(); @@ -368,7 +377,8 @@ if (portalObject.getType() == PortalObject.TYPE_PAGE) { Page page = (Page)portalObject; - if(pomb.getCoordinationService().isEventWiringImplicitModeEnabled(page) != null){ + if (pomb.getCoordinationService().isEventWiringImplicitModeEnabled(page) != null) + { enabled = pomb.getCoordinationService().isEventWiringImplicitModeEnabled(page); } @@ -381,15 +391,16 @@ * * @param event * @throws org.jboss.portal.core.controller.coordination.IllegalCoordinationException + * */ - public void explicitEventsListener(ValueChangeEvent event)throws IllegalCoordinationException + public void explicitEventsListener(ValueChangeEvent event) throws IllegalCoordinationException { PortalObject portalObject = getSelectedObject(); String newValue = event.getNewValue().toString(); if (portalObject.getType() == PortalObject.TYPE_PAGE) { Page page = (Page)portalObject; - pomb.getCoordinationService().setEventWiringImplicitMode(page,Boolean.parseBoolean(newValue)); + pomb.getCoordinationService().setEventWiringImplicitMode(page, Boolean.parseBoolean(newValue)); } } @@ -418,14 +429,30 @@ { return Collections.emptyList(); } - List<QNameSelectItem> result = new LinkedList<QNameSelectItem>(); result.addAll(eventNameToWindowSources.keySet()); Collections.sort(result); + return result; + } + public List<WindowSelectItem> getSourceWindows() + { + if (eventNameToWindowSources == null) + { + return Collections.emptyList(); + } + List<WindowSelectItem> result = new LinkedList<WindowSelectItem>(); + for (Object o : eventNameToWindowSources.entrySet()) + { + //todo - implement + } + + Collections.sort(result); return result; } + + public List<? extends SelectItem> getSelectedSourceEvents() { return selectedSourceEvents; @@ -579,7 +606,8 @@ if (portalObject.getType() == PortalObject.TYPE_PAGE) { Page page = (Page)portalObject; - if(pomb.getCoordinationService().isParameterBindingImplicitModeEnabled(page) != null){ + if (pomb.getCoordinationService().isParameterBindingImplicitModeEnabled(page) != null) + { enabled = pomb.getCoordinationService().isParameterBindingImplicitModeEnabled(page); } @@ -592,6 +620,7 @@ * * @param event * @throws org.jboss.portal.core.controller.coordination.IllegalCoordinationException + * */ public void implicitParameterListener(ValueChangeEvent event) throws IllegalCoordinationException { @@ -600,7 +629,7 @@ if (portalObject.getType() == PortalObject.TYPE_PAGE) { Page page = (Page)portalObject; - pomb.getCoordinationService().setParameterBindingImplicitMode(page,Boolean.parseBoolean(newValue)); + pomb.getCoordinationService().setParameterBindingImplicitMode(page, Boolean.parseBoolean(newValue)); } } 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 18:24:15 UTC (rev 11696) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editCoordination.xhtml 2008-08-16 01:49:08 UTC (rev 11697) @@ -117,9 +117,13 @@ <h:selectManyListbox size="5" value="#{coordinationAction.selectedSourceEvents}"> <f:selectItems value="#{coordinationAction.sourceEvents}"/> </h:selectManyListbox> + + <h:selectManyListbox size="5" value="#{coordinationAction.selectedSourceEvents}"> + <f:selectItems value="#{coordinationAction.sourceWindows}"/> + </h:selectManyListbox> </h:form> - <ui:repeat var="eventWirings" value="#{coordinationAction.eventWirings}"> + <ui:repeat var="eventWirings" value="#{coordinationAction.displayEventWirings}"> #{eventWirings} </ui:repeat> <hr/> @@ -128,7 +132,7 @@ <h3 class="sectionTitle tenpx-top-bottom">#{bundle.COORDINATION_EVENT_MANAGE_EXISTING}</h3> <h:form> <h:dataTable var="wiring" value="#{coordinationAction.displayEventWirings}" - rendered="#{coordinationAction.explicitEventsUsed}" + rendered="true" styleClass="objectList datatable" rowClasses="portlet-section-body,portlet-section-alternate-blue" columnClasses="objectNameColumn, objectActionColumn"