andromdaplugins-cvs

[Andromdaplugins-cvs] CVS update: cartridges/andromda-jsf2/src/main/resources/templates/jsf2/preferences/portlet Preferences.java.vsl

[Chad B. <cwb...@us...>]

  User: cwbrandon
  Date: 08/03/28 16:11:37

  Modified:    andromda-jsf2/src/main/resources/templates/jsf2/preferences/portlet
                        Preferences.java.vsl
  Log:
  handle null when getting values from prefs
  
  Revision  Changes    Path
  1.4       +2 -2      cartridges/andromda-jsf2/src/main/resources/templates/jsf2/preferences/portlet/Preferences.java.vsl
  
  Index: Preferences.java.vsl
  ===================================================================
  RCS file: /cvsroot/andromdaplugins/cartridges/andromda-jsf2/src/main/resources/templates/jsf2/preferences/portlet/Preferences.java.vsl,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -w -r1.3 -r1.4
  --- Preferences.java.vsl	28 Mar 2008 20:46:35 -0000	1.3
  +++ Preferences.java.vsl	28 Mar 2008 23:11:37 -0000	1.4
  @@ -47,9 +47,9 @@
       {
           final java.lang.String value = this.getPreferences().getValue("$attribute.name", null);
   #if (!$attribute.type.stringType)
  -        final $attribute.type.wrapperName wrappedValue = ${attribute.type.wrapperName}.valueOf(value);
  +        final $attribute.type.wrapperName wrappedValue = value != null ? ${attribute.type.wrapperName}.valueOf(value) : null;
   #* *##if ($attribute.type.primitive)
  -        return wrappedValue.${attribute.getterSetterTypeName}Value();
  +        return wrappedValue != null ? wrappedValue.${attribute.getterSetterTypeName}Value() : $attribute.type.javaNullString;
   #* *##else
           return wrappedValue;
   #* *##end
  
  
  

[Andromdaplugins-cvs] CVS update: cartridges/andromda-jsf2/src/main/resources/templates/jsf2/preferences/portlet Preferences.java.vsl

[Chad B. <cwb...@us...>]

  User: cwbrandon
  Date: 08/04/08 17:47:32

  Modified:    andromda-jsf2/src/main/resources/templates/jsf2/preferences/portlet
                        Preferences.java.vsl
  Log:
  generate default value in portlet prefs
  
  Revision  Changes    Path
  1.5       +2 -2      cartridges/andromda-jsf2/src/main/resources/templates/jsf2/preferences/portlet/Preferences.java.vsl
  
  Index: Preferences.java.vsl
  ===================================================================
  RCS file: /cvsroot/andromdaplugins/cartridges/andromda-jsf2/src/main/resources/templates/jsf2/preferences/portlet/Preferences.java.vsl,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -w -r1.4 -r1.5
  --- Preferences.java.vsl	28 Mar 2008 23:11:37 -0000	1.4
  +++ Preferences.java.vsl	9 Apr 2008 00:47:32 -0000	1.5
  @@ -47,9 +47,9 @@
       {
           final java.lang.String value = this.getPreferences().getValue("$attribute.name", null);
   #if (!$attribute.type.stringType)
  -        final $attribute.type.wrapperName wrappedValue = value != null ? ${attribute.type.wrapperName}.valueOf(value) : null;
  +        final $attribute.type.wrapperName wrappedValue = value != null ? ${attribute.type.wrapperName}.valueOf(value) :#if ($attribute.defaultValue) ${attribute.defaultValue}#else null#end;
   #* *##if ($attribute.type.primitive)
  -        return wrappedValue != null ? wrappedValue.${attribute.getterSetterTypeName}Value() : $attribute.type.javaNullString;
  +        return wrappedValue != null ? wrappedValue.${attribute.getterSetterTypeName}Value() : #if ($attribute.defaultValue)${attribute.defaultValue}#else${attribute.type.javaNullString}#end;
   #* *##else
           return wrappedValue;
   #* *##end
  
  
  

[Andromdaplugins-cvs] CVS update: cartridges/andromda-jsf2/src/main/resources/templates/jsf2/preferences/portlet Preferences.java.vsl

[Chad B. <cwb...@us...>]

  User: cwbrandon
  Date: 08/04/08 18:12:34

  Modified:    andromda-jsf2/src/main/resources/templates/jsf2/preferences/portlet
                        Preferences.java.vsl
  Log:
  minor improvement
  
  Revision  Changes    Path
  1.6       +2 -2      cartridges/andromda-jsf2/src/main/resources/templates/jsf2/preferences/portlet/Preferences.java.vsl
  
  Index: Preferences.java.vsl
  ===================================================================
  RCS file: /cvsroot/andromdaplugins/cartridges/andromda-jsf2/src/main/resources/templates/jsf2/preferences/portlet/Preferences.java.vsl,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -w -r1.5 -r1.6
  --- Preferences.java.vsl	9 Apr 2008 00:47:32 -0000	1.5
  +++ Preferences.java.vsl	9 Apr 2008 01:12:34 -0000	1.6
  @@ -47,11 +47,11 @@
       {
           final java.lang.String value = this.getPreferences().getValue("$attribute.name", null);
   #if (!$attribute.type.stringType)
  -        final $attribute.type.wrapperName wrappedValue = value != null ? ${attribute.type.wrapperName}.valueOf(value) :#if ($attribute.defaultValue) ${attribute.defaultValue}#else null#end;
  +        final $attribute.type.wrapperName wrappedValue = value != null ? ${attribute.type.wrapperName}.valueOf(value) : null;
   #* *##if ($attribute.type.primitive)
           return wrappedValue != null ? wrappedValue.${attribute.getterSetterTypeName}Value() : #if ($attribute.defaultValue)${attribute.defaultValue}#else${attribute.type.javaNullString}#end;
   #* *##else
  -        return wrappedValue;
  +        return wrappedValue == null ?#if ($attribute.defaultValue) ${attribute.defaultValue}#else null#end : null;
   #* *##end
   #else
           return value;