Author: chris.laprun(a)jboss.com Date: 2008-10-27 12:40:24 -0400 (Mon, 27 Oct 2008) New Revision: 12186 Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/AliasBindingManagerBean.java 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/EventWiringManagerBean.java branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/ParameterBindingManagerBean.java branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editCoordination.xhtml Log: - JBPORTAL-2213: fix support for fallback handling of coordination i.e. implicit handling at page level but with some explicit elements. Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/AliasBindingManagerBean.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/AliasBindingManagerBean.java 2008-10-27 15:06:26 UTC (rev 12185) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/AliasBindingManagerBean.java 2008-10-27 16:40:24 UTC (rev 12186) @@ -83,7 +83,7 @@ this.originalQNames = originalQNames; } - public void loadInfoFrom(Page page) + public boolean loadInfoFrom(Page page) { Collection<? extends AliasBindingInfo> bindings = managerBean.getCoordinationService().getAliasBindings(page); if (!bindings.isEmpty()) @@ -93,16 +93,18 @@ { displayAliasBindings.put(binding.getName(), new DisplayAliasBinding(binding)); } + return true; } else { displayAliasBindings = Collections.emptyMap(); + return false; } } public List<DisplayAliasBinding> getDisplayAliasBindings() { - if (displayAliasBindings == null) + if (displayAliasBindings == null || displayAliasBindings.isEmpty()) { return Collections.emptyList(); } 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-10-27 15:06:26 UTC (rev 12185) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/CoordinationManagerBean.java 2008-10-27 16:40:24 UTC (rev 12186) @@ -69,23 +69,23 @@ private enum CoordinationType { wiring() - { - String localizationKey() - { - return "COORDINATION_WIRING"; - }}, + { + String localizationKey() + { + return "COORDINATION_WIRING"; + }}, parameter() - { - String localizationKey() - { - return "COORDINATION_PARAMETER"; - }}, + { + String localizationKey() + { + return "COORDINATION_PARAMETER"; + }}, alias() - { - String localizationKey() - { - return "COORDINATION_ALIAS"; - }}; + { + String localizationKey() + { + return "COORDINATION_ALIAS"; + }}; private CoordinationBean bean; @@ -125,7 +125,13 @@ this.managerBean = managerBean; } - public abstract void loadInfoFrom(Page page); + /** + * Loads the specific coordination information from the specified page data. + * + * @param page the page from which coordination information is to be loaded + * @return <code>true</code> if specific information existed and was loaded, <code>false</code> otherwise + */ + public abstract boolean loadInfoFrom(Page page); public abstract String delete(String name) throws IllegalCoordinationException; @@ -286,18 +292,11 @@ Page selectedPage = getSelectedPage(); - boolean explicitEventsUsed = isExplicitEventsUsed(); - boolean explicitParametersUsed = isExplicitParametersUsed(); - + // always load information since we might be in a fallback situation i.e. explicit handling is disabled + // for the page but some explicit elements are still defined (possible in XML) aliasManager.loadInfoFrom(selectedPage); - if (explicitEventsUsed) - { - eventManager.loadInfoFrom(selectedPage); - } - if (explicitParametersUsed) - { - parameterManager.loadInfoFrom(selectedPage); - } + boolean explicitEventsUsed = eventManager.loadInfoFrom(selectedPage); + boolean explicitParametersUsed = parameterManager.loadInfoFrom(selectedPage); Collection<PortalObject> children = selectedPage.getChildren(PortalObject.WINDOW_MASK); if (!children.isEmpty()) Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/EventWiringManagerBean.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/EventWiringManagerBean.java 2008-10-27 15:06:26 UTC (rev 12185) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/EventWiringManagerBean.java 2008-10-27 16:40:24 UTC (rev 12186) @@ -37,12 +37,12 @@ import java.util.Collection; import java.util.Collections; import java.util.HashMap; +import java.util.HashSet; import java.util.LinkedList; import java.util.List; import java.util.Map; import java.util.SortedSet; import java.util.TreeSet; -import java.util.HashSet; /** * @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a> @@ -69,7 +69,7 @@ super(managerBean); } - public void loadInfoFrom(Page page) + public boolean loadInfoFrom(Page page) { Collection<EventWiringInfo> wiringInfos = managerBean.getCoordinationService().getEventWirings(page); if (!wiringInfos.isEmpty()) @@ -79,10 +79,13 @@ { displayEventWirings.put(ewInfo.getName(), new DisplayEventWiring(ewInfo)); } + + return true; } else { displayEventWirings = Collections.emptyMap(); + return false; } } @@ -122,7 +125,7 @@ public Collection<DisplayEventWiring> getDisplayEventWirings() { - if (displayEventWirings == null) + if (displayEventWirings == null || displayEventWirings.isEmpty()) { return Collections.emptyList(); } Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/ParameterBindingManagerBean.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/ParameterBindingManagerBean.java 2008-10-27 15:06:26 UTC (rev 12185) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/ParameterBindingManagerBean.java 2008-10-27 16:40:24 UTC (rev 12186) @@ -119,7 +119,7 @@ public Collection<DisplayParameterBinding> getDisplayParameterBindings() { - if (displayParameterBindings == null) + if (displayParameterBindings == null || displayParameterBindings.isEmpty()) { return Collections.emptyList(); } @@ -135,7 +135,7 @@ availableParameterWindowPairs = new HashMap<Window, WindowSelectItemGroup>(children.size()); } - public void loadInfoFrom(Page page) + public boolean loadInfoFrom(Page page) { Collection<? extends ParameterBindingInfo> windowBindingInfos = managerBean.getCoordinationService().getParameterBindings(page); if (windowBindingInfos != null && !windowBindingInfos.isEmpty()) @@ -145,10 +145,13 @@ { displayParameterBindings.put(wbInfo.getName(), new DisplayParameterBinding(wbInfo)); } + + return true; } else { displayParameterBindings = Collections.emptyMap(); + return false; } } 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-10-27 15:06:26 UTC (rev 12185) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editCoordination.xhtml 2008-10-27 16:40:24 UTC (rev 12186) @@ -25,6 +25,7 @@ <br/> + <!-- Alias bindings --> <div class="tenpx-top-bottom"> <h2 class="portlet-area-header" onclick="toggle_visibility('aliasBindings');" style="cursor: pointer"><a name="#{bundle.COORDINATION_ALIAS_BINDINGS}"/>#{bundle.COORDINATION_ALIAS_BINDINGS}</h2> @@ -112,6 +113,7 @@ </div> </div> + <!-- Parameter bindings --> <div class="tenpx-top-bottom"> <h2 class="portlet-area-header" onclick="toggle_visibility('parameterBindings');" style="cursor: pointer"><a name="#{bundle.COORDINATION_PARAMETER_BINDINGS}"/>#{bundle.COORDINATION_PARAMETER_BINDINGS}</h2> <div id="parameterBindings"> @@ -121,7 +123,7 @@ #{bundle.COORDINATION_PARAMETER_EXPLICIT_MODE} </h:form> - <h:panelGroup rendered="#{coordinationManager.explicitParametersUsed}"> + <h:panelGroup rendered="#{coordinationManager.explicitParametersUsed || !empty parameterManager.displayParameterBindings}"> <hr/> <!-- Create parameter binding --> @@ -217,7 +219,7 @@ onchange="this.form.submit()" immediate="true"/>#{bundle.COORDINATION_EVENT_EXPLICIT_MODE} </h:form> - <h:panelGroup rendered="#{coordinationManager.explicitEventsUsed}"> + <h:panelGroup rendered="#{coordinationManager.explicitEventsUsed || !empty eventManager.displayEventWirings}"> <hr/> <!-- Create new event wiring --> <h3 class="sectionTitle tenpx-top-bottom">#{bundle.COORDINATION_EVENT_CREATE}</h3>