Author: julien(a)jboss.com Date: 2008-02-05 09:32:02 -0500 (Tue, 05 Feb 2008) New Revision: 9772 Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/PortletController.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/PortletControllerContext.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller2/PageRenderer.java Log: removed a method from an interface when it only the impl should define it (even if propbably it shold not be in the impl) Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/PortletController.java =================================================================== --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/PortletController.java 2008-02-05 14:21:20 UTC (rev 9771) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/PortletController.java 2008-02-05 14:32:02 UTC (rev 9772) @@ -33,6 +33,9 @@ import java.io.IOException; /** + * The portlet controller which handles the page state management and the interactions between + * the action phase and the event phase. It really only does that and not more. + * * @author <a href="mailto:julien@jboss.org">Julien Viet</a> * @version $Revision: 1.1 $ */ Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/PortletControllerContext.java =================================================================== --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/PortletControllerContext.java 2008-02-05 14:21:20 UTC (rev 9771) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/PortletControllerContext.java 2008-02-05 14:32:02 UTC (rev 9772) @@ -25,7 +25,6 @@ import org.jboss.portal.portlet.PortletInvokerException; import org.jboss.portal.portlet.spi.PortletInvocationContext; import org.jboss.portal.portlet.info.PortletInfo; -import org.jboss.portal.portlet.invocation.PortletInvocation; import org.jboss.portal.portlet.invocation.ActionInvocation; import org.jboss.portal.portlet.invocation.EventInvocation; import org.jboss.portal.portlet.invocation.ResourceInvocation; @@ -39,6 +38,8 @@ import java.util.List; /** + * The context provided to call the portlet controller. + * * @author <a href="mailto:julien@jboss.org">Julien Viet</a> * @version $Revision: 1.1 $ */ @@ -63,6 +64,4 @@ EventControllerContext getEventControllerContext(); - // To be removed, now only used in controller2 - PortletInvocationResponse invoke(PortletInvocation invocation) throws PortletInvokerException; } Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller2/PageRenderer.java =================================================================== --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller2/PageRenderer.java 2008-02-05 14:21:20 UTC (rev 9771) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller2/PageRenderer.java 2008-02-05 14:32:02 UTC (rev 9772) @@ -42,12 +42,9 @@ import org.jboss.portal.portlet.invocation.response.FragmentResponse; import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse; import org.jboss.portal.portlet.invocation.response.ResponseProperties; -import org.jboss.portal.portlet.test.controller2.TestInstanceContext; import org.jboss.portal.portlet.test.controller.WindowNavigationalState; -import org.jboss.portal.portlet.test.controller2.TestPortalContext; import org.jboss.portal.portlet.test.controller.PageNavigationalState; import org.jboss.portal.portlet.test.controller.PortletControllerContext; -import org.jboss.portal.portlet.test.controller.response.PageUpdateResponse; import org.w3c.dom.Element; import javax.servlet.http.HttpServletRequest; @@ -179,7 +176,7 @@ // try { - PortletInvocationResponse response = context.invoke(render); + PortletInvocationResponse response = ((PortletControllerContextImpl)context).invoke(render); if (response instanceof FragmentResponse) {