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

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

  User: vancek  
  Date: 06/01/24 18:57:29

  Modified:    andromda-ejb3/src/main/java/org/andromda/cartridges/ejb3/metafacades
                        EJB3AssociationEndFacadeLogicImpl.java
  Log:
  moved ENTITY_DEFAULT_ASSOCIATION_OPTIONAL, ENTITY_DEFAULT_COMPOSITE_CASCADE, ENTITY_DEFAULT_AGGREGATION_CASCADE from EJB3Global
  
  Revision  Changes    Path
  1.3       +19 -4     cartridges/andromda-ejb3/src/main/java/org/andromda/cartridges/ejb3/metafacades/EJB3AssociationEndFacadeLogicImpl.java
  
  Index: EJB3AssociationEndFacadeLogicImpl.java
  ===================================================================
  RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/main/java/org/andromda/cartridges/ejb3/metafacades/EJB3AssociationEndFacadeLogicImpl.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -w -r1.2 -r1.3
  --- EJB3AssociationEndFacadeLogicImpl.java	3 Jan 2006 01:34:57 -0000	1.2
  +++ EJB3AssociationEndFacadeLogicImpl.java	25 Jan 2006 02:57:29 -0000	1.3
  @@ -24,6 +24,21 @@
   {
   
       /**
  +     * The property that stores the default entity association optional attribute for Many-to-One and One-to-One
  +     */
  +    public static final String ENTITY_DEFAULT_ASSOCIATION_OPTIONAL = "entityDefaultAssociationOptional";
  +    
  +    /**
  +     * The default composite association cascade property
  +     */
  +    public static final String ENTITY_DEFAULT_COMPOSITE_CASCADE = "entityCompositeCascade";
  +    
  +    /**
  +     * The default aggregation association cascade property
  +     */
  +    public static final String ENTITY_DEFAULT_AGGREGATION_CASCADE = "entityAggergationCascade";
  +    
  +    /**
        * Represents the EJB3 <code>ALL</code> cascade option and fully qualified representation.
        */
       private static final String ENTITY_CASCADE_ALL = "ALL";
  @@ -184,7 +199,7 @@
           if (StringUtils.isBlank(optionalString))
           {
               optionalString = 
  -                String.valueOf(this.getConfiguredProperty(EJB3Globals.ENTITY_DEFAULT_ASSOCIATION_OPTIONAL));
  +                String.valueOf(this.getConfiguredProperty(ENTITY_DEFAULT_ASSOCIATION_OPTIONAL));
           } 
           optional = Boolean.valueOf(optionalString).booleanValue();
           return optional;
  @@ -336,7 +351,7 @@
       protected String handleGetCompositionCascadeType()
       {
           return StringUtils.trimToEmpty(
  -                ObjectUtils.toString(this.getConfiguredProperty(EJB3Globals.ENTITY_DEFAULT_COMPOSITE_CASCADE)));
  +                ObjectUtils.toString(this.getConfiguredProperty(ENTITY_DEFAULT_COMPOSITE_CASCADE)));
       }
   
       /**
  @@ -345,7 +360,7 @@
       protected String handleGetAggregationCascadeType()
       {
           return StringUtils.trimToEmpty(
  -                ObjectUtils.toString(this.getConfiguredProperty(EJB3Globals.ENTITY_DEFAULT_AGGREGATION_CASCADE)));
  +                ObjectUtils.toString(this.getConfiguredProperty(ENTITY_DEFAULT_AGGREGATION_CASCADE)));
       }
   
   }
  \ No newline at end of file