[portal-commits] JBoss Portal SVN: r11782 - in branches/JBoss_Portal_Branch_2_7/core-admin/src: resources/portal-admin-war/WEB-INF and 1 other directories.
portal-commits at lists.jboss.org
portal-commits at lists.jboss.org
Mon Sep 1 16:03:05 EDT 2008
Author: chris.laprun at jboss.com
Date: 2008-09-01 16:03:05 -0400 (Mon, 01 Sep 2008)
New Revision: 11782
Added:
branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/ParameterBindingManagerBean.java
Modified:
branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/CoordinationManagerBean.java
branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/faces-config.xml
branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editCoordination.xhtml
Log:
- Renamed WindowBindingManagerBean to ParameterBindingManagerBean to follow documentation convention.
Might want to rename WindowBindingInfo accordingly...
- Renamed *Coordination beans to *Manager.
Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/CoordinationManagerBean.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/CoordinationManagerBean.java 2008-09-01 19:46:59 UTC (rev 11781)
+++ branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/CoordinationManagerBean.java 2008-09-01 20:03:05 UTC (rev 11782)
@@ -57,7 +57,7 @@
private AliasBindingManagerBean aliasManager;
private EventWiringManagerBean eventManager;
- private WindowBindingManagerBean windowManager;
+ private ParameterBindingManagerBean parameterManager;
// Handle selections for deletion and renaming
private static final String RESOURCE_NAME = "Resource";
@@ -66,7 +66,7 @@
private String selectedName;
private CoordinationType selectedType;
private static ThreadLocal<EventWiringManagerBean> eventManagerHolder = new ThreadLocal<EventWiringManagerBean>();
- private static ThreadLocal<WindowBindingManagerBean> windowManagerHolder = new ThreadLocal<WindowBindingManagerBean>();
+ private static ThreadLocal<ParameterBindingManagerBean> windowManagerHolder = new ThreadLocal<ParameterBindingManagerBean>();
private static ThreadLocal<AliasBindingManagerBean> aliasManagerHolder = new ThreadLocal<AliasBindingManagerBean>();
private String newName;
static final String EDIT_COORDINATION = "editCoordination";
@@ -212,15 +212,15 @@
this.eventManager.setManagerBean(this);
}
- public WindowBindingManagerBean getWindowManager()
+ public ParameterBindingManagerBean getParameterManager()
{
- return windowManager;
+ return parameterManager;
}
- public void setWindowManager(WindowBindingManagerBean windowManager)
+ public void setParameterManager(ParameterBindingManagerBean parameterManager)
{
- this.windowManager = windowManager;
- this.windowManager.setManagerBean(this);
+ this.parameterManager = parameterManager;
+ this.parameterManager.setManagerBean(this);
}
public AliasBindingManagerBean getAliasManager()
@@ -294,13 +294,13 @@
{
eventManager.loadInfoFrom(selectedPage);
- windowManager.loadInfoFrom(selectedPage);
+ parameterManager.loadInfoFrom(selectedPage);
aliasManager.loadInfoFrom(selectedPage);
Collection<PortalObject> children = selectedPage.getChildren(PortalObject.WINDOW_MASK);
if (!children.isEmpty())
{
- windowManager.initKnowing(children);
+ parameterManager.initKnowing(children);
aliasManager.initKnowing(children);
for (PortalObject po : children)
@@ -312,7 +312,7 @@
Instance instance = pomb.getInstanceContainer().getDefinition(pc.getInstanceRef());
PortletInfo info = instance.getPortlet().getInfo();
- windowManager.extractInfoFrom(window, info);
+ parameterManager.extractInfoFrom(window, info);
eventManager.extractInfoFrom(window, info);
aliasManager.extractInfoFrom(window, info);
}
@@ -362,7 +362,7 @@
// make manager accessible to CoordinationType
eventManagerHolder.set(eventManager);
- windowManagerHolder.set(windowManager);
+ windowManagerHolder.set(parameterManager);
aliasManagerHolder.set(aliasManager);
}
Copied: branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/ParameterBindingManagerBean.java (from rev 11781, branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/WindowBindingManagerBean.java)
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/ParameterBindingManagerBean.java (rev 0)
+++ branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/ParameterBindingManagerBean.java 2008-09-01 20:03:05 UTC (rev 11782)
@@ -0,0 +1,285 @@
+/*
+* JBoss, a division of Red Hat
+* Copyright 2008, Red Hat Middleware, LLC, and individual contributors as indicated
+* by the @authors tag. See the copyright.txt in the distribution for a
+* full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+
+package org.jboss.portal.core.admin.ui.coordination;
+
+import org.jboss.portal.core.controller.coordination.IllegalCoordinationException;
+import org.jboss.portal.core.controller.coordination.WindowBindingInfo;
+import org.jboss.portal.core.model.portal.Page;
+import org.jboss.portal.core.model.portal.PortalObject;
+import org.jboss.portal.core.model.portal.Window;
+import org.jboss.portal.portlet.info.NavigationInfo;
+import org.jboss.portal.portlet.info.ParameterInfo;
+import org.jboss.portal.portlet.info.PortletInfo;
+
+import javax.faces.model.SelectItem;
+import javax.xml.namespace.QName;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+/**
+ * @author <a href="mailto:chris.laprun at jboss.com">Chris Laprun</a>
+ * @version $Revision$
+ */
+public class ParameterBindingManagerBean extends CoordinationManagerBean.CoordinationBean
+{
+ private Map<String, DisplayParameterBinding> displayParameterBindings;
+ private List<ParameterWindowSelectItem> availableParameterWindowPairs;
+ private List<String> selectedParameterWindowPairs;
+ private String windowBindingName;
+
+ public List<ParameterWindowSelectItem> getAvailableParameterWindowPairs()
+ {
+ return availableParameterWindowPairs;
+ }
+
+ public List<String> getSelectedParameterWindowPairs()
+ {
+ return selectedParameterWindowPairs;
+ }
+
+ public void setSelectedParameterWindowPairs(List<String> selectedParameterWindowPairs)
+ {
+ this.selectedParameterWindowPairs = selectedParameterWindowPairs;
+ }
+
+ public String getWindowBindingName()
+ {
+ return windowBindingName;
+ }
+
+ public void setWindowBindingName(String windowBindingName)
+ {
+ this.windowBindingName = windowBindingName;
+ }
+
+ public void extractInfoFrom(Window window, PortletInfo info)
+ {
+ // retrieve metadata on public render parameters
+ NavigationInfo navInfo = info.getNavigation();
+ for (ParameterInfo pInfo : navInfo.getPublicParameters())
+ {
+ availableParameterWindowPairs.add(new ParameterWindowSelectItem(pInfo, window));
+ }
+ }
+
+ public Collection<DisplayParameterBinding> getDisplayParameterBindings()
+ {
+ if (displayParameterBindings == null)
+ {
+ return Collections.emptyList();
+ }
+
+ List<DisplayParameterBinding> result = new LinkedList<DisplayParameterBinding>(displayParameterBindings.values());
+ Collections.sort(result);
+
+ return result;
+ }
+
+ public void initKnowing(Collection<PortalObject> children)
+ {
+ availableParameterWindowPairs = new LinkedList<ParameterWindowSelectItem>();
+ }
+
+ public void loadInfoFrom(Page page)
+ {
+ Collection<? extends WindowBindingInfo> windowBindingInfos = managerBean.getCoordinationService().getWindowBindings(page);
+ if (windowBindingInfos != null && !windowBindingInfos.isEmpty())
+ {
+ displayParameterBindings = new HashMap<String, DisplayParameterBinding>(windowBindingInfos.size());
+ for (WindowBindingInfo wbInfo : windowBindingInfos)
+ {
+ displayParameterBindings.put(wbInfo.getName(), new DisplayParameterBinding(wbInfo));
+ }
+ }
+ else
+ {
+ displayParameterBindings = Collections.emptyMap();
+ }
+ }
+
+ public String create() throws IllegalCoordinationException
+ {
+ if (windowBindingName != null)
+ {
+ Map<Window, QName> windowBinding = new HashMap<Window, QName>();
+ for (String pairAsString : selectedParameterWindowPairs)
+ {
+ // get ParameterWindowPair from String
+ String[] names = ParameterWindowPair.resolveFrom(pairAsString);
+
+ Window window = (Window)managerBean.getSelectedPage().getChild(names[ParameterWindowPair.WINDOW_NAME]);
+ windowBinding.put(window, QName.valueOf(names[ParameterWindowPair.PARAM_NAME]));
+ }
+
+ managerBean.getCoordinationService().setWindowBinding(windowBindingName, windowBinding);
+ }
+
+ return resetSelection();
+ }
+
+ public String resetSelection()
+ {
+ windowBindingName = null;
+ selectedParameterWindowPairs = null;
+
+ return CoordinationManagerBean.EDIT_COORDINATION;
+ }
+
+ public String delete(String name) throws IllegalCoordinationException
+ {
+ DisplayParameterBinding displayParam = displayParameterBindings.get(name);
+ if (displayParam != null)
+ {
+ WindowBindingInfo bindingInfo = displayParam.getBindingInfo();
+ managerBean.getCoordinationService().removeWindowBinding(bindingInfo);
+ }
+ return CoordinationManagerBean.EDIT_COORDINATION;
+ }
+
+ public String rename(String name, String newName) throws IllegalCoordinationException
+ {
+ DisplayParameterBinding displayParam = displayParameterBindings.get(name);
+ if (displayParam != null)
+ {
+ WindowBindingInfo bindingInfo = displayParam.getBindingInfo();
+ managerBean.getCoordinationService().renameWindowBinding(bindingInfo, newName);
+ }
+ return CoordinationManagerBean.EDIT_COORDINATION;
+ }
+
+ public static class DisplayParameterBinding implements Comparable
+ {
+ private List<ParameterWindowPair> parameterWindowPairs;
+ private WindowBindingInfo bindingInfo;
+
+ public DisplayParameterBinding(WindowBindingInfo bindingInfo)
+ {
+ this.bindingInfo = bindingInfo;
+ Set<Map.Entry<Window,QName>> entries = bindingInfo.getWindows().entrySet();
+ parameterWindowPairs = new LinkedList<ParameterWindowPair>();
+ for (Map.Entry<Window, QName> entry : entries)
+ {
+ parameterWindowPairs.add(new ParameterWindowPair(entry.getValue(), entry.getKey()));
+ }
+ }
+
+ public String getName()
+ {
+ return bindingInfo.getName();
+ }
+
+ public WindowBindingInfo getBindingInfo()
+ {
+ return bindingInfo;
+ }
+
+ public List<ParameterWindowPair> getParameterWindowPairs()
+ {
+ return parameterWindowPairs;
+ }
+
+ public int compareTo(Object o)
+ {
+ DisplayParameterBinding other = (DisplayParameterBinding)o;
+ return getName().compareTo(other.getName());
+ }
+ }
+
+ public static class ParameterWindowSelectItem extends SelectItem implements Comparable
+ {
+ public ParameterWindowSelectItem(ParameterInfo parameterInfo, Window window)
+ {
+ super(new ParameterWindowPair(parameterInfo, window), ParameterWindowPair.asString(parameterInfo.getName(), window));
+ }
+
+ public int compareTo(Object o)
+ {
+ ParameterWindowSelectItem pair = (ParameterWindowSelectItem)o;
+ return toString().compareTo(pair.toString());
+ }
+
+ private ParameterWindowPair getPair()
+ {
+ return (ParameterWindowPair)getValue();
+ }
+ }
+
+ public static class ParameterWindowPair
+ {
+ private Window window;
+ private QName name;
+ public static final int PARAM_NAME = 0;
+ public static final int WINDOW_NAME = 1;
+
+ public ParameterWindowPair(ParameterInfo info, Window window)
+ {
+ this(info.getName(), window);
+ }
+
+ public ParameterWindowPair(QName name, Window window)
+ {
+ this.window = window;
+ this.name = name;
+ }
+
+ public QName getName()
+ {
+ return name;
+ }
+
+ public Window getWindow()
+ {
+ return window;
+ }
+
+ public String getSeparator()
+ {
+ return ":";
+ }
+
+ @Override
+ public String toString()
+ {
+ return ParameterWindowPair.asString(name, window);
+ }
+
+ static String asString(QName qname, Window window)
+ {
+ return qname + ":" + window.getName();
+ }
+
+ public static String[] resolveFrom(String pairAsString)
+ {
+ int separatorIndex = pairAsString.indexOf(':');
+ String name = pairAsString.substring(0, separatorIndex);
+ String windowName = pairAsString.substring(separatorIndex + 1);
+
+ return new String[] {name, windowName};
+ }
+ }
+}
Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/faces-config.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/faces-config.xml 2008-09-01 19:46:59 UTC (rev 11781)
+++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/faces-config.xml 2008-09-01 20:03:05 UTC (rev 11782)
@@ -353,15 +353,15 @@
</managed-property>
<managed-property>
<property-name>eventManager</property-name>
- <value>#{eventCoordination}</value>
+ <value>#{eventManager}</value>
</managed-property>
<managed-property>
- <property-name>windowManager</property-name>
- <value>#{windowCoordination}</value>
+ <property-name>parameterManager</property-name>
+ <value>#{parameterManager}</value>
</managed-property>
<managed-property>
<property-name>aliasManager</property-name>
- <value>#{aliasCoordination}</value>
+ <value>#{aliasManager}</value>
</managed-property>
</managed-bean>
@@ -421,17 +421,17 @@
</managed-property>
</managed-bean>
<managed-bean>
- <managed-bean-name>eventCoordination</managed-bean-name>
+ <managed-bean-name>eventManager</managed-bean-name>
<managed-bean-class>org.jboss.portal.core.admin.ui.coordination.EventWiringManagerBean</managed-bean-class>
<managed-bean-scope>session</managed-bean-scope>
</managed-bean>
<managed-bean>
- <managed-bean-name>windowCoordination</managed-bean-name>
- <managed-bean-class>org.jboss.portal.core.admin.ui.coordination.WindowBindingManagerBean</managed-bean-class>
+ <managed-bean-name>parameterManager</managed-bean-name>
+ <managed-bean-class>org.jboss.portal.core.admin.ui.coordination.ParameterBindingManagerBean</managed-bean-class>
<managed-bean-scope>session</managed-bean-scope>
</managed-bean>
<managed-bean>
- <managed-bean-name>aliasCoordination</managed-bean-name>
+ <managed-bean-name>aliasManager</managed-bean-name>
<managed-bean-class>org.jboss.portal.core.admin.ui.coordination.AliasBindingManagerBean</managed-bean-class>
<managed-bean-scope>session</managed-bean-scope>
</managed-bean>
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-09-01 19:46:59 UTC (rev 11781)
+++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editCoordination.xhtml 2008-09-01 20:03:05 UTC (rev 11782)
@@ -14,23 +14,23 @@
<!-- Create alias binding -->
<h3 class="sectionTitle tenpx-top-bottom">#{bundle.COORDINATION_ALIAS_CREATE}</h3>
- <h:outputText value="#{bundle.COORDINATION_ALIAS_CREATE_NO_PARAMS}" rendered="#{empty aliasCoordination.availableRenderParameters}"/>
- <h:form rendered="#{!empty aliasCoordination.availableRenderParameters}">
+ <h:outputText value="#{bundle.COORDINATION_ALIAS_CREATE_NO_PARAMS}" rendered="#{empty aliasManager.availableRenderParameters}"/>
+ <h:form rendered="#{!empty aliasManager.availableRenderParameters}">
<div class="float-left quarter-width">
#{bundle.COORDINATION_ALIAS_CREATE_STEP1}
- <h:selectOneListbox id="alias" size="5" value="#{aliasCoordination.originalQName}"
+ <h:selectOneListbox id="alias" size="5" value="#{aliasManager.originalQName}"
immediate="true" onchange="this.form.submit()">
- <f:selectItems value="#{aliasCoordination.availableRenderParameters}"/>
+ <f:selectItems value="#{aliasManager.availableRenderParameters}"/>
</h:selectOneListbox>
</div>
- <h:panelGroup rendered="#{!empty aliasCoordination.originalQName}">
+ <h:panelGroup rendered="#{!empty aliasManager.originalQName}">
<div class="float-left quarter-width">
#{bundle.COORDINATION_ALIAS_CREATE_STEP2}
- <h:inputText id="aliasName" value="#{aliasCoordination.aliasName}"/>
+ <h:inputText id="aliasName" value="#{aliasManager.aliasName}"/>
<h:commandButton value="#{bundle.COORDINATION_ALIAS_CREATE_CREATE}"
- action="#{aliasCoordination.create}" styleClass="portlet-form-button"/>
- <h:commandButton value="#{bundle.COMMON_CANCEL}" action="#{aliasCoordination.cancel}"
+ action="#{aliasManager.create}" styleClass="portlet-form-button"/>
+ <h:commandButton value="#{bundle.COMMON_CANCEL}" action="#{aliasManager.cancel}"
styleClass="portlet-form-button"/>
</div>
</h:panelGroup>
@@ -40,10 +40,10 @@
<!-- Manage existing alias bindings -->
<h3 class="sectionTitle tenpx-top-bottom">#{bundle.COORDINATION_ALIAS_MANAGE_EXISTING}</h3>
- <h:outputText value="#{bundle.COORDINATION_ALIAS_EXISTING_NONE}" rendered="#{empty aliasCoordination.displayAliasBindings}"/>
- <h:form rendered="#{!empty aliasCoordination.displayAliasBindings}">
+ <h:outputText value="#{bundle.COORDINATION_ALIAS_EXISTING_NONE}" rendered="#{empty aliasManager.displayAliasBindings}"/>
+ <h:form rendered="#{!empty aliasManager.displayAliasBindings}">
<div class="float-left full-width">
- <h:dataTable var="binding" value="#{aliasCoordination.displayAliasBindings}"
+ <h:dataTable var="binding" value="#{aliasManager.displayAliasBindings}"
rendered="true" styleClass="objectList datatable"
rowClasses="portlet-section-body,portlet-section-alternate-blue"
columnClasses="objectNameColumn"
@@ -91,23 +91,23 @@
<!-- Create parameter binding -->
<h3 class="sectionTitle tenpx-top-bottom">#{bundle.COORDINATION_PARAMETER_CREATE}</h3>
- <h:outputText value="#{bundle.COORDINATION_PARAMETER_CREATE_NO_PAIRS}" rendered="#{empty windowCoordination.availableParameterWindowPairs}"/>
- <h:form rendered="#{!empty windowCoordination.availableParameterWindowPairs}">
+ <h:outputText value="#{bundle.COORDINATION_PARAMETER_CREATE_NO_PAIRS}" rendered="#{empty parameterManager.availableParameterWindowPairs}"/>
+ <h:form rendered="#{!empty parameterManager.availableParameterWindowPairs}">
<div class="float-left quarter-width">
#{bundle.COORDINATION_PARAMETER_CREATE_STEP1}
- <h:selectManyListbox id="parameterWindowPair" size="5" value="#{windowCoordination.selectedParameterWindowPairs}"
+ <h:selectManyListbox id="parameterWindowPair" size="5" value="#{parameterManager.selectedParameterWindowPairs}"
immediate="true" onchange="this.form.submit()">
- <f:selectItems value="#{windowCoordination.availableParameterWindowPairs}"/>
+ <f:selectItems value="#{parameterManager.availableParameterWindowPairs}"/>
</h:selectManyListbox>
</div>
- <h:panelGroup rendered="#{!empty windowCoordination.selectedParameterWindowPairs}">
+ <h:panelGroup rendered="#{!empty parameterManager.selectedParameterWindowPairs}">
<div class="float-left quarter-width">
#{bundle.COORDINATION_PARAMETER_CREATE_STEP2}
- <h:inputText id="bindingName" value="#{windowCoordination.windowBindingName}"/>
+ <h:inputText id="bindingName" value="#{parameterManager.windowBindingName}"/>
<h:commandButton value="#{bundle.COORDINATION_PARAMETER_CREATE_CREATE}"
- action="#{windowCoordination.create}" styleClass="portlet-form-button"/>
- <h:commandButton value="#{bundle.COMMON_CANCEL}" action="#{windowCoordination.cancel}"
+ action="#{parameterManager.create}" styleClass="portlet-form-button"/>
+ <h:commandButton value="#{bundle.COMMON_CANCEL}" action="#{parameterManager.cancel}"
styleClass="portlet-form-button"/>
</div>
</h:panelGroup>
@@ -118,9 +118,9 @@
<!-- Manage existing parameter bindings -->
<h3 class="sectionTitle tenpx-top-bottom">#{bundle.COORDINATION_PARAMETER_MANAGE_EXISTING}</h3>
<div class="float-left full-width">
- <h:outputText value="#{bundle.COORDINATION_PARAMETER_EXISTING_NONE}" rendered="#{empty windowCoordination.displayParameterBindings}"/>
- <h:form rendered="#{!empty windowCoordination.displayParameterBindings}">
- <h:dataTable var="binding" value="#{windowCoordination.displayParameterBindings}"
+ <h:outputText value="#{bundle.COORDINATION_PARAMETER_EXISTING_NONE}" rendered="#{empty parameterManager.displayParameterBindings}"/>
+ <h:form rendered="#{!empty parameterManager.displayParameterBindings}">
+ <h:dataTable var="binding" value="#{parameterManager.displayParameterBindings}"
rendered="true" styleClass="objectList datatable"
rowClasses="portlet-section-body,portlet-section-alternate-blue"
columnClasses="objectNameColumn"
@@ -175,46 +175,46 @@
<hr/>
<!-- Create new event wiring -->
<h3 class="sectionTitle tenpx-top-bottom">#{bundle.COORDINATION_EVENT_CREATE}</h3>
- <h:outputText value="#{bundle.COORDINATION_EVENT_CREATE_NO_EVENTS}" rendered="#{empty eventCoordination.sourceEvents}"/>
- <h:form rendered="#{!empty eventCoordination.sourceEvents}">
+ <h:outputText value="#{bundle.COORDINATION_EVENT_CREATE_NO_EVENTS}" rendered="#{empty eventManager.sourceEvents}"/>
+ <h:form rendered="#{!empty eventManager.sourceEvents}">
<h:panelGroup>
#{bundle.COORDINATION_EVENT_CREATE_STEP1}
- <h:selectOneListbox id="sourceEvent" size="5" value="#{eventCoordination.selectedSourceEvent}" immediate="true"
- valueChangeListener="#{eventCoordination.selectSourceEvent}" onchange="this.form.submit()">
- <f:selectItems value="#{eventCoordination.sourceEvents}"/>
+ <h:selectOneListbox id="sourceEvent" size="5" value="#{eventManager.selectedSourceEvent}" immediate="true"
+ valueChangeListener="#{eventManager.selectSourceEvent}" onchange="this.form.submit()">
+ <f:selectItems value="#{eventManager.sourceEvents}"/>
</h:selectOneListbox>
</h:panelGroup>
- <h:panelGroup rendered="#{!empty eventCoordination.selectedSourceEvent}">
+ <h:panelGroup rendered="#{!empty eventManager.selectedSourceEvent}">
#{bundle.COORDINATION_EVENT_CREATE_STEP2}
- <h:selectManyListbox id="sourceWindows" size="5" value="#{eventCoordination.selectedSourceWindows}" immediate="true"
- valueChangeListener="#{eventCoordination.selectSourceWindows}" onchange="this.form.submit()">
- <f:selectItems value="#{eventCoordination.sourceWindows}"/>
+ <h:selectManyListbox id="sourceWindows" size="5" value="#{eventManager.selectedSourceWindows}" immediate="true"
+ valueChangeListener="#{eventManager.selectSourceWindows}" onchange="this.form.submit()">
+ <f:selectItems value="#{eventManager.sourceWindows}"/>
</h:selectManyListbox>
</h:panelGroup>
- <h:panelGroup rendered="#{!empty eventCoordination.selectedSourceWindows}">
+ <h:panelGroup rendered="#{!empty eventManager.selectedSourceWindows}">
#{bundle.COORDINATION_EVENT_CREATE_STEP3}
- <h:selectOneListbox id="destEvent" size="5" value="#{eventCoordination.selectedDestinationEvent}" immediate="true"
- valueChangeListener="#{eventCoordination.selectDestinationEvent}" onchange="this.form.submit()">
- <f:selectItems value="#{eventCoordination.destinationEvents}"/>
+ <h:selectOneListbox id="destEvent" size="5" value="#{eventManager.selectedDestinationEvent}" immediate="true"
+ valueChangeListener="#{eventManager.selectDestinationEvent}" onchange="this.form.submit()">
+ <f:selectItems value="#{eventManager.destinationEvents}"/>
</h:selectOneListbox>
</h:panelGroup>
- <h:panelGroup rendered="#{!empty eventCoordination.selectedDestinationEvent}">
+ <h:panelGroup rendered="#{!empty eventManager.selectedDestinationEvent}">
#{bundle.COORDINATION_EVENT_CREATE_STEP4}
- <h:selectManyListbox id="destWindows" size="5" value="#{eventCoordination.selectedDestinationWindows}" immediate="true"
- valueChangeListener="#{eventCoordination.selectDestinationWindows}" onchange="this.form.submit()">
- <f:selectItems value="#{eventCoordination.destinationWindows}"/>
+ <h:selectManyListbox id="destWindows" size="5" value="#{eventManager.selectedDestinationWindows}" immediate="true"
+ valueChangeListener="#{eventManager.selectDestinationWindows}" onchange="this.form.submit()">
+ <f:selectItems value="#{eventManager.destinationWindows}"/>
</h:selectManyListbox>
</h:panelGroup>
- <h:panelGroup rendered="#{!empty eventCoordination.selectedDestinationWindows}">
+ <h:panelGroup rendered="#{!empty eventManager.selectedDestinationWindows}">
#{bundle.COORDINATION_EVENT_CREATE_STEP5}
- <h:inputText id="wiringName" value="#{eventCoordination.wiringName}"/>
- <h:commandButton value="#{bundle.COORDINATION_EVENT_CREATE_CREATE}" action="#{eventCoordination.create}"
+ <h:inputText id="wiringName" value="#{eventManager.wiringName}"/>
+ <h:commandButton value="#{bundle.COORDINATION_EVENT_CREATE_CREATE}" action="#{eventManager.create}"
styleClass="portlet-form-button"/>
- <h:commandButton value="#{bundle.COMMON_CANCEL}" action="#{eventCoordination.cancel}"
+ <h:commandButton value="#{bundle.COMMON_CANCEL}" action="#{eventManager.cancel}"
styleClass="portlet-form-button"/>
</h:panelGroup>
</h:form>
@@ -222,9 +222,9 @@
<!-- Manage existing wirings -->
<h3 class="sectionTitle tenpx-top-bottom">#{bundle.COORDINATION_EVENT_MANAGE_EXISTING}</h3>
- <h:outputText value="#{bundle.COORDINATION_EVENT_EXISTING_NONE}" rendered="#{empty eventCoordination.displayEventWirings}"/>
- <h:form rendered="#{!empty eventCoordination.displayEventWirings}">
- <h:dataTable var="wiring" value="#{eventCoordination.displayEventWirings}"
+ <h:outputText value="#{bundle.COORDINATION_EVENT_EXISTING_NONE}" rendered="#{empty eventManager.displayEventWirings}"/>
+ <h:form rendered="#{!empty eventManager.displayEventWirings}">
+ <h:dataTable var="wiring" value="#{eventManager.displayEventWirings}"
styleClass="objectList datatable"
rowClasses="portlet-section-body,portlet-section-alternate-blue"
columnClasses="objectNameColumn, objectActionColumn"
More information about the portal-commits
mailing list