August 2008 - portal-commits - Jboss List Archives

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

by portal-commits＠lists.jboss.org

Author: chris.laprun(a)jboss.com Date: 2008-08-12 04:55:39 -0400 (Tue, 12 Aug 2008) New Revision: 11690 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/editPage.xhtml branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/objectNavigation.xhtml Log: - editCoordination is not listener anymore so that CoordinationAction is more in line with other actions. 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-12 03:57:40 UTC (rev 11689) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/CoordinationAction.java 2008-08-12 08:55:39 UTC (rev 11690) @@ -203,7 +203,7 @@ this.stringStub = stringStub; } - public String editCoordination(ActionEvent event) throws ConversionException + public String editCoordination() throws ConversionException { PortalObject portalObject = getSelectedObject(); Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editPage.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editPage.xhtml 2008-08-12 03:57:40 UTC (rev 11689) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editPage.xhtml 2008-08-12 08:55:39 UTC (rev 11690) @@ -41,8 +41,8 @@ #{bundle.DISPLAY_NAMES} </h:commandLink> <h:panelGroup rendered="#{'page' eq portalobjectmgr.selectedObjectType}"> - | <h:commandLink action="editCoordination" - actionListener="#{coordinationAction.editCoordination}" + | <h:commandLink action="#{coordinationAction.editCoordination}" + actionListener="#{portalobjectmgr.selectObject}" styleClass="actionCoordination"> <f:param name="id" value="#{portalobjectmgr.selectedObject.id}" /> #{bundle.COORDINATION_COORDINATION} Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/objectNavigation.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/objectNavigation.xhtml 2008-08-12 03:57:40 UTC (rev 11689) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/objectNavigation.xhtml 2008-08-12 08:55:39 UTC (rev 11690) @@ -108,8 +108,8 @@ actionListener="#{portalobjectmgr.selectObject}"> <f:param name="id" value="#{object.id}"/> #{bundle.DISPLAY_NAMES} - </h:commandLink> | <h:commandLink action="editCoordination" styleClass="actionCoordination" - actionListener="#{coordinationAction.editCoordination}"> + </h:commandLink> | <h:commandLink action="#{coordinationAction.editCoordination}" styleClass="actionCoordination" + actionListener="#{portalobjectmgr.selectObject}"> <f:param name="id" value="#{object.id}"/> #{bundle.COORDINATION_COORDINATION} </h:commandLink>

15 years, 9 months

1
0
0 / 0

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

by portal-commits＠lists.jboss.org

Author: wesleyhales Date: 2008-08-11 23:57:40 -0400 (Mon, 11 Aug 2008) New Revision: 11689 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: began form for window binding 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-11 21:14:31 UTC (rev 11688) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/CoordinationAction.java 2008-08-12 03:57:40 UTC (rev 11689) @@ -44,6 +44,7 @@ import javax.faces.context.FacesContext; import javax.faces.event.ActionEvent; import javax.faces.event.ValueChangeEvent; +import javax.faces.model.SelectItem; import javax.xml.namespace.QName; import java.util.ArrayList; import java.util.Collection; @@ -73,10 +74,12 @@ private Map<String, String> aliasBindings; - private Map<String, String> windowBindings; + private ArrayList<SelectItem> windowBindings = new ArrayList<SelectItem>(); private List<ParameterInfo> availablePRPs; + private List<SelectItem> selectedWindowBindings = new ArrayList<SelectItem>(); + private String stringStub; public PortalObjectId getSelectedObjectId() @@ -86,6 +89,7 @@ public PortalObject getSelectedObject() { + System.out.println("------getSelectedObjectId()---" + getSelectedObjectId()); return pomb.getPortalObjectContainer().getObject(getSelectedObjectId()); } @@ -155,16 +159,12 @@ this.aliasBindings = aliasBindings; } - public Map<String, String> getWindowBindings() + public ArrayList<SelectItem> getWindowBindings() { - if (windowBindings == null) - { - windowBindings = new HashMap<String, String>(); - } return windowBindings; } - public void setWindowBindings(Map<String, String> windowBindings) + public void setWindowBindings(ArrayList<SelectItem> windowBindings) { this.windowBindings = windowBindings; } @@ -183,6 +183,16 @@ this.availablePRPs = availablePRPs; } + public List<SelectItem> getSelectedWindowBindings() + { + return selectedWindowBindings; + } + + public void setSelectedWindowBindings(List<SelectItem> selectedWindowBindings) + { + this.selectedWindowBindings = selectedWindowBindings; + } + public String getStringStub() { return stringStub; @@ -241,9 +251,9 @@ Map.Entry entry = (Map.Entry)o1; Window paramName = (Window)entry.getKey(); QName paramValue = (QName)entry.getValue(); - getWindowBindings().put(paramName.getName(), paramValue.toString()); + getWindowBindings().add(new SelectItem(paramName.getName(),paramValue.toString())); + //System.out.println("-------paramName.getName()-" + paramName.getName()); } - } // process only windows... @@ -251,11 +261,6 @@ { Window window = (Window)po; getWindows().put(window.getName(), window.getId()); - //if (eventWirings.size() > 0) - //{ - //getEventSources().put(portalObject.getName(),pomb.getCoordinationService().getEventDestinationWirings((Window)portalObject)); - //getEventDestinations().put(portalObject.getName(),pomb.getCoordinationService().getEventSourceWirings((Window)portalObject)); - //} if (ContentType.PORTLET.equals(window.getContentType())) { PortletContent pc = (PortletContent)window.getContent(); @@ -269,10 +274,10 @@ { ParameterInfo pInfo = (ParameterInfo)o; getAvailablePRPs().add(pInfo); - System.out.println("key---------" + pInfo.getName()); - System.out.println("key---------" + pInfo.getId()); - System.out.println("key---------" + pInfo.getDescription()); - System.out.println("key---------" + pInfo.getAliases()); +// System.out.println("key---------" + pInfo.getName()); +// System.out.println("key---------" + pInfo.getId()); +// System.out.println("key---------" + pInfo.getDescription()); +// System.out.println("key---------" + pInfo.getAliases()); } } @@ -283,7 +288,6 @@ { e.printStackTrace(); } - } return "editCoordination"; @@ -422,4 +426,12 @@ return name.compareTo(other.getName()); } } + + public void createWindowBinding(ActionEvent event){ + //String id = (String) event.getComponent().getAttributes().get(""); + for (SelectItem binding : getSelectedWindowBindings()){ + System.out.println("-----------" + binding); + } + + } } 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-11 21:14:31 UTC (rev 11688) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editCoordination.xhtml 2008-08-12 03:57:40 UTC (rev 11689) @@ -16,17 +16,34 @@ #{bundle.COORDINATION_PARAMETER_IMPLICIT_MODE} #{coordinationAction.selectedObject.properties['coordination.parameter.implicit_mode']} <hr/> - #{bundle.COORDINATION_WINDOWS} - <h:selectManyListbox size="5" value="#{coordinationAction.stringStub}"> - <f:selectItems value="#{coordinationAction.windows}"/> - </h:selectManyListbox> + <h:form> + <ui:remove> + <div class="float-left quarter-width"> + #{bundle.COORDINATION_WINDOWS} + <h:selectManyListbox size="5" value="#{coordinationAction.stringStub}"> + <f:selectItems value="#{coordinationAction.windows}"/> + </h:selectManyListbox> + </div> + </ui:remove> - <hr/> - #{bundle.COORDINATION_WINDOW_BINDINGS} - <h:selectManyListbox size="5" value="#{coordinationAction.stringStub}"> - <f:selectItems value="#{coordinationAction.windowBindings}"/> - </h:selectManyListbox> + <div class="float-left quarter-width"> + #{bundle.COORDINATION_WINDOW_BINDINGS} + <h:selectManyListbox size="5" value="#{coordinationAction.selectedWindowBindings}"> + <f:selectItems value="#{coordinationAction.windowBindings}"/> + </h:selectManyListbox> + </div> + <ui:remove> + <div class="float-left quarter-width"> + <h:inputText value="#{coordinationAction.stringStub}"/> + </div> + </ui:remove> + + <h:commandButton actionListener="#{coordinationAction.createWindowBinding}" value="Create Binding" > + <f:param name="id" value="#{coordinationAction.selectedObjectId}"/> + </h:commandButton> + <br class="clear"/> + </h:form>  <h3 class="sectionTitle tenpx-top-bottom">Manage Existing Parameter Bindings</h3>

15 years, 9 months

1
0
0 / 0

JBoss Portal SVN: r11688 - in branches/JBoss_Portal_Branch_2_7/core-admin/src: resources/portal-admin-war/WEB-INF/classes and 1 other directories.

by portal-commits＠lists.jboss.org

Author: chris.laprun(a)jboss.com Date: 2008-08-11 17:14:31 -0400 (Mon, 11 Aug 2008) New Revision: 11688 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/PortalInstanceDisplayNameAction.java branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/classes/Resource.properties branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editCoordination.xhtml Log: - Beginning of implementation for displaying existing event wirings: + needs better display of collections (in particular for windows) + checkbox progressive disclosure mechanism doesn't work yet + rename wiring has not been implemented as it'd be better implemented with support in CoordinationConfigurator + delete wiring has not been tested (and thus probably doesn't work) 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-11 20:35:28 UTC (rev 11687) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/CoordinationAction.java 2008-08-11 21:14:31 UTC (rev 11688) @@ -22,37 +22,37 @@ ******************************************************************************/ package org.jboss.portal.core.admin.ui.actions; +import org.jboss.portal.common.NotYetImplemented; import org.jboss.portal.common.util.ConversionException; import org.jboss.portal.core.admin.ui.PortalObjectManagerBean; -import org.jboss.portal.core.admin.ui.PreferencesBean; import org.jboss.portal.core.controller.coordination.AliasBindingInfo; import org.jboss.portal.core.controller.coordination.EventWiringInfo; +import org.jboss.portal.core.controller.coordination.IllegalCoordinationException; 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.core.model.instance.Instance; -import org.jboss.portal.core.model.content.ContentType; -import org.jboss.portal.core.impl.model.content.portlet.PortletContent; -import org.jboss.portal.portlet.info.PortletInfo; -import org.jboss.portal.portlet.info.EventingInfo; -import org.jboss.portal.portlet.info.MetaInfo; -import org.jboss.portal.portlet.info.PreferencesInfo; -import org.jboss.portal.portlet.info.PreferenceInfo; -import org.jboss.portal.portlet.info.CapabilitiesInfo; -import org.jboss.portal.portlet.info.SecurityInfo; +import org.jboss.portal.portlet.Portlet; import org.jboss.portal.portlet.info.NavigationInfo; import org.jboss.portal.portlet.info.ParameterInfo; -import org.jboss.portal.portlet.Portlet; +import org.jboss.portal.portlet.info.PortletInfo; +import javax.faces.context.FacesContext; import javax.faces.event.ActionEvent; +import javax.faces.event.ValueChangeEvent; import javax.xml.namespace.QName; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; import java.util.HashMap; +import java.util.HashSet; +import java.util.List; import java.util.Map; -import java.util.Iterator; -import java.util.List; -import java.util.ArrayList; +import java.util.Set; /** * @author <a href="mailto:whales@redhat.com">Wesley Hales</a> @@ -64,7 +64,8 @@ private Map<String, PortalObjectId> windows; - private Map<String, String> eventWirings; + private Map<String, EventWiringInfo> eventWirings; + private Map<String, DisplayEventWiring> displayEventWirings; private Map<String, String> eventSources; @@ -112,20 +113,6 @@ this.pomb = pomb; } - public Map<String, String> getEventWirings() - { - if (eventWirings == null) - { - eventWirings = new HashMap<String, String>(); - } - return eventWirings; - } - - public void setEventWirings(Map<String, String> eventWirings) - { - this.eventWirings = eventWirings; - } - public Map<String, String> getEventSources() { if (eventSources == null) @@ -213,34 +200,26 @@ if (portalObject.getType() == PortalObject.TYPE_PAGE) { - Page page = (Page) portalObject; + Page page = (Page)portalObject; try { //eventwirings prep for ui - for (Object o : pomb.getCoordinationService().getEventWirings(page)) + Collection<EventWiringInfo> wiringInfos = pomb.getCoordinationService().getEventWirings(page); + for (EventWiringInfo ewInfo : wiringInfos) { - EventWiringInfo ewInfo = (EventWiringInfo)o; - getEventWirings().put(ewInfo.getName(), ewInfo.getName()); - - //prep sources - for (Object o1 : ewInfo.getSources().entrySet()) + if (eventWirings == null) { - Map.Entry entry = (Map.Entry)o1; - Window paramName = (Window)entry.getKey(); - QName paramValue = (QName)entry.getValue(); - getEventSources().put(paramName.getName(), paramValue.getNamespaceURI()); + eventWirings = new HashMap<String, EventWiringInfo>(wiringInfos.size()); } + eventWirings.put(ewInfo.getName(), ewInfo); - //prep destinations - for (Object o1 : ewInfo.getDestinations().entrySet()) + if (displayEventWirings == null) { - Map.Entry entry = (Map.Entry)o1; - Window paramName = (Window)entry.getKey(); - QName paramValue = (QName)entry.getValue(); - getEventDestinations().put(paramName.getName(), paramValue.getNamespaceURI()); + displayEventWirings = new HashMap<String, DisplayEventWiring>(); } + displayEventWirings.put(ewInfo.getName(), new DisplayEventWiring(ewInfo)); } //aliasbindings prep for ui @@ -262,13 +241,11 @@ Map.Entry entry = (Map.Entry)o1; Window paramName = (Window)entry.getKey(); QName paramValue = (QName)entry.getValue(); - getWindowBindings().put(paramName.getName(),paramValue.toString()); + getWindowBindings().put(paramName.getName(), paramValue.toString()); } - + } - - // process only windows... for (PortalObject po : page.getChildren(PortalObject.WINDOW_MASK)) { @@ -279,9 +256,9 @@ //getEventSources().put(portalObject.getName(),pomb.getCoordinationService().getEventDestinationWirings((Window)portalObject)); //getEventDestinations().put(portalObject.getName(),pomb.getCoordinationService().getEventSourceWirings((Window)portalObject)); //} - if(ContentType.PORTLET.equals(window.getContentType())) + if (ContentType.PORTLET.equals(window.getContentType())) { - PortletContent pc = (PortletContent) window.getContent(); + PortletContent pc = (PortletContent)window.getContent(); Instance instance = pomb.getInstanceContainer().getDefinition(pc.getInstanceRef()); Portlet portlet = instance.getPortlet(); PortletInfo info = portlet.getInfo(); @@ -312,4 +289,137 @@ return "editCoordination"; } + // JSF helper methods + + /** + * Retrieves the value of the parameter which name is given. + * + * @param name + * @return + */ + public String getFacesParam(String name) + { + return FacesContext.getCurrentInstance().getExternalContext().getRequestParameterMap().get(name); + } + + /** Bypass the rest of the life cycle and re-display page */ + public void renderResponse() + { + FacesContext.getCurrentInstance().renderResponse(); + } + + // Event Wirings methods + + public boolean isExplicitEventsUsed() + { + Map<String, String> props = getSelectedObject().getProperties(); + if (props != null) + { + return !Boolean.valueOf(props.get("coordination.event.implicit_mode")); + } + return false; + } + + public Map<String, EventWiringInfo> getEventWirings() + { + return eventWirings; + } + + public Collection<DisplayEventWiring> getDisplayEventWirings() + { + if (displayEventWirings == null) + { + return Collections.emptyList(); + } + + ArrayList<DisplayEventWiring> result = new ArrayList<DisplayEventWiring>(displayEventWirings.values()); + Collections.sort(result); + + return result; + } + + public String deleteWiring() + { + String wiring = getFacesParam("wiring"); + EventWiringInfo event = eventWirings.get(wiring); + try + { + pomb.getCoordinationService().removeEventWiring(event); + displayEventWirings.remove(wiring); + } + catch (IllegalCoordinationException e) + { + e.printStackTrace(); //To change body of catch statement use File | Settings | File Templates. + } + + return null; + } + + public String renameWiring() + { + String wiring = getFacesParam("wiring"); + EventWiringInfo event = eventWirings.get(wiring); + // todo: implement, rename operation should be on CoordinationConfigurator + + throw new NotYetImplemented("renameWiring not yet implemented!"); + } + + public void useWSDLListener(ValueChangeEvent event) + { + + } + + + public static class DisplayEventWiring implements Comparable + { + private String name; + private Set<Window> sourceWindows; + private Set<QName> sourceEvents; + private Set<Window> destinationWindows; + private Set<QName> destinationEvents; + + DisplayEventWiring(EventWiringInfo eventInfo) + { + name = eventInfo.getName(); + + Map<Window, QName> sources = eventInfo.getSources(); + sourceWindows = new HashSet<Window>(sources.keySet()); + sourceEvents = new HashSet<QName>(sources.values()); + + Map<Window, QName> destinations = eventInfo.getDestinations(); + destinationWindows = new HashSet<Window>(destinations.keySet()); + destinationEvents = new HashSet<QName>(destinations.values()); + } + + public String getName() + { + return name; + } + + public Set<Window> getSourceWindows() + { + return sourceWindows; + } + + public Set<QName> getSourceEvents() + { + return sourceEvents; + } + + public Set<Window> getDestinationWindows() + { + return destinationWindows; + } + + public Set<QName> getDestinationEvents() + { + return destinationEvents; + } + + public int compareTo(Object o) + { + DisplayEventWiring other = (DisplayEventWiring)o; + return name.compareTo(other.getName()); + } + } } Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/PortalInstanceDisplayNameAction.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/PortalInstanceDisplayNameAction.java 2008-08-11 20:35:28 UTC (rev 11687) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/PortalInstanceDisplayNameAction.java 2008-08-11 21:14:31 UTC (rev 11688) @@ -23,27 +23,20 @@ package org.jboss.portal.core.admin.ui.actions; import org.jboss.portal.common.i18n.LocaleFormat; -import org.jboss.portal.common.i18n.LocaleManager; import org.jboss.portal.common.i18n.LocalizedString; import org.jboss.portal.common.util.ConversionException; -import org.jboss.portal.core.admin.ui.PortalObjectManagerBean; -import org.jboss.portal.core.admin.ui.PortletManagerBean; -import org.jboss.portal.core.admin.ui.InstanceManagerBean; import org.jboss.portal.core.admin.ui.DisplayNameBean; +import org.jboss.portal.core.admin.ui.InstanceManagerBean; import org.jboss.portal.core.model.instance.Instance; -import org.jboss.portal.core.model.portal.PortalObject; import javax.faces.application.FacesMessage; import javax.faces.context.FacesContext; -import java.util.ArrayList; import java.util.Collection; import java.util.HashMap; -import java.util.Iterator; import java.util.List; import java.util.Locale; import java.util.Map; import java.util.SortedMap; -import java.util.TreeMap; /** * @author <a href="mailto:whales@redhat.com">Wesley Hales</a> @@ -191,7 +184,7 @@ public String getFacesParam(String param) { - return (String)FacesContext.getCurrentInstance().getExternalContext().getRequestParameterMap().get(param); + return FacesContext.getCurrentInstance().getExternalContext().getRequestParameterMap().get(param); } Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/classes/Resource.properties =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/classes/Resource.properties 2008-08-11 20:35:28 UTC (rev 11687) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/classes/Resource.properties 2008-08-11 21:14:31 UTC (rev 11688) @@ -277,5 +277,13 @@ COORDINATION_ALIAS_BINDINGS=Alias bindings COORDINATION_WINDOW_BINDINGS=Window bindings -COORDINATION_EVENT_WIRINGS=Event wirings -COORDINATION_EVENT_IMPLICIT_MODE=Event implicit mode +COORDINATION_EVENT_WIRINGS=event wirings +COORDINATION_EVENT_EXPLICIT_MODE=Use explicit event wiring +COORDINATION_EVENT_MANAGE_EXISTING=Manage existing event wirings: +COORDINATION_EVENT_EXISTING_NAME=Name +COORDINATION_EVENT_EXISTING_SOURCE_WINDOWS=Source windows +COORDINATION_EVENT_EXISTING_SOURCE_EVENTS=Source events +COORDINATION_EVENT_EXISTING_DESTINATION_EVENTS=Destination events +COORDINATION_EVENT_EXISTING_DESTINATION_WINDOWS=Destination windows +COORDINATION_EVENT_EXISTING_ACTIONS=Actions +COORDINATION_EVENT_CREATE=Create new event wiring: \ No newline at end of file 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-11 20:35:28 UTC (rev 11687) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editCoordination.xhtml 2008-08-11 21:14:31 UTC (rev 11688) @@ -9,28 +9,27 @@ <ui:param name="portalObjectScreen" value="#{bundle.COORDINATION_COORDINATION}"/> <ui:define name="content"> <div class="tenpx-top-bottom"> - <h2 class="portlet-area-header">#{coordinationAction.selectedObject.name} #{bundle.COORDINATION_PARAMETER_BINDINGS}</h2> - <h3 class="sectionTitle tenpx-top-bottom">#{bundle.COORDINATION_CREATE_PARAMETER_BINDING}</h3> + <h2 class="portlet-area-header">#{coordinationAction.selectedObject.name} #{bundle.COORDINATION_PARAMETER_BINDINGS}</h2> + +  + <h3 class="sectionTitle tenpx-top-bottom">#{bundle.COORDINATION_CREATE_PARAMETER_BINDING}</h3> #{bundle.COORDINATION_PARAMETER_IMPLICIT_MODE} #{coordinationAction.selectedObject.properties['coordination.parameter.implicit_mode']} - <hr/> - #{bundle.COORDINATION_EVENT_IMPLICIT_MODE} #{coordinationAction.selectedObject.properties['coordination.event.implicit_mode']} - <hr/> - #{bundle.COORDINATION_WINDOWS} - <h:selectManyListbox size="5" value="#{coordinationAction.stringStub}"> - <f:selectItems value="#{coordinationAction.windows}"/> - </h:selectManyListbox> + <hr/> - <hr/> - #{bundle.COORDINATION_WINDOW_BINDINGS} - <h:selectManyListbox size="5" value="#{coordinationAction.stringStub}"> - <f:selectItems value="#{coordinationAction.windowBindings}"/> - </h:selectManyListbox> - - <h3 class="sectionTitle tenpx-top-bottom">Manage Existing Parameter Bindings</h3> + #{bundle.COORDINATION_WINDOWS} + <h:selectManyListbox size="5" value="#{coordinationAction.stringStub}"> + <f:selectItems value="#{coordinationAction.windows}"/> + </h:selectManyListbox> - <div class="float-left quarter-width"> + <hr/> + #{bundle.COORDINATION_WINDOW_BINDINGS} + <h:selectManyListbox size="5" value="#{coordinationAction.stringStub}"> + <f:selectItems value="#{coordinationAction.windowBindings}"/> + </h:selectManyListbox> - </div> +  + <h3 class="sectionTitle tenpx-top-bottom">Manage Existing Parameter Bindings</h3> + <div class="float-left quarter-width"> <h:selectManyListbox size="5" value="#{coordinationAction.stringStub}"> <f:selectItems value="#{coordinationAction.windows}"/> @@ -39,10 +38,82 @@ <div class="float-left quarter-width"> <h:inputText value="#{coordinationAction.stringStub}"/> </div> + <br class="clear"/> + </div> - <h3 class="portlet-section-title tenpx-top-bottom">#{coordinationAction.selectedObject.name} Event Coordination</h3> - #{bundle.COORDINATION_EVENT_WIRINGS} - <h:selectManyListbox size="5" value="#{coordinationAction.stringStub}"> +  + <h2 class="portlet-area-header">#{coordinationAction.selectedObject.name} #{bundle.COORDINATION_EVENT_WIRINGS}</h2> + + <h:form> + <h:selectBooleanCheckbox id="useExplicitEvents" value="#{coordinationAction.explicitEventsUsed}" + onchange="this.form.submit()" valueChangeListener="#{consumer.explicitEventsListener}" + immediate="true"/> #{bundle.COORDINATION_EVENT_EXPLICIT_MODE} + </h:form> + +  + <h3 class="sectionTitle tenpx-top-bottom">#{bundle.COORDINATION_EVENT_MANAGE_EXISTING}</h3> + <h:form> + <h:dataTable var="wiring" value="#{coordinationAction.displayEventWirings}" + rendered="#{coordinationAction.explicitEventsUsed}" + styleClass="objectList datatable" + rowClasses="portlet-section-body,portlet-section-alternate-blue" + columnClasses="objectNameColumn, objectActionColumn" + headerClass="portlet-section-header"> + <h:column> + <f:facet name="header"> + <h:outputText value="#{bundle.COORDINATION_EVENT_EXISTING_NAME}"/> + </f:facet> + #{wiring.name} + </h:column> + <h:column> + <f:facet name="header"> + <h:outputText value="#{bundle.COORDINATION_EVENT_EXISTING_SOURCE_WINDOWS}"/> + </f:facet> + #{wiring.sourceWindows} + </h:column> + <h:column> + <f:facet name="header"> + <h:outputText value="#{bundle.COORDINATION_EVENT_EXISTING_SOURCE_EVENTS}"/> + </f:facet> + #{wiring.sourceEvents} + </h:column> + <h:column> + <f:facet name="header"> + <h:outputText value="#{bundle.COORDINATION_EVENT_EXISTING_DESTINATION_EVENTS}"/> + </f:facet> + #{wiring.destinationEvents} + </h:column> + <h:column> + <f:facet name="header"> + <h:outputText value="#{bundle.COORDINATION_EVENT_EXISTING_DESTINATION_WINDOWS}"/> + </f:facet> + #{wiring.destinationWindows} + </h:column> + <h:column> + <f:facet name="header"> + <h:outputText value="#{bundle.COORDINATION_EVENT_EXISTING_ACTIONS}"/> + </f:facet> + + <h:commandLink action="#{coordinationAction.deleteWiring}"> + <h:outputText styleClass="actionDelete" value="#{bundle.COMMON_DELETE}"/> + <f:param name="wiring" value="#{wiring.name}"/> + </h:commandLink> + <h:commandLink action="#{coordinationAction.renameWiring}"> + <h:outputText styleClass="actionRename" value="#{bundle.RENAME}"/> + <f:param name="wiring" value="#{wiring.name}"/> + </h:commandLink> + </h:column> + </h:dataTable> + </h:form> + +  + <h3 class="sectionTitle tenpx-top-bottom">#{bundle.COORDINATION_EVENT_CREATE}</h3> + <h:form> + + </h:form> + + <ui:remove> + <h:selectManyListbox size="5" value="#{coordinationAction.stringStub}"> <f:selectItems value="#{coordinationAction.eventWirings}"/> </h:selectManyListbox> <br/> @@ -69,9 +140,6 @@ <ui:repeat var="eventDestinations" value="#{coordinationAction.eventDestinations}"> #{eventDestinations} </ui:repeat> - - - <ui:remove> <h:selectOneMenu id="locales" value="#{coordinationAction.stringStub}"> <f:selectItems value="#{coordinationAction.pomb.portalItems}"/> </h:selectOneMenu> @@ -92,6 +160,5 @@ </h:selectManyListbox> <br/> </ui:remove> - </div> </ui:define> </ui:composition>

15 years, 9 months

1
0
0 / 0

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

by portal-commits＠lists.jboss.org

Author: wesleyhales Date: 2008-08-11 16:35:28 -0400 (Mon, 11 Aug 2008) New Revision: 11687 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: use ParameterInfo and create temporary stringStub for JSF components 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-11 17:15:51 UTC (rev 11686) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/CoordinationAction.java 2008-08-11 20:35:28 UTC (rev 11687) @@ -24,6 +24,7 @@ import org.jboss.portal.common.util.ConversionException; import org.jboss.portal.core.admin.ui.PortalObjectManagerBean; +import org.jboss.portal.core.admin.ui.PreferencesBean; import org.jboss.portal.core.controller.coordination.AliasBindingInfo; import org.jboss.portal.core.controller.coordination.EventWiringInfo; import org.jboss.portal.core.controller.coordination.WindowBindingInfo; @@ -37,12 +38,21 @@ import org.jboss.portal.portlet.info.PortletInfo; import org.jboss.portal.portlet.info.EventingInfo; import org.jboss.portal.portlet.info.MetaInfo; +import org.jboss.portal.portlet.info.PreferencesInfo; +import org.jboss.portal.portlet.info.PreferenceInfo; +import org.jboss.portal.portlet.info.CapabilitiesInfo; +import org.jboss.portal.portlet.info.SecurityInfo; +import org.jboss.portal.portlet.info.NavigationInfo; +import org.jboss.portal.portlet.info.ParameterInfo; import org.jboss.portal.portlet.Portlet; import javax.faces.event.ActionEvent; import javax.xml.namespace.QName; import java.util.HashMap; import java.util.Map; +import java.util.Iterator; +import java.util.List; +import java.util.ArrayList; /** * @author <a href="mailto:whales@redhat.com">Wesley Hales</a> @@ -64,8 +74,9 @@ private Map<String, String> windowBindings; - private Map<String, String> availablePRPs; + private List<ParameterInfo> availablePRPs; + private String stringStub; public PortalObjectId getSelectedObjectId() { @@ -171,20 +182,30 @@ this.windowBindings = windowBindings; } - public Map<String, String> getAvailablePRPs() + public List<ParameterInfo> getAvailablePRPs() { if (availablePRPs == null) { - availablePRPs = new HashMap<String, String>(); + availablePRPs = new ArrayList<ParameterInfo>(); } return availablePRPs; } - public void setAvailablePRPs(Map<String, String> availablePRPs) + public void setAvailablePRPs(List<ParameterInfo> availablePRPs) { this.availablePRPs = availablePRPs; } + public String getStringStub() + { + return stringStub; + } + + public void setStringStub(String stringStub) + { + this.stringStub = stringStub; + } + public String editCoordination(ActionEvent event) throws ConversionException { PortalObject portalObject = getSelectedObject(); @@ -264,8 +285,19 @@ Instance instance = pomb.getInstanceContainer().getDefinition(pc.getInstanceRef()); Portlet portlet = instance.getPortlet(); PortletInfo info = portlet.getInfo(); - MetaInfo metaInfo = info.getMeta(); - System.out.println("-------metaInfo--" + metaInfo.getMetaValue(MetaInfo.DESCRIPTION)); + NavigationInfo navInfo = info.getNavigation(); + + + for (Object o : navInfo.getPublicParameters()) + { + ParameterInfo pInfo = (ParameterInfo)o; + getAvailablePRPs().add(pInfo); + System.out.println("key---------" + pInfo.getName()); + System.out.println("key---------" + pInfo.getId()); + System.out.println("key---------" + pInfo.getDescription()); + System.out.println("key---------" + pInfo.getAliases()); + + } } } 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-11 17:15:51 UTC (rev 11686) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editCoordination.xhtml 2008-08-11 20:35:28 UTC (rev 11687) @@ -16,22 +16,13 @@ #{bundle.COORDINATION_EVENT_IMPLICIT_MODE} #{coordinationAction.selectedObject.properties['coordination.event.implicit_mode']} <hr/> #{bundle.COORDINATION_WINDOWS} - <h:selectManyListbox size="5" value="#{addDisplayNameAction.newLocale}"> + <h:selectManyListbox size="5" value="#{coordinationAction.stringStub}"> <f:selectItems value="#{coordinationAction.windows}"/> </h:selectManyListbox> - <hr/> - - #{bundle.COORDINATION_ALIAS_BINDINGS} - <h:selectManyListbox size="5" value="#{addDisplayNameAction.newLocale}"> - <f:selectItems value="#{coordinationAction.aliasBindings}"/> - </h:selectManyListbox> - <br/> - - <hr/> #{bundle.COORDINATION_WINDOW_BINDINGS} - <h:selectManyListbox size="5" value="#{addDisplayNameAction.newLocale}"> + <h:selectManyListbox size="5" value="#{coordinationAction.stringStub}"> <f:selectItems value="#{coordinationAction.windowBindings}"/> </h:selectManyListbox> @@ -41,17 +32,17 @@ </div> <div class="float-left quarter-width"> - <h:selectManyListbox size="5" value="#{addDisplayNameAction.newLocale}"> + <h:selectManyListbox size="5" value="#{coordinationAction.stringStub}"> <f:selectItems value="#{coordinationAction.windows}"/> </h:selectManyListbox> </div> <div class="float-left quarter-width"> - <h:inputText value="#{addDisplayNameAction.newLocale}"/> + <h:inputText value="#{coordinationAction.stringStub}"/> </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}"> + <h:selectManyListbox size="5" value="#{coordinationAction.stringStub}"> <f:selectItems value="#{coordinationAction.eventWirings}"/> </h:selectManyListbox> <br/> @@ -61,7 +52,7 @@ <hr/> eventSources - <h:selectManyListbox size="5" value="#{addDisplayNameAction.newLocale}"> + <h:selectManyListbox size="5" value="#{coordinationAction.stringStub}"> <f:selectItems value="#{coordinationAction.eventSources}"/> </h:selectManyListbox> <br/> @@ -71,7 +62,7 @@ <hr/> eventDestinations - <h:selectManyListbox size="5" value="#{addDisplayNameAction.newLocale}"> + <h:selectManyListbox size="5" value="#{coordinationAction.stringStub}"> <f:selectItems value="#{coordinationAction.eventDestinations}"/> </h:selectManyListbox> <br/> @@ -81,19 +72,25 @@ <ui:remove> - <h:selectOneMenu id="locales" value="#{addDisplayNameAction.newLocale}"> + <h:selectOneMenu id="locales" value="#{coordinationAction.stringStub}"> <f:selectItems value="#{coordinationAction.pomb.portalItems}"/> </h:selectOneMenu> <br/> - <h:selectOneMenu id="locales" value="#{addDisplayNameAction.newLocale}"> + <h:selectOneMenu id="locales" value="#{coordinationAction.stringStub}"> <f:selectItems value="#{coordinationAction.pomb.instanceItems}"/> </h:selectOneMenu> <br/> - <h:selectOneMenu id="locales" value="#{addDisplayNameAction.newLocale}"> + <h:selectOneMenu id="locales" value="#{coordinationAction.stringStub}"> <f:selectItems value="#{coordinationAction.pomb.portalPageItems}"/> </h:selectOneMenu> + <hr/> + #{bundle.COORDINATION_ALIAS_BINDINGS} + <h:selectManyListbox size="5" value="#{coordinationAction.stringStub}"> + <f:selectItems value="#{coordinationAction.aliasBindings}"/> + </h:selectManyListbox> + <br/> </ui:remove> </div> </ui:define>

15 years, 9 months

1
0
0 / 0

JBoss Portal SVN: r11686 - branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/actions.

by portal-commits＠lists.jboss.org

Author: wesleyhales Date: 2008-08-11 13:15:51 -0400 (Mon, 11 Aug 2008) New Revision: 11686 Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/CoordinationAction.java 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-11 13:46:47 UTC (rev 11685) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/CoordinationAction.java 2008-08-11 17:15:51 UTC (rev 11686) @@ -31,6 +31,13 @@ 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.core.model.instance.Instance; +import org.jboss.portal.core.model.content.ContentType; +import org.jboss.portal.core.impl.model.content.portlet.PortletContent; +import org.jboss.portal.portlet.info.PortletInfo; +import org.jboss.portal.portlet.info.EventingInfo; +import org.jboss.portal.portlet.info.MetaInfo; +import org.jboss.portal.portlet.Portlet; import javax.faces.event.ActionEvent; import javax.xml.namespace.QName; @@ -57,7 +64,9 @@ private Map<String, String> windowBindings; + private Map<String, String> availablePRPs; + public PortalObjectId getSelectedObjectId() { return pomb.getSelectedPortalObjectId(); @@ -162,6 +171,20 @@ this.windowBindings = windowBindings; } + public Map<String, String> getAvailablePRPs() + { + if (availablePRPs == null) + { + availablePRPs = new HashMap<String, String>(); + } + return availablePRPs; + } + + public void setAvailablePRPs(Map<String, String> availablePRPs) + { + this.availablePRPs = availablePRPs; + } + public String editCoordination(ActionEvent event) throws ConversionException { PortalObject portalObject = getSelectedObject(); @@ -218,20 +241,32 @@ Map.Entry entry = (Map.Entry)o1; Window paramName = (Window)entry.getKey(); QName paramValue = (QName)entry.getValue(); - getWindowBindings().put(paramName.getName(),paramValue.getNamespaceURI()); + getWindowBindings().put(paramName.getName(),paramValue.toString()); } } + + // process only windows... - for (PortalObject windows : page.getChildren(PortalObject.WINDOW_MASK)) + for (PortalObject po : page.getChildren(PortalObject.WINDOW_MASK)) { - getWindows().put(windows.getName(), windows.getId()); + Window window = (Window)po; + getWindows().put(window.getName(), window.getId()); //if (eventWirings.size() > 0) //{ //getEventSources().put(portalObject.getName(),pomb.getCoordinationService().getEventDestinationWirings((Window)portalObject)); //getEventDestinations().put(portalObject.getName(),pomb.getCoordinationService().getEventSourceWirings((Window)portalObject)); //} + if(ContentType.PORTLET.equals(window.getContentType())) + { + PortletContent pc = (PortletContent) window.getContent(); + Instance instance = pomb.getInstanceContainer().getDefinition(pc.getInstanceRef()); + Portlet portlet = instance.getPortlet(); + PortletInfo info = portlet.getInfo(); + MetaInfo metaInfo = info.getMeta(); + System.out.println("-------metaInfo--" + metaInfo.getMetaValue(MetaInfo.DESCRIPTION)); + } } }

15 years, 9 months

1
0
0 / 0

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

by portal-commits＠lists.jboss.org

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}">

15 years, 9 months

1
0
0 / 0

JBoss Portal SVN: r11684 - branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf.

by portal-commits＠lists.jboss.org

Author: chris.laprun(a)jboss.com Date: 2008-08-10 16:22:59 -0400 (Sun, 10 Aug 2008) New Revision: 11684 Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/confirmDeleteInstance.xhtml branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/dashboards.xhtml branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/displayNameObject.xhtml branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editContext.xhtml branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editPage.xhtml branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editPageLayout.xhtml branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editPageSecurity.xhtml branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editPageTheme.xhtml branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editPortalSecurity.xhtml branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editPortalTheme.xhtml branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editProperties.xhtml branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editWindowSecurity.xhtml branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editWindowTheme.xhtml branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/instances.xhtml branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/objectNavigation.xhtml branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/objectTemplate.xhtml branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/objects.xhtml branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/portlets.xhtml branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/renameObject.xhtml Log: - No need to load bundle on each page as it's loaded in the templates... - renameObject wasn't using a localized value. Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/confirmDeleteInstance.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/confirmDeleteInstance.xhtml 2008-08-10 20:04:17 UTC (rev 11683) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/confirmDeleteInstance.xhtml 2008-08-10 20:22:59 UTC (rev 11684) @@ -7,7 +7,6 @@ xmlns:c="http://java.sun.com/jstl/core" class="admin-ui"> - <f:loadBundle basename="Resource" var="bundle" /> <ui:composition template="instancesTemplate.xhtml"> <ui:define name="content"> Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/dashboards.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/dashboards.xhtml 2008-08-10 20:04:17 UTC (rev 11683) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/dashboards.xhtml 2008-08-10 20:22:59 UTC (rev 11684) @@ -5,7 +5,6 @@ xmlns:c="http://java.sun.com/jstl/core" template="dashboardsTemplate.xhtml"> - <f:loadBundle basename="Resource" var="bundle" /> <ui:define name="content">  Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/displayNameObject.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/displayNameObject.xhtml 2008-08-10 20:04:17 UTC (rev 11683) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/displayNameObject.xhtml 2008-08-10 20:22:59 UTC (rev 11684) @@ -4,8 +4,7 @@ xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" xmlns:c="http://java.sun.com/jstl/core"> - <f:loadBundle basename="Resource" var="bundle" /> - <ui:composition template="/jsf/objectTemplate.xhtml"> + <ui:composition template="objectTemplate.xhtml"> <ui:param name="portalObjectScreen" value="#{bundle.DISPLAY_NAMES}"/> <ui:define name="content"> Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editContext.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editContext.xhtml 2008-08-10 20:04:17 UTC (rev 11683) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editContext.xhtml 2008-08-10 20:22:59 UTC (rev 11684) @@ -5,7 +5,6 @@ xmlns:h="http://java.sun.com/jsf/html" xmlns:c="http://java.sun.com/jstl/core"> - <f:loadBundle basename="Resource" var="bundle" /> <ui:composition template="objectTemplate.xhtml"> <ui:define name="content"> Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editPage.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editPage.xhtml 2008-08-10 20:04:17 UTC (rev 11683) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editPage.xhtml 2008-08-10 20:22:59 UTC (rev 11684) @@ -5,7 +5,6 @@ xmlns:c="http://java.sun.com/jstl/core" xmlns:h="http://java.sun.com/jsf/html"> - <f:loadBundle basename="Resource" var="bundle" /> <ui:composition template="objectTemplate.xhtml"> <ui:define name="content"> Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editPageLayout.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editPageLayout.xhtml 2008-08-10 20:04:17 UTC (rev 11683) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editPageLayout.xhtml 2008-08-10 20:22:59 UTC (rev 11684) @@ -6,7 +6,6 @@ xmlns:ct="http://www.julien.com" xmlns:jbp="http://www.jboss.org/portal" xmlns:c="http://java.sun.com/jstl/core"> - <f:loadBundle basename="Resource" var="bundle" /> <ui:composition template="objectTemplate.xhtml"> <ui:param name="portalObjectScreen" value="#{bundle.COMMON_LAYOUT}"/> <ui:define name="content"> Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editPageSecurity.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editPageSecurity.xhtml 2008-08-10 20:04:17 UTC (rev 11683) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editPageSecurity.xhtml 2008-08-10 20:22:59 UTC (rev 11684) @@ -3,7 +3,6 @@ xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:f="http://java.sun.com/jsf/core" xmlns:h="http://java.sun.com/jsf/html"> - <f:loadBundle basename="Resource" var="bundle" /> <ui:composition template="objectTemplate.xhtml"> <ui:param name="portalObjectScreen" value="#{bundle.SECURITY}"/> <ui:define name="content"> Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editPageTheme.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editPageTheme.xhtml 2008-08-10 20:04:17 UTC (rev 11683) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editPageTheme.xhtml 2008-08-10 20:22:59 UTC (rev 11684) @@ -3,7 +3,6 @@ xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core"> - <f:loadBundle basename="Resource" var="bundle" /> <ui:composition template="objectTemplate.xhtml"> <ui:param name="portalObjectScreen" value="#{bundle.THEME}"/> <ui:define name="content"> Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editPortalSecurity.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editPortalSecurity.xhtml 2008-08-10 20:04:17 UTC (rev 11683) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editPortalSecurity.xhtml 2008-08-10 20:22:59 UTC (rev 11684) @@ -3,8 +3,7 @@ xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core"> - <f:loadBundle basename="Resource" var="bundle" /> - <ui:composition template="/jsf/objectTemplate.xhtml"> + <ui:composition template="objectTemplate.xhtml"> <ui:param name="portalObjectScreen" value="#{bundle.SECURITY}"/> <ui:define name="content"> <h3>#{bundle.SET_PORTAL_PERMISSIONS}</h3> Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editPortalTheme.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editPortalTheme.xhtml 2008-08-10 20:04:17 UTC (rev 11683) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editPortalTheme.xhtml 2008-08-10 20:22:59 UTC (rev 11684) @@ -3,7 +3,6 @@ xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core"> - <f:loadBundle basename="Resource" var="bundle" /> <ui:composition template="objectTemplate.xhtml"> <ui:param name="portalObjectScreen" value="#{bundle.THEME}"/> <ui:define name="content"> Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editProperties.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editProperties.xhtml 2008-08-10 20:04:17 UTC (rev 11683) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editProperties.xhtml 2008-08-10 20:22:59 UTC (rev 11684) @@ -5,7 +5,6 @@ xmlns:h="http://java.sun.com/jsf/html" xmlns:c="http://java.sun.com/jstl/core"> - <f:loadBundle basename="Resource" var="bundle" /> <ui:composition template="objectTemplate.xhtml"> <ui:param name="portalObjectScreen" value="#{bundle.COMMON_PROPERTIES}"/> Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editWindowSecurity.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editWindowSecurity.xhtml 2008-08-10 20:04:17 UTC (rev 11683) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editWindowSecurity.xhtml 2008-08-10 20:22:59 UTC (rev 11684) @@ -3,7 +3,6 @@ xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:f="http://java.sun.com/jsf/core" xmlns:h="http://java.sun.com/jsf/html"> - <f:loadBundle basename="Resource" var="bundle" /> <ui:composition template="objectTemplate.xhtml"> <ui:param name="portalObjectScreen" value="#{bundle.SECURITY}"/> <ui:define name="content"> Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editWindowTheme.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editWindowTheme.xhtml 2008-08-10 20:04:17 UTC (rev 11683) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editWindowTheme.xhtml 2008-08-10 20:22:59 UTC (rev 11684) @@ -3,7 +3,6 @@ xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core"> - <f:loadBundle basename="Resource" var="bundle" /> <ui:composition template="objectTemplate.xhtml"> <ui:param name="portalObjectScreen" value="#{bundle.THEME}"/> <ui:define name="content"> Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/instances.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/instances.xhtml 2008-08-10 20:04:17 UTC (rev 11683) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/instances.xhtml 2008-08-10 20:22:59 UTC (rev 11684) @@ -6,7 +6,6 @@ xmlns:jbp="http://www.jboss.com/portal" xmlns:c="http://java.sun.com/jstl/core"> -<f:loadBundle basename="Resource" var="bundle" /> <ui:composition template="instancesTemplate.xhtml"> <ui:define name="content"> Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/objectNavigation.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/objectNavigation.xhtml 2008-08-10 20:04:17 UTC (rev 11683) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/objectNavigation.xhtml 2008-08-10 20:22:59 UTC (rev 11684) @@ -7,8 +7,6 @@ xmlns:pfc="http://www.jboss.com/portal/facelet/common" xmlns:c="http://java.sun.com/jstl/core"> - -<f:loadBundle basename="Resource" var="bundle"/> <h:form> <c:if test="#{not empty portalobjectmgr.selectedObject.portals}"> Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/objectTemplate.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/objectTemplate.xhtml 2008-08-10 20:04:17 UTC (rev 11683) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/objectTemplate.xhtml 2008-08-10 20:22:59 UTC (rev 11684) @@ -33,23 +33,23 @@ <li class="pathSeparator"><h:graphicImage url="/img/pathSeparator.png" alt=">"/></li> </c:if> <li class="#{node.id == portalobjectmgr.selectedObject.id ? 'selected' : 'pathItem'}"> - <c:choose> - <c:when test="#{fn:startsWith(node.declaredProperties['portal.windowContentType'], 'widget/')}"> -  - <h:panelGroup rendered="#{fn:startsWith(node.declaredProperties['portal.windowContentType'], 'widget/')}"> - <span class="objectName">#{node.name}</span> #{node.typeName} - </h:panelGroup> - </c:when> - <c:otherwise> - <h:commandLink action="#{portalobjectmgr.selectObject}"> - <f:param name="id" value="#{node.id}"/> - <c:choose> - <c:when test="#{node.type == PortalObject.TYPE_CONTEXT}">#{bundle.PORTALS}</c:when> - <c:otherwise><span class="objectName">#{node.name}</span> #{node.typeName}</c:otherwise> - </c:choose> - </h:commandLink> - </c:otherwise> - </c:choose> + <c:choose> + <c:when test="#{fn:startsWith(node.declaredProperties['portal.windowContentType'], 'widget/')}"> +  + <h:panelGroup rendered="#{fn:startsWith(node.declaredProperties['portal.windowContentType'], 'widget/')}"> + <span class="objectName">#{node.name}</span> #{node.typeName} + </h:panelGroup> + </c:when> + <c:otherwise> + <h:commandLink action="#{portalobjectmgr.selectObject}"> + <f:param name="id" value="#{node.id}"/> + <c:choose> + <c:when test="#{node.type == PortalObject.TYPE_CONTEXT}">#{bundle.PORTALS}</c:when> + <c:otherwise><span class="objectName">#{node.name}</span> #{node.typeName}</c:otherwise> + </c:choose> + </h:commandLink> + </c:otherwise> + </c:choose> <h:outputText value=" #{portalObjectScreen}" rendered="#{portalObjectScreen != null and node.id == portalobjectmgr.selectedObject.id}"/> </li> Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/objects.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/objects.xhtml 2008-08-10 20:04:17 UTC (rev 11683) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/objects.xhtml 2008-08-10 20:22:59 UTC (rev 11684) @@ -5,8 +5,6 @@ xmlns:h="http://java.sun.com/jsf/html" xmlns:c="http://java.sun.com/jstl/core"> - - <f:loadBundle basename="Resource" var="bundle" /> <c:choose> <c:when test="#{portalobjectmgr.selectedObject.type == PortalObject.TYPE_CONTEXT}"> <ui:include src="editContext.xhtml"/> Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/portlets.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/portlets.xhtml 2008-08-10 20:04:17 UTC (rev 11683) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/portlets.xhtml 2008-08-10 20:22:59 UTC (rev 11684) @@ -8,7 +8,6 @@ xmlns:pfc="http://www.jboss.com/portal/facelet/common" xmlns:portlet="http://java.sun.com/portlet"> -<f:loadBundle basename="Resource" var="bundle" /> <ui:composition template="portletsTemplate.xhtml"> <ui:define name="content"> Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/renameObject.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/renameObject.xhtml 2008-08-10 20:04:17 UTC (rev 11683) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/renameObject.xhtml 2008-08-10 20:22:59 UTC (rev 11684) @@ -4,9 +4,8 @@ xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" xmlns:c="http://java.sun.com/jstl/core"> - <f:loadBundle basename="Resource" var="bundle" /> - <ui:composition template="/jsf/objectTemplate.xhtml"> - <ui:param name="portalObjectScreen" value="Rename"/> + <ui:composition template="objectTemplate.xhtml"> + <ui:param name="portalObjectScreen" value="#{bundle.RENAME}"/> <ui:define name="content"> <h3>#{bundle.RENAME} #{portalobjectmgr.selectedObjectType}</h3> <h:form id="renameForm">

15 years, 10 months

1
0
0 / 0

JBoss Portal SVN: r11683 - in branches/JBoss_Portal_Branch_2_7/core-admin/src: resources/portal-admin-war/WEB-INF/classes and 1 other directories.

by portal-commits＠lists.jboss.org

Author: chris.laprun(a)jboss.com Date: 2008-08-10 16:04:17 -0400 (Sun, 10 Aug 2008) New Revision: 11683 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/WEB-INF/classes/Resource.properties 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/editPage.xhtml branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/objectNavigation.xhtml Log: - Started coordination internalization. - Some minor improvements to CoordinationAction code. - Added coordination link at the top of page. - display name action should use displayNamesAction CSS class (and needs icon). 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 20:44:42 UTC (rev 11682) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/CoordinationAction.java 2008-08-10 20:04:17 UTC (rev 11683) @@ -34,10 +34,8 @@ 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.Iterator; /** * @author <a href="mailto:whales@redhat.com">Wesley Hales</a> @@ -45,11 +43,6 @@ */ public class CoordinationAction { - - private PortalObjectId selectedObjectId; - - private PortalObject selectedObject; - private PortalObjectManagerBean pomb; private Map<String, PortalObjectId> windows; @@ -67,26 +60,14 @@ public PortalObjectId getSelectedObjectId() { - selectedObjectId = pomb.getSelectedPortalObjectId(); - return selectedObjectId; + return pomb.getSelectedPortalObjectId(); } - public void setSelectedObjectId(PortalObjectId selectedObjectId) - { - this.selectedObjectId = selectedObjectId; - } - public PortalObject getSelectedObject() { - selectedObject = pomb.getPortalObjectContainer().getObject(getSelectedObjectId()); - return selectedObject; + return pomb.getPortalObjectContainer().getObject(getSelectedObjectId()); } - public void setSelectedObject(PortalObject selectedObject) - { - this.selectedObject = selectedObject; - } - public Map<String, PortalObjectId> getWindows() { if (windows == null) @@ -183,19 +164,21 @@ public String editCoordination(ActionEvent event) throws ConversionException { - getSelectedObject(); + PortalObject portalObject = getSelectedObject(); - if (selectedObject.getType() == PortalObject.TYPE_PAGE) + if (portalObject.getType() == PortalObject.TYPE_PAGE) { + Page page = (Page) portalObject; + try { //eventwirings prep for ui - for (Object o : pomb.getCoordinationService().getEventWirings((Page)selectedObject)) + for (Object o : pomb.getCoordinationService().getEventWirings(page)) { EventWiringInfo ewInfo = (EventWiringInfo)o; - getEventWirings().put(ewInfo.getName(),ewInfo.getName()); + getEventWirings().put(ewInfo.getName(), ewInfo.getName()); //prep sources for (Object o1 : ewInfo.getSources().entrySet()) @@ -217,7 +200,7 @@ } //aliasbindings prep for ui - for (Object o : pomb.getCoordinationService().getAliasBindings((Page)selectedObject)) + for (Object o : pomb.getCoordinationService().getAliasBindings(page)) { AliasBindingInfo abInfo = (AliasBindingInfo)o; for (QName name : abInfo.getNames()) @@ -227,29 +210,21 @@ } //windowbindings prep for ui - for (Object o : pomb.getCoordinationService().getWindowBindings((Page)selectedObject)) + for (Object o : pomb.getCoordinationService().getWindowBindings(page)) { WindowBindingInfo wbInfo = (WindowBindingInfo)o; getWindowBindings().putAll(wbInfo.getWindows()); } - for (PortalObject portalObject : selectedObject.getChildren()) + // process only windows... + for (PortalObject windows : page.getChildren(PortalObject.WINDOW_MASK)) { - - if (portalObject.getType() == PortalObject.TYPE_WINDOW) - { - 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 - { - - } + getWindows().put(windows.getName(), windows.getId()); + //if (eventWirings.size() > 0) + //{ + //getEventSources().put(portalObject.getName(),pomb.getCoordinationService().getEventDestinationWirings((Window)portalObject)); + //getEventDestinations().put(portalObject.getName(),pomb.getCoordinationService().getEventSourceWirings((Window)portalObject)); + //} } } Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/classes/Resource.properties =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/classes/Resource.properties 2008-08-08 20:44:42 UTC (rev 11682) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/classes/Resource.properties 2008-08-10 20:04:17 UTC (rev 11683) @@ -266,4 +266,16 @@ CONTROL_POLICY_PORTAL_RESOURCE_URI_NAME=On error redirect to this resource CONTROL_POLICY_PORTAL_RESOURCE_URI_DESCRIPTION=On error redirect to this resource -NO_BOUND_LISTENER=no bound listener \ No newline at end of file +NO_BOUND_LISTENER=no bound listener + +COORDINATION_COORDINATION=Coordination +COORDINATION_PARAMETER_BINDINGS=Parameter bindings +COORDINATION_CREATE_PARAMETER_BINDING=Create new parameter binding +COORDINATION_PARAMETER_IMPLICIT_MODE=Parameter implicit mode + +COORDINATION_WINDOWS=Windows +COORDINATION_ALIAS_BINDINGS=Alias bindings +COORDINATION_WINDOW_BINDINGS=Window bindings + +COORDINATION_EVENT_WIRINGS=Event wirings +COORDINATION_EVENT_IMPLICIT_MODE=Event implicit mode 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 20:44:42 UTC (rev 11682) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editCoordination.xhtml 2008-08-10 20:04:17 UTC (rev 11683) @@ -1,4 +1,4 @@ -<ui:composition template="/jsf/objectTemplate.xhtml" +<ui:composition template="objectTemplate.xhtml" xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:h="http://java.sun.com/jsf/html" @@ -6,17 +6,16 @@ xmlns:fn="http://java.sun.com/jsp/jstl/functions" xmlns:pfc="http://www.jboss.com/portal/facelet/common" xmlns:c="http://java.sun.com/jstl/core"> + <ui:param name="portalObjectScreen" value="#{bundle.COORDINATION_COORDINATION}"/> <ui:define name="content"> - - <f:loadBundle basename="Resource" var="bundle"/> <div class="tenpx-top-bottom"> - <h2 class="portlet-area-header">#{coordinationAction.selectedObject.name} Parameter Coordination</h2> - <h3 class="sectionTitle tenpx-top-bottom">Create New Parameter Bindings</h3> - Parameter Implicit Mode #{coordinationAction.selectedObject.properties['coordination.parameter.implicit_mode']} + <h2 class="portlet-area-header">#{coordinationAction.selectedObject.name} #{bundle.COORDINATION_PARAMETER_BINDINGS}</h2> + <h3 class="sectionTitle tenpx-top-bottom">#{bundle.COORDINATION_CREATE_PARAMETER_BINDING}</h3> + #{bundle.COORDINATION_PARAMETER_IMPLICIT_MODE} #{coordinationAction.selectedObject.properties['coordination.parameter.implicit_mode']} <hr/> - Event Implicit Mode #{coordinationAction.selectedObject.properties['coordination.event.implicit_mode']} + #{bundle.COORDINATION_EVENT_IMPLICIT_MODE} #{coordinationAction.selectedObject.properties['coordination.event.implicit_mode']} <hr/> - Windows + #{bundle.COORDINATION_WINDOWS} <h:selectManyListbox size="5" value="#{addDisplayNameAction.newLocale}"> <f:selectItems value="#{coordinationAction.windows}"/> </h:selectManyListbox> @@ -24,21 +23,21 @@ <hr/> - Alias Bindings + #{bundle.COORDINATION_ALIAS_BINDINGS} <h:selectManyListbox size="5" value="#{addDisplayNameAction.newLocale}"> <f:selectItems value="#{coordinationAction.aliasBindings}"/> </h:selectManyListbox> <br/> <hr/> - Window Bindings + #{bundle.COORDINATION_WINDOW_BINDINGS} <h:selectManyListbox size="5" value="#{addDisplayNameAction.newLocale}"> <f:selectItems value="#{coordinationAction.windowBindings}"/> </h:selectManyListbox> <h3 class="portlet-section-title tenpx-top-bottom">#{coordinationAction.selectedObject.name} Event Coordination</h3> - Event Wirings + #{bundle.COORDINATION_EVENT_WIRINGS} <h:selectManyListbox size="5" value="#{addDisplayNameAction.newLocale}"> <f:selectItems value="#{coordinationAction.eventWirings}"/> </h:selectManyListbox> Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editPage.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editPage.xhtml 2008-08-08 20:44:42 UTC (rev 11682) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editPage.xhtml 2008-08-10 20:04:17 UTC (rev 11683) @@ -37,10 +37,18 @@ #{bundle.RENAME} </h:commandLink></h:panelGroup> | <h:commandLink - action="#{addDisplayNameAction.editDisplayNames}" actionListener="#{portalobjectmgr.selectObject}" styleClass="actionRename"> + action="#{addDisplayNameAction.editDisplayNames}" actionListener="#{portalobjectmgr.selectObject}" styleClass="actionDisplayNames"> <f:param name="id" value="#{portalobjectmgr.selectedObject.id}" /> #{bundle.DISPLAY_NAMES} </h:commandLink> + <h:panelGroup rendered="#{'page' eq portalobjectmgr.selectedObjectType}"> + | <h:commandLink action="editCoordination" + actionListener="#{coordinationAction.editCoordination}" + styleClass="actionCoordination"> + <f:param name="id" value="#{portalobjectmgr.selectedObject.id}" /> + #{bundle.COORDINATION_COORDINATION} + </h:commandLink> + </h:panelGroup> <h:panelGroup rendered="#{!((portalobjectmgr.selectedObject.type == PortalObject.TYPE_PORTAL) and ((portalobjectmgr.selectedObject.name == 'admin') or (portalobjectmgr.selectedObject.name == 'template') or (portalobjectmgr.selectedObject.default)))}"> | <h:commandLink action="confirm" styleClass="actionDelete" Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/objectNavigation.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/objectNavigation.xhtml 2008-08-08 20:44:42 UTC (rev 11682) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/objectNavigation.xhtml 2008-08-10 20:04:17 UTC (rev 11683) @@ -106,14 +106,14 @@ actionListener="#{portalobjectmgr.selectObject}"> <f:param name="id" value="#{object.id}"/> #{bundle.RENAME} - </h:commandLink> | <h:commandLink action="#{addDisplayNameAction.editDisplayNames}" styleClass="actionRename" + </h:commandLink> | <h:commandLink action="#{addDisplayNameAction.editDisplayNames}" styleClass="actionDisplayNames" actionListener="#{portalobjectmgr.selectObject}"> <f:param name="id" value="#{object.id}"/> #{bundle.DISPLAY_NAMES} </h:commandLink> | <h:commandLink action="editCoordination" styleClass="actionCoordination" actionListener="#{coordinationAction.editCoordination}"> <f:param name="id" value="#{object.id}"/> - Coordination + #{bundle.COORDINATION_COORDINATION} </h:commandLink> <h:panelGroup rendered="#{not object.default}"> | <h:commandLink action="confirm" styleClass="actionDelete"

15 years, 10 months

1
0
0 / 0

JBoss Portal SVN: r11682 - branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf.

by portal-commits＠lists.jboss.org

Author: wesleyhales Date: 2008-08-08 16:44:42 -0400 (Fri, 08 Aug 2008) New Revision: 11682 Modified: 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/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 20:09:19 UTC (rev 11681) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editCoordination.xhtml 2008-08-08 20:44:42 UTC (rev 11682) @@ -1,84 +1,88 @@ -<div - xmlns="http://www.w3.org/1999/xhtml" - xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:h="http://java.sun.com/jsf/html" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:fn="http://java.sun.com/jsp/jstl/functions" - xmlns:pfc="http://www.jboss.com/portal/facelet/common" - xmlns:c="http://java.sun.com/jstl/core"> +<ui:composition template="/jsf/objectTemplate.xhtml" + xmlns="http://www.w3.org/1999/xhtml" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:fn="http://java.sun.com/jsp/jstl/functions" + xmlns:pfc="http://www.jboss.com/portal/facelet/common" + xmlns:c="http://java.sun.com/jstl/core"> + <ui:define name="content"> + <f:loadBundle basename="Resource" var="bundle"/> + <div class="tenpx-top-bottom"> + <h2 class="portlet-area-header">#{coordinationAction.selectedObject.name} Parameter Coordination</h2> + <h3 class="sectionTitle tenpx-top-bottom">Create New Parameter Bindings</h3> + Parameter Implicit Mode #{coordinationAction.selectedObject.properties['coordination.parameter.implicit_mode']} + <hr/> + Event Implicit Mode #{coordinationAction.selectedObject.properties['coordination.event.implicit_mode']} + <hr/> + Windows + <h:selectManyListbox size="5" value="#{addDisplayNameAction.newLocale}"> + <f:selectItems value="#{coordinationAction.windows}"/> + </h:selectManyListbox> -<f:loadBundle basename="Resource" var="bundle"/> - <h2 class="sectionTitle">#{coordinationAction.selectedObject.name}</h2> - <h3 class="sectionTitle">Coordination</h3> - Parameter Implicit Mode #{coordinationAction.selectedObject.properties['coordination.parameter.implicit_mode']} - <hr/> - Event Implicit Mode #{coordinationAction.selectedObject.properties['coordination.event.implicit_mode']} - <hr/> - Windows - <h:selectManyListbox size="5" value="#{addDisplayNameAction.newLocale}"> - <f:selectItems value="#{coordinationAction.windows}"/> - </h:selectManyListbox> + <hr/> - <hr/> + Alias Bindings + <h:selectManyListbox size="5" value="#{addDisplayNameAction.newLocale}"> + <f:selectItems value="#{coordinationAction.aliasBindings}"/> + </h:selectManyListbox> + <br/> - Alias Bindings - <h:selectManyListbox size="5" value="#{addDisplayNameAction.newLocale}"> - <f:selectItems value="#{coordinationAction.aliasBindings}"/> - </h:selectManyListbox> - <br/> + <hr/> + Window Bindings + <h:selectManyListbox size="5" value="#{addDisplayNameAction.newLocale}"> + <f:selectItems value="#{coordinationAction.windowBindings}"/> + </h:selectManyListbox> - <hr/> - Window Bindings - <h:selectManyListbox size="5" value="#{addDisplayNameAction.newLocale}"> - <f:selectItems value="#{coordinationAction.windowBindings}"/> - </h:selectManyListbox> - - <hr/> - Event Wirings - <h:selectManyListbox size="5" value="#{addDisplayNameAction.newLocale}"> - <f:selectItems value="#{coordinationAction.eventWirings}"/> - </h:selectManyListbox> - <br/> - <ui:repeat var="eventWirings" value="#{coordinationAction.eventWirings}"> - #{eventWirings} - </ui:repeat> - <hr/> - eventSources - <h:selectManyListbox size="5" value="#{addDisplayNameAction.newLocale}"> - <f:selectItems value="#{coordinationAction.eventSources}"/> - </h:selectManyListbox> - <br/> - <ui:repeat var="eventSources" value="#{coordinationAction.eventSources}"> - #{eventSources} - </ui:repeat> + <h3 class="portlet-section-title tenpx-top-bottom">#{coordinationAction.selectedObject.name} Event Coordination</h3> + Event Wirings + <h:selectManyListbox size="5" value="#{addDisplayNameAction.newLocale}"> + <f:selectItems value="#{coordinationAction.eventWirings}"/> + </h:selectManyListbox> + <br/> + <ui:repeat var="eventWirings" value="#{coordinationAction.eventWirings}"> + #{eventWirings} + </ui:repeat> + <hr/> - <hr/> - eventDestinations - <h:selectManyListbox size="5" value="#{addDisplayNameAction.newLocale}"> - <f:selectItems value="#{coordinationAction.eventDestinations}"/> - </h:selectManyListbox> - <br/> - <ui:repeat var="eventDestinations" value="#{coordinationAction.eventDestinations}"> - #{eventDestinations} - </ui:repeat> - + eventSources + <h:selectManyListbox size="5" value="#{addDisplayNameAction.newLocale}"> + <f:selectItems value="#{coordinationAction.eventSources}"/> + </h:selectManyListbox> + <br/> + <ui:repeat var="eventSources" value="#{coordinationAction.eventSources}"> + #{eventSources} + </ui:repeat> - <ui:remove> - <h:selectOneMenu id="locales" value="#{addDisplayNameAction.newLocale}"> - <f:selectItems value="#{coordinationAction.pomb.portalItems}"/> - </h:selectOneMenu> - <br/> + <hr/> + eventDestinations + <h:selectManyListbox size="5" value="#{addDisplayNameAction.newLocale}"> + <f:selectItems value="#{coordinationAction.eventDestinations}"/> + </h:selectManyListbox> + <br/> + <ui:repeat var="eventDestinations" value="#{coordinationAction.eventDestinations}"> + #{eventDestinations} + </ui:repeat> - <h:selectOneMenu id="locales" value="#{addDisplayNameAction.newLocale}"> - <f:selectItems value="#{coordinationAction.pomb.instanceItems}"/> - </h:selectOneMenu> - <br/> - <h:selectOneMenu id="locales" value="#{addDisplayNameAction.newLocale}"> - <f:selectItems value="#{coordinationAction.pomb.portalPageItems}"/> - </h:selectOneMenu> - </ui:remove> -</div> + <ui:remove> + <h:selectOneMenu id="locales" value="#{addDisplayNameAction.newLocale}"> + <f:selectItems value="#{coordinationAction.pomb.portalItems}"/> + </h:selectOneMenu> + <br/> + + <h:selectOneMenu id="locales" value="#{addDisplayNameAction.newLocale}"> + <f:selectItems value="#{coordinationAction.pomb.instanceItems}"/> + </h:selectOneMenu> + <br/> + + <h:selectOneMenu id="locales" value="#{addDisplayNameAction.newLocale}"> + <f:selectItems value="#{coordinationAction.pomb.portalPageItems}"/> + </h:selectOneMenu> + </ui:remove> + </div> + </ui:define> +</ui:composition>

15 years, 10 months

1
0
0 / 0

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

by portal-commits＠lists.jboss.org

Author: wesleyhales Date: 2008-08-08 16:09:19 -0400 (Fri, 08 Aug 2008) New Revision: 11681 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-08 17:27:04 UTC (rev 11680) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/CoordinationAction.java 2008-08-08 20:09:19 UTC (rev 11681) @@ -37,6 +37,7 @@ import java.util.Collection; import java.util.HashMap; import java.util.Map; +import java.util.Iterator; /** * @author <a href="mailto:whales@redhat.com">Wesley Hales</a> @@ -53,11 +54,11 @@ private Map<String, PortalObjectId> windows; - private Collection<EventWiringInfo> eventWirings; + private Map<String, String> eventWirings; - private Map<String, Collection<QName>> eventSources; + private Map<String, QName> eventSources; - private Map<String, Collection<QName>> eventDestinations; + private Map<String, QName> eventDestinations; private Map<String, String> aliasBindings; @@ -110,40 +111,44 @@ this.pomb = pomb; } - public Collection<EventWiringInfo> getEventWirings() + public Map<String, String> getEventWirings() { + if (eventWirings == null) + { + eventWirings = new HashMap<String, String>(); + } return eventWirings; } - public void setEventWirings(Collection<EventWiringInfo> eventWirings) + public void setEventWirings(Map<String, String> eventWirings) { this.eventWirings = eventWirings; } - public Map<String, Collection<QName>> getEventSources() + public Map<String, QName> getEventSources() { if (eventSources == null) { - eventSources = new HashMap<String, Collection<QName>>(); + eventSources = new HashMap<String, QName>(); } return eventSources; } - public void setEventSources(Map<String, Collection<QName>> eventSources) + public void setEventSources(Map<String, QName> eventSources) { this.eventSources = eventSources; } - public Map<String, Collection<QName>> getEventDestinations() + public Map<String, QName> getEventDestinations() { if (eventDestinations == null) { - eventDestinations = new HashMap<String, Collection<QName>>(); + eventDestinations = new HashMap<String, QName>(); } return eventDestinations; } - public void setEventDestinations(Map<String, Collection<QName>> eventDestinations) + public void setEventDestinations(Map<String, QName> eventDestinations) { this.eventDestinations = eventDestinations; } @@ -185,9 +190,33 @@ try { - eventWirings = pomb.getCoordinationService().getEventWirings((Page)selectedObject); - //aliasbindings ready for ui + //eventwirings prep for ui + for (Object o : pomb.getCoordinationService().getEventWirings((Page)selectedObject)) + { + EventWiringInfo ewInfo = (EventWiringInfo)o; + getEventWirings().put(ewInfo.getName(),ewInfo.getName()); + + //prep sources + for (Object o1 : ewInfo.getSources().entrySet()) + { + Map.Entry entry = (Map.Entry)o1; + Window paramName = (Window)entry.getKey(); + QName paramValue = (QName)entry.getValue(); + getEventSources().put(paramName.getName(), paramValue); + } + + //prep destinations + for (Object o1 : ewInfo.getDestinations().entrySet()) + { + Map.Entry entry = (Map.Entry)o1; + Window paramName = (Window)entry.getKey(); + QName paramValue = (QName)entry.getValue(); + getEventDestinations().put(paramName.getName(), paramValue); + } + } + + //aliasbindings prep for ui for (Object o : pomb.getCoordinationService().getAliasBindings((Page)selectedObject)) { AliasBindingInfo abInfo = (AliasBindingInfo)o; @@ -195,34 +224,26 @@ { getAliasBindings().put(name.getNamespaceURI(), name.getNamespaceURI()); } - } - //windowbindings ready for ui + //windowbindings prep for ui for (Object o : pomb.getCoordinationService().getWindowBindings((Page)selectedObject)) { WindowBindingInfo wbInfo = (WindowBindingInfo)o; getWindowBindings().putAll(wbInfo.getWindows()); - } - //System.out.println("-----------ew-" + eventWirings.size()); - - //System.out.println("-----------ab-" + aliasBindings.size()); - - //System.out.println("-----------wb-" + windowBindings.size()); - for (PortalObject portalObject : selectedObject.getChildren()) { if (portalObject.getType() == PortalObject.TYPE_WINDOW) { getWindows().put(portalObject.getName(), portalObject.getId()); - if (eventWirings.size() > 0) - { + //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 17:27:04 UTC (rev 11680) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editCoordination.xhtml 2008-08-08 20:09:19 UTC (rev 11681) @@ -37,22 +37,34 @@ <hr/> Event Wirings + <h:selectManyListbox size="5" value="#{addDisplayNameAction.newLocale}"> + <f:selectItems value="#{coordinationAction.eventWirings}"/> + </h:selectManyListbox> + <br/> <ui:repeat var="eventWirings" value="#{coordinationAction.eventWirings}"> #{eventWirings} </ui:repeat> <hr/> - <f:subview rendered="#{not empty coordinationAction.eventWirings}" id="events"> + eventSources + <h:selectManyListbox size="5" value="#{addDisplayNameAction.newLocale}"> + <f:selectItems value="#{coordinationAction.eventSources}"/> + </h:selectManyListbox> + <br/> <ui:repeat var="eventSources" value="#{coordinationAction.eventSources}"> #{eventSources} </ui:repeat> <hr/> eventDestinations + <h:selectManyListbox size="5" value="#{addDisplayNameAction.newLocale}"> + <f:selectItems value="#{coordinationAction.eventDestinations}"/> + </h:selectManyListbox> + <br/> <ui:repeat var="eventDestinations" value="#{coordinationAction.eventDestinations}"> #{eventDestinations} </ui:repeat> - </f:subview> + <ui:remove> <h:selectOneMenu id="locales" value="#{addDisplayNameAction.newLocale}">

15 years, 10 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

portal-commits August 2008