Menu
▾
▴
andromdaplugins-cvs
|
From: Chad B. <cwb...@us...> - 2007-07-19 18:09:30
|
User: cwbrandon
Date: 07/07/19 11:09:32
Modified: andromda-jsf2/src/main/resources/templates/jsf2/views/jsp
view.jsp.vsl login.jsp.vsl
andromda-jsf2/src/main/resources/templates/jsf2/views/facelets
view-action.xhtml.vsl view-table.xhtml.vsl
view-variables.xhtml.vsl login.xhtml.vsl
andromda-jsf2/src/main/resources/templates/jsf2/views/jsp/includes
footer.jspf.vsl registration-header.jsp.vsl
view-variables.jspf.vsl header.jsp.vsl
view-table.jspf.vsl
andromda-jsf2/src/main/resources/templates/jsf2/views/facelets/layout
layout.xhtml.vsl return.xhtml.vsl header.xhtml.vsl
footer.xhtml.vsl
andromda-jsf2/src/main/resources/templates/jsf2/views/facelets/crud
view.xhtml.vsl
andromda-jsf2/src/main/resources/templates/jsf2/views
renderActionFormInput.vm
Log:
change h:outputText to tr:outputText (to keep consistent styling)
Revision Changes Path
1.4 +3 -3 cartridges/andromda-jsf2/src/main/resources/templates/jsf2/views/jsp/view.jsp.vsl
Index: view.jsp.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-jsf2/src/main/resources/templates/jsf2/views/jsp/view.jsp.vsl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -w -r1.3 -r1.4
--- view.jsp.vsl 5 Jul 2007 17:09:21 -0000 1.3
+++ view.jsp.vsl 19 Jul 2007 18:09:27 -0000 1.4
@@ -38,15 +38,15 @@
<h:panelGrid columns="1" style="text-align:right" width="100%">
<h:panelGroup styleClass="userPanel">
<t:graphicImage url="/images/user.gif"/>
- <h:outputText value=" #{remoteUser}"/>
+ <tr:outputText value=" #{remoteUser}"/>
</h:panelGroup>
</h:panelGrid>
- <h:outputText value="~"/>
+ <tr:outputText value="~"/>
<h:panelGrid columns="1" width="100%">
<tr:form>
<tr:menuList>
<tr:commandNavigationItem action="logout" styleClass="userPanel">
- <h:outputText value="#{messages['logout.action']}" style="text-align:left;"/>
+ <tr:outputText value="#{messages['logout.action']}" style="text-align:left;"/>
</tr:commandNavigationItem>
</tr:menuList>
</tr:form>
1.5 +1 -1 cartridges/andromda-jsf2/src/main/resources/templates/jsf2/views/jsp/login.jsp.vsl
Index: login.jsp.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-jsf2/src/main/resources/templates/jsf2/views/jsp/login.jsp.vsl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -w -r1.4 -r1.5
--- login.jsp.vsl 19 Jul 2007 17:48:22 -0000 1.4
+++ login.jsp.vsl 19 Jul 2007 18:09:29 -0000 1.5
@@ -32,7 +32,7 @@
<jsp:directive.include file="/includes/footer.jspf"/>
</f:facet>
<t:div id="pageContent">
- <h:outputText value="#{messages['login.text']}" styleClass="loginText" escape="false"/>
+ <tr:outputText value="#{messages['login.text']}" styleClass="loginText" escape="false"/>
<f:verbatim><br/></f:verbatim>
#set ($actionParam = "param.action")
<tr:outputText value="#{messages['login.error']}" rendered="${${actionParam} == 'error'}" styleClass="error"/>
1.4 +1 -1 cartridges/andromda-jsf2/src/main/resources/templates/jsf2/views/facelets/view-action.xhtml.vsl
Index: view-action.xhtml.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-jsf2/src/main/resources/templates/jsf2/views/facelets/view-action.xhtml.vsl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -w -r1.3 -r1.4
--- view-action.xhtml.vsl 5 Jul 2007 17:09:21 -0000 1.3
+++ view-action.xhtml.vsl 19 Jul 2007 18:09:30 -0000 1.4
@@ -15,7 +15,7 @@
#else
<a:popup scrolling="yes" height="350px" width="550px" actionOpen="#{${action.controller.beanName}.${action.triggerName}}" center="false">
#end
- <h:outputText value="#{messages['$action.messageKey']}"/>
+ <tr:outputText value="#{messages['$action.messageKey']}"/>
#foreach ($parameter in $action.parameters)
#if (!$parameter.complex || $parameter.type.enumeration)
#renderActionCommandLinkParameter($parameter "")
1.3 +7 -7 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.2
retrieving revision 1.3
diff -u -w -r1.2 -r1.3
--- view-table.xhtml.vsl 5 Jul 2007 17:09:21 -0000 1.2
+++ view-table.xhtml.vsl 19 Jul 2007 18:09:30 -0000 1.3
@@ -32,25 +32,25 @@
#end
<tr:column sortable="true" sortProperty="$columnName">
<f:facet name="header">
- <h:outputText value="#{messages['$table.getTableColumnMessageKey($columnName)']}"/>
+ <tr:outputText value="#{messages['$table.getTableColumnMessageKey($columnName)']}"/>
</f:facet>
#set ($tableColumnActions = $table.getTableColumnActions($columnName))
#if (!$tableColumnActions.empty)
#set ($action = $tableColumnActions.iterator().next())
<tr:commandLink action="#{${action.controller.beanName}.${action.triggerName}}">
- <h:outputText value="#{row.${columnName}}">
+ <tr:outputText value="#{row.${columnName}}">
#if ($column.type.dateType)
<a:convertDateTime pattern="$defaultDateFormat"/>
#end
- </h:outputText>
+ </tr:outputText>
#renderTableCommandLinkParameters()
</tr:commandLink>
#else
- <h:outputText value="#{row.${columnName}}">
+ <tr:outputText value="#{row.${columnName}}">
#if ($column.type.dateType)
<a:convertDateTime pattern="$defaultDateFormat"/>
#end
- </h:outputText>
+ </tr:outputText>
#end
</tr:column>
#end
@@ -59,11 +59,11 @@
<f:facet name="header">
<t:graphicImage url="/images/space.gif"/>
</f:facet>
- <h:outputText value="#{row}">
+ <tr:outputText value="#{row}">
#if ($column.type.dateType)
<a:convertDateTime pattern="$defaultDateFormat"/>
#end
- </h:outputText>
+ </tr:outputText>
</tr:column>
#end
## - render any table hyperlink actions
1.3 +12 -12 cartridges/andromda-jsf2/src/main/resources/templates/jsf2/views/facelets/view-variables.xhtml.vsl
Index: view-variables.xhtml.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-jsf2/src/main/resources/templates/jsf2/views/facelets/view-variables.xhtml.vsl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -r1.2 -r1.3
--- view-variables.xhtml.vsl 5 Jul 2007 17:09:21 -0000 1.2
+++ view-variables.xhtml.vsl 19 Jul 2007 18:09:30 -0000 1.3
@@ -9,48 +9,48 @@
#foreach ($variable in $view.variables)
#if (!$variable.table)
#if ($variable.attributes.empty)
- <h:outputText value="#{messages['$variable.messageKey']} :"/>
+ <tr:outputText value="#{messages['$variable.messageKey']} :"/>
#if ($variable.type.collectionType || $variable.type.arrayType)
<c:forEach var="item" items="${${variable.name}}" varStatus="status">
${item} <c:if test="${!status.last}">,</c:if>
</c:forEach>
#else
- <h:outputText value="#{${variable.name}}">
+ <tr:outputText value="#{${variable.name}}">
#if ($variable.type.dateType)
<a:convertDateTime pattern="$variable.format"/>
#end
- </h:outputText>
+ </tr:outputText>
#end
#else
#foreach ($attribute in $variable.attributes)
- <h:outputText value="#{messages['$attribute.messageKey']} :"/>
- <h:outputText value="#{${variable.name}.${attribute.name}}">
+ <tr:outputText value="#{messages['$attribute.messageKey']} :"/>
+ <tr:outputText value="#{${variable.name}.${attribute.name}}">
#if ($attribute.type.dateType)
<a:convertDateTime pattern="$attribute.format"/>
#end
- </h:outputText>
+ </tr:outputText>
#end
#foreach ($associationEnd in $variable.navigableAssociationEnds)
#if ($associationEnd.many)
<c:forEach var="item" items="${${variable.name}.${associationEnd.name}}">
<c:set var="item" value="${item}" scope="request"/>
#foreach ($itemAttribute in $associationEnd.type.getAttributes(true))
- <h:outputText value="#{messages['$itemAttribute.messageKey']} :"/>
- <h:outputText value="#{item.${itemAttribute.name}}">
+ <tr:outputText value="#{messages['$itemAttribute.messageKey']} :"/>
+ <tr:outputText value="#{item.${itemAttribute.name}}">
#if ($itemAttribute.type.dateType)
<a:convertDateTime pattern="$itemAttribute.format"/>
#end
- </h:outputText>
+ </tr:outputText>
#end
</c:forEach>
#else
#foreach ($itemAttribute in $associationEnd.type.getAttributes(true))
- <h:outputText value="#{messages['$itemAttribute.messageKey']} :"/>
- <h:outputText value="#{item.${itemAttribute.name}}">
+ <tr:outputText value="#{messages['$itemAttribute.messageKey']} :"/>
+ <tr:outputText value="#{item.${itemAttribute.name}}">
#if ($itemAttribute.type.dateType)
<a:convertDateTime pattern="$itemAttribute.format"/>
#end
- </h:outputText>
+ </tr:outputText>
#end
#end
#end
1.8 +1 -1 cartridges/andromda-jsf2/src/main/resources/templates/jsf2/views/facelets/login.xhtml.vsl
Index: login.xhtml.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-jsf2/src/main/resources/templates/jsf2/views/facelets/login.xhtml.vsl,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -w -r1.7 -r1.8
--- login.xhtml.vsl 19 Jul 2007 17:48:22 -0000 1.7
+++ login.xhtml.vsl 19 Jul 2007 18:09:30 -0000 1.8
@@ -24,7 +24,7 @@
</ui:insert>
</f:facet>
<div id="pageContent">
- <h:outputText value="#{messages['login.text']}" styleClass="loginText" escape="false"/>
+ <tr:outputText value="#{messages['login.text']}" styleClass="loginText" escape="false"/>
<br/>
#set ($actionParam = "param.action")
<tr:outputText value="#{messages['login.error']}" rendered="${${actionParam} == 'error'}" styleClass="error"/>
1.2 +1 -1 cartridges/andromda-jsf2/src/main/resources/templates/jsf2/views/jsp/includes/footer.jspf.vsl
Index: footer.jspf.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-jsf2/src/main/resources/templates/jsf2/views/jsp/includes/footer.jspf.vsl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- footer.jspf.vsl 5 Dec 2006 19:39:15 -0000 1.1
+++ footer.jspf.vsl 19 Jul 2007 18:09:30 -0000 1.2
@@ -1,3 +1,3 @@
<h:panelGroup id="footer">
- <h:outputText value="#{messages['footer.message']}" escape="false"/>
+ <tr:outputText value="#{messages['footer.message']}" escape="false"/>
</h:panelGroup>
\ No newline at end of file
1.2 +1 -1 cartridges/andromda-jsf2/src/main/resources/templates/jsf2/views/jsp/includes/registration-header.jsp.vsl
Index: registration-header.jsp.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-jsf2/src/main/resources/templates/jsf2/views/jsp/includes/registration-header.jsp.vsl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- registration-header.jsp.vsl 5 Dec 2006 19:39:15 -0000 1.1
+++ registration-header.jsp.vsl 19 Jul 2007 18:09:30 -0000 1.2
@@ -1,7 +1,7 @@
<%@ include file="/$jspIncludes" %>
<h:panelGrid id="header_group1" columns="1" styleClass="pageHeader" width="100%" >
- <h:outputText value="#{messages['application.name']}" styleClass="applicationTitle"/>
+ <tr:outputText value="#{messages['application.name']}" styleClass="applicationTitle"/>
</h:panelGrid>
1.2 +12 -12 cartridges/andromda-jsf2/src/main/resources/templates/jsf2/views/jsp/includes/view-variables.jspf.vsl
Index: view-variables.jspf.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-jsf2/src/main/resources/templates/jsf2/views/jsp/includes/view-variables.jspf.vsl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- view-variables.jspf.vsl 5 Dec 2006 19:39:15 -0000 1.1
+++ view-variables.jspf.vsl 19 Jul 2007 18:09:30 -0000 1.2
@@ -2,7 +2,7 @@
#foreach ($variable in $view.variables)
#if (!$variable.table)
#if ($variable.attributes.empty)
- <h:outputText value="#{messages['$variable.messageKey']} :"/>
+ <tr:outputText value="#{messages['$variable.messageKey']} :"/>
#if ($variable.type.collectionType || $variable.type.arrayType)
<f:verbatim>
<c:forEach var="item" items="${${variable.name}}" varStatus="status">
@@ -10,42 +10,42 @@
</c:forEach>
</f:verbatim>
#else
- <h:outputText value="#{${variable.name}}">
+ <tr:outputText value="#{${variable.name}}">
#if ($variable.type.dateType)
<a:convertDateTime pattern="$variable.format"/>
#end
- </h:outputText>
+ </tr:outputText>
#end
#else
#foreach ($attribute in $variable.attributes)
- <h:outputText value="#{messages['$attribute.messageKey']} :"/>
- <h:outputText value="#{${variable.name}.${attribute.name}}">
+ <tr:outputText value="#{messages['$attribute.messageKey']} :"/>
+ <tr:outputText value="#{${variable.name}.${attribute.name}}">
#if ($attribute.type.dateType)
<a:convertDateTime pattern="$attribute.format"/>
#end
- </h:outputText>
+ </tr:outputText>
#end
#foreach ($associationEnd in $variable.navigableAssociationEnds)
#if ($associationEnd.many)
<c:forEach var="item" items="${${variable.name}.${associationEnd.name}}">
<c:set var="item" value="${item}" scope="request"/>
#foreach ($itemAttribute in $associationEnd.type.getAttributes(true))
- <h:outputText value="#{messages['$itemAttribute.messageKey']} :"/>
- <h:outputText value="#{item.${itemAttribute.name}}">
+ <tr:outputText value="#{messages['$itemAttribute.messageKey']} :"/>
+ <tr:outputText value="#{item.${itemAttribute.name}}">
#if ($itemAttribute.type.dateType)
<a:convertDateTime pattern="$itemAttribute.format"/>
#end
- </h:outputText>
+ </tr:outputText>
#end
</c:forEach>
#else
#foreach ($itemAttribute in $associationEnd.type.getAttributes(true))
- <h:outputText value="#{messages['$itemAttribute.messageKey']} :"/>
- <h:outputText value="#{item.${itemAttribute.name}}">
+ <tr:outputText value="#{messages['$itemAttribute.messageKey']} :"/>
+ <tr:outputText value="#{item.${itemAttribute.name}}">
#if ($itemAttribute.type.dateType)
<a:convertDateTime pattern="$itemAttribute.format"/>
#end
- </h:outputText>
+ </tr:outputText>
#end
#end
#end
1.2 +1 -1 cartridges/andromda-jsf2/src/main/resources/templates/jsf2/views/jsp/includes/header.jsp.vsl
Index: header.jsp.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-jsf2/src/main/resources/templates/jsf2/views/jsp/includes/header.jsp.vsl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- header.jsp.vsl 5 Dec 2006 19:39:16 -0000 1.1
+++ header.jsp.vsl 19 Jul 2007 18:09:30 -0000 1.2
@@ -1,3 +1,3 @@
-<t:div id="pageHeader"><h:outputText value="#{messages['application.name']}"/></t:div>
+<t:div id="pageHeader"><tr:outputText value="#{messages['application.name']}"/></t:div>
1.2 +7 -7 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.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- view-table.jspf.vsl 5 Dec 2006 19:39:16 -0000 1.1
+++ view-table.jspf.vsl 19 Jul 2007 18:09:31 -0000 1.2
@@ -23,25 +23,25 @@
#end
<tr:column sortable="true" sortProperty="$columnName">
<f:facet name="header">
- <h:outputText value="#{messages['$table.getTableColumnMessageKey($columnName)']}"/>
+ <tr:outputText value="#{messages['$table.getTableColumnMessageKey($columnName)']}"/>
</f:facet>
#set ($tableColumnActions = $table.getTableColumnActions($columnName))
#if (!$tableColumnActions.empty)
#set ($action = $tableColumnActions.iterator().next())
<tr:commandLink action="#{${action.controller.beanName}.${action.triggerName}}">
- <h:outputText value="#{row.${columnName}}">
+ <tr:outputText value="#{row.${columnName}}">
#if ($column.type.dateType)
<a:convertDateTime pattern="$defaultDateFormat"/>
#end
- </h:outputText>
+ </tr:outputText>
#renderTableCommandLinkParameters()
</tr:commandLink>
#else
- <h:outputText value="#{row.${columnName}}">
+ <tr:outputText value="#{row.${columnName}}">
#if ($column.type.dateType)
<a:convertDateTime pattern="$defaultDateFormat"/>
#end
- </h:outputText>
+ </tr:outputText>
#end
</tr:column>
#end
@@ -50,11 +50,11 @@
<f:facet name="header">
<t:graphicImage url="/images/space.gif"/>
</f:facet>
- <h:outputText value="#{row}">
+ <tr:outputText value="#{row}">
#if ($column.type.dateType)
<a:convertDateTime pattern="$defaultDateFormat"/>
#end
- </h:outputText>
+ </tr:outputText>
</tr:column>
#end
## - render any table hyperlink actions
1.10 +1 -1 cartridges/andromda-jsf2/src/main/resources/templates/jsf2/views/facelets/layout/layout.xhtml.vsl
Index: layout.xhtml.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-jsf2/src/main/resources/templates/jsf2/views/facelets/layout/layout.xhtml.vsl,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -w -r1.9 -r1.10
--- layout.xhtml.vsl 5 Jul 2007 17:09:23 -0000 1.9
+++ layout.xhtml.vsl 19 Jul 2007 18:09:31 -0000 1.10
@@ -27,7 +27,7 @@
<f:facet name="infoUser">
<tr:panelGroupLayout>
<tr:image source="/images/user.gif"/>
- <h:outputText value=" #{remoteUser}"/>
+ <tr:outputText value=" #{remoteUser}"/>
</tr:panelGroupLayout>
</f:facet>
#end
1.2 +1 -1 cartridges/andromda-jsf2/src/main/resources/templates/jsf2/views/facelets/layout/return.xhtml.vsl
Index: return.xhtml.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-jsf2/src/main/resources/templates/jsf2/views/facelets/layout/return.xhtml.vsl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- return.xhtml.vsl 5 Dec 2006 19:39:25 -0000 1.1
+++ return.xhtml.vsl 19 Jul 2007 18:09:31 -0000 1.2
@@ -4,7 +4,7 @@
xmlns:h="http://java.sun.com/jsf/html">
<ui:composition>
<h:panelGroup id="return">
- <tr:goLink destination="#{messages['return.link.uri']}"><h:outputText value="#{messages['return.link.text']}" escape="false"/></tr:goLink>
+ <tr:goLink destination="#{messages['return.link.uri']}"><tr:outputText value="#{messages['return.link.text']}" escape="false"/></tr:goLink>
</h:panelGroup>
</ui:composition>
</html>
1.3 +1 -1 cartridges/andromda-jsf2/src/main/resources/templates/jsf2/views/facelets/layout/header.xhtml.vsl
Index: header.xhtml.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-jsf2/src/main/resources/templates/jsf2/views/facelets/layout/header.xhtml.vsl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -r1.2 -r1.3
--- header.xhtml.vsl 4 Mar 2007 19:08:30 -0000 1.2
+++ header.xhtml.vsl 19 Jul 2007 18:09:31 -0000 1.3
@@ -4,7 +4,7 @@
xmlns:h="http://java.sun.com/jsf/html">
<ui:composition>
<tr:panelGroupLayout inlineStyle="overflow: auto; font-size: x-large; font-weight: bold;">
- <h:outputText>#{messages['application.name']}</h:outputText>
+ <tr:outputText>#{messages['application.name']}</tr:outputText>
</tr:panelGroupLayout>
</ui:composition>
</html>
1.2 +3 -2 cartridges/andromda-jsf2/src/main/resources/templates/jsf2/views/facelets/layout/footer.xhtml.vsl
Index: footer.xhtml.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-jsf2/src/main/resources/templates/jsf2/views/facelets/layout/footer.xhtml.vsl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- footer.xhtml.vsl 5 Dec 2006 19:39:25 -0000 1.1
+++ footer.xhtml.vsl 19 Jul 2007 18:09:31 -0000 1.2
@@ -1,9 +1,10 @@
<html xmlns="http://www.w3.org/1999/xhtml"
xmlns:ui="http://java.sun.com/jsf/facelets"
- xmlns:h="http://java.sun.com/jsf/html">
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:tr="http://myfaces.apache.org/trinidad">
<ui:composition>
<h:panelGroup id="footer">
- <h:outputText value="#{messages['footer.message']}" escape="false"/>
+ <tr:outputText value="#{messages['footer.message']}" escape="false"/>
</h:panelGroup>
</ui:composition>
</html>
1.9 +5 -5 cartridges/andromda-jsf2/src/main/resources/templates/jsf2/views/facelets/crud/view.xhtml.vsl
Index: view.xhtml.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-jsf2/src/main/resources/templates/jsf2/views/facelets/crud/view.xhtml.vsl,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -w -r1.8 -r1.9
--- view.xhtml.vsl 5 Jul 2007 17:09:25 -0000 1.8
+++ view.xhtml.vsl 19 Jul 2007 18:09:32 -0000 1.9
@@ -42,7 +42,7 @@
</c:if>
</tr:selectOneRadio>
#elseif ($parameter.plainText)
- <h:outputText value="#{${formValuePropertyName}}"/>
+ <tr:outputText value="#{${formValuePropertyName}}"/>
#else
##if the widget type is not defined explicitly ...
#if($parameter.type.enumeration)
@@ -143,18 +143,18 @@
#if(!$member.hidden && !$member.inputFile)
<tr:column sortable=#if($manageable.tableSortable)"true"#else"false"#end sortProperty="$member.name">
<f:facet name="header">
- <h:outputText value="#{messages['$member.messageKey']}"/>
+ <tr:outputText value="#{messages['$member.messageKey']}"/>
</f:facet>
#if($member.type.enumeration)
<c:set var="messageKey" value="${member.type.messageKey}.#{row.${member.name}}"/>
- <h:outputText value="#{messages[messageKey]}">
+ <tr:outputText value="#{messages[messageKey]}">
#else
- <h:outputText value="#{row.${member.name}}">
+ <tr:outputText value="#{row.${member.name}}">
#end
#if ($column.type.dateType)
<a:convertDateTime pattern="$defaultDateFormat"/>
#end
- </h:outputText>
+ </tr:outputText>
</tr:column>
#end
#end
1.6 +3 -3 cartridges/andromda-jsf2/src/main/resources/templates/jsf2/views/renderActionFormInput.vm
Index: renderActionFormInput.vm
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-jsf2/src/main/resources/templates/jsf2/views/renderActionFormInput.vm,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -w -r1.5 -r1.6
--- renderActionFormInput.vm 4 Mar 2007 16:06:54 -0000 1.5
+++ renderActionFormInput.vm 19 Jul 2007 18:09:32 -0000 1.6
@@ -60,7 +60,7 @@
#elseif ($parameter.inputTable)
#renderInputTable($parameter)
#elseif ($parameter.plainText)
- <h:outputText value="#{${formValuePropertyName}}"/>
+ <tr:outputText value="#{${formValuePropertyName}}"/>
#elseif ($parameter.inputSecret)
<tr:panelLabelAndMessage label="#{messages['$parameter.messageKey']}:" showRequired="$parameter.required">
<h:inputSecret id="$propertyId" value="#{${formValuePropertyName}}" required="$parameter.required" readonly="$parameter.readOnly"/>
@@ -110,7 +110,7 @@
#set ($columnId = $column.getFormPropertyId($parameter))
<h:column>
<f:facet name="header">
- <h:outputText value="#{messages['$column.messageKey']}"/>
+ <tr:outputText value="#{messages['$column.messageKey']}"/>
</f:facet>
#if ($column.type.dateType)
#if ($column.readOnly)
@@ -132,7 +132,7 @@
#end
</h:inputText>
#else
- <h:outputText value="#{item.${column.name}}"/>
+ <tr:outputText value="#{item.${column.name}}"/>
#end
#if ($column.inputTypePresent)
<t:message for="$columnId" styleClass="error" showDetail="true" showSummary="false"/>
|
|
From: Walter M. <wal...@us...> - 2007-10-31 11:12:07
|
User: walterim
Date: 07/10/31 04:10:58
Modified: andromda-jsf2/src/main/resources/templates/jsf2/views
renderActionFormInput.vm
Log:
Avoiding the automatic Trinidad conversion in <selectOneChoice/> since it does not work with the andromda generated populator.
Revision Changes Path
1.7 +1 -1 cartridges/andromda-jsf2/src/main/resources/templates/jsf2/views/renderActionFormInput.vm
Index: renderActionFormInput.vm
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-jsf2/src/main/resources/templates/jsf2/views/renderActionFormInput.vm,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -w -r1.6 -r1.7
--- renderActionFormInput.vm 19 Jul 2007 18:09:32 -0000 1.6
+++ renderActionFormInput.vm 31 Oct 2007 11:10:58 -0000 1.7
@@ -38,7 +38,7 @@
#if ($multiSelect)
#set ($selectBoxType = "selectManyListbox")
#end
- <tr:$selectBoxType id="$propertyId" value="#{${formValuePropertyName}}" label="#{messages['$parameter.messageKey']}:" required="$parameter.required" readOnly="$parameter.readOnly"#if ($multiSelect) size="$defaultMultiSelectSize"#end>
+ <tr:$selectBoxType id="$propertyId" value="#{${formValuePropertyName}}" label="#{messages['$parameter.messageKey']}:" required="$parameter.required" readOnly="$parameter.readOnly" valuePassThru="true"#if ($multiSelect) size="$defaultMultiSelectSize"#end>
<c:if test="${!empty ${backingListName}}">
<f:selectItems value="#{${backingListName}}" />
</c:if>
|
|
From: Walter M. <wal...@us...> - 2008-02-25 14:29:51
|
User: walterim
Date: 08/02/25 06:29:54
Modified: andromda-jsf2/src/main/resources/templates/jsf2/views
renderActionFormInput.vm
Log:
Using Trinidad date component since it looks it's working fine now.
Revision Changes Path
1.8 +7 -10 cartridges/andromda-jsf2/src/main/resources/templates/jsf2/views/renderActionFormInput.vm
Index: renderActionFormInput.vm
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-jsf2/src/main/resources/templates/jsf2/views/renderActionFormInput.vm,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -w -r1.7 -r1.8
--- renderActionFormInput.vm 31 Oct 2007 11:10:58 -0000 1.7
+++ renderActionFormInput.vm 25 Feb 2008 14:29:54 -0000 1.8
@@ -24,11 +24,9 @@
#if ($parameter.readOnly)
<tr:inputText id="$propertyId" value="#{${formValuePropertyName}}" label="#{messages['$parameter.messageKey']}:" readOnly="true""/>
#else
- <tr:panelLabelAndMessage label="#{messages['$parameter.messageKey']}:" showRequired="$parameter.required">
- <t:inputCalendar id="$propertyId" value="#{${formValuePropertyName}}" renderAsPopup="true" popupDateFormat="$parameter.format" required="$parameter.required">
- <a:convertDateTime pattern="$parameter.format"/>
- </t:inputCalendar>
- </tr:panelLabelAndMessage>
+ <tr:inputDate id="$propertyId" value="#{${formValuePropertyName}}" label="#{messages['$parameter.messageKey']}:" required="$parameter.required">
+ <f:convertDateTime pattern="$parameter.format"/>
+ </tr:inputDate>
#end
#elseif ($parameter.inputCheckbox)
<tr:selectBooleanCheckbox id="$propertyId" value="#{${formValuePropertyName}}" label="#{messages['$parameter.messageKey']}:" required="$parameter.required" readOnly="$parameter.readOnly"/>
@@ -86,7 +84,7 @@
#else
<tr:inputText id="$propertyId" value="#{${formValuePropertyName}}" label="#{messages['$parameter.messageKey']}:" required="$parameter.required" readOnly="$parameter.readOnly"#if($parameter.inputTextarea) rows="3" columns="40"#end>
#if ($parameter.type.timeType)
- <a:convertDateTime pattern="$parameter.format"/>
+ <f:convertDateTime pattern="$parameter.format"/>
#end
</tr:inputText>
#end
@@ -116,10 +114,9 @@
#if ($column.readOnly)
<h:inputText id="$columnId" value="#{item.${column.name}}" readonly="true">
#else
- <t:inputCalendar id="$columnId" monthYearRowClass="yearMonthHeader" weekRowClass="weekHeader" value="#{item.${column.name}}"
- renderAsPopup="true" popupDateFormat="$column.format" required="$column.required">
- <a:convertDateTime pattern="$column.format"/>
- </t:inputCalendar>
+ <tr:inputDate id="$columnId" value="#{item.${column.name}}" required="$column.required">
+ <f:convertDateTime pattern="$parameter.format"/>
+ </tr:inputDate>
#end
#elseif ($column.inputCheckbox)
<h:selectBooleanCheckbox id="$columnId" value="#{item.${column.name}}" required="$column.required" readonly="$column.readOnly"/>
|
|
From: Walter M. <wal...@us...> - 2008-09-18 12:57:41
|
User: walterim
Date: 08/09/18 05:57:51
Modified: andromda-jsf2/src/main/java/org/andromda/cartridges/jsf2/metafacades
JSFManageableEntityAttributeLogicImpl.java
andromda-jsf2/src/main/uml JSFMetafacadeModel.xml.zip
andromda-jsf2/src/main/resources/templates/jsf2/views
renderActionFormInput.vm
Log:
Better handling of associations between manageable and non-manageable associations.
Revision Changes Path
1.4 +29 -0 cartridges/andromda-jsf2/src/main/java/org/andromda/cartridges/jsf2/metafacades/JSFManageableEntityAttributeLogicImpl.java
Index: JSFManageableEntityAttributeLogicImpl.java
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-jsf2/src/main/java/org/andromda/cartridges/jsf2/metafacades/JSFManageableEntityAttributeLogicImpl.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -w -r1.3 -r1.4
--- JSFManageableEntityAttributeLogicImpl.java 7 Sep 2007 16:42:48 -0000 1.3
+++ JSFManageableEntityAttributeLogicImpl.java 18 Sep 2008 12:57:51 -0000 1.4
@@ -6,6 +6,7 @@
import org.andromda.utils.StringUtilsHelper;
import org.andromda.metafacades.uml.ClassifierFacade;
import org.andromda.metafacades.uml.ModelElementFacade;
+import org.andromda.metafacades.uml.ParameterFacade;
import org.apache.commons.lang.ObjectUtils;
import org.apache.commons.lang.StringUtils;
@@ -562,4 +563,32 @@
return dateFormat;
}
+
+ /**
+ * @see org.andromda.cartridges.jsf2.metafacades.JSFAttribute#getFormPropertyName(org.andromda.metafacades.uml.ParameterFacade)
+ */
+ protected String handleGetFormPropertyName(final ParameterFacade ownerParameter)
+ {
+ final StringBuffer propertyName = new StringBuffer();
+ if (ownerParameter != null)
+ {
+ propertyName.append(ownerParameter.getName());
+ propertyName.append('.');
+ }
+ final String name = this.getName();
+ if (name != null && name.trim().length() > 0)
+ {
+ propertyName.append(name);
+ }
+ return propertyName.toString();
+ }
+
+ /**
+ * @see org.andromda.cartridges.jsf2.metafacades.JSFAttribute#getFormPropertyId(java.lang.String)
+ */
+ protected String handleGetFormPropertyId(final ParameterFacade ownerParameter)
+ {
+ return StringUtilsHelper.lowerCamelCaseName(this.getFormPropertyName(ownerParameter));
+ }
+
}
\ No newline at end of file
1.17 +226 -179 cartridges/andromda-jsf2/src/main/uml/JSFMetafacadeModel.xml.zip
<<Binary file>>
1.10 +5 -0 cartridges/andromda-jsf2/src/main/resources/templates/jsf2/views/renderActionFormInput.vm
Index: renderActionFormInput.vm
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-jsf2/src/main/resources/templates/jsf2/views/renderActionFormInput.vm,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -w -r1.9 -r1.10
--- renderActionFormInput.vm 11 Aug 2008 12:26:18 -0000 1.9
+++ renderActionFormInput.vm 18 Sep 2008 12:57:51 -0000 1.10
@@ -8,8 +8,13 @@
##
#macro(renderActionInput $parameter $ownerParameter)
#if ($parameter.backingListName)
+#if ($ownerParameter.type.hasStereotype('Entity'))
+#set ($propertyId = $parameter.getFormPropertyId($ownerParameter))
+#set ($valuePropertyName = ${parameter.getFormPropertyName($ownerParameter)})
+#else
#set ($propertyId = $parameter.name)
#set ($valuePropertyName = $parameter.name)
+#end
#set ($backingListName = $parameter.backingListName)
#set ($backingValueName = $parameter.backingValueName)
#else
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X