[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/31 07:25:10

  Modified:    andromda-ejb3/src/main/java/org/andromda/cartridges/ejb3/metafacades
                        EJB3EntityAttributeFacadeLogicImpl.java
  Log:
  overriden getDefaultValue to put double quotes around string values
  
  Revision  Changes    Path
  1.8       +33 -8     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.7
  retrieving revision 1.8
  diff -u -w -r1.7 -r1.8
  --- EJB3EntityAttributeFacadeLogicImpl.java	28 Jan 2006 02:59:46 -0000	1.7
  +++ EJB3EntityAttributeFacadeLogicImpl.java	31 Jan 2006 15:25:10 -0000	1.8
  @@ -6,6 +6,7 @@
   import org.andromda.cartridges.ejb3.EJB3Globals;
   import org.andromda.cartridges.ejb3.EJB3Profile;
   import org.andromda.metafacades.uml.AttributeFacade;
  +import org.andromda.metafacades.uml.ClassifierFacade;
   import org.apache.commons.lang.StringUtils;
   import org.apache.commons.lang.math.NumberUtils;
   
  @@ -57,14 +58,6 @@
   	}
   
       /**
  -     * @see org.andromda.cartridges.ejb3.metafacades.EJB3EntityAttributeFacade#getFetchType()
  -     */
  -	protected String handleGetFetchType() 
  -	{
  -		return (String)this.findTaggedValue(EJB3Profile.TAGGEDVALUE_PERSISTENCE_FETCH_TYPE);
  -	}
  -
  -    /**
        * Overridden to provide handling of inheritance.
        *
        * @see org.andromda.metafacades.uml.AttributeFacade#isRequired()
  @@ -84,6 +77,38 @@
       }
   
       /**
  +     * Override to provide java specific handling of the default value.
  +     *
  +     * @see org.andromda.metafacades.uml.AttributeFacade#getDefaultValue()
  +     */
  +    public String getDefaultValue()
  +    {
  +        String defaultValue = super.getDefaultValue();
  +        final ClassifierFacade type = this.getType();
  +        if (type != null)
  +        {
  +            final String fullyQualifiedName = StringUtils.trimToEmpty(type.getFullyQualifiedName());
  +            if (type.isStringType())
  +            {
  +                defaultValue = "\"" + defaultValue + "\"";
  +            }
  +            else if (fullyQualifiedName.startsWith("java.lang"))
  +            {
  +                defaultValue = fullyQualifiedName + ".valueOf(" + defaultValue + ")";
  +            }
  +        }
  +        return defaultValue;
  +    }
  +    
  +    /**
  +     * @see org.andromda.cartridges.ejb3.metafacades.EJB3EntityAttributeFacade#getFetchType()
  +     */
  +	protected String handleGetFetchType() 
  +	{
  +		return (String)this.findTaggedValue(EJB3Profile.TAGGEDVALUE_PERSISTENCE_FETCH_TYPE);
  +	}
  +
  +    /**
        * @see org.andromda.cartridges.ejb3.metafacades.EJB3EntityAttributeFacadeLogic#handleIsEager()
        */
       protected boolean handleIsEager()