[portal-commits] JBoss Portal SVN: r11813 - branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination.
portal-commits at lists.jboss.org
portal-commits at lists.jboss.org
Thu Sep 4 13:23:53 EDT 2008
Author: chris.laprun at jboss.com
Date: 2008-09-04 13:23:53 -0400 (Thu, 04 Sep 2008)
New Revision: 11813
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
Log:
- CoordinationBean refactoring:
+ provided default implementation of resetSelection that calls refresh on the main manager
+ added initKnowing for better consistency
+ create, delete and rename should now call resetSelection when done
- Improved CoordinationType
- Fixed problems with deleteSelected and renameSelected
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-09-04 15:56:54 UTC (rev 11812)
+++ branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/AliasBindingManagerBean.java 2008-09-04 17:23:53 UTC (rev 11813)
@@ -144,7 +144,6 @@
e.printStackTrace(); //To change body of catch statement use File | Settings | File Templates.
}
}
- managerBean.refresh();
return resetSelection();
}
@@ -153,7 +152,7 @@
aliasName = null;
originalQNames = null;
- return CoordinationManagerBean.EDIT_COORDINATION;
+ return super.resetSelection();
}
public String delete(String name) throws IllegalCoordinationException
@@ -164,7 +163,7 @@
AliasBindingInfo alias = binding.getAlias();
managerBean.getCoordinationService().removeAliasBinding(alias);
}
- return CoordinationManagerBean.EDIT_COORDINATION;
+ return resetSelection();
}
public String rename(String oldName, String newName) throws IllegalCoordinationException
@@ -175,7 +174,7 @@
AliasBindingInfo alias = binding.getAlias();
managerBean.getCoordinationService().renameAliasBinding(alias, newName);
}
- return CoordinationManagerBean.EDIT_COORDINATION;
+ return resetSelection();
}
public void extractInfoFrom(Window window, PortletInfo info)
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-04 15:56:54 UTC (rev 11812)
+++ branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/CoordinationManagerBean.java 2008-09-04 17:23:53 UTC (rev 11813)
@@ -22,15 +22,6 @@
package org.jboss.portal.core.admin.ui.coordination;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Locale;
-import java.util.Map;
-import java.util.ResourceBundle;
-
-import javax.faces.context.FacesContext;
-import javax.faces.event.ActionEvent;
-
import org.jboss.portal.common.util.ParameterValidation;
import org.jboss.portal.core.admin.ui.PortalObjectManagerBean;
import org.jboss.portal.core.controller.coordination.CoordinationConfigurator;
@@ -47,6 +38,14 @@
import org.jboss.portal.core.model.portal.Window;
import org.jboss.portal.portlet.info.PortletInfo;
+import javax.faces.context.FacesContext;
+import javax.faces.event.ActionEvent;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Locale;
+import java.util.Map;
+import java.util.ResourceBundle;
+
/**
* @author <a href="mailto:chris.laprun at jboss.com">Chris Laprun</a>
* @version $Revision$
@@ -70,55 +69,34 @@
private enum CoordinationType
{
wiring() {
- private CoordinationBean bean;
-
String localizationKey()
{
return "COORDINATION_WIRING";
- }
- CoordinationBean getBean()
- {
- return bean;
- }
- void setBean(CoordinationBean bean)
- {
- this.bean = bean;
}},
parameter() {
- private CoordinationBean bean;
-
String localizationKey()
{
return "COORDINATION_PARAMETER";
- }
- CoordinationBean getBean()
- {
- return bean;
- }
- void setBean(CoordinationBean bean)
- {
- this.bean = bean;
}},
alias() {
- private CoordinationBean bean;
-
String localizationKey()
{
return "COORDINATION_ALIAS";
- }
- CoordinationBean getBean()
- {
- return bean;
- }
- void setBean(CoordinationBean bean)
- {
- this.bean = bean;
}};
- abstract String localizationKey();
- abstract CoordinationBean getBean();
+ private CoordinationBean bean;
- abstract void setBean(CoordinationBean bean);
+ CoordinationBean getBean()
+ {
+ return bean;
+ }
+
+ void setBean(CoordinationBean bean)
+ {
+ this.bean = bean;
+ }
+
+ abstract String localizationKey();
}
abstract static class CoordinationBean
@@ -154,12 +132,18 @@
public abstract String create() throws IllegalCoordinationException;
- public abstract String resetSelection();
+ public String resetSelection()
+ {
+ managerBean.refresh();
+ return CoordinationManagerBean.EDIT_COORDINATION;
+ }
public String cancel()
{
return resetSelection();
}
+
+ public abstract void initKnowing(Collection<PortalObject> children);
}
public Page getSelectedPage()
@@ -286,31 +270,37 @@
try
{
// reset the different managers as they are in session scope but need to be re-initialized each time a new
- // page is reloaded, also need to update the holders for the different managers
- managers.put(CoordinationType.alias.name(), replaceInSession("aliasManager", new AliasBindingManagerBean(this)));
- managers.put(CoordinationType.wiring.name(), replaceInSession("eventManager", new EventWiringManagerBean(this)));
- managers.put(CoordinationType.parameter.name(), replaceInSession("parameterManager", new ParameterBindingManagerBean(this)));
+ // page is reloaded
+ AliasBindingManagerBean aliasManager = new AliasBindingManagerBean(this);
+ EventWiringManagerBean eventManager = new EventWiringManagerBean(this);
+ ParameterBindingManagerBean parameterManager = new ParameterBindingManagerBean(this);
+ managers.put(CoordinationType.alias.name(), replaceInSession("aliasManager", aliasManager));
+ managers.put(CoordinationType.wiring.name(), replaceInSession("eventManager", eventManager));
+ managers.put(CoordinationType.parameter.name(), replaceInSession("parameterManager", parameterManager));
Page selectedPage = getSelectedPage();
- if (isExplicitEventsUsed())
+ boolean explicitEventsUsed = isExplicitEventsUsed();
+ boolean explicitParametersUsed = isExplicitParametersUsed();
+
+ aliasManager.loadInfoFrom(selectedPage);
+ if (explicitEventsUsed)
{
- managers.get(CoordinationType.wiring.name()).loadInfoFrom(selectedPage);
+ eventManager.loadInfoFrom(selectedPage);
}
- if (isExplicitParametersUsed())
+ if (explicitParametersUsed)
{
- managers.get(CoordinationType.parameter.name()).loadInfoFrom(selectedPage);
+ parameterManager.loadInfoFrom(selectedPage);
}
- managers.get(CoordinationType.alias.name()).loadInfoFrom(selectedPage);
Collection<PortalObject> children = selectedPage.getChildren(PortalObject.WINDOW_MASK);
if (!children.isEmpty())
{
- if (isExplicitParametersUsed())
+ aliasManager.initKnowing(children);
+ if (explicitParametersUsed)
{
- ((ParameterBindingManagerBean)managers.get(CoordinationType.parameter.name())).initKnowing(children);
+ parameterManager.initKnowing(children);
}
- ((AliasBindingManagerBean)managers.get(CoordinationType.alias.name())).initKnowing(children);
for (PortalObject po : children)
{
@@ -323,15 +313,15 @@
{
PortletInfo info = instance.getPortlet().getInfo();
- if (isExplicitParametersUsed())
+ aliasManager.extractInfoFrom(window, info);
+ if (explicitEventsUsed)
{
- managers.get(CoordinationType.parameter.name()).extractInfoFrom(window, info);
+ eventManager.extractInfoFrom(window, info);
}
- if (isExplicitEventsUsed())
+ if (explicitParametersUsed)
{
- managers.get(CoordinationType.wiring.name()).extractInfoFrom(window, info);
+ parameterManager.extractInfoFrom(window, info);
}
- managers.get(CoordinationType.alias.name()).extractInfoFrom(window, info);
}
}
}
@@ -441,8 +431,7 @@
{
selectedName = getFacesParam(SELECTED_NAME);
selectedType = CoordinationType.valueOf(getFacesParam(SELECTED_TYPE));
-
- selectedType.setBean(managers.get(getFacesParam(SELECTED_TYPE)));
+ selectedType.setBean(managers.get(selectedType.name()));
}
public String getSelectedName()
@@ -459,7 +448,6 @@
public String deleteSelected(ActionEvent actionEvent)
{
- select(actionEvent);
if (selectedType != null)
{
try
@@ -484,8 +472,6 @@
*/
public void refresh()
{
- // need to make sure that POMB has a selection...
-// pomb.selectObject(selectedObjectId);
editCoordination();
}
@@ -511,6 +497,6 @@
selectedType = null;
selectedName = null;
newName = null;
- return ""; //EDIT_COORDINATION;
+ return EDIT_COORDINATION;
}
}
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-09-04 15:56:54 UTC (rev 11812)
+++ branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/EventWiringManagerBean.java 2008-09-04 17:23:53 UTC (rev 11813)
@@ -25,6 +25,7 @@
import org.jboss.portal.core.controller.coordination.EventWiringInfo;
import org.jboss.portal.core.controller.coordination.IllegalCoordinationException;
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.EventInfo;
import org.jboss.portal.portlet.info.EventingInfo;
@@ -328,7 +329,7 @@
selectedDestinationEvent = null;
selectedDestinationWindows = null;
- return CoordinationManagerBean.EDIT_COORDINATION;
+ return super.resetSelection();
}
public String delete(String name) throws IllegalCoordinationException
@@ -339,7 +340,7 @@
EventWiringInfo event = displayEvent.getEventInfo();
managerBean.getCoordinationService().removeEventWiring(event);
}
- return CoordinationManagerBean.EDIT_COORDINATION;
+ return resetSelection();
}
public String rename(String oldName, String newName) throws IllegalCoordinationException
@@ -350,7 +351,7 @@
EventWiringInfo event = displayEvent.getEventInfo();
managerBean.getCoordinationService().renameEventWiring(event, newName);
}
- return CoordinationManagerBean.EDIT_COORDINATION;
+ return resetSelection();
}
public void extractInfoFrom(Window window, PortletInfo info)
@@ -361,6 +362,11 @@
eventNameToWindowDestinations = addEventInfoFor(window, eventingInfo.getConsumedEvents(), eventNameToWindowDestinations);
}
+ public void initKnowing(Collection<PortalObject> children)
+ {
+ // nothing to do here
+ }
+
public static class DisplayEventWiring implements Comparable
{
private List<Window> sourceWindows;
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-09-04 15:56:54 UTC (rev 11812)
+++ branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/ParameterBindingManagerBean.java 2008-09-04 17:23:53 UTC (rev 11813)
@@ -156,7 +156,7 @@
windowBindingName = null;
selectedParameterWindowPairs = null;
- return CoordinationManagerBean.EDIT_COORDINATION;
+ return super.resetSelection();
}
public String delete(String name) throws IllegalCoordinationException
@@ -167,7 +167,7 @@
WindowBindingInfo bindingInfo = displayParam.getBindingInfo();
managerBean.getCoordinationService().removeWindowBinding(bindingInfo);
}
- return CoordinationManagerBean.EDIT_COORDINATION;
+ return resetSelection();
}
public String rename(String name, String newName) throws IllegalCoordinationException
@@ -178,7 +178,7 @@
WindowBindingInfo bindingInfo = displayParam.getBindingInfo();
managerBean.getCoordinationService().renameWindowBinding(bindingInfo, newName);
}
- return CoordinationManagerBean.EDIT_COORDINATION;
+ return resetSelection();
}
public static class DisplayParameterBinding implements Comparable
More information about the portal-commits
mailing list