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

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

  User: vancek  
  Date: 06/01/02 17:36:31

  Modified:    andromda-ejb3/src/main/java/org/andromda/cartridges/ejb3/metafacades
                        EJB3EntityAttributeFacadeLogicImpl.java
  Log:
  renamed fetch type and generator type constants
  
  Revision  Changes    Path
  1.2       +8 -6      cartridges/andromda-ejb3/src/main/java/org/andromda/cartridges/ejb3/metafacades/EJB3EntityAttributeFacadeLogicImpl.java
  
  Index: EJB3EntityAttributeFacadeLogicImpl.java
  ===================================================================
  RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/main/java/org/andromda/cartridges/ejb3/metafacades/EJB3EntityAttributeFacadeLogicImpl.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -w -r1.1 -r1.2
  --- EJB3EntityAttributeFacadeLogicImpl.java	28 Dec 2005 00:32:55 -0000	1.1
  +++ EJB3EntityAttributeFacadeLogicImpl.java	3 Jan 2006 01:36:31 -0000	1.2
  @@ -1,5 +1,8 @@
   package org.andromda.cartridges.ejb3.metafacades;
   
  +import java.util.Collection;
  +import java.util.Iterator;
  +
   import org.andromda.cartridges.ejb3.EJB3Globals;
   import org.andromda.cartridges.ejb3.EJB3Profile;
   import org.apache.commons.lang.StringUtils;
  @@ -57,7 +60,7 @@
           boolean isEager = false;
           if (StringUtils.isNotBlank(this.getFetchType()))
           {
  -            if (this.getFetchType().equalsIgnoreCase(EJB3Profile.FETCHTYPE_EAGER))
  +            if (this.getFetchType().equalsIgnoreCase(EJB3Globals.FETCH_TYPE_EAGER))
               {
                   isEager = true;
               }
  @@ -73,7 +76,7 @@
           boolean isLazy = false;
           if (StringUtils.isNotBlank(this.getFetchType()))
           {
  -            if (this.getFetchType().equalsIgnoreCase(EJB3Profile.FETCHTYPE_LAZY)) {
  +            if (this.getFetchType().equalsIgnoreCase(EJB3Globals.FETCH_TYPE_LAZY)) {
                   isLazy = true;
               }
           }
  @@ -113,7 +116,7 @@
               genType = String.valueOf(this.getConfiguredProperty(EJB3Globals.ENTITY_DEFAULT_GENERATOR_TYPE));
               if (StringUtils.isBlank(genType))
               {
  -                genType = EJB3Profile.GENERATORTYPE_AUTO;
  +                genType = EJB3Globals.GENERATOR_TYPE_AUTO;
               }
           }
           return genType;
  @@ -158,7 +161,7 @@
           boolean isSequence = false;
           if (StringUtils.isNotBlank(this.getGeneratorType())) 
           {
  -            if (this.getGeneratorType().equalsIgnoreCase(EJB3Profile.GENERATORTYPE_SEQUENCE))
  +            if (this.getGeneratorType().equalsIgnoreCase(EJB3Globals.GENERATOR_TYPE_SEQUENCE))
               {
                   isSequence = true;
               }
  @@ -174,7 +177,7 @@
           boolean isTable = false;
           if (StringUtils.isNotBlank(this.getGeneratorType())) 
           {
  -            if (this.getGeneratorType().equalsIgnoreCase(EJB3Profile.GENERATORTYPE_TABLE))
  +            if (this.getGeneratorType().equalsIgnoreCase(EJB3Globals.GENERATOR_TYPE_TABLE))
               {
                   isTable = true;
               }
  @@ -320,5 +323,4 @@
           }
           return isTransient;
       }
  -
   }
  \ No newline at end of file