From: Wouter Z. <dra...@us...> - 2003-09-21 16:16:28
|
User: draftdog Date: 03/09/21 09:15:48 Modified: andromda-bpm4struts/src/templates StrutsJSP.vsl Log: updated to reflect changes in the script helper, added VTL comments Revision Changes Path 1.2 +14 -8 cartridges/andromda-bpm4struts/src/templates/StrutsJSP.vsl Index: StrutsJSP.vsl =================================================================== RCS file: /cvsroot/andromda/cartridges/andromda-bpm4struts/src/templates/StrutsJSP.vsl,v retrieving revision 1.1 retrieving revision 1.2 diff -u -w -r1.1 -r1.2 --- StrutsJSP.vsl 10 Sep 2003 20:36:20 -0000 1.1 +++ StrutsJSP.vsl 21 Sep 2003 16:15:48 -0000 1.2 @@ -1,8 +1,11 @@ <%@ taglib uri="struts-bean.tld" prefix="bean" %> <%@ taglib uri="struts-html.tld" prefix="html" %> +## +## This macro will render documentation +## #macro ( generateJSPDocumentation $item $indent ) -#set ($tagValue = $transform.findTagValue( $transform.getTaggedValues($item), "documentation")) +#set ($tagValue = $transform.staticHelper.findTagValue( $item, "documentation")) #set ($paras = $transform.formatHTMLStringAsParagraphs($tagValue)) ${indent}[ ${indent}[ documentation: @@ -19,8 +22,11 @@ #end ${indent}[ #end -#set ($activityGraph = $transform.getStateMachine($class)) -#set ($useCase = $transform.getParentUseCase($activityGraph)) +## +## Set global invariants +## +#set ($activityGraph = $transform.dynamicHelper.getStateMachineContext($class)) +#set ($useCase = $transform.getUseCaseContext($activityGraph)) #set ($controllerForm = $transform.getControllerForm($useCase)) #set ($controllerClass = $transform.getControllerClass($useCase)) #set ($formName = $transform.toJavaMethodName($controllerForm)) @@ -30,11 +36,11 @@ #set ($transitions = $class.outgoing) #if ($transform.isFinalState($class)) -#set ($targetUseCaseName = $transform.findTagValue($class, "TargetUseCase")) +#set ($targetUseCaseName = $transform.staticHelper.findTagValue($class, "TargetUseCase")) #if ($targetUseCaseName) #set ($targetUseCase = $transform.findUseCaseByName($targetUseCaseName)) #if ($targetUseCase) -#set ($initialState = $transform.getInitialStates($transform.getActivityGraphs($targetUseCase).iterator().next()).iterator().next()) +#set ($initialState = $transform.getInitialState($transform.getActivityGraph($targetUseCase))) <html:forward name="$transform.toForwardName($initialState)"/> #else <!-- @@ -58,17 +64,17 @@ <html:submit value="submit"/> #else #foreach ($transition in $transitions) - <html:submit property="transition" value="$transform.toFinalMemberName($transition)"/> + <html:submit property="trigger" value="$transform.toFinalMemberName($transition.trigger)"/> #end #end </html:form> #else #if ($transitions.size() == 1) -<html:link action="/$actionName?target=$methodName">$transform.toForwardName($transition)</html:link> +<html:link action="/$actionName?target=$methodName">$transform.toForwardName($transition.trigger)</html:link> #else <ul> #foreach ($transition in $transitions) - <li><html:link action="/$actionName?target=$methodName" paramId="transition" paramName="$transform.toFinalMemberName($transition)">$transform.toForwardName($transition)</html:link></li> + <li><html:link action="/$actionName?target=$methodName" paramId="trigger" paramName="$transform.toFinalMemberName($transition.trigger)">$transform.toForwardName($transition.trigger)</html:link></li> #end </ul> #end |
From: Wouter Z. <dra...@us...> - 2003-09-28 01:41:06
|
User: draftdog Date: 03/09/27 18:40:54 Modified: andromda-bpm4struts/src/templates StrutsJSP.vsl Log: simplified VTL code a lot, moved logic into script helper classes. a JSP page now corresponds to an action state, and has a button for each triggered transition (or an anonymous one if there are none) Revision Changes Path 1.3 +13 -47 cartridges/andromda-bpm4struts/src/templates/StrutsJSP.vsl Index: StrutsJSP.vsl =================================================================== RCS file: /cvsroot/andromda/cartridges/andromda-bpm4struts/src/templates/StrutsJSP.vsl,v retrieving revision 1.2 retrieving revision 1.3 diff -u -w -r1.2 -r1.3 --- StrutsJSP.vsl 21 Sep 2003 16:15:48 -0000 1.2 +++ StrutsJSP.vsl 28 Sep 2003 01:40:54 -0000 1.3 @@ -25,58 +25,24 @@ ## ## Set global invariants ## -#set ($activityGraph = $transform.dynamicHelper.getStateMachineContext($class)) -#set ($useCase = $transform.getUseCaseContext($activityGraph)) +#set ($stateMachine = $transform.dynamicHelper.getStateMachineContext($class)) +#set ($useCase = $transform.getUseCaseContext($stateMachine)) #set ($controllerForm = $transform.getControllerForm($useCase)) #set ($controllerClass = $transform.getControllerClass($useCase)) -#set ($formName = $transform.toJavaMethodName($controllerForm)) -#set ($fullyQualifiedFormName = $transform.toFullyQualifiedJavaClassName($controllerForm)) #set ($actionName = $transform.toJavaClassName($controllerClass)) #set ($methodName = $transform.toJavaMethodName($class)) -#set ($transitions = $class.outgoing) - -#if ($transform.isFinalState($class)) -#set ($targetUseCaseName = $transform.staticHelper.findTagValue($class, "TargetUseCase")) -#if ($targetUseCaseName) -#set ($targetUseCase = $transform.findUseCaseByName($targetUseCaseName)) -#if ($targetUseCase) -#set ($initialState = $transform.getInitialState($transform.getActivityGraph($targetUseCase))) -<html:forward name="$transform.toForwardName($initialState)"/> -#else -<!-- - A target use case was specified: $targetUseCaseName, but it was not found in the UML model ! - Please check the tagged value "TargetUseCase" on the FinalState with name $class.name, - you can find this FinalState in the activity graph $activityGraph.name - (in turn found in the use case: "${transform.getPackageName($useCase)}.${useCase.name}") ---> -#end -#else -<!-- - This is a final state, the end of a use case. You should redirect or forward to another page here. - You can do this by adding a tagged value to this final state in the UML model, the key is "TargetUseCase" while - the value must be a fully qualified name of a use case, such as: "${transform.getPackageName($useCase)}.${useCase.name}" ---> -#end -#else -#if ($controllerForm) +#set ($formName = $transform.toJavaMethodName($controllerForm)) +#set ($fullyQualifiedFormName = $transform.toFullyQualifiedJavaClassName($controllerForm)) +#set ($triggeredTransitions = $transform.dynamicHelper.getNextTriggeredTransitions($class)) +## +## Start JSP body +## <html:form action="/$actionName?target=$methodName"> -#if ($transitions.size() == 1) - <html:submit value="submit"/> -#else -#foreach ($transition in $transitions) +#if ($triggeredTransitions.size() > 0) +#foreach ($transition in $triggeredTransitions) <html:submit property="trigger" value="$transform.toFinalMemberName($transition.trigger)"/> #end -#end -</html:form> #else -#if ($transitions.size() == 1) -<html:link action="/$actionName?target=$methodName">$transform.toForwardName($transition.trigger)</html:link> -#else -<ul> -#foreach ($transition in $transitions) - <li><html:link action="/$actionName?target=$methodName" paramId="trigger" paramName="$transform.toFinalMemberName($transition.trigger)">$transform.toForwardName($transition.trigger)</html:link></li> -#end -</ul> -#end -#end + <html:submit value="submit"/> #end +</html:form> |
From: Wouter Z. <dra...@us...> - 2003-10-14 22:32:15
|
User: draftdog Date: 03/10/14 15:32:12 Modified: andromda-bpm4struts/src/templates StrutsJSP.vsl Log: template now has additional comments to help the user, more verbose generated output Revision Changes Path 1.4 +41 -4 cartridges/andromda-bpm4struts/src/templates/StrutsJSP.vsl Index: StrutsJSP.vsl =================================================================== RCS file: /cvsroot/andromda/cartridges/andromda-bpm4struts/src/templates/StrutsJSP.vsl,v retrieving revision 1.3 retrieving revision 1.4 diff -u -w -r1.3 -r1.4 --- StrutsJSP.vsl 28 Sep 2003 01:40:54 -0000 1.3 +++ StrutsJSP.vsl 14 Oct 2003 22:32:12 -0000 1.4 @@ -37,6 +37,40 @@ ## ## Start JSP body ## + + +<!-- + Use this piece of code if you want to have only hyperlinks + +#if ($triggeredTransitions.size() > 0) +#foreach ($transition in $triggeredTransitions) + <html:link action="/$actionName?target=$methodName" paramId="trigger" paramName="$transform.toFinalMemberName($transition.trigger)"/> +#end +#else + <html:link action="/$actionName?target=$methodName"/> +#end + +--> + +#if ($controllerForm) +<!-- + Use this piece of code when you want additional information passed into the form + (you will need to manually add input fields. + + Valid input field examples are: +#foreach ($attribute in $transform.staticHelper.getAttributes($controllerForm)) +#set ($attributeName = $attribute.name) +#set ($typeName = $attribute.type.name) +#if ($attributeName == "trigger")## do nothing +#elseif ($typeName == "String") + <html:text property="$attributeName"/> +#elseif ($typeName == "boolean") + <html:checkbox property="$attributeName"/> +#elseif ($typeName.endsWith("[]") || $typeName == "Collection") + <html:select property="$attributeName"/> +#end +#end + <html:form action="/$actionName?target=$methodName"> #if ($triggeredTransitions.size() > 0) #foreach ($transition in $triggeredTransitions) @@ -46,3 +80,6 @@ <html:submit value="submit"/> #end </html:form> + +--> +#end \ No newline at end of file |
From: Wouter Z. <dra...@us...> - 2003-10-24 23:02:26
|
User: draftdog Date: 03/10/24 15:59:43 Modified: andromda-bpm4struts/src/templates StrutsJSP.vsl Log: improved re-usability of generated struts tags, added content in hyperlinks so there will be something to click on (however, the file must still be manually updated before deployment - this VTL tries to be generic) Revision Changes Path 1.5 +5 -4 cartridges/andromda-bpm4struts/src/templates/StrutsJSP.vsl Index: StrutsJSP.vsl =================================================================== RCS file: /cvsroot/andromda/cartridges/andromda-bpm4struts/src/templates/StrutsJSP.vsl,v retrieving revision 1.4 retrieving revision 1.5 diff -u -w -r1.4 -r1.5 --- StrutsJSP.vsl 14 Oct 2003 22:32:12 -0000 1.4 +++ StrutsJSP.vsl 24 Oct 2003 22:59:43 -0000 1.5 @@ -33,7 +33,7 @@ #set ($methodName = $transform.toJavaMethodName($class)) #set ($formName = $transform.toJavaMethodName($controllerForm)) #set ($fullyQualifiedFormName = $transform.toFullyQualifiedJavaClassName($controllerForm)) -#set ($triggeredTransitions = $transform.dynamicHelper.getNextTriggeredTransitions($class)) +#set ($triggeredTransitions = $transform.getNextTriggeredTransitions($class)) ## ## Start JSP body ## @@ -44,10 +44,11 @@ #if ($triggeredTransitions.size() > 0) #foreach ($transition in $triggeredTransitions) - <html:link action="/$actionName?target=$methodName" paramId="trigger" paramName="$transform.toFinalMemberName($transition.trigger)"/> +#set ($triggerName = $transform.toFinalMemberName($transition.trigger)) + <html:link action="/$actionName?target=$methodName&trigger=$triggerName">$triggerName</html:link> #end #else - <html:link action="/$actionName?target=$methodName"/> + <html:link action="/$actionName?target=$methodName">$transition.target.name</html:link> #end --> @@ -55,7 +56,7 @@ #if ($controllerForm) <!-- Use this piece of code when you want additional information passed into the form - (you will need to manually add input fields. + (you will need to manually add input fields) Valid input field examples are: #foreach ($attribute in $transform.staticHelper.getAttributes($controllerForm)) |
From: Wouter Z. <dra...@us...> - 2003-12-26 13:42:58
|
User: draftdog Date: 03/12/26 05:42:54 Modified: andromda-bpm4struts/src/templates StrutsJSP.vsl Log: minor improvements in names being displayed on screen Revision Changes Path 1.6 +3 -3 cartridges/andromda-bpm4struts/src/templates/StrutsJSP.vsl Index: StrutsJSP.vsl =================================================================== RCS file: /cvsroot/andromda/cartridges/andromda-bpm4struts/src/templates/StrutsJSP.vsl,v retrieving revision 1.5 retrieving revision 1.6 diff -u -w -r1.5 -r1.6 --- StrutsJSP.vsl 24 Oct 2003 22:59:43 -0000 1.5 +++ StrutsJSP.vsl 26 Dec 2003 13:42:53 -0000 1.6 @@ -48,7 +48,7 @@ <html:link action="/$actionName?target=$methodName&trigger=$triggerName">$triggerName</html:link> #end #else - <html:link action="/$actionName?target=$methodName">$transition.target.name</html:link> + <html:link action="/$actionName?target=$methodName">continue</html:link> #end --> @@ -63,12 +63,12 @@ #set ($attributeName = $attribute.name) #set ($typeName = $attribute.type.name) #if ($attributeName == "trigger")## do nothing -#elseif ($typeName == "String") - <html:text property="$attributeName"/> #elseif ($typeName == "boolean") <html:checkbox property="$attributeName"/> #elseif ($typeName.endsWith("[]") || $typeName == "Collection") <html:select property="$attributeName"/> +#else + <html:text property="$attributeName"/> #end #end |
From: Wouter Z. <dra...@us...> - 2004-01-20 00:03:42
|
User: draftdog Date: 04/01/19 16:03:42 Modified: andromda-bpm4struts/src/templates Tag: V3x_MMD StrutsJSP.vsl Log: a first implementation, still incomplete but useful as a basis Revision Changes Path No revision No revision 1.5.2.1 +57 -71 cartridges/andromda-bpm4struts/src/templates/StrutsJSP.vsl Index: StrutsJSP.vsl =================================================================== RCS file: /cvsroot/andromda/cartridges/andromda-bpm4struts/src/templates/StrutsJSP.vsl,v retrieving revision 1.5 retrieving revision 1.5.2.1 diff -u -w -r1.5 -r1.5.2.1 --- StrutsJSP.vsl 24 Oct 2003 22:59:43 -0000 1.5 +++ StrutsJSP.vsl 20 Jan 2004 00:03:41 -0000 1.5.2.1 @@ -1,86 +1,72 @@ -<%@ taglib uri="struts-bean.tld" prefix="bean" %> -<%@ taglib uri="struts-html.tld" prefix="html" %> +#set ($inputFields = $class.inputFields) +#set ($controllerClass = $class.controllerClass) +#set ($triggers = $class.triggers) ## -## This macro will render documentation -## -#macro ( generateJSPDocumentation $item $indent ) -#set ($tagValue = $transform.staticHelper.findTagValue( $item, "documentation")) -#set ($paras = $transform.formatHTMLStringAsParagraphs($tagValue)) -${indent}[ -${indent}[ documentation: -${indent}[ -#if ($paras) -#foreach ( $par in $paras ) -${indent}[ -#foreach ( $line in $par.lines ) -${indent}[ $line -#end -#end +## In case no model has been specified we assume no parameter needed to be posted +## and we use a hyperlink +## +#if ($class.isWithoutModel()) + <html:link action="$controllerClass.controllerName?$controllerClass.parameter=$class.abstractMethodName"> + $class.abstractMethodName + </html:link> #else -${indent}[ NO DOCUMENTATION HAS BEEN SUPPLIED -#end -${indent}[ -#end ## -## Set global invariants +## If the view is backed by a model (indicating request parameters) we render a form ## -#set ($stateMachine = $transform.dynamicHelper.getStateMachineContext($class)) -#set ($useCase = $transform.getUseCaseContext($stateMachine)) -#set ($controllerForm = $transform.getControllerForm($useCase)) -#set ($controllerClass = $transform.getControllerClass($useCase)) -#set ($actionName = $transform.toJavaClassName($controllerClass)) -#set ($methodName = $transform.toJavaMethodName($class)) -#set ($formName = $transform.toJavaMethodName($controllerForm)) -#set ($fullyQualifiedFormName = $transform.toFullyQualifiedJavaClassName($controllerForm)) -#set ($triggeredTransitions = $transform.getNextTriggeredTransitions($class)) + <html:form action="$controllerClass.controllerName?$controllerClass.parameter=$class.abstractMethodName"> + <table> ## -## Start JSP body +## Render a new row for each input field on this view ## - - -<!-- - Use this piece of code if you want to have only hyperlinks - -#if ($triggeredTransitions.size() > 0) -#foreach ($transition in $triggeredTransitions) -#set ($triggerName = $transform.toFinalMemberName($transition.trigger)) - <html:link action="/$actionName?target=$methodName&trigger=$triggerName">$triggerName</html:link> -#end +#foreach ($inputField in $inputFields) + <tr> + <td>$inputField.name</td> + <td> +## +## Check if the input field is read only +## +#if ($inputField.isReadOnly()) +#set ($readOnly = "readonly=true") #else - <html:link action="/$actionName?target=$methodName">$transition.target.name</html:link> +#set ($readOnly = "") #end - ---> - -#if ($controllerForm) -<!-- - Use this piece of code when you want additional information passed into the form - (you will need to manually add input fields) - - Valid input field examples are: -#foreach ($attribute in $transform.staticHelper.getAttributes($controllerForm)) -#set ($attributeName = $attribute.name) -#set ($typeName = $attribute.type.name) -#if ($attributeName == "trigger")## do nothing -#elseif ($typeName == "String") - <html:text property="$attributeName"/> -#elseif ($typeName == "boolean") - <html:checkbox property="$attributeName"/> -#elseif ($typeName.endsWith("[]") || $typeName == "Collection") - <html:select property="$attributeName"/> +## +## Check if the input field should be disabled +## +#if ($inputField.isDisabled()) +#set ($disabled = "disabled=true") +#else +#set ($disabled = "") #end +## +## Depending on the type of the input field we render a different widget +## +#if ($inputField.isCheckbox()) + <html:checkbox $readOnly $disabled property="$inputField.name"/> +#else if ($inputField.isRadiobutton()) + <html:radio $readOnly $disabled property="$inputField.name"/> +#else if ($inputField.isTextField()) + <html:text $readOnly $disabled property="$inputField.name"/> +#else if ($inputField.isTextArea()) + <html:textarea $readOnly $disabled property="$inputField.name"/> +#else if ($inputField.isCombobox()) + <html:select $readOnly $disabled property="${inputField.name}Selected"> + <html:options property="$inputField.name"/> + </html:select> +#else if ($inputField.isList()) + <html:optionsCollection $readOnly $disabled property="$inputField.name"/> #end - - <html:form action="/$actionName?target=$methodName"> -#if ($triggeredTransitions.size() > 0) -#foreach ($transition in $triggeredTransitions) - <html:submit property="trigger" value="$transform.toFinalMemberName($transition.trigger)"/> +## +## Triggers are represented by submit buttons that will post the form to the action +## +#foreach ($trigger in $triggers) + <html:submit property="$trigger.name"/> #end -#else - <html:submit value="submit"/> + </td> + </tr> #end + </table> </html:form> - ---> #end \ No newline at end of file + |
From: Wouter Z. <dra...@us...> - 2004-01-31 16:06:17
|
User: draftdog Date: 04/01/31 08:04:35 Modified: andromda-bpm4struts/src/templates Tag: V3x_MMD StrutsJSP.vsl Log: adapted the template to the new model (association names and properties of the struts decorators) implemented better rendering of triggers implemented better support for rendering the proper widget Revision Changes Path No revision No revision 1.5.2.2 +150 -39 cartridges/andromda-bpm4struts/src/templates/StrutsJSP.vsl Index: StrutsJSP.vsl =================================================================== RCS file: /cvsroot/andromda/cartridges/andromda-bpm4struts/src/templates/StrutsJSP.vsl,v retrieving revision 1.5.2.1 retrieving revision 1.5.2.2 diff -u -w -r1.5.2.1 -r1.5.2.2 --- StrutsJSP.vsl 20 Jan 2004 00:03:41 -0000 1.5.2.1 +++ StrutsJSP.vsl 31 Jan 2004 16:04:35 -0000 1.5.2.2 @@ -1,21 +1,34 @@ +<%@ taglib uri="struts-html.tld" prefix="html" %> + +## +## Constant declarations +## +#set ($servlet = $class.servlet) +#set ($formBean = $servlet.formBean) #set ($inputFields = $class.inputFields) -#set ($controllerClass = $class.controllerClass) #set ($triggers = $class.triggers) - +## +## Specific to this class +## +#set ($servletName = "/$str.toJavaClassName($servlet.servletName)") +#set ($dispatchMethodName = "$str.toJavaMethodName($class.actionState.name)") +## +## Title +## +<h2>$str.separate("$class.name", " ")</h2> +<p> ## ## In case no model has been specified we assume no parameter needed to be posted ## and we use a hyperlink ## -#if ($class.isWithoutModel()) - <html:link action="$controllerClass.controllerName?$controllerClass.parameter=$class.abstractMethodName"> - $class.abstractMethodName - </html:link> -#else +#if ($inputFields.size() > 0) +<html:javascript formName="$str.toJavaMethodName($class.name)" /> + ## ## If the view is backed by a model (indicating request parameters) we render a form ## - <html:form action="$controllerClass.controllerName?$controllerClass.parameter=$class.abstractMethodName"> - <table> +<html:form action="$servletName?$servlet.dispatchParameter=$dispatchMethodName"> + <table cellpadding="5" cellspacing="5" border="0"> ## ## Render a new row for each input field on this view ## @@ -24,49 +37,147 @@ <td>$inputField.name</td> <td> ## -## Check if the input field is read only +## Depending on the type of the input field we render a different widget +## +#if ($inputField.defaultValue) +#set ($value = 'value="$inputField.defaultValue"') +#else +#set ($value = '') +#end +## +## C H E C K B O X & R A D I O B U T T O N ## +#if ( ($inputField.fieldType == 'radio') || ($inputField.fieldType == 'checkbox') ) #if ($inputField.isReadOnly()) -#set ($readOnly = "readonly=true") +#set ($disabled = 'disabled="true"') #else -#set ($readOnly = "") +#set ($disabled = '') +#end + <html:$inputField.fieldType property="$inputField.name" $disabled $value/> #end ## -## Check if the input field should be disabled +## T E X T F I E L D & P A S S W O R D ## -#if ($inputField.isDisabled()) -#set ($disabled = "disabled=true") +#if ( ($inputField.fieldType == 'text') || ($inputField.fieldType == 'password') ) +#if ($inputField.isReadOnly()) +#set ($readonly = 'readonly="true"') +#else +#set ($readonly = '') +#end +#if ($inputField.size) +#set ($maxLength = 'maxLength="$inputField.size"') #else -#set ($disabled = "") +#set ($maxLength = '') +#end + <html:$inputField.fieldType property="$inputField.name" $readonly $maxLength $value/> #end ## -## Depending on the type of the input field we render a different widget +## T E X T A R E A +## +#if ($inputField.fieldType == 'textarea') +#if ($inputField.isReadOnly()) +#set ($readonly = 'readonly="true"') +#else +#set ($readonly = '') +#end +#if ($inputField.size) +#if ($inputField.size < 15) +#set ($rows = 'rows="3"') +#set ($cols = 'cols="$inputField.size"') +#else +#set ($rowValue = $inputField.size / 15) +#set ($rows = 'rows="$rowValue"') +#set ($cols = 'cols="15"') +#end +#else +#set ($rows = '') +#set ($cols = '') +#end + <html:$inputField.fieldType property="$inputField.name" $readonly $cols $rows $value/> +#end +## +## C O M B O B O X & L I S T ## -#if ($inputField.isCheckbox()) - <html:checkbox $readOnly $disabled property="$inputField.name"/> -#else if ($inputField.isRadiobutton()) - <html:radio $readOnly $disabled property="$inputField.name"/> -#else if ($inputField.isTextField()) - <html:text $readOnly $disabled property="$inputField.name"/> -#else if ($inputField.isTextArea()) - <html:textarea $readOnly $disabled property="$inputField.name"/> -#else if ($inputField.isCombobox()) - <html:select $readOnly $disabled property="${inputField.name}Selected"> - <html:options property="$inputField.name"/> +#if ($inputField.fieldType == 'select') +#if ($inputField.isMultiple()) +#set ($multiple = 'multiple="true"') +#else +#set ($multiple = 'multiple="false"') +#end +#if ($inputField.isReadOnly()) +#set ($disabled = 'disabled="true"') +#else +#set ($disabled = '') +#end +#if ($inputField.size) +#set ($size = 'size="$inputField.size"') +#else +#set ($size = '') +#end + <html:select $disabled $size $multiple property="$inputField.name"> + <html:options property="$inputField.backingPropertyName"/> </html:select> -#else if ($inputField.isList()) - <html:optionsCollection $readOnly $disabled property="$inputField.name"/> #end + </td> + </tr> +#end + <tr> + <td> ## ## Triggers are represented by submit buttons that will post the form to the action ## #foreach ($trigger in $triggers) - <html:submit property="$trigger.name"/> +#if ($trigger.triggerName) +#set ($triggerName = $trigger.triggerName) +#else +#set ($triggerName = "submit") +#end + <html:submit value="$triggerName"/> #end </td> </tr> -#end </table> </html:form> +#else +## +## So we have no input fields, render a link for each trigger +## +<ol> +#foreach ($trigger in $triggers) +## get the trigger name +#if ($trigger.triggerName) +#set ($triggerName = $trigger.triggerName) +#else +#set ($triggerName = "submit") +#end +## different scenarios depending on the number of triggers +#if ($triggers.size() > 1) +#set ($linkParams = 'paramId="trigger" paramName="$formBean.formBeanName" paramProperty="$triggerName"') +#set ($linkQuery = '&trigger=$triggerName') +#else +#set ($linkParams = '') +#set ($linkQuery = '') +#if ($triggerName != "submit") +#set ($triggerName = "Go to $triggerName") +#end +#end +## in case we have a form we better use it +#if ($formBean) + <li> + <html:link action="$servletName?$servlet.dispatchParameter=$dispatchMethodName" $linkParams> + $str.separate("$triggerName"," ") + </html:link> + </li> +#else + <li> + <html:link action="$servletName?$servlet.dispatchParameter=${dispatchMethodName}${linkQuery}"> + $str.separate("$triggerName"," ") + </html:link> + </li> +#end +#end +</ol> +## +## #end |
From: Wouter Z. <dra...@us...> - 2004-02-11 01:05:42
|
User: draftdog Date: 04/02/10 17:01:59 Modified: andromda-bpm4struts/src/templates Tag: V3x_MMD StrutsJSP.vsl Log: submit buttons have the 'trigger' property now, this will send the appropriate value as a request parameter Revision Changes Path No revision No revision 1.5.2.3 +15 -18 cartridges/andromda-bpm4struts/src/templates/StrutsJSP.vsl Index: StrutsJSP.vsl =================================================================== RCS file: /cvsroot/andromda/cartridges/andromda-bpm4struts/src/templates/StrutsJSP.vsl,v retrieving revision 1.5.2.2 retrieving revision 1.5.2.3 diff -u -w -r1.5.2.2 -r1.5.2.3 --- StrutsJSP.vsl 31 Jan 2004 16:04:35 -0000 1.5.2.2 +++ StrutsJSP.vsl 11 Feb 2004 01:01:59 -0000 1.5.2.3 @@ -1,5 +1,4 @@ <%@ taglib uri="struts-html.tld" prefix="html" %> - ## ## Constant declarations ## @@ -15,14 +14,21 @@ ## ## Title ## -<h2>$str.separate("$class.name", " ")</h2> +#set ($title = $str.separate("$class.name", " ")) +<html:html> + <head> + <title>$title</title> + <html:javascript formName="$str.toJavaMethodName($class.name)" /> + </head> + <body> + +<h2>$title</h2> <p> ## ## In case no model has been specified we assume no parameter needed to be posted ## and we use a hyperlink ## #if ($inputFields.size() > 0) -<html:javascript formName="$str.toJavaMethodName($class.name)" /> ## ## If the view is backed by a model (indicating request parameters) we render a form @@ -132,7 +138,7 @@ #else #set ($triggerName = "submit") #end - <html:submit value="$triggerName"/> + <html:submit property="trigger" value="$triggerName"/> #end </td> </tr> @@ -144,7 +150,7 @@ ## <ol> #foreach ($trigger in $triggers) -## get the trigger name +## get the trigger name (or take the default one if not present) #if ($trigger.triggerName) #set ($triggerName = $trigger.triggerName) #else @@ -152,32 +158,23 @@ #end ## different scenarios depending on the number of triggers #if ($triggers.size() > 1) -#set ($linkParams = 'paramId="trigger" paramName="$formBean.formBeanName" paramProperty="$triggerName"') -#set ($linkQuery = '&trigger=$triggerName') +#set ($linkQuery = "trigger=$triggerName") #else -#set ($linkParams = '') #set ($linkQuery = '') #if ($triggerName != "submit") #set ($triggerName = "Go to $triggerName") #end #end -## in case we have a form we better use it -#if ($formBean) - <li> - <html:link action="$servletName?$servlet.dispatchParameter=$dispatchMethodName" $linkParams> - $str.separate("$triggerName"," ") - </html:link> - </li> -#else <li> - <html:link action="$servletName?$servlet.dispatchParameter=${dispatchMethodName}${linkQuery}"> + <html:link action="${servletName}?${servlet.dispatchParameter}=${dispatchMethodName}&${linkQuery}"> $str.separate("$triggerName"," ") </html:link> </li> #end -#end </ol> ## ## #end + </body> +</html:html> \ No newline at end of file |
From: Wouter Z. <dra...@us...> - 2004-02-15 10:54:54
|
User: draftdog Date: 04/02/15 02:47:45 Modified: andromda-bpm4struts/src/templates Tag: V3x_MMD StrutsJSP.vsl Log: removed the 'go to' prefix for the JSP page links ... would be annoying at times Revision Changes Path No revision No revision 1.5.2.4 +1 -1 cartridges/andromda-bpm4struts/src/templates/StrutsJSP.vsl Index: StrutsJSP.vsl =================================================================== RCS file: /cvsroot/andromda/cartridges/andromda-bpm4struts/src/templates/StrutsJSP.vsl,v retrieving revision 1.5.2.3 retrieving revision 1.5.2.4 diff -u -w -r1.5.2.3 -r1.5.2.4 --- StrutsJSP.vsl 11 Feb 2004 01:01:59 -0000 1.5.2.3 +++ StrutsJSP.vsl 15 Feb 2004 10:47:44 -0000 1.5.2.4 @@ -162,7 +162,7 @@ #else #set ($linkQuery = '') #if ($triggerName != "submit") -#set ($triggerName = "Go to $triggerName") +#set ($triggerName = "$triggerName") #end #end <li> |
From: Wouter Z. <dra...@us...> - 2004-02-16 23:30:26
|
User: draftdog Date: 04/02/16 15:22:03 Modified: andromda-bpm4struts/src/templates Tag: V3x_MMD StrutsJSP.vsl Log: trigger String values are now i18n'ed message keys, this is reflected by buttons and hyperlinks Revision Changes Path No revision No revision 1.5.2.5 +48 -53 cartridges/andromda-bpm4struts/src/templates/StrutsJSP.vsl Index: StrutsJSP.vsl =================================================================== RCS file: /cvsroot/andromda/cartridges/andromda-bpm4struts/src/templates/StrutsJSP.vsl,v retrieving revision 1.5.2.4 retrieving revision 1.5.2.5 diff -u -w -r1.5.2.4 -r1.5.2.5 --- StrutsJSP.vsl 15 Feb 2004 10:47:44 -0000 1.5.2.4 +++ StrutsJSP.vsl 16 Feb 2004 23:22:03 -0000 1.5.2.5 @@ -1,3 +1,4 @@ +<%@ taglib uri="struts-bean.tld" prefix="bean" %> <%@ taglib uri="struts-html.tld" prefix="html" %> ## ## Constant declarations @@ -6,6 +7,7 @@ #set ($formBean = $servlet.formBean) #set ($inputFields = $class.inputFields) #set ($triggers = $class.triggers) +#set ($triggerMessages = $class.triggerMessages) ## ## Specific to this class ## @@ -14,15 +16,26 @@ ## ## Title ## -#set ($title = $str.separate("$class.name", " ")) <html:html> <head> - <title>$title</title> + <title><bean:message key="$class.titleMessageKey"/></title> <html:javascript formName="$str.toJavaMethodName($class.name)" /> + <script type="text/javascript"> + <!-- + /** + * This script is needed to be able to use i18n on button labels + */ + function submitForm(form,trigger) + { + form.trigger.value = trigger; + form.submit(); + } + //--> + </script> </head> <body> -<h2>$title</h2> +<h2><bean:message key="$class.titleMessageKey"/></h2> <p> ## ## In case no model has been specified we assume no parameter needed to be posted @@ -40,7 +53,7 @@ ## #foreach ($inputField in $inputFields) <tr> - <td>$inputField.name</td> + <td><bean:message key="$inputField.messageKey"/></td> <td> ## ## Depending on the type of the input field we render a different widget @@ -132,13 +145,10 @@ ## ## Triggers are represented by submit buttons that will post the form to the action ## -#foreach ($trigger in $triggers) -#if ($trigger.triggerName) -#set ($triggerName = $trigger.triggerName) -#else -#set ($triggerName = "submit") -#end - <html:submit property="trigger" value="$triggerName"/> +#foreach ($triggerMessage in $triggerMessages.keySet()) + <html:button property="trigger" onclick='submitForm(this.form,"$triggerMessage")'> + <bean:message key="$triggerMessage"/> + </html:button> #end </td> </tr> @@ -149,25 +159,10 @@ ## So we have no input fields, render a link for each trigger ## <ol> -#foreach ($trigger in $triggers) -## get the trigger name (or take the default one if not present) -#if ($trigger.triggerName) -#set ($triggerName = $trigger.triggerName) -#else -#set ($triggerName = "submit") -#end -## different scenarios depending on the number of triggers -#if ($triggers.size() > 1) -#set ($linkQuery = "trigger=$triggerName") -#else -#set ($linkQuery = '') -#if ($triggerName != "submit") -#set ($triggerName = "$triggerName") -#end -#end +#foreach ($triggerMessage in $triggerMessages.keySet()) <li> - <html:link action="${servletName}?${servlet.dispatchParameter}=${dispatchMethodName}&${linkQuery}"> - $str.separate("$triggerName"," ") + <html:link action="${servletName}?${servlet.dispatchParameter}=${dispatchMethodName}&trigger=$triggerMessage"> + <bean:message key="$triggerMessage"/> </html:link> </li> #end |
From: Wouter Z. <dra...@us...> - 2004-02-18 00:22:24
|
User: draftdog Date: 04/02/17 16:13:13 Modified: andromda-bpm4struts/src/templates Tag: V3x_MMD StrutsJSP.vsl Log: improved overall layout of page (minor change) Revision Changes Path No revision No revision 1.5.2.6 +2 -2 cartridges/andromda-bpm4struts/src/templates/StrutsJSP.vsl Index: StrutsJSP.vsl =================================================================== RCS file: /cvsroot/andromda/cartridges/andromda-bpm4struts/src/templates/StrutsJSP.vsl,v retrieving revision 1.5.2.5 retrieving revision 1.5.2.6 diff -u -w -r1.5.2.5 -r1.5.2.6 |
From: Wouter Z. <dra...@us...> - 2004-02-18 14:22:39
|
User: draftdog Date: 04/02/18 06:12:54 Modified: andromda-bpm4struts/src/templates Tag: V3x_MMD StrutsJSP.vsl Log: trigger is now a hidden input field, buttons are named differently, also rendering tooltips now Revision Changes Path No revision No revision 1.5.2.7 +15 -8 cartridges/andromda-bpm4struts/src/templates/StrutsJSP.vsl Index: StrutsJSP.vsl =================================================================== RCS file: /cvsroot/andromda/cartridges/andromda-bpm4struts/src/templates/StrutsJSP.vsl,v retrieving revision 1.5.2.6 retrieving revision 1.5.2.7 diff -u -w -r1.5.2.6 -r1.5.2.7 --- StrutsJSP.vsl 18 Feb 2004 00:13:11 -0000 1.5.2.6 +++ StrutsJSP.vsl 18 Feb 2004 14:12:53 -0000 1.5.2.7 @@ -47,11 +47,14 @@ ## If the view is backed by a model (indicating request parameters) we render a form ## <html:form action="$servletName?$servlet.dispatchParameter=$dispatchMethodName"> +## This next field hold the trigger requests parameter that will be sent to the server + <html:hidden property="trigger" value=""/> <table cellpadding="5" cellspacing="5" border="0"> ## ## Render a new row for each input field on this view ## #foreach ($inputField in $inputFields) +#set ($titleKey = "${inputField.messageKey}.title") <tr> <td><bean:message key="$inputField.messageKey"/></td> <td> @@ -72,7 +75,7 @@ #else #set ($disabled = '') #end - <html:$inputField.fieldType property="$inputField.name" $disabled $value/> + <html:$inputField.fieldType property="$inputField.name" titleKey="$titleKey" $disabled $value/> #end ## ## T E X T F I E L D & P A S S W O R D @@ -88,7 +91,7 @@ #else #set ($maxLength = '') #end - <html:$inputField.fieldType property="$inputField.name" $readonly $maxLength $value/> + <html:$inputField.fieldType property="$inputField.name" titleKey="$titleKey" $readonly $maxLength $value/> #end ## ## T E X T A R E A @@ -112,7 +115,7 @@ #set ($rows = '') #set ($cols = '') #end - <html:$inputField.fieldType property="$inputField.name" $readonly $cols $rows $value/> + <html:$inputField.fieldType property="$inputField.name" titleKey="$titleKey" $readonly $cols $rows $value/> #end ## ## C O M B O B O X & L I S T @@ -133,7 +136,7 @@ #else #set ($size = '') #end - <html:select $disabled $size $multiple property="$inputField.name"> + <html:select $disabled $size $multiple property="$inputField.name" $titleKey> <html:options property="$inputField.backingPropertyName"/> </html:select> #end @@ -146,9 +149,12 @@ ## Triggers are represented by submit buttons that will post the form to the action ## #foreach ($triggerMessage in $triggerMessages.keySet()) - <html:button property="trigger" onclick='submitForm(this.form,"$triggerMessage")'> - <bean:message key="$triggerMessage"/> - </html:button> +#set ($title = ${triggerMessages.get($triggerMessage)}) +#set ($buttonName = "${triggerMessage}.button") + <input type="button" name="$buttonName" + onclick="submitForm(this.form,'$triggerMessage')" + title="$title" + value="<bean:message key="$triggerMessage"/>"> #end </td> </tr> @@ -160,8 +166,9 @@ ## <ol> #foreach ($triggerMessage in $triggerMessages.keySet()) +#set ($title = "${triggerMessage}.title") <li> - <html:link action="${servletName}?${servlet.dispatchParameter}=${dispatchMethodName}&trigger=$triggerMessage"> + <html:link action="${servletName}?${servlet.dispatchParameter}=${dispatchMethodName}&trigger=$triggerMessage" titleKey="$title"> <bean:message key="$triggerMessage"/> </html:link> </li> |
From: Wouter Z. <dra...@us...> - 2004-02-18 21:27:33
|
User: draftdog Date: 04/02/18 13:17:42 Modified: andromda-bpm4struts/src/templates Tag: V3x_MMD StrutsJSP.vsl Log: added a test for the rendering of the validation javascript, the dynamic javascript has been disabled and is implemented in the template enhancement: validator method is specified Revision Changes Path No revision No revision 1.5.2.8 +22 -7 cartridges/andromda-bpm4struts/src/templates/StrutsJSP.vsl Index: StrutsJSP.vsl =================================================================== RCS file: /cvsroot/andromda/cartridges/andromda-bpm4struts/src/templates/StrutsJSP.vsl,v retrieving revision 1.5.2.7 retrieving revision 1.5.2.8 diff -u -w -r1.5.2.7 -r1.5.2.8 --- StrutsJSP.vsl 18 Feb 2004 14:12:53 -0000 1.5.2.7 +++ StrutsJSP.vsl 18 Feb 2004 21:17:42 -0000 1.5.2.8 @@ -19,19 +19,34 @@ <html:html> <head> <title><bean:message key="$class.titleMessageKey"/></title> - <html:javascript formName="$str.toJavaMethodName($class.name)" /> - <script type="text/javascript"> +#if ($inputFields.size() > 0) + <script type="text/javascript" language="Javascript1.1"> <!-- - /** - * This script is needed to be able to use i18n on button labels - */ function submitForm(form,trigger) { form.trigger.value = trigger; + + if (true == ${formBean.validationMethodName}(form)) form.submit(); } + + var bCancel = false; + + function ${formBean.validationMethodName}(form) + { + return (bCancel) ? true : validateRequired(form); + } + + function required() + { +#foreach ($inputField in $inputFields) + this.a$velocityCount = new Array("$inputField.name", "$str.upperCaseFirstLetter($inputField.name)", new Function ("varName", " return this[varName];")); +#end + } //--> </script> + <html:javascript formName="$formBean.formBeanName" method="${formBean.validationMethodName}" dynamicJavascript="false" staticJavascript="true"/> +#end </head> <body> @@ -46,7 +61,7 @@ ## ## If the view is backed by a model (indicating request parameters) we render a form ## - <html:form action="$servletName?$servlet.dispatchParameter=$dispatchMethodName"> + <html:form action="$servletName?$servlet.dispatchParameter=$dispatchMethodName" onsubmit="return ${formBean.validationMethodName}(this);"> ## This next field hold the trigger requests parameter that will be sent to the server <html:hidden property="trigger" value=""/> <table cellpadding="5" cellspacing="5" border="0"> |
From: Wouter Z. <dra...@us...> - 2004-02-19 16:54:24
|
User: draftdog Date: 04/02/19 08:43:54 Modified: andromda-bpm4struts/src/templates Tag: V3x_MMD StrutsJSP.vsl Log: static validation routines are now in a separate page to make use of browser page caching Revision Changes Path No revision No revision 1.5.2.9 +2 -1 cartridges/andromda-bpm4struts/src/templates/StrutsJSP.vsl Index: StrutsJSP.vsl =================================================================== RCS file: /cvsroot/andromda/cartridges/andromda-bpm4struts/src/templates/StrutsJSP.vsl,v retrieving revision 1.5.2.8 retrieving revision 1.5.2.9 diff -u -w -r1.5.2.8 -r1.5.2.9 --- StrutsJSP.vsl 18 Feb 2004 21:17:42 -0000 1.5.2.8 +++ StrutsJSP.vsl 19 Feb 2004 16:43:51 -0000 1.5.2.9 @@ -20,6 +20,8 @@ <head> <title><bean:message key="$class.titleMessageKey"/></title> #if ($inputFields.size() > 0) +#set ($javaScriptURI = "${servlet.useCase.workflow.contextPath}/form-validation.jsp") + <script type="text/javascript" language="Javascript1.1" src="<html:rewrite page="$javaScriptURI"/>"></script> <script type="text/javascript" language="Javascript1.1"> <!-- function submitForm(form,trigger) @@ -45,7 +47,6 @@ } //--> </script> - <html:javascript formName="$formBean.formBeanName" method="${formBean.validationMethodName}" dynamicJavascript="false" staticJavascript="true"/> #end </head> <body> |
From: Wouter Z. <dra...@us...> - 2004-02-20 22:05:46
|
User: draftdog Date: 04/02/20 13:54:17 Modified: andromda-bpm4struts/src/templates Tag: V3x_MMD StrutsJSP.vsl Log: cleaned up the self-written javascript and added a the struts tag to dynamically generate the jsp's form validation routines Revision Changes Path No revision No revision 1.5.2.10 +4 -17 cartridges/andromda-bpm4struts/src/templates/StrutsJSP.vsl Index: StrutsJSP.vsl =================================================================== RCS file: /cvsroot/andromda/cartridges/andromda-bpm4struts/src/templates/StrutsJSP.vsl,v retrieving revision 1.5.2.9 retrieving revision 1.5.2.10 diff -u -w -r1.5.2.9 -r1.5.2.10 --- StrutsJSP.vsl 19 Feb 2004 16:43:51 -0000 1.5.2.9 +++ StrutsJSP.vsl 20 Feb 2004 21:54:16 -0000 1.5.2.10 @@ -4,7 +4,7 @@ ## Constant declarations ## #set ($servlet = $class.servlet) -#set ($formBean = $servlet.formBean) +#set ($formBeanName = $class.formBeanName) #set ($inputFields = $class.inputFields) #set ($triggers = $class.triggers) #set ($triggerMessages = $class.triggerMessages) @@ -22,29 +22,16 @@ #if ($inputFields.size() > 0) #set ($javaScriptURI = "${servlet.useCase.workflow.contextPath}/form-validation.jsp") <script type="text/javascript" language="Javascript1.1" src="<html:rewrite page="$javaScriptURI"/>"></script> + <html:javascript formName="$formBeanName" dynamicJavascript="true" staticJavascript="false" htmlComment="true"/> <script type="text/javascript" language="Javascript1.1"> <!-- function submitForm(form,trigger) { form.trigger.value = trigger; - if (true == ${formBean.validationMethodName}(form)) + if (true == ${class.validationMethodName}(form)) form.submit(); } - - var bCancel = false; - - function ${formBean.validationMethodName}(form) - { - return (bCancel) ? true : validateRequired(form); - } - - function required() - { -#foreach ($inputField in $inputFields) - this.a$velocityCount = new Array("$inputField.name", "$str.upperCaseFirstLetter($inputField.name)", new Function ("varName", " return this[varName];")); -#end - } //--> </script> #end @@ -62,7 +49,7 @@ ## ## If the view is backed by a model (indicating request parameters) we render a form ## - <html:form action="$servletName?$servlet.dispatchParameter=$dispatchMethodName" onsubmit="return ${formBean.validationMethodName}(this);"> + <html:form action="$servletName?$servlet.dispatchParameter=$dispatchMethodName" onsubmit="return ${class.validationMethodName}(this);"> ## This next field hold the trigger requests parameter that will be sent to the server <html:hidden property="trigger" value=""/> <table cellpadding="5" cellspacing="5" border="0"> |
From: Wouter Z. <dra...@us...> - 2004-02-20 23:45:58
|
User: draftdog Date: 04/02/20 15:34:26 Modified: andromda-bpm4struts/src/templates Tag: V3x_MMD StrutsJSP.vsl Log: the custom JS has been simplified, and the external dynamic JS file has been added (in comment, because it is not working yet) unfortunately the external file contains the HTML script tags and this is invalid, this must be solved by the Struts developers (adding an attribute to html:javascript to specify not to render them) Revision Changes Path No revision No revision 1.5.2.11 +6 -6 cartridges/andromda-bpm4struts/src/templates/StrutsJSP.vsl Index: StrutsJSP.vsl =================================================================== RCS file: /cvsroot/andromda/cartridges/andromda-bpm4struts/src/templates/StrutsJSP.vsl,v retrieving revision 1.5.2.10 retrieving revision 1.5.2.11 diff -u -w -r1.5.2.10 -r1.5.2.11 --- StrutsJSP.vsl 20 Feb 2004 21:54:16 -0000 1.5.2.10 +++ StrutsJSP.vsl 20 Feb 2004 23:34:24 -0000 1.5.2.11 @@ -20,16 +20,16 @@ <head> <title><bean:message key="$class.titleMessageKey"/></title> #if ($inputFields.size() > 0) -#set ($javaScriptURI = "${servlet.useCase.workflow.contextPath}/form-validation.jsp") - <script type="text/javascript" language="Javascript1.1" src="<html:rewrite page="$javaScriptURI"/>"></script> - <html:javascript formName="$formBeanName" dynamicJavascript="true" staticJavascript="false" htmlComment="true"/> +#set ($staticJavaScriptURI = "${servlet.useCase.workflow.contextPath}/form-validation.jsp") +#set ($dynamicJavaScriptURI = "${class.fullPathName}JS.jsp") + <script type="text/javascript" language="Javascript1.1" src="<html:rewrite page="$staticJavaScriptURI"/>"></script> +<!-- <script type="text/javascript" language="Javascript1.1" src="<html:rewrite page="$dynamicJavaScriptURI"/>"></script>--> +<html:javascript formName="$formBeanName" dynamicJavascript="true" staticJavascript="false" htmlComment="truea"/> <script type="text/javascript" language="Javascript1.1"> <!-- function submitForm(form,trigger) { form.trigger.value = trigger; - - if (true == ${class.validationMethodName}(form)) form.submit(); } //--> |
From: Wouter Z. <dra...@us...> - 2004-02-22 13:15:14
|
User: draftdog Date: 04/02/22 05:02:29 Modified: andromda-bpm4struts/src/templates Tag: V3x_MMD StrutsJSP.vsl Log: fixed a bug where the titleKey for a list/combobox was not properly rendered Revision Changes Path No revision No revision 1.5.2.12 +1 -1 cartridges/andromda-bpm4struts/src/templates/StrutsJSP.vsl Index: StrutsJSP.vsl =================================================================== RCS file: /cvsroot/andromda/cartridges/andromda-bpm4struts/src/templates/StrutsJSP.vsl,v retrieving revision 1.5.2.11 retrieving revision 1.5.2.12 diff -u -w -r1.5.2.11 -r1.5.2.12 --- StrutsJSP.vsl 20 Feb 2004 23:34:24 -0000 1.5.2.11 +++ StrutsJSP.vsl 22 Feb 2004 13:02:27 -0000 1.5.2.12 @@ -139,7 +139,7 @@ #else #set ($size = '') #end - <html:select $disabled $size $multiple property="$inputField.name" $titleKey> + <html:select $disabled $size $multiple property="$inputField.name" titleKey="$titleKey"> <html:options property="$inputField.backingPropertyName"/> </html:select> #end |
From: Wouter Z. <dra...@us...> - 2004-02-22 15:06:56
|
User: draftdog Date: 04/02/22 06:54:08 Modified: andromda-bpm4struts/src/templates Tag: V3x_MMD StrutsJSP.vsl Log: simplified the template added support for cancelling and resetting the form Revision Changes Path No revision No revision 1.5.2.13 +27 -13 cartridges/andromda-bpm4struts/src/templates/StrutsJSP.vsl Index: StrutsJSP.vsl =================================================================== RCS file: /cvsroot/andromda/cartridges/andromda-bpm4struts/src/templates/StrutsJSP.vsl,v retrieving revision 1.5.2.12 retrieving revision 1.5.2.13 diff -u -w -r1.5.2.12 -r1.5.2.13 --- StrutsJSP.vsl 22 Feb 2004 13:02:27 -0000 1.5.2.12 +++ StrutsJSP.vsl 22 Feb 2004 14:54:08 -0000 1.5.2.13 @@ -7,7 +7,6 @@ #set ($formBeanName = $class.formBeanName) #set ($inputFields = $class.inputFields) #set ($triggers = $class.triggers) -#set ($triggerMessages = $class.triggerMessages) ## ## Specific to this class ## @@ -49,7 +48,10 @@ ## ## If the view is backed by a model (indicating request parameters) we render a form ## - <html:form action="$servletName?$servlet.dispatchParameter=$dispatchMethodName" onsubmit="return ${class.validationMethodName}(this);"> +#set ($formAction = "$servletName?$servlet.dispatchParameter=$dispatchMethodName") +#set ($formFocus = "$class.firstInputField.name") +#set ($formOnSubmit = "return ${class.validationMethodName}(this);") + <html:form action="$formAction" focus="$formFocus" onsubmit="$formOnSubmit"> ## This next field hold the trigger requests parameter that will be sent to the server <html:hidden property="trigger" value=""/> <table cellpadding="5" cellspacing="5" border="0"> @@ -151,13 +153,25 @@ ## ## Triggers are represented by submit buttons that will post the form to the action ## -#foreach ($triggerMessage in $triggerMessages.keySet()) -#set ($title = ${triggerMessages.get($triggerMessage)}) -#set ($buttonName = "${triggerMessage}.button") - <input type="button" name="$buttonName" - onclick="submitForm(this.form,'$triggerMessage')" - title="$title" - value="<bean:message key="$triggerMessage"/>"> +## 1. cancel triggers must send a specific parameter name to the servlet +## 2. reset triggers do not call the servlet, they simply reset the form +## +#foreach ($trigger in $triggers) +#if ($trigger.isCancelTrigger()) + <input type="button" name="<%=org.apache.struts.Globals.CANCEL_KEY%>" + onclick="submitForm(this.form,'${class.messageKey}.$trigger.messageKey')" + title="<bean:message key="${class.messageKey}.$trigger.titleMessageKey"/>" + value="<bean:message key="${class.messageKey}.$trigger.messageKey"/>"> +#elseif ($trigger.isResetTrigger()) + <input type="reset" + title="<bean:message key="${class.messageKey}.$trigger.titleMessageKey"/>" + value="<bean:message key="${class.messageKey}.$trigger.messageKey"/>"> +#else + <input type="button" + onclick="submitForm(this.form,'${class.messageKey}.$trigger.messageKey')" + title="<bean:message key="${class.messageKey}.$trigger.titleMessageKey"/>" + value="<bean:message key="${class.messageKey}.$trigger.messageKey"/>"> +#end #end </td> </tr> @@ -168,11 +182,11 @@ ## So we have no input fields, render a link for each trigger ## <ol> -#foreach ($triggerMessage in $triggerMessages.keySet()) -#set ($title = "${triggerMessage}.title") +#foreach ($trigger in $triggers) +#set ($linkAction = "${servletName}?${servlet.dispatchParameter}=${dispatchMethodName}&trigger=$trigger.messageKey") <li> - <html:link action="${servletName}?${servlet.dispatchParameter}=${dispatchMethodName}&trigger=$triggerMessage" titleKey="$title"> - <bean:message key="$triggerMessage"/> + <html:link action="$linkAction" titleKey="$trigger.titleMessageKey"> + <bean:message key="$trigger.messageKey"/> </html:link> </li> #end |
From: Wouter Z. <dra...@us...> - 2004-02-22 15:45:48
|
User: draftdog Date: 04/02/22 07:33:00 Modified: andromda-bpm4struts/src/templates Tag: V3x_MMD StrutsJSP.vsl Log: htmlComment in the dynamic JavaScript had an illegal value (a typo) Revision Changes Path No revision No revision 1.5.2.14 +1 -1 cartridges/andromda-bpm4struts/src/templates/StrutsJSP.vsl Index: StrutsJSP.vsl =================================================================== RCS file: /cvsroot/andromda/cartridges/andromda-bpm4struts/src/templates/StrutsJSP.vsl,v retrieving revision 1.5.2.13 retrieving revision 1.5.2.14 diff -u -w -r1.5.2.13 -r1.5.2.14 --- StrutsJSP.vsl 22 Feb 2004 14:54:08 -0000 1.5.2.13 +++ StrutsJSP.vsl 22 Feb 2004 15:32:44 -0000 1.5.2.14 @@ -23,7 +23,7 @@ #set ($dynamicJavaScriptURI = "${class.fullPathName}JS.jsp") <script type="text/javascript" language="Javascript1.1" src="<html:rewrite page="$staticJavaScriptURI"/>"></script> <!-- <script type="text/javascript" language="Javascript1.1" src="<html:rewrite page="$dynamicJavaScriptURI"/>"></script>--> -<html:javascript formName="$formBeanName" dynamicJavascript="true" staticJavascript="false" htmlComment="truea"/> +<html:javascript formName="$formBeanName" dynamicJavascript="true" staticJavascript="false" htmlComment="true"/> <script type="text/javascript" language="Javascript1.1"> <!-- function submitForm(form,trigger) |
From: Wouter Z. <dra...@us...> - 2004-02-22 16:45:36
|
User: draftdog Date: 04/02/22 08:32:44 Modified: andromda-bpm4struts/src/templates Tag: V3x_MMD StrutsJSP.vsl Log: fixed some confusion with the message keys, this will be solved once the model is free for updates again. for now this patch works fine Revision Changes Path No revision No revision 1.5.2.15 +4 -4 cartridges/andromda-bpm4struts/src/templates/StrutsJSP.vsl Index: StrutsJSP.vsl =================================================================== RCS file: /cvsroot/andromda/cartridges/andromda-bpm4struts/src/templates/StrutsJSP.vsl,v retrieving revision 1.5.2.14 retrieving revision 1.5.2.15 diff -u -w -r1.5.2.14 -r1.5.2.15 --- StrutsJSP.vsl 22 Feb 2004 15:32:44 -0000 1.5.2.14 +++ StrutsJSP.vsl 22 Feb 2004 16:32:43 -0000 1.5.2.15 @@ -159,7 +159,7 @@ #foreach ($trigger in $triggers) #if ($trigger.isCancelTrigger()) <input type="button" name="<%=org.apache.struts.Globals.CANCEL_KEY%>" - onclick="submitForm(this.form,'${class.messageKey}.$trigger.messageKey')" + onclick="submitForm(this.form,'$trigger.messageKey');" title="<bean:message key="${class.messageKey}.$trigger.titleMessageKey"/>" value="<bean:message key="${class.messageKey}.$trigger.messageKey"/>"> #elseif ($trigger.isResetTrigger()) @@ -168,7 +168,7 @@ value="<bean:message key="${class.messageKey}.$trigger.messageKey"/>"> #else <input type="button" - onclick="submitForm(this.form,'${class.messageKey}.$trigger.messageKey')" + onclick="submitForm(this.form,'$trigger.messageKey');" title="<bean:message key="${class.messageKey}.$trigger.titleMessageKey"/>" value="<bean:message key="${class.messageKey}.$trigger.messageKey"/>"> #end @@ -185,8 +185,8 @@ #foreach ($trigger in $triggers) #set ($linkAction = "${servletName}?${servlet.dispatchParameter}=${dispatchMethodName}&trigger=$trigger.messageKey") <li> - <html:link action="$linkAction" titleKey="$trigger.titleMessageKey"> - <bean:message key="$trigger.messageKey"/> + <html:link action="$linkAction" titleKey="${class.messageKey}.$trigger.titleMessageKey"> + <bean:message key="${class.messageKey}.$trigger.messageKey"/> </html:link> </li> #end |
From: Wouter Z. <dra...@us...> - 2004-02-22 18:08:05
|
User: draftdog Date: 04/02/22 09:55:09 Modified: andromda-bpm4struts/src/templates Tag: V3x_MMD StrutsJSP.vsl Log: moved the validation routine out of the onsubmit handler, apparently the onsubmit handler is not called when calling form.submit() directly (I thought this used to work though) tested on Mozilla and IE, works now Revision Changes Path No revision No revision 1.5.2.16 +2 -3 cartridges/andromda-bpm4struts/src/templates/StrutsJSP.vsl Index: StrutsJSP.vsl =================================================================== RCS file: /cvsroot/andromda/cartridges/andromda-bpm4struts/src/templates/StrutsJSP.vsl,v retrieving revision 1.5.2.15 retrieving revision 1.5.2.16 diff -u -w -r1.5.2.15 -r1.5.2.16 --- StrutsJSP.vsl 22 Feb 2004 16:32:43 -0000 1.5.2.15 +++ StrutsJSP.vsl 22 Feb 2004 17:55:07 -0000 1.5.2.16 @@ -29,7 +29,7 @@ function submitForm(form,trigger) { form.trigger.value = trigger; - form.submit(); + if (${class.validationMethodName}(form)) form.submit(); } //--> </script> @@ -50,8 +50,7 @@ ## #set ($formAction = "$servletName?$servlet.dispatchParameter=$dispatchMethodName") #set ($formFocus = "$class.firstInputField.name") -#set ($formOnSubmit = "return ${class.validationMethodName}(this);") - <html:form action="$formAction" focus="$formFocus" onsubmit="$formOnSubmit"> + <html:form action="$formAction" focus="$formFocus"> ## This next field hold the trigger requests parameter that will be sent to the server <html:hidden property="trigger" value=""/> <table cellpadding="5" cellspacing="5" border="0"> |
From: Wouter Z. <dra...@us...> - 2004-02-24 22:38:52
|
User: draftdog Date: 04/02/24 14:32:11 Modified: andromda-bpm4struts/src/templates Tag: V3x_MMD StrutsJSP.vsl Log: moved macros to a separate file simplified names (calling decorators is easier now) Revision Changes Path No revision No revision 1.5.2.17 +19 -131 cartridges/andromda-bpm4struts/src/templates/StrutsJSP.vsl Index: StrutsJSP.vsl =================================================================== RCS file: /cvsroot/andromda/cartridges/andromda-bpm4struts/src/templates/StrutsJSP.vsl,v retrieving revision 1.5.2.16 retrieving revision 1.5.2.17 diff -u -w -r1.5.2.16 -r1.5.2.17 --- StrutsJSP.vsl 22 Feb 2004 17:55:07 -0000 1.5.2.16 +++ StrutsJSP.vsl 24 Feb 2004 22:32:11 -0000 1.5.2.17 @@ -1,29 +1,24 @@ +#parse("templates/StrutsJSP.vm") + <%@ taglib uri="struts-bean.tld" prefix="bean" %> <%@ taglib uri="struts-html.tld" prefix="html" %> ## ## Constant declarations ## #set ($servlet = $class.servlet) -#set ($formBeanName = $class.formBeanName) -#set ($inputFields = $class.inputFields) -#set ($triggers = $class.triggers) ## ## Specific to this class ## -#set ($servletName = "/$str.toJavaClassName($servlet.servletName)") -#set ($dispatchMethodName = "$str.toJavaMethodName($class.actionState.name)") +#set ($servletName = "/$servlet.servletName") +#set ($dispatchParameter = "$servlet.dispatchParameter") +#set ($dispatchMethodName = "$class.actionState.dispatchMethodName") ## ## Title ## <html:html> <head> <title><bean:message key="$class.titleMessageKey"/></title> -#if ($inputFields.size() > 0) -#set ($staticJavaScriptURI = "${servlet.useCase.workflow.contextPath}/form-validation.jsp") -#set ($dynamicJavaScriptURI = "${class.fullPathName}JS.jsp") - <script type="text/javascript" language="Javascript1.1" src="<html:rewrite page="$staticJavaScriptURI"/>"></script> -<!-- <script type="text/javascript" language="Javascript1.1" src="<html:rewrite page="$dynamicJavaScriptURI"/>"></script>--> -<html:javascript formName="$formBeanName" dynamicJavascript="true" staticJavascript="false" htmlComment="true"/> +#if ($class.hasForms()) <script type="text/javascript" language="Javascript1.1"> <!-- function submitForm(form,trigger) @@ -35,115 +30,27 @@ </script> #end </head> + <body> <h2><bean:message key="$class.titleMessageKey"/></h2> <p> -## -## In case no model has been specified we assume no parameter needed to be posted -## and we use a hyperlink -## -#if ($inputFields.size() > 0) + +#foreach ($request in $class.requests) ## -## If the view is backed by a model (indicating request parameters) we render a form +## In case we're dealing with a form (we have input buttons) ## -#set ($formAction = "$servletName?$servlet.dispatchParameter=$dispatchMethodName") -#set ($formFocus = "$class.firstInputField.name") - <html:form action="$formAction" focus="$formFocus"> -## This next field hold the trigger requests parameter that will be sent to the server +#set ($action = "$servletName?$dispatchParameter=$dispatchMethodName") +#if ($request.isForm()) + <html:form action="$action"> <html:hidden property="trigger" value=""/> <table cellpadding="5" cellspacing="5" border="0"> -## -## Render a new row for each input field on this view -## -#foreach ($inputField in $inputFields) -#set ($titleKey = "${inputField.messageKey}.title") +#foreach ($parameter in $request.parameters) <tr> - <td><bean:message key="$inputField.messageKey"/></td> + <td><bean:message key="$parameter.messageKey"/></td> <td> -## -## Depending on the type of the input field we render a different widget -## -#if ($inputField.defaultValue) -#set ($value = 'value="$inputField.defaultValue"') -#else -#set ($value = '') -#end -## -## C H E C K B O X & R A D I O B U T T O N -## -#if ( ($inputField.fieldType == 'radio') || ($inputField.fieldType == 'checkbox') ) -#if ($inputField.isReadOnly()) -#set ($disabled = 'disabled="true"') -#else -#set ($disabled = '') -#end - <html:$inputField.fieldType property="$inputField.name" titleKey="$titleKey" $disabled $value/> -#end -## -## T E X T F I E L D & P A S S W O R D -## -#if ( ($inputField.fieldType == 'text') || ($inputField.fieldType == 'password') ) -#if ($inputField.isReadOnly()) -#set ($readonly = 'readonly="true"') -#else -#set ($readonly = '') -#end -#if ($inputField.size) -#set ($maxLength = 'maxLength="$inputField.size"') -#else -#set ($maxLength = '') -#end - <html:$inputField.fieldType property="$inputField.name" titleKey="$titleKey" $readonly $maxLength $value/> -#end -## -## T E X T A R E A -## -#if ($inputField.fieldType == 'textarea') -#if ($inputField.isReadOnly()) -#set ($readonly = 'readonly="true"') -#else -#set ($readonly = '') -#end -#if ($inputField.size) -#if ($inputField.size < 15) -#set ($rows = 'rows="3"') -#set ($cols = 'cols="$inputField.size"') -#else -#set ($rowValue = $inputField.size / 15) -#set ($rows = 'rows="$rowValue"') -#set ($cols = 'cols="15"') -#end -#else -#set ($rows = '') -#set ($cols = '') -#end - <html:$inputField.fieldType property="$inputField.name" titleKey="$titleKey" $readonly $cols $rows $value/> -#end -## -## C O M B O B O X & L I S T -## -#if ($inputField.fieldType == 'select') -#if ($inputField.isMultiple()) -#set ($multiple = 'multiple="true"') -#else -#set ($multiple = 'multiple="false"') -#end -#if ($inputField.isReadOnly()) -#set ($disabled = 'disabled="true"') -#else -#set ($disabled = '') -#end -#if ($inputField.size) -#set ($size = 'size="$inputField.size"') -#else -#set ($size = '') -#end - <html:select $disabled $size $multiple property="$inputField.name" titleKey="$titleKey"> - <html:options property="$inputField.backingPropertyName"/> - </html:select> -#end +#renderFormField ($parameter " ") </td> </tr> #end @@ -156,21 +63,7 @@ ## 2. reset triggers do not call the servlet, they simply reset the form ## #foreach ($trigger in $triggers) -#if ($trigger.isCancelTrigger()) - <input type="button" name="<%=org.apache.struts.Globals.CANCEL_KEY%>" - onclick="submitForm(this.form,'$trigger.messageKey');" - title="<bean:message key="${class.messageKey}.$trigger.titleMessageKey"/>" - value="<bean:message key="${class.messageKey}.$trigger.messageKey"/>"> -#elseif ($trigger.isResetTrigger()) - <input type="reset" - title="<bean:message key="${class.messageKey}.$trigger.titleMessageKey"/>" - value="<bean:message key="${class.messageKey}.$trigger.messageKey"/>"> -#else - <input type="button" - onclick="submitForm(this.form,'$trigger.messageKey');" - title="<bean:message key="${class.messageKey}.$trigger.titleMessageKey"/>" - value="<bean:message key="${class.messageKey}.$trigger.messageKey"/>"> -#end +#renderFormButton ($trigger " ") #end </td> </tr> @@ -182,17 +75,12 @@ ## <ol> #foreach ($trigger in $triggers) -#set ($linkAction = "${servletName}?${servlet.dispatchParameter}=${dispatchMethodName}&trigger=$trigger.messageKey") <li> - <html:link action="$linkAction" titleKey="${class.messageKey}.$trigger.titleMessageKey"> - <bean:message key="${class.messageKey}.$trigger.messageKey"/> - </html:link> +#renderHyperlink ($action $trigger " ") </li> #end </ol> -## -## #end - +#end </body> </html:html> \ No newline at end of file |
From: Wouter Z. <dra...@us...> - 2004-03-09 00:49:40
|
User: draftdog Date: 04/03/08 16:32:56 Modified: andromda-bpm4struts/src/templates Tag: V3x_MMD StrutsJSP.vsl Log: several fixes added VM (temp) rendering page variables now, and also a title on the screen Revision Changes Path No revision No revision 1.5.2.21 +144 -6 cartridges/andromda-bpm4struts/src/templates/StrutsJSP.vsl Index: StrutsJSP.vsl =================================================================== RCS file: /cvsroot/andromda/cartridges/andromda-bpm4struts/src/templates/StrutsJSP.vsl,v retrieving revision 1.5.2.20 retrieving revision 1.5.2.21 diff -u -w -r1.5.2.20 -r1.5.2.21 --- StrutsJSP.vsl 7 Mar 2004 19:51:21 -0000 1.5.2.20 +++ StrutsJSP.vsl 9 Mar 2004 00:32:56 -0000 1.5.2.21 @@ -1,6 +1,132 @@ #set ($generatedFile = "${class.fullPathName}") -#parse("templates/StrutsJSP.vm") +## +## +## This macro takes care of rendering the appropriate Struts +## HTML hyperlink tags for the argument trigger +## +## +#macro ( renderHyperlink $action $indent ) +#set ($triggerKey = $action.triggerKey) +${indent}<html:link forward="$action.forwardName" titleKey="$triggerKey" paramName="request" paramProperty="parameterMap"> +${indent} <bean:message key="$triggerKey"/> +${indent}</html:link> +#end +## +## +## This macro takes care of rendering the appropriate Struts +## HTML button tags for the argument trigger +## +## +#macro ( renderFormButton $trigger $indent ) +#if ($trigger.isCancelTrigger()) +${indent}<input type="button" name="<%=org.apache.struts.Globals.CANCEL_KEY%>" +${indent} onclick="submitForm(this.form,'$trigger.messageKey');" +${indent} title="<bean:message key="$trigger.titleKey"/>" +${indent} value="<bean:message key="$trigger.messageKey"/>"> +#elseif ($trigger.isResetTrigger()) +${indent}<input type="reset" +${indent} title="<bean:message key="$trigger.titleKey"/>" +${indent} value="<bean:message key="$trigger.messageKey"/>"> +#else +${indent}<input type="submit" +${indent} title="<bean:message key="$trigger.triggerKey"/>" +${indent} value="<bean:message key="$trigger.triggerKey"/>"/> +#end +#end +## +## +## This macro takes care of rendering the appropriate Struts tags +## for the argument form field +## +## +#macro ( renderFormField $field $indent) +#set ($widgetType = $field.widgetType) +## +## Take the default value into account +## +#if ($field.defaultValue) +#set ($value = 'value="$field.defaultValue"') +#else +#set ($value = '') +#end +## +## Depending on the type of the input field we render a different widget +## +## +## C H E C K B O X & R A D I O B U T T O N +## +#if ( ($widgetType == 'radio') || ($widgetType == 'checkbox') ) +#if ($field.isReadOnly()) +#set ($disabled = 'disabled="true"') +#else +#set ($disabled = '') +#end +${indent}<html:$widgetType property="$field.name" titleKey="$field.titleKey" $disabled $value/> +## +## T E X T F I E L D & P A S S W O R D +## +#elseif ( ($widgetType == 'text') || ($widgetType == 'password') ) +#if ($field.isReadOnly()) +#set ($readonly = 'readonly="true"') +#else +#set ($readonly = '') +#end +## ADD THIS SOON: titleKey="$field.titleKey" +${indent}<html:$widgetType property="$field.name" $readonly $value/> +## +## T E X T A R E A +## +#elseif ($widgetType == 'textarea') +#if ($field.isReadOnly()) +#set ($readonly = 'readonly="true"') +#else +#set ($readonly = '') +#end +#if ($field.columnCount) +#set ($cols = 'cols="$field.columnCount"') +#else +#set ($cols = '') +#end +#if ($field.rowCount) +#set ($rows = 'rows="$field.rowCount"') +#else +#set ($rows = '') +#end +${indent}<html:$widgetType property="$field.name" titleKey="$field.titleKey" $readonly $cols $rows $value/> +## +## C O M B O B O X & L I S T +## +#elseif ($widgetType == 'select') +#if ($field.isMultiple()) +#set ($multiple = 'multiple="true"') +#else +#set ($multiple = 'multiple="false"') +#end +#if ($field.isReadOnly()) +#set ($disabled = 'disabled="true"') +#else +#set ($disabled = '') +#end +#if ($field.size) +#set ($size = 'size="$field.size"') +#else +#set ($size = '') +#end +${indent}<html:select $disabled $size $multiple property="$field.name" titleKey="$field.titleKey"> +${indent} <html:options property="$field.backingPropertyName"/> +${indent}</html:select> +## +## Any other field will be rendered as plain text (no input) +## +#else +${indent}<bean:write name="$action.formName" property="$field.name" scope="request"/> +#end +#end + + + + <%@ taglib uri="struts-bean.tld" prefix="bean" %> <%@ taglib uri="struts-html.tld" prefix="html" %> @@ -8,6 +134,14 @@ #set ($actions = $class.actions) +#foreach ($variable in $) +#set ($variableName = $variable.name) +#set ($variableType = $variable.type) +<bean:define id="$variableName" name="$variableName" type="$variableType" scope="request" toScope="page"/> +#end + + + <html:html xhtml="true"> <head> @@ -15,7 +149,9 @@ #if ($class.hasForms()) #foreach ($action in $actions) #if ($action.isFormAction()) +<!-- <script type="text/javascript" language="Javascript1.1" src="<html:rewrite page="${action.fullPathName}JS.jsp"/>"></script> +--> #end #end #end @@ -23,6 +159,8 @@ <body> + <p><h2><bean:message key="$class.titleKey"/></h2></p> + <logic:messagesPresent> <html:messages id="error"> ERR: <bean:write name="error"/> <br/> @@ -39,19 +177,19 @@ #if ($action.isHyperlinkAction()) #renderHyperlink($action " ") #elseif ($action.isFormAction()) - <html:form forward="$action.forwardName"> + <html:form action="${action.actionPath}.do"> <table cellpadding="5" cellspacing="5" border="0"> -#foreach ($field in $class.actionParameters) +#foreach ($field in $action.actionParameters) <tr> - <td><bean:message key="$field.messageKey"/></td> + <td><bean:message key="${action.triggerKey}.${field.messageKey}"/></td> <td> -##renderFormField($field " ") +#renderFormField($field " ") </td> </tr> #end <tr> <td> -##renderFormButtons($class " ") +#renderFormButton($action " ") </td> </tr> </table> |
From: Wouter Z. <dra...@us...> - 2004-03-12 00:00:09
|
User: draftdog Date: 04/03/11 15:41:08 Modified: andromda-bpm4struts/src/templates Tag: V3x_MMD StrutsJSP.vsl Log: applied fixes in the bean:define tags (page variables) applied fixes the resource message keys Revision Changes Path No revision No revision 1.5.2.22 +59 -67 cartridges/andromda-bpm4struts/src/templates/StrutsJSP.vsl Index: StrutsJSP.vsl =================================================================== RCS file: /cvsroot/andromda/cartridges/andromda-bpm4struts/src/templates/StrutsJSP.vsl,v retrieving revision 1.5.2.21 retrieving revision 1.5.2.22 diff -u -w -r1.5.2.21 -r1.5.2.22 --- StrutsJSP.vsl 9 Mar 2004 00:32:56 -0000 1.5.2.21 +++ StrutsJSP.vsl 11 Mar 2004 23:41:07 -0000 1.5.2.22 @@ -1,37 +1,56 @@ -#set ($generatedFile = "${class.fullPathName}") - +#set ($generatedFile = "${class.fullPath}.jsp") ## ## ## This macro takes care of rendering the appropriate Struts -## HTML hyperlink tags for the argument trigger +## HTML hyperlink tags for the argument action ## ## #macro ( renderHyperlink $action $indent ) #set ($triggerKey = $action.triggerKey) -${indent}<html:link forward="$action.forwardName" titleKey="$triggerKey" paramName="request" paramProperty="parameterMap"> -${indent} <bean:message key="$triggerKey"/> +#set ($roles = $action.actionRoles) +${indent}<logic:present role="$roles"> +${indent} <html:link forward="$action.forwardName" titleKey="${action.messageKey}.$triggerKey" paramName="request" paramProperty="parameterMap"> +${indent} <bean:message key="${action.messageKey}.$triggerKey"/> ${indent}</html:link> +${indent}</logic:present> +${indent}<logic:notPresent role="$roles"> +${indent} <bean:message key="${action.messageKey}.$triggerKey"/> +${indent}</logic:notPresent> #end ## ## ## This macro takes care of rendering the appropriate Struts -## HTML button tags for the argument trigger +## HTML button tags for the argument action ## ## -#macro ( renderFormButton $trigger $indent ) -#if ($trigger.isCancelTrigger()) -${indent}<input type="button" name="<%=org.apache.struts.Globals.CANCEL_KEY%>" -${indent} onclick="submitForm(this.form,'$trigger.messageKey');" -${indent} title="<bean:message key="$trigger.titleKey"/>" -${indent} value="<bean:message key="$trigger.messageKey"/>"> -#elseif ($trigger.isResetTrigger()) -${indent}<input type="reset" -${indent} title="<bean:message key="$trigger.titleKey"/>" -${indent} value="<bean:message key="$trigger.messageKey"/>"> -#else -${indent}<input type="submit" -${indent} title="<bean:message key="$trigger.triggerKey"/>" -${indent} value="<bean:message key="$trigger.triggerKey"/>"/> +#macro ( renderFormButtons $action $indent ) +#set ($trigger = $action.actionTrigger) +#set ($roles = $action.actionRoles) +#if ($roles != "") +${indent}<logic:present role="$roles"> +#end +${indent} <html:submit titleKey="${action.messageKey}.$trigger.titleKey"> +${indent} <bean:message key="${action.messageKey}.$trigger.triggerKey"/> +${indent} </html:submit> +#if ($action.isResettable()) +${indent} <html:reset titleKey="${action.messageKey}.$trigger.resetTitleKey"> +${indent} <bean:message key="${action.messageKey}.$trigger.resetMessageKey"/> +${indent} </html:reset> +#end +#if ($roles != "") +${indent}</logic:present> +#end +#if ($roles != "") +${indent}<logic:notPresent role="$roles"> +${indent} <html:submit titleKey="${action.messageKey}.$trigger.notAllowedTitleKey" disabled="true"> +${indent} <bean:message key="${action.messageKey}.$trigger.notAllowedKey"/> +${indent} </html:submit> +#if ($action.isResettable()) +${indent} <html:reset titleKey="${action.messageKey}.$trigger.resetNotAllowedTitleKey" disabled="true"> +${indent} <bean:message key="${action.messageKey}.$trigger.resetNotAllowedKey"/> +${indent} </html:reset> +#end +${indent}</logic:notPresent> #end #end ## @@ -83,17 +102,7 @@ #else #set ($readonly = '') #end -#if ($field.columnCount) -#set ($cols = 'cols="$field.columnCount"') -#else -#set ($cols = '') -#end -#if ($field.rowCount) -#set ($rows = 'rows="$field.rowCount"') -#else -#set ($rows = '') -#end -${indent}<html:$widgetType property="$field.name" titleKey="$field.titleKey" $readonly $cols $rows $value/> +${indent}<html:$widgetType property="$field.name" titleKey="$field.titleKey" $readonly $value/> ## ## C O M B O B O X & L I S T ## @@ -108,53 +117,38 @@ #else #set ($disabled = '') #end -#if ($field.size) -#set ($size = 'size="$field.size"') -#else -#set ($size = '') -#end -${indent}<html:select $disabled $size $multiple property="$field.name" titleKey="$field.titleKey"> -${indent} <html:options property="$field.backingPropertyName"/> +${indent}<html:select $disabled $multiple property="$field.name" titleKey="$field.titleKey"> +${indent} <html:options property="$field.backingListName"/> ${indent}</html:select> ## ## Any other field will be rendered as plain text (no input) ## #else -${indent}<bean:write name="$action.formName" property="$field.name" scope="request"/> +${indent}<bean:write name="$action.actionName" property="$field.name" scope="request"/> #end #end - - - - - <%@ taglib uri="struts-bean.tld" prefix="bean" %> <%@ taglib uri="struts-html.tld" prefix="html" %> <%@ taglib uri="struts-logic.tld" prefix="logic" %> - +## +## CONSTANTS +## #set ($actions = $class.actions) +#set ($formBeanName = $class.useCase.formBeanName) +## +## START TEMPLATE +## -#foreach ($variable in $) +#foreach ($variable in $class.pageVariables) #set ($variableName = $variable.name) -#set ($variableType = $variable.type) -<bean:define id="$variableName" name="$variableName" type="$variableType" scope="request" toScope="page"/> +#set ($variableType = $variable.type.fullyQualifiedName) +<bean:define id="$variableName" name="$formBeanName" property="$variableName" type="$variableType" scope="request" toScope="page"/> #end - - <html:html xhtml="true"> <head> <title><bean:message key="$class.titleKey"/></title> -#if ($class.hasForms()) -#foreach ($action in $actions) -#if ($action.isFormAction()) -<!-- - <script type="text/javascript" language="Javascript1.1" src="<html:rewrite page="${action.fullPathName}JS.jsp"/>"></script> ---> -#end -#end -#end </head> <body> @@ -163,20 +157,20 @@ <logic:messagesPresent> <html:messages id="error"> - ERR: <bean:write name="error"/> <br/> + ERROR: <bean:write name="error"/> <br/> </html:messages> </logic:messagesPresent> <logic:messagesPresent message="true"> <html:messages id="message"> - MSG: <bean:write name="message"/> <br/> + MESSAGE: <bean:write name="message"/> <br/> </html:messages> </logic:messagesPresent> #foreach ($action in $actions) -#if ($action.isHyperlinkAction()) +#if ($action.isHyperlink()) #renderHyperlink($action " ") -#elseif ($action.isFormAction()) +#elseif ($action.isFormPost()) <html:form action="${action.actionPath}.do"> <table cellpadding="5" cellspacing="5" border="0"> #foreach ($field in $action.actionParameters) @@ -189,7 +183,7 @@ #end <tr> <td> -#renderFormButton($action " ") +#renderFormButtons($action " ") </td> </tr> </table> @@ -202,5 +196,3 @@ </html:html> - - |
From: Wouter Z. <dra...@us...> - 2004-03-12 01:49:57
|
User: draftdog Date: 04/03/11 17:30:51 Modified: andromda-bpm4struts/src/templates Tag: V3x_MMD StrutsJSP.vsl Log: fixed message resource keys Revision Changes Path No revision No revision 1.5.2.23 +18 -26 cartridges/andromda-bpm4struts/src/templates/StrutsJSP.vsl Index: StrutsJSP.vsl =================================================================== RCS file: /cvsroot/andromda/cartridges/andromda-bpm4struts/src/templates/StrutsJSP.vsl,v retrieving revision 1.5.2.22 retrieving revision 1.5.2.23 diff -u -w -r1.5.2.22 -r1.5.2.23 --- StrutsJSP.vsl 11 Mar 2004 23:41:07 -0000 1.5.2.22 +++ StrutsJSP.vsl 12 Mar 2004 01:30:50 -0000 1.5.2.23 @@ -24,17 +24,18 @@ ## ## #macro ( renderFormButtons $action $indent ) +#set ($messageKey = $action.messageKey) #set ($trigger = $action.actionTrigger) #set ($roles = $action.actionRoles) #if ($roles != "") ${indent}<logic:present role="$roles"> #end -${indent} <html:submit titleKey="${action.messageKey}.$trigger.titleKey"> -${indent} <bean:message key="${action.messageKey}.$trigger.triggerKey"/> +${indent} <html:submit titleKey="${messageKey}.$trigger.titleKey"> +${indent} <bean:message key="${messageKey}.$trigger.triggerKey"/> ${indent} </html:submit> #if ($action.isResettable()) -${indent} <html:reset titleKey="${action.messageKey}.$trigger.resetTitleKey"> -${indent} <bean:message key="${action.messageKey}.$trigger.resetMessageKey"/> +${indent} <html:reset titleKey="${messageKey}.$trigger.resetTitleKey"> +${indent} <bean:message key="${messageKey}.$trigger.resetMessageKey"/> ${indent} </html:reset> #end #if ($roles != "") @@ -42,12 +43,12 @@ #end #if ($roles != "") ${indent}<logic:notPresent role="$roles"> -${indent} <html:submit titleKey="${action.messageKey}.$trigger.notAllowedTitleKey" disabled="true"> -${indent} <bean:message key="${action.messageKey}.$trigger.notAllowedKey"/> +${indent} <html:submit titleKey="${messageKey}.$trigger.notAllowedTitleKey" disabled="true"> +${indent} <bean:message key="${messageKey}.$trigger.notAllowedKey"/> ${indent} </html:submit> #if ($action.isResettable()) -${indent} <html:reset titleKey="${action.messageKey}.$trigger.resetNotAllowedTitleKey" disabled="true"> -${indent} <bean:message key="${action.messageKey}.$trigger.resetNotAllowedKey"/> +${indent} <html:reset titleKey="${messageKey}.$trigger.resetNotAllowedTitleKey" disabled="true"> +${indent} <bean:message key="${messageKey}.$trigger.resetNotAllowedKey"/> ${indent} </html:reset> #end ${indent}</logic:notPresent> @@ -59,17 +60,9 @@ ## for the argument form field ## ## -#macro ( renderFormField $field $indent) +#macro ( renderFormField $action $field $indent) #set ($widgetType = $field.widgetType) ## -## Take the default value into account -## -#if ($field.defaultValue) -#set ($value = 'value="$field.defaultValue"') -#else -#set ($value = '') -#end -## ## Depending on the type of the input field we render a different widget ## ## @@ -81,7 +74,7 @@ #else #set ($disabled = '') #end -${indent}<html:$widgetType property="$field.name" titleKey="$field.titleKey" $disabled $value/> +${indent}<html:$widgetType property="$field.name" titleKey="${messageKey}.$field.titleKey" $disabled/> ## ## T E X T F I E L D & P A S S W O R D ## @@ -91,8 +84,7 @@ #else #set ($readonly = '') #end -## ADD THIS SOON: titleKey="$field.titleKey" -${indent}<html:$widgetType property="$field.name" $readonly $value/> +${indent}<html:$widgetType property="$field.name" titleKey="${messageKey}.$field.titleKey" $readonly/> ## ## T E X T A R E A ## @@ -102,7 +94,7 @@ #else #set ($readonly = '') #end -${indent}<html:$widgetType property="$field.name" titleKey="$field.titleKey" $readonly $value/> +${indent}<html:$widgetType property="$field.name" titleKey="${messageKey}.$field.titleKey" $readonly/> ## ## C O M B O B O X & L I S T ## @@ -117,7 +109,7 @@ #else #set ($disabled = '') #end -${indent}<html:select $disabled $multiple property="$field.name" titleKey="$field.titleKey"> +${indent}<html:select $disabled $multiple property="$field.name" titleKey="${messageKey}.$field.titleKey"> ${indent} <html:options property="$field.backingListName"/> ${indent}</html:select> ## @@ -168,6 +160,8 @@ </logic:messagesPresent> #foreach ($action in $actions) +#set ($messageKey = $action.messageKey) +#set ($actionTrigger = $action.actionTrigger) #if ($action.isHyperlink()) #renderHyperlink($action " ") #elseif ($action.isFormPost()) @@ -175,9 +169,9 @@ <table cellpadding="5" cellspacing="5" border="0"> #foreach ($field in $action.actionParameters) <tr> - <td><bean:message key="${action.triggerKey}.${field.messageKey}"/></td> + <td><bean:message key="${messageKey}.$field.messageKey"/></td> <td> -#renderFormField($field " ") +#renderFormField($action $field " ") </td> </tr> #end @@ -194,5 +188,3 @@ </body> </html:html> - - |