[Andromdaplugins-cvs] CVS update: cartridges/andromda-ejb3/src/main/java/org/andromda/cartridges/ejb3/metafacades EJB3EntityFacadeLogicImpl.java

[Vance K. <va...@us...>]

  User: vancek  
  Date: 06/01/20 09:19:59

  Modified:    andromda-ejb3/src/main/java/org/andromda/cartridges/ejb3/metafacades
                        EJB3EntityFacadeLogicImpl.java
  Log:
  requiresGeneralizationMapping no longer checks for super entity not being an embeddable superclass. added embeddableSuperclassGeneralizationExists to check for super entity being an ebeddable superclass.
  
  Revision  Changes    Path
  1.6       +12 -1     cartridges/andromda-ejb3/src/main/java/org/andromda/cartridges/ejb3/metafacades/EJB3EntityFacadeLogicImpl.java
  
  Index: EJB3EntityFacadeLogicImpl.java
  ===================================================================
  RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/main/java/org/andromda/cartridges/ejb3/metafacades/EJB3EntityFacadeLogicImpl.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -w -r1.5 -r1.6
  --- EJB3EntityFacadeLogicImpl.java	18 Jan 2006 09:21:39 -0000	1.5
  +++ EJB3EntityFacadeLogicImpl.java	20 Jan 2006 17:19:58 -0000	1.6
  @@ -832,7 +832,10 @@
        */
       protected boolean handleIsRequiresGeneralizationMapping()
       {
  -        return (this.getSuperEntity() != null && !this.getSuperEntity().isEmbeddableSuperclass());
  +        return (this.getSuperEntity() != null && 
  +                (this.getSuperEntity().isInheritanceSingleTable() || 
  +                        this.getSuperEntity().isInheritanceTablePerClass() ||
  +                        this.getSuperEntity().isInheritanceJoined()));
       }
   
       /**
  @@ -867,6 +870,14 @@
       }
   
       /**
  +     * @see org.andromda.cartridges.ejb3.metafacades.EJB3EntityFacadeLogic#handleIsEmbeddableSuperclassGeneralizationExists()
  +     */
  +    protected boolean handleIsEmbeddableSuperclassGeneralizationExists()
  +    {
  +        return (this.getSuperEntity() != null && this.getSuperEntity().isEmbeddableSuperclass());
  +    }
  +    
  +    /**
        * @see org.andromda.cartridges.ejb3.metafacades.EJB3EntityFacadeLogic#
        *      handleGetAttributesAsList(java.util.Collection, boolean, boolean)
        */