[portal-commits] JBoss Portal SVN: r11685 - in branches/JBoss_Portal_Branch_2_7/core-admin/src: resources/portal-admin-war/jsf and 1 other directory.

Author: wesleyhales Date: 2008-08-11 09:46:47 -0400 (Mon, 11 Aug 2008) New Revision: 11685 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 updates 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-10 20:22:59 UTC (rev 11684) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/CoordinationAction.java 2008-08-11 13:46:47 UTC (rev 11685) @@ -49,13 +49,13 @@ private Map<String, String> eventWirings; - private Map<String, QName> eventSources; + private Map<String, String> eventSources; - private Map<String, QName> eventDestinations; + private Map<String, String> eventDestinations; private Map<String, String> aliasBindings; - private Map<Window, QName> windowBindings; + private Map<String, String> windowBindings; public PortalObjectId getSelectedObjectId() @@ -106,30 +106,30 @@ this.eventWirings = eventWirings; } - public Map<String, QName> getEventSources() + public Map<String, String> getEventSources() { if (eventSources == null) { - eventSources = new HashMap<String, QName>(); + eventSources = new HashMap<String, String>(); } return eventSources; } - public void setEventSources(Map<String, QName> eventSources) + public void setEventSources(Map<String, String> eventSources) { this.eventSources = eventSources; } - public Map<String, QName> getEventDestinations() + public Map<String, String> getEventDestinations() { if (eventDestinations == null) { - eventDestinations = new HashMap<String, QName>(); + eventDestinations = new HashMap<String, String>(); } return eventDestinations; } - public void setEventDestinations(Map<String, QName> eventDestinations) + public void setEventDestinations(Map<String, String> eventDestinations) { this.eventDestinations = eventDestinations; } @@ -148,16 +148,16 @@ this.aliasBindings = aliasBindings; } - public Map<Window, QName> getWindowBindings() + public Map<String, String> getWindowBindings() { if (windowBindings == null) { - windowBindings = new HashMap<Window, QName>(); + windowBindings = new HashMap<String, String>(); } return windowBindings; } - public void setWindowBindings(Map<Window, QName> windowBindings) + public void setWindowBindings(Map<String, String> windowBindings) { this.windowBindings = windowBindings; } @@ -186,7 +186,7 @@ Map.Entry entry = (Map.Entry)o1; Window paramName = (Window)entry.getKey(); QName paramValue = (QName)entry.getValue(); - getEventSources().put(paramName.getName(), paramValue); + getEventSources().put(paramName.getName(), paramValue.getNamespaceURI()); } //prep destinations @@ -195,7 +195,7 @@ Map.Entry entry = (Map.Entry)o1; Window paramName = (Window)entry.getKey(); QName paramValue = (QName)entry.getValue(); - getEventDestinations().put(paramName.getName(), paramValue); + getEventDestinations().put(paramName.getName(), paramValue.getNamespaceURI()); } } @@ -213,7 +213,14 @@ for (Object o : pomb.getCoordinationService().getWindowBindings(page)) { WindowBindingInfo wbInfo = (WindowBindingInfo)o; - getWindowBindings().putAll(wbInfo.getWindows()); + for (Object o1 : wbInfo.getWindows().entrySet()) + { + Map.Entry entry = (Map.Entry)o1; + Window paramName = (Window)entry.getKey(); + QName paramValue = (QName)entry.getValue(); + getWindowBindings().put(paramName.getName(),paramValue.getNamespaceURI()); + } + } // process only windows... 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-10 20:22:59 UTC (rev 11684) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editCoordination.xhtml 2008-08-11 13:46:47 UTC (rev 11685) @@ -34,8 +34,21 @@ <h:selectManyListbox size="5" value="#{addDisplayNameAction.newLocale}"> <f:selectItems value="#{coordinationAction.windowBindings}"/> </h:selectManyListbox> + + <h3 class="sectionTitle tenpx-top-bottom">Manage Existing Parameter Bindings</h3> + <div class="float-left quarter-width"> + </div> + <div class="float-left quarter-width"> + <h:selectManyListbox size="5" value="#{addDisplayNameAction.newLocale}"> + <f:selectItems value="#{coordinationAction.windows}"/> + </h:selectManyListbox> + </div> + <div class="float-left quarter-width"> + <h:inputText value="#{addDisplayNameAction.newLocale}"/> + </div> + <h3 class="portlet-section-title tenpx-top-bottom">#{coordinationAction.selectedObject.name} Event Coordination</h3> #{bundle.COORDINATION_EVENT_WIRINGS} <h:selectManyListbox size="5" value="#{addDisplayNameAction.newLocale}">