9:32 a.m.
Author: chris.laprun(a)jboss.com
Date: 2008-08-31 10:32:15 -0400 (Sun, 31 Aug 2008)
New Revision: 11769
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/EventWiringManagerBean.java
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/resources/portal-admin-war/jsf/editCoordination.xhtml
Log:
- Use name instead of id when passing a binding to rename or delete confirmation page.
- Rename and delete should reload data from Coordination service (except that right now
persistence doesn't work).
- Reset the selection after creating a binding.
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-08-30
01:13:22 UTC (rev 11768)
+++
branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/CoordinationManagerBean.java 2008-08-31
14:32:15 UTC (rev 11769)
@@ -22,7 +22,6 @@
package org.jboss.portal.core.admin.ui.coordination;
-import org.jboss.portal.common.util.ConversionException;
import org.jboss.portal.core.admin.ui.PortalObjectManagerBean;
import org.jboss.portal.core.controller.coordination.CoordinationConfigurator;
import org.jboss.portal.core.controller.coordination.IllegalCoordinationException;
@@ -68,7 +67,7 @@
private static ThreadLocal<EventWiringManagerBean> eventManagerHolder = new
ThreadLocal<EventWiringManagerBean>();
private static ThreadLocal<WindowBindingManagerBean> windowManagerHolder = new
ThreadLocal<WindowBindingManagerBean>();
private String newName;
- private static final String EDIT_COORDINATION = "editCoordination";
+ static final String EDIT_COORDINATION = "editCoordination";
private enum CoordinationType
{
@@ -247,7 +246,7 @@
}
}
- public String editCoordination() throws ConversionException
+ public String editCoordination()
{
try
{
@@ -342,6 +341,7 @@
try
{
selectedType.bean().delete(selectedName);
+ editCoordination();
}
catch (IllegalCoordinationException e)
{
@@ -370,6 +370,7 @@
if(selectedType != null)
{
selectedType.bean().rename(selectedName, newName);
+ editCoordination();
}
// reset selection
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-08-30
01:13:22 UTC (rev 11768)
+++
branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/EventWiringManagerBean.java 2008-08-31
14:32:15 UTC (rev 11769)
@@ -317,7 +317,7 @@
selectedDestinationEvent = null;
selectedDestinationWindows = null;
- return null;
+ return CoordinationManagerBean.EDIT_COORDINATION;
}
public String delete(String name) throws IllegalCoordinationException
@@ -330,7 +330,7 @@
managerBean.getCoordinationService().removeEventWiring(event);
displayEventWirings.remove(name);
}
- return null;
+ return CoordinationManagerBean.EDIT_COORDINATION;
}
public String rename(String oldName, String newName) throws
IllegalCoordinationException
@@ -340,12 +340,9 @@
{
EventWiringInfo event = displayEvent.getEventInfo();
managerBean.getCoordinationService().renameEventWiring(event, newName);
-
- // reload event information
- loadInfoFrom(managerBean.getSelectedPage());
}
- return null;
+ return CoordinationManagerBean.EDIT_COORDINATION;
}
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/WindowBindingManagerBean.java
===================================================================
---
branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/WindowBindingManagerBean.java 2008-08-30
01:13:22 UTC (rev 11768)
+++
branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/WindowBindingManagerBean.java 2008-08-31
14:32:15 UTC (rev 11769)
@@ -278,7 +278,13 @@
}
}
}
- return null;
+
+ // reset selection
+ windowBindingName = null;
+ selectedWindows = null;
+ selectedRenderParameter = null;
+
+ return CoordinationManagerBean.EDIT_COORDINATION;
}
public String cancelBinding()
@@ -300,7 +306,8 @@
managerBean.getCoordinationService().removeWindowBinding(bindingInfo);
displayParameterBindings.remove(name);
}
- return null;
+
+ return CoordinationManagerBean.EDIT_COORDINATION;
}
public String rename(String name, String newName) throws IllegalCoordinationException
@@ -310,11 +317,8 @@
{
WindowBindingInfo bindingInfo = displayParam.getBindingInfo();
managerBean.getCoordinationService().renameWindowBinding(bindingInfo, newName);
-
- // reload event information
- loadInfoFrom(managerBean.getSelectedPage());
}
- return null;
+ return CoordinationManagerBean.EDIT_COORDINATION;
}
}
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-30
01:13:22 UTC (rev 11768)
+++
branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editCoordination.xhtml 2008-08-31
14:32:15 UTC (rev 11769)
@@ -47,7 +47,7 @@
#{bundle.COORDINATION_PARAMETER_CREATE_STEP3}
<h:inputText id="bindingName"
value="#{windowCoordination.windowBindingName}"/>
<h:commandButton
value="#{bundle.COORDINATION_PARAMETER_CREATE_CREATE}"
- action="#{eventCoordination.createBinding}"
styleClass="portlet-form-button"/>
+ action="#{windowCoordination.createBinding}"
styleClass="portlet-form-button"/>
<h:commandButton value="#{bundle.COMMON_CANCEL}"
action="#{eventCoordination.cancelBinding}"
styleClass="portlet-form-button"/>
</div>
@@ -81,12 +81,12 @@
<f:facet name="header">Actions</f:facet>
<h:commandLink action="renameCoordination"
actionListener="#{coordinationManager.select}">
<h:outputText styleClass="actionRename"
value="#{bundle.RENAME}"/>
- <f:param name="name"
value="#{binding.name}"/>
+ <f:param name="name"
value="#{binding.id}"/>
<f:param name="type"
value="parameter"/>
</h:commandLink> |
<h:commandLink action="confirmCoordinationDeletion"
actionListener="#{coordinationManager.select}">
<h:outputText styleClass="actionDelete"
value="#{bundle.COMMON_DELETE}"/>
- <f:param name="name"
value="#{binding.name}"/>
+ <f:param name="name"
value="#{binding.id}"/>
<f:param name="type"
value="parameter"/>
</h:commandLink>
</h:column>