Menu
▾
▴
[Andromda-cvs] CVS update: cartridges/andromda-jsf/src/java/org/andromda/cartridges/jsf/metafacades JSFParameterLogicImpl.java
|
From: Chad B. <cwb...@us...> - 2005-09-10 20:20:38
|
User: cwbrandon
Date: 05/09/10 13:20:30
Modified: andromda-jsf/src/META-INF/andromda cartridge.xml
andromda-jsf/src/templates/jsf/views/jsp/includes
view-action.jspf.vsl
andromda-jsf/src/java/org/andromda/cartridges/jsf/metafacades
JSFParameterLogicImpl.java
Added: andromda-jsf/src/templates/jsf/views/jsp/includes
renderActionFormInput.vm
renderActionCommandLinkParameter.vm
Log:
break some functionality out into macros
Revision Changes Path
1.5 +2 -1 cartridges/andromda-jsf/src/META-INF/andromda/cartridge.xml
Index: cartridge.xml
===================================================================
RCS file: /cvsroot/andromda/cartridges/andromda-jsf/src/META-INF/andromda/cartridge.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -w -r1.4 -r1.5
--- cartridge.xml 9 Sep 2005 18:35:59 -0000 1.4
+++ cartridge.xml 10 Sep 2005 20:20:30 -0000 1.5
@@ -1,7 +1,8 @@
<cartridge>
<templateEngine>
- <macrolibrary name="templates/jsf/macros/renderValidation.vm"/>
+ <macrolibrary name="templates/jsf/views/jsp/includes/renderActionFormInput.vm"/>
+ <macrolibrary name="templates/jsf/views/jsp/includes/renderActionCommandLinkParameter.vm"/>
<!-- cartridge-macrolibrary merge-point-->
</templateEngine>
1.4 +2 -62 cartridges/andromda-jsf/src/templates/jsf/views/jsp/includes/view-action.jspf.vsl
Index: view-action.jspf.vsl
===================================================================
RCS file: /cvsroot/andromda/cartridges/andromda-jsf/src/templates/jsf/views/jsp/includes/view-action.jspf.vsl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -w -r1.3 -r1.4
--- view-action.jspf.vsl 9 Sep 2005 17:06:15 -0000 1.3
+++ view-action.jspf.vsl 10 Sep 2005 20:20:30 -0000 1.4
@@ -9,13 +9,7 @@
#end
<h:outputText value="#{messages['$action.messageKey']}"/>
#foreach ($parameter in $action.parameters)
-#if ($parameter.type.dateType || $parameter.type.timeType)
-#set ($parameterValue = "${parameter.name}Formatted")
- <fmt:formatDate var="$parameterValue" value="${${formName}.${parameter.name}}" pattern="$parameter.format" scope="request"/>
-#else
-#set ($parameterValue = "${formName}.${parameter.name}")
-#end
- <f:param name="$parameter.name" value="#{${parameterValue}}"/>
+#renderActionCommandLinkParameter()
#end
#if ($action.hyperlink)
</h:commandLink>
@@ -36,61 +30,7 @@
footerClass="formFooter"
columnClasses="formLabels,,formInputs">
#foreach ($parameter in $action.parameters)
-#if (!$parameter.table && !$parameter.inputHidden)
- <h:outputLabel for="${formName}:${parameter.name}" value="#{messages['$parameter.messageKey']}"/>
- <f:verbatim>:</f:verbatim>
- <h:panelGroup>
-#if ($parameter.type.dateType)
-#if ($parameter.readOnly)
- <h:inputText id="$parameter.name" value="#{${formName}.${parameter.name}}" readonly="true">
-#else
- <x:inputCalendar id="$parameter.name"
- monthYearRowClass="yearMonthHeader"
- weekRowClass="weekHeader"
- value="#{${formName}.${parameter.name}}"
- renderAsPopup="true"
- popupDateFormat="$parameter.format"
- required="$parameter.required">
- <jsf:convertDateTime pattern="$parameter.format"/>
- </x:inputCalendar>
-#end
-#elseif ($parameter.inputCheckbox)
- <h:selectBooleanCheckbox id="$parameter.name" value="#{${formName}.${parameter.name}}" required="$parameter.required" readonly="$parameter.readOnly"/>
-#elseif ($parameter.inputSelect)
- <h:selectOneMenu id="$parameter.name" value="#{${formName}.${parameter.name}}" styleClass="selectOneMenu" required="$parameter.required" readonly="$parameter.readOnly">
- <f:selectItem itemValue="" itemLabel="#{messages['select.value.text']}" />
- <c:if test="${!empty ${formName}.${parameter.backingListName}}">
- <f:selectItems value="#{${formName}.${parameter.backingListName}}" />
- </c:if>
- </h:selectOneMenu>
-#elseif ($parameter.inputTextarea)
- <h:inputTextarea id="$parameter.name" rows="5" value="#{${formName}.${parameter.name}}" required="$parameter.required" readonly="$parameter.readOnly"/>
-#elseif ($parameter.inputSecret)
- <h:inputSecret id="$parameter.name" value="#{${formName}.${parameter.name}}" required="$parameter.required" readonly="$parameter.readOnly"/>
-#elseif ($parameter.inputFile)
- <x:inputFileUpload id="$parameter.name" value="#{${formName}.${parameter.name}}" storage="file" required="$parameter.required" readonly="$parameter.readOnly" styleClass="fileUploadInput"/>
-#elseif ($parameter.inputMultibox)
- <h:selectManyCheckbox id="$parameter.name" value="#{${formName}.${parameter.name}}" layout="pageDirection" styleClass="selectManyCheckbox">
- <c:if test="${!empty ${formName}.${parameter.backingListName}}">
- <f:selectItems value="#{${formName}.${parameter.backingListName}}" />
- </c:if>
- </h:selectManyCheckbox>
-#elseif ($parameter.inputRadio)
- <h:selectOneRadio id="$parameter.name" value="#{${formName}.${parameter.name}}" layout="pageDirection" styleClass="selectOneRadio">
- <c:if test="${!empty ${formName}.${parameter.backingListName}}">
- <f:selectItems value="#{${formName}.${parameter.backingListName}}" />
- </c:if>
- </h:selectOneRadio>
-#else
- <h:inputText id="$parameter.name" value="#{${formName}.${parameter.name}}" required="$parameter.required" readonly="$parameter.readOnly">
-#if ($parameter.type.timeType)
- <jsf:convertDateTime pattern="$parameter.format"/>
-#end
- </h:inputText>
-#end
- <x:message for="$parameter.name" styleClass="error" showDetail="true" showSummary="false"/>
- </h:panelGroup>
-#end
+#renderActionInput()
#end
<h:panelGroup/>
<h:panelGroup/>
1.1 cartridges/andromda-jsf/src/templates/jsf/views/jsp/includes/renderActionFormInput.vm
Index: renderActionFormInput.vm
===================================================================
##
## A macro that renders the appropriate action form input field
##
#macro(renderActionInput)
#if (!$parameter.table && !$parameter.inputHidden)
<h:outputLabel for="${formName}:${parameter.name}" value="#{messages['$parameter.messageKey']}"/>
<f:verbatim>:</f:verbatim>
<h:panelGroup>
#if ($parameter.type.dateType)
#if ($parameter.readOnly)
<h:inputText id="$parameter.name" value="#{${formName}.${parameter.name}}" readonly="true">
#else
<x:inputCalendar id="$parameter.name"
monthYearRowClass="yearMonthHeader"
weekRowClass="weekHeader"
value="#{${formName}.${parameter.name}}"
renderAsPopup="true"
popupDateFormat="$parameter.format"
required="$parameter.required">
<jsf:convertDateTime pattern="$parameter.format"/>
</x:inputCalendar>
#end
#elseif ($parameter.inputCheckbox)
<h:selectBooleanCheckbox id="$parameter.name" value="#{${formName}.${parameter.name}}" required="$parameter.required" readonly="$parameter.readOnly"/>
#elseif ($parameter.inputSelect)
<h:selectOneMenu id="$parameter.name" value="#{${formName}.${parameter.name}}" styleClass="selectOneMenu" required="$parameter.required" readonly="$parameter.readOnly">
<f:selectItem itemValue="" itemLabel="#{messages['select.value.text']}" />
<c:if test="${!empty ${formName}.${parameter.backingListName}}">
<f:selectItems value="#{${formName}.${parameter.backingListName}}" />
</c:if>
</h:selectOneMenu>
#elseif ($parameter.inputTextarea)
<h:inputTextarea id="$parameter.name" rows="5" value="#{${formName}.${parameter.name}}" required="$parameter.required" readonly="$parameter.readOnly"/>
#elseif ($parameter.inputSecret)
<h:inputSecret id="$parameter.name" value="#{${formName}.${parameter.name}}" required="$parameter.required" readonly="$parameter.readOnly"/>
#elseif ($parameter.inputFile)
<x:inputFileUpload id="$parameter.name" value="#{${formName}.${parameter.name}}" storage="file" required="$parameter.required" readonly="$parameter.readOnly" styleClass="fileUploadInput"/>
#elseif ($parameter.inputMultibox)
<h:selectManyCheckbox id="$parameter.name" value="#{${formName}.${parameter.name}}" layout="pageDirection" styleClass="selectManyCheckbox">
<c:if test="${!empty ${formName}.${parameter.backingListName}}">
<f:selectItems value="#{${formName}.${parameter.backingListName}}" />
</c:if>
</h:selectManyCheckbox>
#elseif ($parameter.inputRadio)
<h:selectOneRadio id="$parameter.name" value="#{${formName}.${parameter.name}}" layout="pageDirection" styleClass="selectOneRadio">
<c:if test="${!empty ${formName}.${parameter.backingListName}}">
<f:selectItems value="#{${formName}.${parameter.backingListName}}" />
</c:if>
</h:selectOneRadio>
#else
<h:inputText id="$parameter.name" value="#{${formName}.${parameter.name}}" required="$parameter.required" readonly="$parameter.readOnly">
#if ($parameter.type.timeType)
<jsf:convertDateTime pattern="$parameter.format"/>
#end
</h:inputText>
#end
<x:message for="$parameter.name" styleClass="error" showDetail="true" showSummary="false"/>
</h:panelGroup>
#end
#end
1.1 cartridges/andromda-jsf/src/templates/jsf/views/jsp/includes/renderActionCommandLinkParameter.vm
Index: renderActionCommandLinkParameter.vm
===================================================================
##
## A macro that renders the appropriate action commandLink parameter
##
#macro(renderActionCommandLinkParameter)
#if ($parameter.type.dateType || $parameter.type.timeType)
#set ($parameterValue = "${parameter.name}Formatted")
<fmt:formatDate var="$parameterValue" value="${${formName}.${parameter.name}}" pattern="$parameter.format" scope="request"/>
#else
#set ($parameterValue = "${formName}.${parameter.name}")
#end
<f:param name="$parameter.name" value="#{${parameterValue}}"/>
#end
1.4 +1 -1 cartridges/andromda-jsf/src/java/org/andromda/cartridges/jsf/metafacades/JSFParameterLogicImpl.java
Index: JSFParameterLogicImpl.java
===================================================================
RCS file: /cvsroot/andromda/cartridges/andromda-jsf/src/java/org/andromda/cartridges/jsf/metafacades/JSFParameterLogicImpl.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -w -r1.3 -r1.4
--- JSFParameterLogicImpl.java 9 Sep 2005 17:06:15 -0000 1.3
+++ JSFParameterLogicImpl.java 10 Sep 2005 20:20:30 -0000 1.4
@@ -88,7 +88,7 @@
*/
protected String handleGetDocumentationValue()
{
- final String value = StringUtilsHelper.toResourceMessage(getDocumentation(
+ final String value = StringUtilsHelper.toResourceMessage(this.getDocumentation(
"",
64,
false));
|