You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lu...@apache.org on 2009/07/09 09:28:43 UTC
svn commit: r792424 - in /myfaces/core/branches/2_0_0/impl/src:
main/java/org/apache/myfaces/application/
main/java/org/apache/myfaces/lifecycle/
test/java/org/apache/myfaces/lifecycle/
Author: lu4242
Date: Thu Jul 9 07:28:43 2009
New Revision: 792424
URL: http://svn.apache.org/viewvc?rev=792424&view=rev
Log:
MYFACES-2270 Add FacesContext param to Application.publishEvent
Modified:
myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/application/ApplicationImpl.java
myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/lifecycle/LifecycleImpl.java
myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/lifecycle/PhaseListenerManager.java
myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/lifecycle/RestoreViewExecutor.java
myfaces/core/branches/2_0_0/impl/src/test/java/org/apache/myfaces/lifecycle/RestoreViewExecutorTest.java
Modified: myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/application/ApplicationImpl.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/application/ApplicationImpl.java?rev=792424&r1=792423&r2=792424&view=diff
==============================================================================
--- myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/application/ApplicationImpl.java (original)
+++ myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/application/ApplicationImpl.java Thu Jul 9 07:28:43 2009
@@ -443,7 +443,7 @@
}
@Override
- public void publishEvent(Class<? extends SystemEvent> systemEventClass, Class<?> sourceBaseType, Object source)
+ public void publishEvent(FacesContext facesContext, Class<? extends SystemEvent> systemEventClass, Class<?> sourceBaseType, Object source)
{
checkNull(systemEventClass, "systemEventClass");
checkNull(source, "source");
@@ -479,9 +479,9 @@
}
@Override
- public void publishEvent(Class<? extends SystemEvent> systemEventClass, Object source)
+ public void publishEvent(FacesContext facesContext, Class<? extends SystemEvent> systemEventClass, Object source)
{
- publishEvent(systemEventClass, source.getClass(), source);
+ publishEvent(facesContext, systemEventClass, source.getClass(), source);
}
@Override
Modified: myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/lifecycle/LifecycleImpl.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/lifecycle/LifecycleImpl.java?rev=792424&r1=792423&r2=792424&view=diff
==============================================================================
--- myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/lifecycle/LifecycleImpl.java (original)
+++ myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/lifecycle/LifecycleImpl.java Thu Jul 9 07:28:43 2009
@@ -288,6 +288,6 @@
{
ExceptionQueuedEventContext context = new ExceptionQueuedEventContext (facesContext, e, null, phaseId);
- facesContext.getApplication().publishEvent (ExceptionQueuedEvent.class, context);
+ facesContext.getApplication().publishEvent (facesContext, ExceptionQueuedEvent.class, context);
}
}
Modified: myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/lifecycle/PhaseListenerManager.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/lifecycle/PhaseListenerManager.java?rev=792424&r1=792423&r2=792424&view=diff
==============================================================================
--- myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/lifecycle/PhaseListenerManager.java (original)
+++ myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/lifecycle/PhaseListenerManager.java Thu Jul 9 07:28:43 2009
@@ -119,6 +119,6 @@
context.getAttributes().put (key, Boolean.TRUE);
- facesContext.getApplication().publishEvent (ExceptionQueuedEvent.class, context);
+ facesContext.getApplication().publishEvent (facesContext, ExceptionQueuedEvent.class, context);
}
}
Modified: myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/lifecycle/RestoreViewExecutor.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/lifecycle/RestoreViewExecutor.java?rev=792424&r1=792423&r2=792424&view=diff
==============================================================================
--- myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/lifecycle/RestoreViewExecutor.java (original)
+++ myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/lifecycle/RestoreViewExecutor.java Thu Jul 9 07:28:43 2009
@@ -120,7 +120,7 @@
facesContext.renderResponse();
// Publish an AfterAddToParent event with the created UIViewRoot as the event source.
- application.publishEvent(PostAddToViewEvent.class, viewRoot);
+ application.publishEvent(facesContext, PostAddToViewEvent.class, viewRoot);
}
return false;
Modified: myfaces/core/branches/2_0_0/impl/src/test/java/org/apache/myfaces/lifecycle/RestoreViewExecutorTest.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_0/impl/src/test/java/org/apache/myfaces/lifecycle/RestoreViewExecutorTest.java?rev=792424&r1=792423&r2=792424&view=diff
==============================================================================
--- myfaces/core/branches/2_0_0/impl/src/test/java/org/apache/myfaces/lifecycle/RestoreViewExecutorTest.java (original)
+++ myfaces/core/branches/2_0_0/impl/src/test/java/org/apache/myfaces/lifecycle/RestoreViewExecutorTest.java Thu Jul 9 07:28:43 2009
@@ -89,7 +89,7 @@
expect(_viewHandler.createView(same(_facesContext), eq("calculatedViewId"))).andReturn(viewRoot);
- _application.publishEvent(same(PostAddToViewEvent.class), same(viewRoot));
+ _application.publishEvent(_facesContext, same(PostAddToViewEvent.class), same(viewRoot));
_facesContext.setViewRoot(same(viewRoot));
_mocksControl.replay();