From: Chad B. <cwb...@us...> - 2008-04-09 00:47:25
|
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 |