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

[Peter Muir]

  User: pmuir   
  Date: 07/08/08 07:37:33

  Modified:    src/main/org/jboss/seam  Entity.java
  Log:
  JBSEAM-1700
  
  Revision  Changes    Path
  1.12      +18 -0     jboss-seam/src/main/org/jboss/seam/Entity.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Entity.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/Entity.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -b -r1.11 -r1.12
  --- Entity.java	30 Jun 2007 19:01:05 -0000	1.11
  +++ Entity.java	8 Aug 2007 11:37:33 -0000	1.12
  @@ -34,11 +34,24 @@
      private Field identifierField;
      private Method versionGetter;
      private Field versionField;
  +   private String name;
   
      public Entity(Class<?> beanClass)
      {
         super(beanClass);
         
  +      if (beanClass.isAnnotationPresent(javax.persistence.Entity.class))
  +      {
  +         if (!"".equals(beanClass.getAnnotation(javax.persistence.Entity.class).name()))
  +         {
  +            name = beanClass.getAnnotation(javax.persistence.Entity.class).name();
  +         }
  +         else
  +         {
  +            name = beanClass.getName();
  +         }
  +      }
  +      
         for ( Class<?> clazz=beanClass; clazz!=Object.class; clazz = clazz.getSuperclass() )
         {
   
  @@ -176,6 +189,11 @@
         }
      }
   
  +   public String getName()
  +   {
  +      return name;
  +   }
  +
      public static Entity forClass(Class clazz)
      {
         if ( !Contexts.isApplicationContextActive() )