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

[webbeans-commits at lists.jboss.org]

Author: pete.muir at jboss.org
Date: 2008-10-19 10:07:50 -0400 (Sun, 19 Oct 2008)
New Revision: 118

Modified:
   ri/trunk/webbeans-api/src/main/java/javax/webbeans/manager/Bean.java
   ri/trunk/webbeans-api/src/main/java/javax/webbeans/manager/Manager.java
   ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/BeanImpl.java
   ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/ManagerImpl.java
   ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/deployment/DeploymentStrategy.java
Log:
Update manager and bean api


Modified: ri/trunk/webbeans-api/src/main/java/javax/webbeans/manager/Bean.java
===================================================================
--- ri/trunk/webbeans-api/src/main/java/javax/webbeans/manager/Bean.java	2008-10-15 08:19:05 UTC (rev 117)
+++ ri/trunk/webbeans-api/src/main/java/javax/webbeans/manager/Bean.java	2008-10-19 14:07:50 UTC (rev 118)
@@ -28,6 +28,18 @@
 
 public abstract class Bean<T>
 {
+   
+   private final Manager manager;
+   
+   protected Bean(Manager manager)
+   {
+      this.manager = manager;
+   }
+   
+   protected Manager getManager()
+   {
+      return manager;
+   }
 
    public abstract Set<Class> getTypes();
    public abstract Set<Annotation> getBindingTypes();
@@ -35,6 +47,9 @@
    public abstract Annotation getDeploymentType();
    public abstract String getName();
    
+   public abstract boolean isSerializable();
+   public abstract boolean isNullable();
+   
    public abstract T create(Manager container);
    public abstract void destroy(Manager container, T instance);
 

Modified: ri/trunk/webbeans-api/src/main/java/javax/webbeans/manager/Manager.java
===================================================================
--- ri/trunk/webbeans-api/src/main/java/javax/webbeans/manager/Manager.java	2008-10-15 08:19:05 UTC (rev 117)
+++ ri/trunk/webbeans-api/src/main/java/javax/webbeans/manager/Manager.java	2008-10-19 14:07:50 UTC (rev 118)
@@ -41,14 +41,16 @@
          Annotation... bindingTypes);
 
    public Object getInstanceByName(String name);
+   
+   public <T> T getInstance(Bean<T> bean);
 
-   public Set<Bean> resolveByName(String name);
+   public Set<Bean<?>> resolveByName(String name);
 
    public void fireEvent(Object event, Annotation... bindings);
    
-   public void addObserver(Observer observer);
+   public <T> void addObserver(Observer<T> observer);
    
-   public void removeObserver(Observer observer);
+   public <T> void removeObserver(Observer<T> observer);
    
    public <T> Set<Observer<T>> resolveObservers(T event, Annotation... bindings);
    
@@ -56,6 +58,6 @@
    
    public Context getContext(Class<Annotation> scopeType);
    
-   public Manager addComponent(Bean component);
+   public Manager addBean(Bean<?> component);
 
 }

Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/BeanImpl.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/BeanImpl.java	2008-10-15 08:19:05 UTC (rev 117)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/BeanImpl.java	2008-10-19 14:07:50 UTC (rev 118)
@@ -19,8 +19,9 @@
    
    private AbstractComponentModel<T, ?> componentMetaModel;
 
-   public BeanImpl(AbstractComponentModel<T, ?> componentMetaModel)
+   public BeanImpl(AbstractComponentModel<T, ?> componentMetaModel, Manager manager)
    {
+      super(manager);
       this.componentMetaModel = componentMetaModel;
    }
 
@@ -68,4 +69,18 @@
       return null;
    }
 
+   @Override
+   public boolean isNullable()
+   {
+      // TODO Auto-generated method stub
+      return false;
+   }
+
+   @Override
+   public boolean isSerializable()
+   {
+      // TODO Auto-generated method stub
+      return false;
+   }
+
 }

Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/ManagerImpl.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/ManagerImpl.java	2008-10-15 08:19:05 UTC (rev 117)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/ManagerImpl.java	2008-10-19 14:07:50 UTC (rev 118)
@@ -33,14 +33,14 @@
    private ThreadLocal<Map<Class<Annotation>, Context>> contexts = 
       new ThreadLocal<Map<Class<Annotation>, Context>>();
 
-   private Set<Bean> components;
+   private Set<Bean<?>> components;
    
    public ManagerImpl(List<Annotation> enabledDeploymentTypes)
    {
       initEnabledDeploymentTypes(enabledDeploymentTypes);
       this.modelManager = new ModelManager();
       this.ejbLookupManager = new EjbManager();
-      this.components = new HashSet<Bean>();
+      this.components = new HashSet<Bean<?>>();
       this.eventBus = new EventBus();
    }
    
@@ -62,7 +62,7 @@
       }
    }
 
-   public Manager addComponent(Bean component)
+   public Manager addBean(Bean<?> component)
    {
       components.add(component);
       return this;
@@ -74,7 +74,7 @@
       
    }
 
-   public void addObserver(Observer observer)
+   public <T> void addObserver(Observer<T> observer)
    {
       eventBus.addObserver(observer);      
    }
@@ -119,12 +119,12 @@
       return null;
    }
 
-   public void removeObserver(Observer observer)
+   public<T> void removeObserver(Observer<T> observer)
    {
       eventBus.removeObserver(observer);
    }
 
-   public Set<Bean> resolveByName(String name)
+   public Set<Bean<?>> resolveByName(String name)
    {
       // TODO Auto-generated method stub
       return null;
@@ -167,5 +167,11 @@
    {
       return ejbLookupManager;
    }
+
+   public <T> T getInstance(Bean<T> bean)
+   {
+      // TODO Auto-generated method stub
+      return null;
+   }
    
 }

Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/deployment/DeploymentStrategy.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/deployment/DeploymentStrategy.java	2008-10-15 08:19:05 UTC (rev 117)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/deployment/DeploymentStrategy.java	2008-10-19 14:07:50 UTC (rev 118)
@@ -141,7 +141,7 @@
                         SimpleComponentModel componentModel = new SimpleComponentModel(
                               new SimpleAnnotatedType(componentClass), 
                               new SimpleAnnotatedType(null, new HashMap()), container);  
-                        container.addComponent(new BeanImpl(componentModel));
+                        container.addBean(new BeanImpl(componentModel, null));
                         log.info("Web Bean: " + componentModel);
                      }
                   }