Author: julien(a)jboss.com
Date: 2008-03-11 10:03:31 -0400 (Tue, 11 Mar 2008)
New Revision: 10262
Modified:
modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/EventControllerContextSafeInvoker.java
modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/event/AbstractEventControllerContext.java
modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/event/EventControllerContext.java
modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/impl/event/EventControllerContextImpl.java
modules/portlet/trunk/controller/src/test/java/org/jboss/portal/portlet/controller/EventControllerContextFailureTestCase.java
modules/portlet/trunk/controller/src/test/java/org/jboss/portal/portlet/controller/PortletControllerTestCase.java
modules/portlet/trunk/controller/src/test/java/org/jboss/portal/portlet/controller/WiringEventControllerContext.java
modules/portlet/trunk/portal/src/main/java/org/jboss/portal/portlet/portal/jsp/PageEventControllerContext.java
Log:
make event controller context API more symetric
Modified:
modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/EventControllerContextSafeInvoker.java
===================================================================
---
modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/EventControllerContextSafeInvoker.java 2008-03-11
13:07:37 UTC (rev 10261)
+++
modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/EventControllerContextSafeInvoker.java 2008-03-11
14:03:31 UTC (rev 10262)
@@ -44,7 +44,7 @@
{
try
{
- controllerContext.eventProduced(phaseContext, sourceEvent, producedEvent);
+ controllerContext.eventProduced(phaseContext, producedEvent, sourceEvent);
//
return true;
Modified:
modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/event/AbstractEventControllerContext.java
===================================================================
---
modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/event/AbstractEventControllerContext.java 2008-03-11
13:07:37 UTC (rev 10261)
+++
modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/event/AbstractEventControllerContext.java 2008-03-11
14:03:31 UTC (rev 10262)
@@ -32,7 +32,7 @@
*/
public class AbstractEventControllerContext implements EventControllerContext
{
- public void eventProduced(EventPhaseContext context, Event sourceEvent, Event
producedEvent)
+ public void eventProduced(EventPhaseContext context, Event producedEvent, Event
sourceEvent)
{
}
Modified:
modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/event/EventControllerContext.java
===================================================================
---
modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/event/EventControllerContext.java 2008-03-11
13:07:37 UTC (rev 10261)
+++
modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/event/EventControllerContext.java 2008-03-11
14:03:31 UTC (rev 10262)
@@ -67,10 +67,10 @@
* to the portlet controller invoker.</p>
*
* @param context the session
+ * @param producedEvent the produced event
* @param sourceEvent the source event
- * @param producedEvent the produced event
*/
- void eventProduced(EventPhaseContext context, Event sourceEvent, Event
producedEvent);
+ void eventProduced(EventPhaseContext context, Event producedEvent, Event
sourceEvent);
/**
* <p>Context call back when an event is consumed by a portlet. The session
argument
Modified:
modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/impl/event/EventControllerContextImpl.java
===================================================================
---
modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/impl/event/EventControllerContextImpl.java 2008-03-11
13:07:37 UTC (rev 10261)
+++
modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/impl/event/EventControllerContextImpl.java 2008-03-11
14:03:31 UTC (rev 10262)
@@ -46,7 +46,7 @@
this.invoker = invoker;
}
- public void eventProduced(EventPhaseContext context, Event sourceEvent, Event
producedEvent)
+ public void eventProduced(EventPhaseContext context, Event producedEvent, Event
sourceEvent)
{
try
{
Modified:
modules/portlet/trunk/controller/src/test/java/org/jboss/portal/portlet/controller/EventControllerContextFailureTestCase.java
===================================================================
---
modules/portlet/trunk/controller/src/test/java/org/jboss/portal/portlet/controller/EventControllerContextFailureTestCase.java 2008-03-11
13:07:37 UTC (rev 10261)
+++
modules/portlet/trunk/controller/src/test/java/org/jboss/portal/portlet/controller/EventControllerContextFailureTestCase.java 2008-03-11
14:03:31 UTC (rev 10262)
@@ -148,7 +148,7 @@
{
AbstractEventControllerContext ecc = new AbstractEventControllerContext()
{
- public void eventProduced(EventPhaseContext context, Event sourceEvent, Event
producedEvent)
+ public void eventProduced(EventPhaseContext context, Event producedEvent, Event
sourceEvent)
{
called = true;
throw new RuntimeException();
@@ -168,7 +168,7 @@
final Error error = new Error();
ecc = new AbstractEventControllerContext()
{
- public void eventProduced(EventPhaseContext context, Event sourceEvent, Event
producedEvent)
+ public void eventProduced(EventPhaseContext context, Event producedEvent, Event
sourceEvent)
{
called = true;
throw error;
Modified:
modules/portlet/trunk/controller/src/test/java/org/jboss/portal/portlet/controller/PortletControllerTestCase.java
===================================================================
---
modules/portlet/trunk/controller/src/test/java/org/jboss/portal/portlet/controller/PortletControllerTestCase.java 2008-03-11
13:07:37 UTC (rev 10261)
+++
modules/portlet/trunk/controller/src/test/java/org/jboss/portal/portlet/controller/PortletControllerTestCase.java 2008-03-11
14:03:31 UTC (rev 10262)
@@ -353,7 +353,7 @@
controller.setProducedEventThreshold(10);
context.setEventControllerContext(new AbstractEventControllerContext()
{
- public void eventProduced(EventPhaseContext context, Event sourceEvent, Event
producedEvent)
+ public void eventProduced(EventPhaseContext context, Event producedEvent, Event
sourceEvent)
{
context.interrupt();
}
Modified:
modules/portlet/trunk/controller/src/test/java/org/jboss/portal/portlet/controller/WiringEventControllerContext.java
===================================================================
---
modules/portlet/trunk/controller/src/test/java/org/jboss/portal/portlet/controller/WiringEventControllerContext.java 2008-03-11
13:07:37 UTC (rev 10261)
+++
modules/portlet/trunk/controller/src/test/java/org/jboss/portal/portlet/controller/WiringEventControllerContext.java 2008-03-11
14:03:31 UTC (rev 10262)
@@ -49,7 +49,7 @@
/** . */
private final List<EventCallback> callbacks = new
LinkedList<EventCallback>();
- public void eventProduced(EventPhaseContext context, Event sourceEvent, Event
producedEvent)
+ public void eventProduced(EventPhaseContext context, Event producedEvent, Event
sourceEvent)
{
List<Coordinate> dsts = wires.get(new Coordinate(producedEvent.getName(),
producedEvent.getWindowId()));
Modified:
modules/portlet/trunk/portal/src/main/java/org/jboss/portal/portlet/portal/jsp/PageEventControllerContext.java
===================================================================
---
modules/portlet/trunk/portal/src/main/java/org/jboss/portal/portlet/portal/jsp/PageEventControllerContext.java 2008-03-11
13:07:37 UTC (rev 10261)
+++
modules/portlet/trunk/portal/src/main/java/org/jboss/portal/portlet/portal/jsp/PageEventControllerContext.java 2008-03-11
14:03:31 UTC (rev 10262)
@@ -54,7 +54,7 @@
this.prepareResponse = prepareResponse;
}
- public void eventProduced(EventPhaseContext context, Event sourceEvent, Event
producedEvent)
+ public void eventProduced(EventPhaseContext context, Event producedEvent, Event
sourceEvent)
{
for (String windowId : prepareResponse.getWindowIds())
{