[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/18 01:19:11

  Modified:    andromda-ejb3/src/main/java/org/andromda/cartridges/ejb3/metafacades
                        EJB3EntityAttributeFacadeLogicImpl.java
  Log:
  fixed getGeneratorType to default to NONE for Date, Time and String types, renamed isSequenceGeneratorType to isGeneratorTypeSequence, renamed isTableGeneratorType to isGeneratorTypeTable
  
  Revision  Changes    Path
  1.4       +42 -35    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.3
  retrieving revision 1.4
  diff -u -w -r1.3 -r1.4
  --- EJB3EntityAttributeFacadeLogicImpl.java	6 Jan 2006 13:56:17 -0000	1.3
  +++ EJB3EntityAttributeFacadeLogicImpl.java	18 Jan 2006 09:19:11 -0000	1.4
  @@ -105,16 +105,55 @@
   		String genType = (String)this.findTaggedValue(EJB3Profile.TAGGEDVALUE_PERSISTENCE_GENERATOR_TYPE);
           if (StringUtils.isBlank(genType))
           {
  +            if (this.getType().isStringType() || this.getType().isDateType() || this.getType().isTimeType())
  +            {
  +                genType = EJB3Globals.GENERATOR_TYPE_NONE;
  +            }
  +            else
  +            {
               genType = String.valueOf(this.getConfiguredProperty(EJB3Globals.ENTITY_DEFAULT_GENERATOR_TYPE));
               if (StringUtils.isBlank(genType))
               {
                   genType = EJB3Globals.GENERATOR_TYPE_AUTO;
               }
           }
  +        }
           return genType;
   	}
       
       /**
  +     * @see org.andromda.cartridges.ejb3.metafacades.EJB3EntityAttributeFacadeLogic#handleIsSequenceGeneratorType()
  +     */
  +    protected boolean handleIsGeneratorTypeSequence()
  +    {
  +        boolean isSequence = false;
  +        if (StringUtils.isNotBlank(this.getGeneratorType())) 
  +        {
  +            if (this.getGeneratorType().equalsIgnoreCase(EJB3Globals.GENERATOR_TYPE_SEQUENCE))
  +            {
  +                isSequence = true;
  +            }
  +        }
  +        return isSequence;
  +    }
  +
  +    /**
  +     * @see org.andromda.cartridges.ejb3.metafacades.EJB3EntityAttributeFacadeLogic#handleIsTableGeneratorType()
  +     */
  +    protected boolean handleIsGeneratorTypeTable()
  +    {
  +        boolean isTable = false;
  +        if (StringUtils.isNotBlank(this.getGeneratorType())) 
  +        {
  +            if (this.getGeneratorType().equalsIgnoreCase(EJB3Globals.GENERATOR_TYPE_TABLE))
  +            {
  +                isTable = true;
  +            }
  +        }
  +        return isTable;
  +    }
  +    
  +    /**
        * @see org.andromda.cartridges.ejb3.metafacades.EJB3EntityAttributeFacadeLogic#handleGetGeneratorName()
        */
       protected String handleGetGeneratorName()
  @@ -146,38 +185,6 @@
       }
   
       /**
  -     * @see org.andromda.cartridges.ejb3.metafacades.EJB3EntityAttributeFacadeLogic#handleIsSequenceGeneratorType()
  -     */
  -    protected boolean handleIsSequenceGeneratorType()
  -    {
  -        boolean isSequence = false;
  -        if (StringUtils.isNotBlank(this.getGeneratorType())) 
  -        {
  -            if (this.getGeneratorType().equalsIgnoreCase(EJB3Globals.GENERATOR_TYPE_SEQUENCE))
  -            {
  -                isSequence = true;
  -            }
  -        }
  -        return isSequence;
  -    }
  -
  -    /**
  -     * @see org.andromda.cartridges.ejb3.metafacades.EJB3EntityAttributeFacadeLogic#handleIsTableGeneratorType()
  -     */
  -    protected boolean handleIsTableGeneratorType()
  -    {
  -        boolean isTable = false;
  -        if (StringUtils.isNotBlank(this.getGeneratorType())) 
  -        {
  -            if (this.getGeneratorType().equalsIgnoreCase(EJB3Globals.GENERATOR_TYPE_TABLE))
  -            {
  -                isTable = true;
  -            }
  -        }
  -        return isTable;
  -    }
  -    
  -    /**
        * @see org.andromda.cartridges.ejb3.metafacades.EJB3EntityAttributeFacadeLogic#handleGetGeneratorInitialValue()
        */
       protected int handleGetGeneratorInitialValue()