Menu
▾
▴
[Andromdaplugins-cvs] CVS update: cartridges/andromda-jsf2/src/main/resources/templates/jsf2/views/portlet view-table.xhtml.vsl
|
From: Chad B. <cwb...@us...> - 2008-03-27 21:58:29
|
User: cwbrandon
Date: 08/03/27 14:58:35
Modified: andromda-jsf2/src/main/resources/META-INF/andromda
cartridge.xml
andromda-jsf2/src/main/resources/templates/jsf2/views/jsp/includes
view-table.jspf.vsl
andromda-jsf2/src/main/resources/templates/jsf2/views/facelets
view-table.xhtml.vsl
andromda-jsf2/src/main/resources/templates/jsf2/views/portlet
view-table.xhtml.vsl
Added: andromda-jsf2/src/main/resources/templates/jsf2/views
renderTableCommandLinkParameters.vm
Log:
move renderTableCommandLinkParameters into its on vm file
Revision Changes Path
1.16 +3 -1 cartridges/andromda-jsf2/src/main/resources/META-INF/andromda/cartridge.xml
Index: cartridge.xml
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-jsf2/src/main/resources/META-INF/andromda/cartridge.xml,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -w -r1.15 -r1.16
--- cartridge.xml 27 Mar 2008 18:34:45 -0000 1.15
+++ cartridge.xml 27 Mar 2008 21:58:35 -0000 1.16
@@ -4,6 +4,7 @@
<macrolibrary name="templates/jsf2/controllers/Controller.java.vm"/>
<macrolibrary name="templates/jsf2/views/renderActionFormInput.vm"/>
<macrolibrary name="templates/jsf2/views/renderActionCommandLinkParameter.vm"/>
+ <macrolibrary name="templates/jsf2/views/renderTableCommandLinkParameters.vm"/>
<macrolibrary name="templates/jsf2/forms/formMacros.vm"/>
<macrolibrary name="templates/jsf2/forms/formImplMacros.vm"/>
<macrolibrary name="templates/jsf2/configuration/validation.xml.vm"/>
@@ -1074,7 +1075,8 @@
outlet="managed-beans"
overwrite="true"
outputToSingleFile="true"
- outputCondition="portlet">
+ outputCondition="portlet"
+ outputOnEmptyElements="false">
<modelElements>
<modelElement variable="applicationUseCases">
<type name="org.andromda.metafacades.uml.FrontEndUseCase">
1.5 +0 -18 cartridges/andromda-jsf2/src/main/resources/templates/jsf2/views/jsp/includes/view-table.jspf.vsl
Index: view-table.jspf.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-jsf2/src/main/resources/templates/jsf2/views/jsp/includes/view-table.jspf.vsl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -w -r1.4 -r1.5
--- view-table.jspf.vsl 25 Feb 2008 14:35:32 -0000 1.4
+++ view-table.jspf.vsl 27 Mar 2008 21:58:35 -0000 1.5
@@ -1,21 +1,3 @@
-##
-## This macro renders the <f:param> elements for a command link
-##
-#macro (renderTableCommandLinkParameters $attribute)
-#foreach ($parameter in $action.parameters)
-#if ($table.tableColumnNames.contains($parameter.name) || $table.tableAttributeNames.contains($parameter.name))
-#set ($parameterValue = "row.${parameter.name}")
-#else
-#set ($parameterValue = "$parameter.name")
-#end
-#if($attribute)
-#set ($elementType = "attribute")
-#else
-#set ($elementType = "param")
-#end
- <f:$elementType name="$parameter.name" value="#{${parameterValue}}"/>
-#end
-#end
<h:form>
#set ($targetColumns = $table.targettedTableColumnNames)
<tr:table allDetailsEnabled="true" var="row" rowBandingInterval="1" value="#{${table.name}}" rows="#{${preferencesBeanName}.maxTableRows}" width="90%">
1.1 cartridges/andromda-jsf2/src/main/resources/templates/jsf2/views/renderTableCommandLinkParameters.vm
Index: renderTableCommandLinkParameters.vm
===================================================================
##
## This macro renders the <f:param> elements for a command link
##
#macro (renderTableCommandLinkParameters $attribute)
#foreach ($parameter in $action.parameters)
#if ($table.tableColumnNames.contains($parameter.name) || $table.tableAttributeNames.contains($parameter.name))
#set ($parameterValue = "row.${parameter.name}")
#else
#set ($parameterValue = "$parameter.name")
#end
#if($attribute)
#set ($elementType = "attribute")
#else
#set ($elementType = "param")
#end
<f:$elementType name="$parameter.name" value="#{${parameterValue}}"/>
#end
#end
1.7 +0 -18 cartridges/andromda-jsf2/src/main/resources/templates/jsf2/views/facelets/view-table.xhtml.vsl
Index: view-table.xhtml.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-jsf2/src/main/resources/templates/jsf2/views/facelets/view-table.xhtml.vsl,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -w -r1.6 -r1.7
--- view-table.xhtml.vsl 25 Feb 2008 14:32:34 -0000 1.6
+++ view-table.xhtml.vsl 27 Mar 2008 21:58:35 -0000 1.7
@@ -1,21 +1,3 @@
-##
-## This macro renders the <f:param> elements for a command link
-##
-#macro (renderTableCommandLinkParameters $attribute)
-#foreach ($parameter in $action.parameters)
-#if ($table.tableColumnNames.contains($parameter.name) || $table.tableAttributeNames.contains($parameter.name))
-#set ($parameterValue = "row.${parameter.name}")
-#else
-#set ($parameterValue = "$parameter.name")
-#end
-#if($attribute)
-#set ($elementType = "attribute")
-#else
-#set ($elementType = "param")
-#end
- <f:$elementType name="$parameter.name" value="#{${parameterValue}}"/>
-#end
-#end
<html xmlns="http://www.w3.org/1999/xhtml"
xmlns:ui="http://java.sun.com/jsf/facelets"
xmlns:h="http://java.sun.com/jsf/html"
1.5 +0 -18 cartridges/andromda-jsf2/src/main/resources/templates/jsf2/views/portlet/view-table.xhtml.vsl
Index: view-table.xhtml.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-jsf2/src/main/resources/templates/jsf2/views/portlet/view-table.xhtml.vsl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -w -r1.4 -r1.5
--- view-table.xhtml.vsl 27 Mar 2008 21:46:14 -0000 1.4
+++ view-table.xhtml.vsl 27 Mar 2008 21:58:35 -0000 1.5
@@ -1,21 +1,3 @@
-##
-## This macro renders the <f:param> elements for a command link
-##
-#macro (renderTableCommandLinkParameters $attribute)
-#foreach ($parameter in $action.parameters)
-#if ($table.tableColumnNames.contains($parameter.name) || $table.tableAttributeNames.contains($parameter.name))
-#set ($parameterValue = "row.${parameter.name}")
-#else
-#set ($parameterValue = "$parameter.name")
-#end
-#if($attribute)
-#set ($elementType = "attribute")
-#else
-#set ($elementType = "param")
-#end
- <f:$elementType name="$parameter.name" value="#{${parameterValue}}"/>
-#end
-#end
<div xmlns="http://www.w3.org/1999/xhtml"
xmlns:ui="http://java.sun.com/jsf/facelets"
xmlns:h="http://java.sun.com/jsf/html"
|
