[webbeans-commits] Webbeans SVN: r3784 - in ri/trunk: spi/src/main/java/org/jboss/webbeans/bootstrap/api and 1 other directories.

[webbeans-commits at lists.jboss.org]

Author: pete.muir at jboss.org
Date: 2009-09-25 12:25:33 -0400 (Fri, 25 Sep 2009)
New Revision: 3784

Modified:
   ri/trunk/impl/src/main/java/org/jboss/webbeans/context/ContextLifecycle.java
   ri/trunk/spi/src/main/java/org/jboss/webbeans/bootstrap/api/Lifecycle.java
   ri/trunk/spi/src/main/java/org/jboss/webbeans/bootstrap/api/helpers/ForwardingLifecycle.java
Log:
Add isXXXActive methods

Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/context/ContextLifecycle.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/context/ContextLifecycle.java	2009-09-25 14:10:58 UTC (rev 3783)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/context/ContextLifecycle.java	2009-09-25 16:25:33 UTC (rev 3784)
@@ -41,11 +41,11 @@
    
    public static LogProvider log = Logging.getLogProvider(ContextLifecycle.class);
 
-   public final ApplicationContext applicationContext;
-   public final SessionContext sessionContext;
-   public final ConversationContext conversationContext;
-   public final RequestContext requestContext;
-   public final DependentContext dependentContext;
+   private final ApplicationContext applicationContext;
+   private final SessionContext sessionContext;
+   private final ConversationContext conversationContext;
+   private final RequestContext requestContext;
+   private final DependentContext dependentContext;
    
    public ContextLifecycle(ApplicationContext applicationContext, SessionContext sessionContext, ConversationContext conversationContext, RequestContext requestContext, DependentContext dependentContext)
    {
@@ -92,9 +92,24 @@
    
    public boolean isRequestActive()
    {
-      return requestContext.isActive() && dependentContext.isActive();
+      return applicationContext.isActive() && requestContext.isActive() && dependentContext.isActive();
    }
    
+   public boolean isApplicationActive()
+   {
+      return applicationContext.isActive() && dependentContext.isActive();
+   }
+   
+   public boolean isConversationActive()
+   {
+      return applicationContext.isActive() && sessionContext.isActive() && conversationContext.isActive() && dependentContext.isActive();
+   }
+   
+   public boolean isSessionActive() 
+   {
+      return applicationContext.isActive() && sessionContext.isActive() && dependentContext.isActive();
+   }
+   
 
    public void beginApplication(BeanStore applicationBeanStore)
    {

Modified: ri/trunk/spi/src/main/java/org/jboss/webbeans/bootstrap/api/Lifecycle.java
===================================================================
--- ri/trunk/spi/src/main/java/org/jboss/webbeans/bootstrap/api/Lifecycle.java	2009-09-25 14:10:58 UTC (rev 3783)
+++ ri/trunk/spi/src/main/java/org/jboss/webbeans/bootstrap/api/Lifecycle.java	2009-09-25 16:25:33 UTC (rev 3784)
@@ -24,6 +24,12 @@
    public void endRequest(String id, BeanStore requestBeanStore);
 
    public boolean isRequestActive();
+   
+   public boolean isSessionActive();
+   
+   public boolean isApplicationActive();
+   
+   public boolean isConversationActive();
 
    public void beginApplication(BeanStore applicationBeanStore);
 

Modified: ri/trunk/spi/src/main/java/org/jboss/webbeans/bootstrap/api/helpers/ForwardingLifecycle.java
===================================================================
--- ri/trunk/spi/src/main/java/org/jboss/webbeans/bootstrap/api/helpers/ForwardingLifecycle.java	2009-09-25 14:10:58 UTC (rev 3783)
+++ ri/trunk/spi/src/main/java/org/jboss/webbeans/bootstrap/api/helpers/ForwardingLifecycle.java	2009-09-25 16:25:33 UTC (rev 3784)
@@ -84,6 +84,21 @@
    {
       return delegate().isRequestActive();
    }
+   
+   public boolean isApplicationActive()
+   {
+      return delegate().isApplicationActive();
+   }
+   
+   public boolean isConversationActive()
+   {
+      return delegate().isConversationActive();
+   }
+   
+   public boolean isSessionActive()
+   {
+      return delegate().isSessionActive();
+   }
 
    public void restoreSession(String id, BeanStore sessionBeanStore)
    {