Menu
▾
▴
Re: [Andromdaplugins-cvs] CVS update: cartridges/andromda-jsf2/src/main/resources/templates/jsf2/controllers/crud Controller.java.vsl
|
From: Chad B. <cha...@gm...> - 2007-01-18 14:47:26
|
Walter,
Please add comments for any commits you do, otherwise its hard to figure
out what you're doing without looking at the entire commit.
Walter Mourao wrote:
> User: walterim
> Date: 07/01/18 02:11:10
>
> Modified: andromda-jsf2/src/main/resources/templates/jsf2/views
> renderActionFormInput.vm
> andromda-jsf2/src/main/resources/templates/jsf2/flow/crud
> ViewPopulator.java.vsl
> andromda-jsf2/src/main/resources/templates/jsf2/views/facelets/layout
> layout.xhtml.vsl
> andromda-jsf2/src/main/resources/templates/jsf2/views/facelets/crud
> view.xhtml.vsl
> andromda-jsf2/src/main/resources/templates/jsf2/forms/crud
> SearchForm.java.vsl Form.java.vsl
> andromda-jsf2/src/main/resources/templates/jsf2/configuration
> web.xml.vsl
> andromda-jsf2/src/main/resources/templates/jsf2/controllers/crud
> Controller.java.vsl
> Log:
>
>
> Revision Changes Path
> 1.3 +2 -1 cartridges/andromda-jsf2/src/main/resources/templates/jsf2/views/renderActionFormInput.vm
>
> Index: renderActionFormInput.vm
> ===================================================================
> RCS file: /cvsroot/andromdaplugins/cartridges/andromda-jsf2/src/main/resources/templates/jsf2/views/renderActionFormInput.vm,v
> retrieving revision 1.2
> retrieving revision 1.3
> diff -u -w -r1.2 -r1.3
> --- renderActionFormInput.vm 11 Dec 2006 13:44:00 -0000 1.2
> +++ renderActionFormInput.vm 18 Jan 2007 10:11:07 -0000 1.3
> @@ -32,7 +32,7 @@
> #end
> #elseif ($parameter.inputCheckbox)
> <tr:selectBooleanCheckbox id="$propertyId" value="#{${formValuePropertyName}}" label="#{messages['$parameter.messageKey']}:" required="$parameter.required" readOnly="$parameter.readOnly"/>
> -#elseif ($parameter.inputSelect || $parameter.type.enumeration)
> +#elseif ($parameter.inputSelect)
> #set ($multiSelect = $parameter.type.collectionType || $parameter.type.arrayType)
> #set ($selectBoxType = "selectOneChoice")
> #if ($multiSelect)
> @@ -74,6 +74,7 @@
> #set ($selectBoxType = "selectManyListbox")
> #end
> <tr:$selectBoxType id="$propertyId" value="#{${formValuePropertyName}}" label="#{messages['$parameter.messageKey']}:" required="$parameter.required" readOnly="$parameter.readOnly"#if ($multiSelect) size="$defaultMultiSelectSize"#else unselectedLabel=""#end>
> + <f:converter converterId="${parameter.type.fullyQualifiedName}"/>
> #foreach ($literal in $field.type.literals)
> #if ($literal.type.stringType)#set ($quote = '')#else#set ($quote = '"')#end
> #set($literalKey = $literal.name)
>
>
>
> 1.3 +1 -1 cartridges/andromda-jsf2/src/main/resources/templates/jsf2/flow/crud/ViewPopulator.java.vsl
>
> Index: ViewPopulator.java.vsl
> ===================================================================
> RCS file: /cvsroot/andromdaplugins/cartridges/andromda-jsf2/src/main/resources/templates/jsf2/flow/crud/ViewPopulator.java.vsl,v
> retrieving revision 1.2
> retrieving revision 1.3
> diff -u -w -r1.2 -r1.3
> --- ViewPopulator.java.vsl 11 Jan 2007 17:35:53 -0000 1.2
> +++ ViewPopulator.java.vsl 18 Jan 2007 10:11:07 -0000 1.3
> @@ -89,7 +89,7 @@
> facesContext,
> "$manageable.formBeanName");
> // - populate the $manageable.formBeanName with any parameters from the previous form
> - ${managedBeansPackage}.${formPopulatorName}.populateForm(form, $manageable.formBeanName);
> + ${manageable.formBeanName}.copyFrom((${manageable.formBeanType})form);
> }
> #if ($formSerialization)
> // - serialize the form
>
>
>
> 1.4 +5 -5 cartridges/andromda-jsf2/src/main/resources/templates/jsf2/views/facelets/layout/layout.xhtml.vsl
>
> Index: layout.xhtml.vsl
> ===================================================================
> RCS file: /cvsroot/andromdaplugins/cartridges/andromda-jsf2/src/main/resources/templates/jsf2/views/facelets/layout/layout.xhtml.vsl,v
> retrieving revision 1.3
> retrieving revision 1.4
> diff -u -w -r1.3 -r1.4
> --- layout.xhtml.vsl 30 Dec 2006 20:10:22 -0000 1.3
> +++ layout.xhtml.vsl 18 Jan 2007 10:11:07 -0000 1.4
> @@ -36,21 +36,21 @@
> <f:facet name="navigation1">
> <tr:navigationPane hint="tabs" level="0" var="item" value="#{menuModel.model}">
> <f:facet name="nodeStamp">
> - <tr:commandNavigationItem text="#{item.label}" action="#{item.getAction}"/>
> + <tr:commandNavigationItem text="#{messages[item.label]}" action="#{item.getAction}"/>
> </f:facet>
> </tr:navigationPane>
> </f:facet>
> <f:facet name="navigation2">
> <tr:navigationPane hint="bar" level="1" var="item" value="#{menuModel.model}">
> <f:facet name="nodeStamp">
> - <tr:commandNavigationItem text="#{item.label}" action="#{item.getAction}"/>
> + <tr:commandNavigationItem text="#{messages[item.label]}" action="#{item.getAction}"/>
> </f:facet>
> </tr:navigationPane>
> </f:facet>
> <f:facet name="navigation3">
> <tr:navigationPane hint="list" level="2" var="item" value="#{menuModel.model}">
> <f:facet name="nodeStamp">
> - <tr:commandNavigationItem text="#{item.label}" action="#{item.getAction}"/>
> + <tr:commandNavigationItem text="#{messages[item.label]}" action="#{item.getAction}"/>
> </f:facet>
> </tr:navigationPane>
> </f:facet>
> @@ -59,7 +59,7 @@
> <f:facet name="navigation3">
> <tr:navigationTree var="item" value="#{menuModel.model}">
> <f:facet name="nodeStamp">
> - <tr:commandNavigationItem text="#{item.label}" action="#{item.getAction}"/>
> + <tr:commandNavigationItem text="#{messages[item.label]}" action="#{item.getAction}"/>
> </f:facet>
> </tr:navigationTree>
> </f:facet>
> @@ -77,7 +77,7 @@
> <f:facet name="location">
> <tr:breadCrumbs var="item" value="#{menuModel.model}">
> <f:facet name="nodeStamp">
> - <tr:commandNavigationItem text="#{item.label}" action="#{item.getAction}"/>
> + <tr:commandNavigationItem text="#{messages[item.label]}" action="#{item.getAction}"/>
> </f:facet>
> </tr:breadCrumbs>
> </f:facet>
>
>
>
> 1.4 +1 -0 cartridges/andromda-jsf2/src/main/resources/templates/jsf2/views/facelets/crud/view.xhtml.vsl
>
> Index: view.xhtml.vsl
> ===================================================================
> RCS file: /cvsroot/andromdaplugins/cartridges/andromda-jsf2/src/main/resources/templates/jsf2/views/facelets/crud/view.xhtml.vsl,v
> retrieving revision 1.3
> retrieving revision 1.4
> diff -u -w -r1.3 -r1.4
> --- view.xhtml.vsl 11 Jan 2007 17:35:53 -0000 1.3
> +++ view.xhtml.vsl 18 Jan 2007 10:11:08 -0000 1.4
> @@ -52,6 +52,7 @@
> #set ($selectBoxType = "selectManyListbox")
> #end
> <tr:$selectBoxType id="$propertyId" value="#{${formValuePropertyName}}" label="#{messages['$parameter.messageKey']}:" required="false" readOnly="false"#if ($multiSelect) size="$defaultMultiSelectSize"#else unselectedLabel=""#end>
> + <f:converter converterId="${field.type.fullyQualifiedName}"/>
> #foreach ($literal in $field.type.literals)
> #if ($literal.type.stringType)#set ($quote = '')#else#set ($quote = '"')#end
> #set($literalKey = $literal.name)
>
>
>
> 1.2 +22 -26 cartridges/andromda-jsf2/src/main/resources/templates/jsf2/forms/crud/SearchForm.java.vsl
>
> Index: SearchForm.java.vsl
> ===================================================================
> RCS file: /cvsroot/andromdaplugins/cartridges/andromda-jsf2/src/main/resources/templates/jsf2/forms/crud/SearchForm.java.vsl,v
> retrieving revision 1.1
> retrieving revision 1.2
> diff -u -w -r1.1 -r1.2
> --- SearchForm.java.vsl 11 Dec 2006 13:44:00 -0000 1.1
> +++ SearchForm.java.vsl 18 Jan 2007 10:11:08 -0000 1.2
> @@ -23,19 +23,6 @@
> implements java.io.Serializable
> {
>
> - public ${manageable.searchFormBeanClassName}(${manageable.formBeanClassName} parent){
> -#foreach ($field in $manageable.manageableSearchAttributes)
> -#if ($field.type.dateType)
> - java.text.DateFormat ${field.dateFormatter} = new java.text.SimpleDateFormat("$field.format");
> -#set ($lenient = !$field.strictDateFormat)
> - ${field.dateFormatter}.setLenient($lenient);
> - parent.getDateTimeFormatters().put("search.${field.name}", ${field.dateFormatter});
> -#elseif ($field.type.timeType)
> - parent.getDateTimeFormatters().put("search.${field.name}", new java.text.SimpleDateFormat("$field.format"));
> -#end
> -#end
> - }
> -
> #foreach ($field in $manageable.manageableSearchAttributes)
> #if ($field.type.collectionType)
> #set ($fieldTypeName = "java.util.List")
> @@ -92,23 +79,32 @@
> this.$member.name = $member.name;
> }
>
> -#end
> - /**
> - * Stores any date or time formatters for this form.
> - */
> - private final java.util.Map dateTimeFormatters = new java.util.HashMap();
> + private java.util.Collection $member.backingListName;
>
> - /**
> - * Gets any date and time formatters (keyed by property name)
> - * for this form.
> - *
> - * @return the Map containing any date and time formatters.
> - */
> - public java.util.Map getDateTimeFormatters()
> +#set ($backingListMethod = $stringUtils.capitalize($member.backingListName))
> + public java.util.Collection get${backingListMethod}(){
> + return ${member.backingListName};
> + }
> +
> + public void set${backingListMethod}(java.util.Collection ${member.backingListName}){
> + this.${member.backingListName} = ${member.backingListName};
> + }
> +
> + private ${member.type.searchFormBeanType} ${member.name}SearchForm = null;##não pode inicializar direto senão dá loop
> +
> + $member.visibility ${member.type.searchFormBeanType} ${member.getterName}SearchForm()
> {
> - return this.dateTimeFormatters;
> + if(this.${member.name}SearchForm == null)
> + this.${member.name}SearchForm = new ${member.type.searchFormBeanType}();
> + return this.${member.name}SearchForm;
> }
>
> + $member.visibility void ${member.setterName}SearchForm(${member.type.searchFormBeanType} ${member.name}SearchForm)
> + {
> + this.${member.name}SearchForm = ${member.name}SearchForm;
> + }
> +#end
> +
> /**
> * The serial version UID of this class. Needed for serialization.
> */
>
>
>
> 1.2 +60 -3 cartridges/andromda-jsf2/src/main/resources/templates/jsf2/forms/crud/Form.java.vsl
>
> Index: Form.java.vsl
> ===================================================================
> RCS file: /cvsroot/andromdaplugins/cartridges/andromda-jsf2/src/main/resources/templates/jsf2/forms/crud/Form.java.vsl,v
> retrieving revision 1.1
> retrieving revision 1.2
> diff -u -w -r1.1 -r1.2
> --- Form.java.vsl 11 Dec 2006 13:44:00 -0000 1.1
> +++ Form.java.vsl 18 Jan 2007 10:11:08 -0000 1.2
> @@ -30,16 +30,18 @@
> #set ($lenient = !$field.strictDateFormat)
> ${field.dateFormatter}.setLenient($lenient);
> this.dateTimeFormatters.put("${field.name}", ${field.dateFormatter});
> + this.dateTimeFormatters.put("searchForm.${field.name}", ${field.dateFormatter});
> #elseif ($field.type.timeType)
> this.dateTimeFormatters.put("${field.name}", new java.text.SimpleDateFormat("$field.format"));
> + this.dateTimeFormatters.put("searchForm.${field.name}", new java.text.SimpleDateFormat("$field.format"));
> #end
> #end
> // - setup the default java.util.Date.toString() formatter
> - java.text.DateFormat dateFormatter = new java.text.SimpleDateFormat("EEE MMM dd hh:mm:ss zzz yyyy");
> + java.text.DateFormat dateFormatter = new java.text.SimpleDateFormat("dd/MM/yyyy hh:mm:ss");
> dateFormatter.setLenient(true);
> this.dateTimeFormatters.put(null, dateFormatter);
>
> - searchForm = new ${manageable.searchFormBeanClassName}(this);
> + searchForm = new ${manageable.searchFormBeanClassName}();
>
> editState=false;
> }
> @@ -60,7 +62,7 @@
> return searchForm;
> }
>
> - public void setSearch(${manageable.searchFormBeanClassName} searchForm){
> + public void setSearchForm(${manageable.searchFormBeanClassName} searchForm){
> this.searchForm = searchForm;
> }
>
> @@ -196,7 +198,19 @@
> this.${member.backingListName} = ${member.backingListName};
> }
>
> + private ${member.type.searchFormBeanType} ${member.name}SearchForm = null;##não pode inicializar direto senão dá loop
>
> + $member.visibility ${member.type.searchFormBeanType} ${member.getterName}SearchForm()
> + {
> + if(this.${member.name}SearchForm == null)
> + this.${member.name}SearchForm = new ${member.type.searchFormBeanType}();
> + return this.${member.name}SearchForm;
> + }
> +
> + $member.visibility void ${member.setterName}SearchForm(${member.type.searchFormBeanType} ${member.name}SearchForm)
> + {
> + this.${member.name}SearchForm = ${member.name}SearchForm;
> + }
> #end
> /**
> * Stores any date or time formatters for this form.
> @@ -255,6 +269,49 @@
> }
>
> /**
> + * Gets the current {@link javax.faces.application.FacesMessage} message
> + * instances stored within this form, as Map.
> + *
> + * @return the current Faces messages.
> + */
> + public java.util.Map get${stringUtils.capitalize($formMessagesProperty)}Map()
> + {
> + return this.${formMessagesProperty};
> + }
> +
> + /**
> + * Sets the current {@link javax.faces.application.FacesMessage} message
> + * instances stored within this form, as Map.
> + *
> + * @return the current Faces messages.
> + */
> + public void set${stringUtils.capitalize($formMessagesProperty)}Map(java.util.Map ${formMessagesProperty})
> + {
> + this.${formMessagesProperty} = ${formMessagesProperty};
> + }
> +
> +
> + public void copyFrom($manageable.formBeanClassName otherForm){
> +#foreach ($field in $manageable.manageableAttributes)
> + this.${field.setterName}(otherForm.${field.getterName}());
> +#set ($backingListMethod = $stringUtils.capitalize($field.backingListName))
> + this.set${backingListMethod}(otherForm.get${backingListMethod}());
> +#end
> +#foreach ($member in $manageable.manageableAssociationEnds)
> + this.${member.setterName}(otherForm.${member.getterName}());
> +#set ($backingListMethod = $stringUtils.capitalize($member.backingListName))
> + this.set${backingListMethod}(otherForm.get${backingListMethod}());
> +#end
> +
> + this.set${stringUtils.capitalize($formMessagesProperty)}Map(get${stringUtils.capitalize($formMessagesProperty)}Map());
> +
> + this.setEditState(otherForm.getEditState());
> + this.setSearchForm(otherForm.getSearchForm());
> + this.${manageable.listSetterName}(otherForm.${manageable.listGetterName}());
> + this.setSelectedRows(otherForm.getSelectedRows());
> + }
> +
> + /**
> * The serial version UID of this class. Needed for serialization.
> */
> private static final long serialVersionUID = ${manageable.formSerialVersionUID}L;
>
>
>
> 1.5 +4 -0 cartridges/andromda-jsf2/src/main/resources/templates/jsf2/configuration/web.xml.vsl
>
> Index: web.xml.vsl
> ===================================================================
> RCS file: /cvsroot/andromdaplugins/cartridges/andromda-jsf2/src/main/resources/templates/jsf2/configuration/web.xml.vsl,v
> retrieving revision 1.4
> retrieving revision 1.5
> diff -u -w -r1.4 -r1.5
> --- web.xml.vsl 11 Jan 2007 17:35:19 -0000 1.4
> +++ web.xml.vsl 18 Jan 2007 10:11:09 -0000 1.5
> @@ -28,6 +28,10 @@
> <param-name>facelets.VIEW_MAPPINGS</param-name>
> <param-value>*.xhtml</param-value>
> </context-param>
> + <context-param>
> + <param-name>facelets.DEVELOPMENT</param-name>
> + <param-value>true</param-value>
> + </context-param>
>
> <context-param>
> <param-name>facelets.LIBRARIES</param-name>
>
>
>
> 1.3 +9 -7 cartridges/andromda-jsf2/src/main/resources/templates/jsf2/controllers/crud/Controller.java.vsl
>
> Index: Controller.java.vsl
> ===================================================================
> RCS file: /cvsroot/andromdaplugins/cartridges/andromda-jsf2/src/main/resources/templates/jsf2/controllers/crud/Controller.java.vsl,v
> retrieving revision 1.2
> retrieving revision 1.3
> diff -u -w -r1.2 -r1.3
> --- Controller.java.vsl 11 Jan 2007 17:35:53 -0000 1.2
> +++ Controller.java.vsl 18 Jan 2007 10:11:10 -0000 1.3
> @@ -52,14 +52,14 @@
> ## saveMaxResultsWarning();
> ##
> ###end
> -###if (!$manageable.manageableAssociationEnds.empty)
> -## final java.util.Map backingLists = ${manageable.manageableServiceAccessorCall}.readBackingLists();
> -###foreach ($member in $manageable.manageableAssociationEnds)
> -## form.${member.setterName}BackingList((java.util.Collection)backingLists.get("${member.name}"));
> -###end
> -##
> -###end
> ###end
> +#if (!$manageable.manageableAssociationEnds.empty)
> + final java.util.Map backingLists = ${manageable.manageableServiceAccessorCall}.readBackingLists();
> +#foreach ($member in $manageable.manageableAssociationEnds)
> + form.${member.setterName}BackingList((java.util.Collection)backingLists.get("${member.name}"));
> +#end
> +
> +#end
> form.setEditState(false);
> }
>
> @@ -267,6 +267,8 @@
>
> if(form.${manageable.listGetterName}() != null) //only searches again if there was an old search
> doSearch(form); //search again to show the updated item (if it fits the search criteria)
> +
> + form.setEditState(false);
> }
> #end
> public String search(){
>
>
>
>
>
> ------------------------------------------------------------------------
>
> -------------------------------------------------------------------------
> Take Surveys. Earn Cash. Influence the Future of IT
> Join SourceForge.net's Techsay panel and you'll get the chance to share your
> opinions on IT & business topics through brief surveys - and earn cash
> http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
> ------------------------------------------------------------------------
>
> _______________________________________________
> Andromdaplugins-cvs mailing list
> And...@li...
> https://lists.sourceforge.net/lists/listinfo/andromdaplugins-cvs
>
|
