[seam-commits] Seam SVN: r13359 - in modules/xml/trunk/impl/src: main/java/org/jboss/seam/xml/core and 3 other directories.

[seam-commits at lists.jboss.org]

Author: swd847
Date: 2010-07-10 20:54:59 -0400 (Sat, 10 Jul 2010)
New Revision: 13359

Removed:
   modules/xml/trunk/impl/src/test/java/org/jboss/seam/xml/test/iface/
   modules/xml/trunk/impl/src/test/resources/org/jboss/seam/xml/test/iface/
Modified:
   modules/xml/trunk/impl/src/main/java/org/jboss/seam/xml/bootstrap/XmlExtension.java
   modules/xml/trunk/impl/src/main/java/org/jboss/seam/xml/core/XmlResult.java
   modules/xml/trunk/impl/src/main/java/org/jboss/seam/xml/model/ModelBuilder.java
Log:
removed interface config as per SEAMXML-8


Modified: modules/xml/trunk/impl/src/main/java/org/jboss/seam/xml/bootstrap/XmlExtension.java
===================================================================
--- modules/xml/trunk/impl/src/main/java/org/jboss/seam/xml/bootstrap/XmlExtension.java	2010-07-11 00:40:19 UTC (rev 13358)
+++ modules/xml/trunk/impl/src/main/java/org/jboss/seam/xml/bootstrap/XmlExtension.java	2010-07-11 00:54:59 UTC (rev 13359)
@@ -90,7 +90,7 @@
 
    List<Exception> errors = new ArrayList<Exception>();
 
-   Map<Class, GenericBeanResult> genericBeans = new HashMap<Class, GenericBeanResult>();
+   Map<Class<?>, GenericBeanResult> genericBeans = new HashMap<Class<?>, GenericBeanResult>();
 
    /**
     * This is the entry point for the extension
@@ -213,26 +213,6 @@
          event.veto();
          return;
       }
-      boolean found = false;
-      AnnotatedTypeBuilder builder = AnnotatedTypeBuilder.newInstance(event.getAnnotatedType());
-      builder.mergeAnnotations(event.getAnnotatedType(), true);
-      for (XmlResult r : results)
-      {
-         for (BeanResult<?> i : r.getInterfaces())
-         {
-            if (i.getType().isAssignableFrom(event.getAnnotatedType().getJavaClass()))
-            {
-               found = true;
-               builder.mergeAnnotations(i.getBuilder().create(), true);
-               log.info("Overriding " + event.getAnnotatedType().getJavaClass() +" annotations based on interface " + i.getType().getName());
-            }
-         }
-      }
-      if (found)
-      {
-         event.setAnnotatedType(builder.create());
-      }
-
    }
 
    public <T> void processInjectionTarget(@Observes ProcessInjectionTarget<T> event)

Modified: modules/xml/trunk/impl/src/main/java/org/jboss/seam/xml/core/XmlResult.java
===================================================================
--- modules/xml/trunk/impl/src/main/java/org/jboss/seam/xml/core/XmlResult.java	2010-07-11 00:40:19 UTC (rev 13358)
+++ modules/xml/trunk/impl/src/main/java/org/jboss/seam/xml/core/XmlResult.java	2010-07-11 00:54:59 UTC (rev 13359)
@@ -50,8 +50,6 @@
 
    private final List<BeanResult<?>> beans = new ArrayList<BeanResult<?>>();
 
-   private final List<BeanResult<?>> interfaces = new ArrayList<BeanResult<?>>();
-
    private final List<GenericBeanResult> genericBeans = new ArrayList<GenericBeanResult>();
 
    private final Map<BeanResult<?>, List<FieldValueObject>> fieldValues = new HashMap<BeanResult<?>, List<FieldValueObject>>();
@@ -128,16 +126,6 @@
       return veto;
    }
 
-   public void addInterface(BeanResult<?> bean)
-   {
-      interfaces.add(bean);
-   }
-
-   public List<BeanResult<?>> getInterfaces()
-   {
-      return interfaces;
-   }
-
    public void addInterfaceFieldValues(Class<?> clazz, List<FieldValueObject> values)
    {
       interfaceFieldValues.put(clazz, values);

Modified: modules/xml/trunk/impl/src/main/java/org/jboss/seam/xml/model/ModelBuilder.java
===================================================================
--- modules/xml/trunk/impl/src/main/java/org/jboss/seam/xml/model/ModelBuilder.java	2010-07-11 00:40:19 UTC (rev 13358)
+++ modules/xml/trunk/impl/src/main/java/org/jboss/seam/xml/model/ModelBuilder.java	2010-07-11 00:54:59 UTC (rev 13359)
@@ -130,14 +130,7 @@
             ClassXmlItem cxml = (ClassXmlItem) rb;
             // get the AnnotatedType information
             BeanResult<?> tp = buildAnnotatedType(cxml);
-            if (cxml.getJavaClass().isInterface())
-            {
-               ret.addInterface(tp);
-            }
-            else
-            {
-               ret.addBean(tp);
-            }
+            ret.addBean(tp);
             // <override> or <speciailizes> need to veto the bean
             if (tp.getBeanType() != BeanResultType.ADD)
             {