[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/22 21:53:32

  Modified:    andromda-ejb3/src/main/java/org/andromda/cartridges/ejb3/metafacades
                        EJB3EntityFacadeLogicImpl.java
  Log:
  updated getAttributesAsList to filter identifiers with auto generator types
  
  Revision  Changes    Path
  1.7       +29 -18    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.6
  retrieving revision 1.7
  diff -u -w -r1.6 -r1.7
  --- EJB3EntityFacadeLogicImpl.java	20 Jan 2006 17:19:58 -0000	1.6
  +++ EJB3EntityFacadeLogicImpl.java	23 Jan 2006 05:53:32 -0000	1.7
  @@ -568,7 +568,8 @@
       }
   
       /**
  -     * @see org.andromda.cartridges.ejb3.metafacades.EJB3EntityFacadeLogic#handleGetFullyQualifiedEntityCompositePrimaryKeyName()
  +     * @see org.andromda.cartridges.ejb3.metafacades.EJB3EntityFacadeLogic#
  +     *      handleGetFullyQualifiedEntityCompositePrimaryKeyName()
        */
       protected String handleGetFullyQualifiedEntityCompositePrimaryKeyName()
       {
  @@ -870,7 +871,8 @@
       }
   
       /**
  -     * @see org.andromda.cartridges.ejb3.metafacades.EJB3EntityFacadeLogic#handleIsEmbeddableSuperclassGeneralizationExists()
  +     * @see org.andromda.cartridges.ejb3.metafacades.EJB3EntityFacadeLogic#
  +     *      handleIsEmbeddableSuperclassGeneralizationExists()
        */
       protected boolean handleIsEmbeddableSuperclassGeneralizationExists()
       {
  @@ -879,13 +881,13 @@
       
       /**
        * @see org.andromda.cartridges.ejb3.metafacades.EJB3EntityFacadeLogic#
  -     *      handleGetAttributesAsList(java.util.Collection, boolean, boolean)
  +     *      handleGetAttributesAsList(java.util.Collection, boolean, boolean, boolean)
        */
       protected String handleGetAttributesAsList(
               Collection attributes, 
               boolean includeTypes, 
               boolean includeNames,
  -            boolean includeCompPKAttr)
  +            boolean includeAutoIdentifiers)
       {
           if (!includeNames && !includeTypes || attributes == null)
           {
  @@ -899,12 +901,20 @@
           {
               EJB3EntityAttributeFacade attr = (EJB3EntityAttributeFacade)it.next();
               /**
  -             * Do not include attributes that are assigned for optimistic lock value for version or
  -             * identifier attributes for entities with a composite primary key .
  +             * Do not include attributes that are assigned for optimistic lock value as a version
  +             */
  +            boolean isCompositePKPresent = this.isCompositePrimaryKeyPresent();
  +            if (!attr.isVersion())
  +            {
  +                /**
  +                 * Do not include identifier attributes for entities with a composite primary key
  +                 * or if includeAutoIdentifiers is false, do not include identifiers with auto generated values.
                */
  -            boolean isCompositePK = this.isCompositePrimaryKeyPresent();
  -            if (!attr.isVersion() && 
  -                    ((isCompositePK && (!attr.isIdentifier() || includeCompPKAttr)) || !isCompositePK))
  +                if ((isCompositePKPresent && (includeAutoIdentifiers || !attr.isIdentifier())) || 
  +                    (!isCompositePKPresent && 
  +                            ((!includeAutoIdentifiers && attr.isIdentifier() && attr.isGeneratorTypeNone()) || 
  +                            (includeAutoIdentifiers && attr.isIdentifier()) ||
  +                            !attr.isIdentifier())))
               {
                   sb.append(separator);
                   separator = ", ";
  @@ -918,6 +928,7 @@
                       sb.append(attr.getName());
                   }
               }
  +            }
                   
           }
           return sb.toString();