Author: chris.laprun(a)jboss.com Date: 2007-03-15 15:25:36 -0400 (Thu, 15 Mar 2007) New Revision: 6693 Modified: trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/Refresher.java trunk/portlet-federation/src/main/org/jboss/portal/portlet/federation/FederatingPortletInvoker.java trunk/portlet-federation/src/main/org/jboss/portal/portlet/federation/impl/FederatingPortletInvokerService.java Log: - Added FederatingPortletInvoker.unregisterInvoker(id) method. - Fixed javadoc and typos. Modified: trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/Refresher.java =================================================================== --- trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/Refresher.java 2007-03-15 17:16:43 UTC (rev 6692) +++ trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/Refresher.java 2007-03-15 19:25:36 UTC (rev 6693) @@ -30,7 +30,7 @@ import javax.faces.event.PhaseListener; /** - * Refresh the beans before JSR performs the render. + * Refresh the beans before JSF performs the render. * * @author <a href="mailto:julien@jboss.org">Julien Viet</a> * @version $Revision: 5448 $ Modified: trunk/portlet-federation/src/main/org/jboss/portal/portlet/federation/FederatingPortletInvoker.java =================================================================== --- trunk/portlet-federation/src/main/org/jboss/portal/portlet/federation/FederatingPortletInvoker.java 2007-03-15 17:16:43 UTC (rev 6692) +++ trunk/portlet-federation/src/main/org/jboss/portal/portlet/federation/FederatingPortletInvoker.java 2007-03-15 19:25:36 UTC (rev 6693) @@ -22,8 +22,8 @@ ******************************************************************************/ package org.jboss.portal.portlet.federation; +import org.jboss.portal.portlet.PortletInvoker; import org.jboss.portal.portlet.federation.spi.PortletInvokerRegistration; -import org.jboss.portal.portlet.PortletInvoker; import java.util.Collection; @@ -47,8 +47,8 @@ /** * Unregister an invoker. * - * @param registration the invoker to register - * @throws IllegalArgumentException if the invoker is null or already registered + * @param registration the invoker to unregister + * @throws IllegalArgumentException if invoker is null or not registered */ void unregisterInvoker(PortletInvokerRegistration registration) throws IllegalArgumentException; @@ -67,4 +67,13 @@ * @return a collection that contains the portlet invokers */ Collection getFederatedInvokers(); + + /** + * Unregisters the invoker associated with the specified identifier. + * + * @param id the identifier of the invoker to unregister + * @throws IllegalArgumentException if the identifier is null or no invoker is registered with this identifier + * @since 2.6 + */ + void unregisterInvoker(String id); } Modified: trunk/portlet-federation/src/main/org/jboss/portal/portlet/federation/impl/FederatingPortletInvokerService.java =================================================================== --- trunk/portlet-federation/src/main/org/jboss/portal/portlet/federation/impl/FederatingPortletInvokerService.java 2007-03-15 17:16:43 UTC (rev 6692) +++ trunk/portlet-federation/src/main/org/jboss/portal/portlet/federation/impl/FederatingPortletInvokerService.java 2007-03-15 19:25:36 UTC (rev 6693) @@ -22,15 +22,15 @@ ******************************************************************************/ package org.jboss.portal.portlet.federation.impl; -import org.jboss.portal.portlet.federation.FederatedPortletInvoker; -import org.jboss.portal.portlet.federation.FederatingPortletInvoker; -import org.jboss.portal.portlet.federation.spi.PortletInvokerRegistration; import org.jboss.portal.jems.as.system.AbstractJBossService; import org.jboss.portal.portlet.InvokerUnavailableException; import org.jboss.portal.portlet.NoSuchPortletException; import org.jboss.portal.portlet.Portlet; import org.jboss.portal.portlet.PortletContext; import org.jboss.portal.portlet.PortletInvokerException; +import org.jboss.portal.portlet.federation.FederatedPortletInvoker; +import org.jboss.portal.portlet.federation.FederatingPortletInvoker; +import org.jboss.portal.portlet.federation.spi.PortletInvokerRegistration; import org.jboss.portal.portlet.invocation.PortletInvocation; import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse; import org.jboss.portal.portlet.state.PropertyChange; @@ -84,7 +84,11 @@ { throw new IllegalArgumentException("No null invoker"); } - String id = registration.getId(); + unregisterInvoker(registration.getId()); + } + + public synchronized void unregisterInvoker(String id) + { if (id == null) { throw new IllegalArgumentException("No null id accepted");