fix build failure

git-svn-id: http://anonsvn.jboss.org/repos/weld/ri/trunk@225 1c488680-804c-0410-94cd-c6b725194a0e
weld · Nov 3, 2008 · c32319f · c32319f
1 parent 321bce3
commit c32319f
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/webbeans-ri/src/main/java/org/jboss/webbeans/model/bean/AbstractBeanModel.java b/webbeans-ri/src/main/java/org/jboss/webbeans/model/bean/AbstractBeanModel.java
@@ -1,6 +1,7 @@
 package org.jboss.webbeans.model.bean;
 
 import java.lang.annotation.Annotation;
+import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
@@ -23,6 +24,7 @@
 import org.jboss.webbeans.injectable.InjectableMethod;
 import org.jboss.webbeans.injectable.InjectableParameter;
 import org.jboss.webbeans.introspector.AnnotatedItem;
+import org.jboss.webbeans.introspector.SimpleAnnotatedType;
 import org.jboss.webbeans.model.MergedStereotypesModel;
 import org.jboss.webbeans.util.LoggerUtil;
 import org.jboss.webbeans.util.Reflections;
@@ -65,6 +67,10 @@ protected AbstractClassBeanModel<? extends T> getSpecializedType() {
       throw new UnsupportedOperationException();
    }
 
+   protected static <T> SimpleAnnotatedType getEmptyAnnotatedType(Class<T> type) {
+      return new SimpleAnnotatedType<T>(type, new HashMap<Class<? extends Annotation>, Annotation>());
+   }
+
    protected void initInjectionPoints()
    {
       injectionPoints = new HashSet<Injectable<?,?>>();

diff --git a/webbeans-ri/src/main/java/org/jboss/webbeans/model/bean/EnterpriseBeanModel.java b/webbeans-ri/src/main/java/org/jboss/webbeans/model/bean/EnterpriseBeanModel.java
@@ -13,7 +13,6 @@
 import org.jboss.webbeans.injectable.InjectableParameter;
 import org.jboss.webbeans.introspector.AnnotatedType;
 import org.jboss.webbeans.introspector.SimpleAnnotatedType;
-import org.jboss.webbeans.test.util.Util;
 import org.jboss.webbeans.util.Reflections;
 
 public class EnterpriseBeanModel<T> extends AbstractEnterpriseBeanModel<T>
@@ -126,7 +125,7 @@ protected AbstractClassBeanModel<? extends T> getSpecializedType()
       Class<?> superclass = getAnnotatedItem().getType().getSuperclass();
       if ( superclass!=null )
       {
-         return new EnterpriseBeanModel( new SimpleAnnotatedType( superclass ), Util.getEmptyAnnotatedType( getAnnotatedItem().getType().getSuperclass() ), container );
+         return new EnterpriseBeanModel(new SimpleAnnotatedType(superclass), getEmptyAnnotatedType(superclass), container);
       }
       else {
          throw new RuntimeException();

diff --git a/webbeans-ri/src/main/java/org/jboss/webbeans/model/bean/SimpleBeanModel.java b/webbeans-ri/src/main/java/org/jboss/webbeans/model/bean/SimpleBeanModel.java
@@ -12,7 +12,6 @@
 import org.jboss.webbeans.injectable.SimpleConstructor;
 import org.jboss.webbeans.introspector.AnnotatedType;
 import org.jboss.webbeans.introspector.SimpleAnnotatedType;
-import org.jboss.webbeans.test.util.Util;
 import org.jboss.webbeans.util.LoggerUtil;
 import org.jboss.webbeans.util.Reflections;
 
@@ -128,7 +127,7 @@ protected AbstractClassBeanModel<? extends T> getSpecializedType()
       Class<?> superclass = getAnnotatedItem().getType().getSuperclass();
       if ( superclass!=null )
       {
-         return new SimpleBeanModel( new SimpleAnnotatedType( superclass ), Util.getEmptyAnnotatedType( getAnnotatedItem().getType().getSuperclass() ), container );
+         return new SimpleBeanModel(new SimpleAnnotatedType(superclass), getEmptyAnnotatedType(superclass), container);
       }
       else {
          throw new RuntimeException();