Author: wesleyhales Date: 2008-08-08 13:02:59 -0400 (Fri, 08 Aug 2008) New Revision: 11679 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: more coordination ui 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-08 16:02:45 UTC (rev 11678) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/CoordinationAction.java 2008-08-08 17:02:59 UTC (rev 11679) @@ -22,27 +22,16 @@ ******************************************************************************/ package org.jboss.portal.core.admin.ui.actions; -import org.jboss.portal.common.util.ConversionException; +import org.jboss.portal.core.model.portal.*; import org.jboss.portal.core.admin.ui.PortalObjectManagerBean; +import org.jboss.portal.core.controller.coordination.EventWiringInfo; import org.jboss.portal.core.controller.coordination.AliasBindingInfo; -import org.jboss.portal.core.controller.coordination.EventWiringInfo; import org.jboss.portal.core.controller.coordination.WindowBindingInfo; -import org.jboss.portal.core.impl.model.content.portlet.PortletContent; -import org.jboss.portal.core.model.content.ContentType; -import org.jboss.portal.core.model.instance.Instance; -import org.jboss.portal.core.model.portal.Page; -import org.jboss.portal.core.model.portal.PortalObject; -import org.jboss.portal.core.model.portal.PortalObjectId; -import org.jboss.portal.core.model.portal.Window; -import org.jboss.portal.portlet.Portlet; -import org.jboss.portal.portlet.info.EventingInfo; -import org.jboss.portal.portlet.info.PortletInfo; +import org.jboss.portal.common.util.ConversionException; import javax.faces.event.ActionEvent; import javax.xml.namespace.QName; -import java.util.Collection; -import java.util.HashMap; -import java.util.Map; +import java.util.*; /** * @author <a href="mailto:whales@redhat.com">Wesley Hales</a> @@ -65,9 +54,9 @@ private Map<String, Collection<QName>> eventDestinations; - private Collection<? extends AliasBindingInfo> aliasBindings; + private Map<String, String> aliasBindings; - private Collection<? extends WindowBindingInfo> windowBindings; + private Map<Window, QName> windowBindings; public PortalObjectId getSelectedObjectId() @@ -132,7 +121,6 @@ { eventSources = new HashMap<String, Collection<QName>>(); } - return eventSources; } @@ -155,22 +143,30 @@ this.eventDestinations = eventDestinations; } - public Collection<? extends AliasBindingInfo> getAliasBindings() + public Map<String, String> getAliasBindings() { + if (aliasBindings == null) + { + aliasBindings = new HashMap<String, String>(); + } return aliasBindings; } - public void setAliasBindings(Collection<? extends AliasBindingInfo> aliasBindings) + public void setAliasBindings(Map<String, String> aliasBindings) { this.aliasBindings = aliasBindings; } - public Collection<? extends WindowBindingInfo> getWindowBindings() + public Map<Window, QName> getWindowBindings() { + if (windowBindings == null) + { + windowBindings = new HashMap<Window, QName>(); + } return windowBindings; } - public void setWindowBindings(Collection<? extends WindowBindingInfo> windowBindings) + public void setWindowBindings(Map<Window, QName> windowBindings) { this.windowBindings = windowBindings; } @@ -185,30 +181,49 @@ try { eventWirings = pomb.getCoordinationService().getEventWirings((Page)selectedObject); - aliasBindings = pomb.getCoordinationService().getAliasBindings((Page)selectedObject); - windowBindings = pomb.getCoordinationService().getWindowBindings((Page)selectedObject); - System.out.println("-----------ew-" + eventWirings.size()); + //aliasbindings ready for ui + for (Object o : pomb.getCoordinationService().getAliasBindings((Page)selectedObject)) + { + AliasBindingInfo abInfo = (AliasBindingInfo)o; + for (QName name : abInfo.getNames()) + { + getAliasBindings().put(name.getNamespaceURI(), name.getNamespaceURI()); + } - System.out.println("-----------ab-" + aliasBindings.size()); + } - System.out.println("-----------wb-" + windowBindings.size()); + //windowbindings ready for ui + for (Object o : pomb.getCoordinationService().getWindowBindings((Page)selectedObject)) + { + WindowBindingInfo wbInfo = (WindowBindingInfo)o; + getWindowBindings().putAll(wbInfo.getWindows()); - for (PortalObject portalObject : selectedObject.getChildren(PortalObject.WINDOW_MASK)) + } + + //System.out.println("-----------ew-" + eventWirings.size()); + + //System.out.println("-----------ab-" + aliasBindings.size()); + + //System.out.println("-----------wb-" + windowBindings.size()); + + for (PortalObject portalObject : selectedObject.getChildren()) { - Window window = (Window) portalObject; - getWindows().put(window.getName(), window.getId()); - if(ContentType.PORTLET.equals(window.getContentType())) + + if (portalObject.getType() == PortalObject.TYPE_WINDOW) { - PortletContent pc = (PortletContent) window.getContent(); - Instance instance = pomb.getInstanceContainer().getDefinition(pc.getInstanceRef()); - Portlet portlet = instance.getPortlet(); - PortletInfo info = portlet.getInfo(); - EventingInfo eventingInfo = info.getEventing(); - getEventSources().put(portalObject.getName(), eventingInfo.getProducedEvents().keySet()); - getEventDestinations().put(portalObject.getName(), eventingInfo.getConsumedEvents().keySet()); + getWindows().put(portalObject.getName(), portalObject.getId()); + if (eventWirings.size() > 0) + { + //getEventSources().put(portalObject.getName(),pomb.getCoordinationService().getEventDestinationWirings((Window)portalObject)); + //getEventDestinations().put(portalObject.getName(),pomb.getCoordinationService().getEventSourceWirings((Window)portalObject)); + } + } + else + { + } } } 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-08 16:02:45 UTC (rev 11678) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editCoordination.xhtml 2008-08-08 17:02:59 UTC (rev 11679) @@ -24,16 +24,17 @@ <hr/> Alias Bindings - <ui:repeat value="#{coordinationAction.aliasBindings}" var="aliasBindings"> - #{aliasBindings} - </ui:repeat> + <h:selectManyListbox size="5" value="#{addDisplayNameAction.newLocale}"> + <f:selectItems value="#{coordinationAction.aliasBindings}"/> + </h:selectManyListbox> + <br/> <hr/> Window Bindings - <ui:repeat var="windowBindings" value="#{coordinationAction.windowBindings}"> - #{windowBindings} - </ui:repeat> - + <h:selectManyListbox size="5" value="#{addDisplayNameAction.newLocale}"> + <f:selectItems value="#{coordinationAction.windowBindings}"/> + </h:selectManyListbox> + <hr/> Event Wirings <ui:repeat var="eventWirings" value="#{coordinationAction.eventWirings}">