[webbeans-commits] Webbeans SVN: r195 - ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/contexts.

[webbeans-commits at lists.jboss.org]

Author: pete.muir at jboss.org
Date: 2008-10-28 08:25:44 -0400 (Tue, 28 Oct 2008)
New Revision: 195

Modified:
   ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/contexts/AbstractContext.java
   ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/contexts/DependentContext.java
   ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/contexts/NormalContext.java
Log:
move map into NormalContext

Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/contexts/AbstractContext.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/contexts/AbstractContext.java	2008-10-28 11:59:58 UTC (rev 194)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/contexts/AbstractContext.java	2008-10-28 12:25:44 UTC (rev 195)
@@ -36,14 +36,13 @@
 
    }
    
-   protected BeanMap beans;
    private Class<? extends Annotation> scopeType;
    protected boolean active;
 
    public AbstractContext(Class<? extends Annotation> scopeType)
    {
       this.scopeType = scopeType;
-      beans = new BeanMap();
+      
    }
 
    public abstract <T> T get(Bean<T> bean, boolean create);
@@ -53,20 +52,8 @@
       return scopeType;
    }
 
-   private <T> void destroy(Manager manager, Bean<T> bean)
-   {
-      bean.destroy(beans.get(bean));
-   }
+   public abstract void destroy(Manager manager);
 
-   public void destroy(Manager manager)
-   {
-      for (Bean<? extends Object> bean : beans.keySet())
-      {
-         destroy(manager, bean);
-      }
-      beans = null;
-   }
-
    public boolean isActive()
    {
       return active;

Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/contexts/DependentContext.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/contexts/DependentContext.java	2008-10-28 11:59:58 UTC (rev 194)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/contexts/DependentContext.java	2008-10-28 12:25:44 UTC (rev 195)
@@ -1,15 +1,14 @@
 package org.jboss.webbeans.contexts;
 
-import java.lang.annotation.Annotation;
-
 import javax.webbeans.ContextNotActiveException;
 import javax.webbeans.Dependent;
 import javax.webbeans.manager.Bean;
+import javax.webbeans.manager.Manager;
 
 public class DependentContext extends AbstractContext
 {
 
-   public DependentContext(Class<? extends Annotation> scopeType)
+   public DependentContext()
    {
       super(Dependent.class);
       active = false;
@@ -31,4 +30,11 @@
    {
       return "Dependent context";
    }
+   
+   @Override
+   public void destroy(Manager manager)
+   {
+      
+   }
+   
 }

Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/contexts/NormalContext.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/contexts/NormalContext.java	2008-10-28 11:59:58 UTC (rev 194)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/contexts/NormalContext.java	2008-10-28 12:25:44 UTC (rev 195)
@@ -4,13 +4,17 @@
 
 import javax.webbeans.ContextNotActiveException;
 import javax.webbeans.manager.Bean;
+import javax.webbeans.manager.Manager;
 
 public abstract class NormalContext extends AbstractContext
 {
 
+   private BeanMap beans;
+
    public NormalContext(Class<? extends Annotation> scopeType)
    {
       super(scopeType);
+      beans = new BeanMap();
       active = true;
    }
    
@@ -45,6 +49,20 @@
 
       beans.put(bean, instance);
       return instance;
-   }   
+   }
+   
+   private <T> void destroy(Manager manager, Bean<T> bean)
+   {
+      bean.destroy(beans.get(bean));
+   }
 
+   public void destroy(Manager manager)
+   {
+      for (Bean<? extends Object> bean : beans.keySet())
+      {
+         destroy(manager, bean);
+      }
+      beans = null;
+   }
+
 }