Skip to content

Commit

Permalink
Fix compile problems from API update
Browse files Browse the repository at this point in the history
git-svn-id: http://anonsvn.jboss.org/repos/weld/ri/trunk@122 1c488680-804c-0410-94cd-c6b725194a0e
  • Loading branch information
pmuir committed Oct 20, 2008
1 parent b057c24 commit 555eedc
Show file tree
Hide file tree
Showing 16 changed files with 271 additions and 271 deletions.
13 changes: 9 additions & 4 deletions webbeans-ri/src/main/java/org/jboss/webbeans/BasicContext.java
Expand Up @@ -26,7 +26,7 @@ public BasicContext(Class<? extends Annotation> scopeType)
}

@SuppressWarnings("unchecked")
public <T> T get(Manager container, Bean<T> component, boolean create)
public <T> T get(Bean<T> component, boolean create)
{
T instance = (T) values.get(component);
if (instance != null)
Expand All @@ -41,7 +41,7 @@ public <T> T get(Manager container, Bean<T> component, boolean create)

// TODO should component creation be synchronized?

instance = component.create(container);
instance = component.create();

values.put(component, instance);
return instance;
Expand All @@ -60,7 +60,7 @@ public <T> void remove(Manager container, Bean<T> component)
if (instance != null)
{
values.remove(component);
component.destroy(container, instance);
component.destroy(instance);
}
else
{
Expand All @@ -77,10 +77,15 @@ public void destroy(Manager container)

for (Bean c : values.keySet())
{
c.destroy(container, values.get(c));
c.destroy(values.get(c));
}

values.clear();
}

public boolean isActive() {
// TODO Auto-generated method stub
return false;
}

}
16 changes: 8 additions & 8 deletions webbeans-ri/src/main/java/org/jboss/webbeans/BeanImpl.java
Expand Up @@ -26,13 +26,13 @@ public BeanImpl(AbstractComponentModel<T, ?> componentMetaModel, ManagerImpl man
}

@Override
public T create(Manager container)
public T create()
{
return componentMetaModel.getConstructor().invoke(container);
return componentMetaModel.getConstructor().invoke(getManager());
}

@Override
public void destroy(Manager container, T instance)
public void destroy(T instance)
{
// TODO Auto-generated method stub

Expand All @@ -45,9 +45,9 @@ public Set<Annotation> getBindingTypes()
}

@Override
public Annotation getDeploymentType()
public Class<Annotation> getDeploymentType()
{
return componentMetaModel.getDeploymentType();
return null; // componentMetaModel.getDeploymentType();
}

@Override
Expand All @@ -57,13 +57,13 @@ public String getName()
}

@Override
public Annotation getScopeType()
public Class<Annotation> getScopeType()
{
return componentMetaModel.getScopeType();
return null; //componentMetaModel.getScopeType();
}

@Override
public Set<Class> getTypes()
public Set<Class<?>> getTypes()
{
// TODO Auto-generated method stub
return null;
Expand Down

0 comments on commit 555eedc

Please sign in to comment.