[jboss-cvs] jboss-seam/src/main/org/jboss/seam/init ...

[Norman Richards]

  User: nrichards
  Date: 06/11/15 14:54:56

  Modified:    src/main/org/jboss/seam/init  Initialization.java
  Log:
  improve xml to component mapping logic
  
  Revision  Changes    Path
  1.114     +16 -8     jboss-seam/src/main/org/jboss/seam/init/Initialization.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Initialization.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/init/Initialization.java,v
  retrieving revision 1.113
  retrieving revision 1.114
  diff -u -b -r1.113 -r1.114
  --- Initialization.java	15 Nov 2006 14:28:00 -0000	1.113
  +++ Initialization.java	15 Nov 2006 19:54:56 -0000	1.114
  @@ -111,7 +111,7 @@
   /**
    * @author Gavin King
    * @author <a href="mailto:theute at jboss.org">Thomas Heute</a>
  - * @version $Revision: 1.113 $
  + * @version $Revision: 1.114 $
    */
   public class Initialization
   {
  @@ -244,20 +244,28 @@
             if (nsInfo != null) {
                 String installed = elem.attributeValue("installed");
                 if (installed==null || "true".equals(replace(installed, replacements))) {
  +                  String name = elem.attributeValue("name");
  +
                     String className = nsInfo.getPackage().getName() + "." + elem.getName();
                     try {
  -                      Class clazz = Reflections.classForName(className);
  +                      Class<Object> clazz = Reflections.classForName(className);
  +                      if (name == null) {
  +                          Name  anno = clazz.getAnnotation(Name.class);
  +                          if (anno != null) {
  +                              name = anno.value();
  +                          }
  +                      }
                     } catch (ClassNotFoundException e) {
                         // if it isn't a classname, set 
                         className = null; 
                     }
   
  -                  String name = elem.attributeValue("name");
                     if (name == null) {
  -                      name = elem.getName();
                         String prefix = nsInfo.getNamespace().prefix();
  -                      if ((prefix!=null) && (prefix.length()>0)) {
  -                          name = prefix + "." + name;
  +                      if ((prefix==null) || (prefix.length()==0)) {
  +                          name = elem.getName();
  +                      } else { 
  +                          name = prefix + "." + elem.getName();
                         }
                     }