Menu
▾
▴
[Andromdaplugins-cvs] CVS update: cartridges/andromda-jsf2/src/main/resources/resources/lib/adf trinidad-impl-incubator-m1-SNAPSHOT.jar trinidad-api-incubator-m1-SNAPSHOT.jar
|
From: Walter M. <wal...@us...> - 2007-03-04 19:08:42
|
User: walterim
Date: 07/03/04 11:08:39
Modified: andromda-jsf2/src/main/resources/templates/jsf2/views/facelets/layout
header.xhtml.vsl layout.xhtml.vsl
andromda-jsf2/src/main/resources/templates/jsf2/views/facelets/crud
view.xhtml.vsl
andromda-jsf2/src/main/java/org/andromda/cartridges/jsf2/metafacades
JSFManageableEntityLogicImpl.java
JSFViewLogicImpl.java
andromda-jsf2/src/main/resources/templates/jsf2/controllers/crud
Controller.java.vsl
andromda-jsf2/src/main/resources/templates/jsf2/views/facelets
view.xhtml.vsl
andromda-jsf2/src/main/uml JSFMetafacadeModel.xml.zip
Removed: andromda-jsf2/src/main/resources/templates/jsf2/views/facelets/layout
menu.xhtml.vsl
andromda-jsf2/src/main/resources/resources/lib/facelets
jsf-facelets.jar el-ri.jar el-api.jar
andromda-jsf2/src/main/resources/resources/lib/adf
trinidad-impl-incubator-m1-SNAPSHOT.jar
trinidad-api-incubator-m1-SNAPSHOT.jar
Log:
File upload support
Revision Changes Path
1.2 +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.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- header.xhtml.vsl 5 Dec 2006 19:39:25 -0000 1.1
+++ header.xhtml.vsl 4 Mar 2007 19:08:30 -0000 1.2
@@ -3,7 +3,7 @@
xmlns:tr="http://myfaces.apache.org/trinidad"
xmlns:h="http://java.sun.com/jsf/html">
<ui:composition>
- <tr:panelGroupLayout layout="vertical" inlineStyle="overflow: auto; font-size: xx-large; font-weight: bold;">
+ <tr:panelGroupLayout inlineStyle="overflow: auto; font-size: x-large; font-weight: bold;">
<h:outputText>#{messages['application.name']}</h:outputText>
</tr:panelGroupLayout>
</ui:composition>
1.6 +16 -13 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.5
retrieving revision 1.6
diff -u -w -r1.5 -r1.6
--- layout.xhtml.vsl 23 Feb 2007 21:19:38 -0000 1.5
+++ layout.xhtml.vsl 4 Mar 2007 19:08:30 -0000 1.6
@@ -13,7 +13,8 @@
</ui:insert>
<c:set var="remoteUser" value="${facesContext.externalContext.request.userPrincipal.name}" scope="request"/>
<trh:body>
- <tr:form>
+ <ui:insert name="usesUpload"/>
+ <tr:form usesUpload="#{usesUpload}">
<ui:insert name="title"/>
<tr:panelPage>
<f:facet name="branding">
@@ -74,23 +75,25 @@
#end
</tr:navigationPane>
</f:facet>
- <f:facet name="location">
- <tr:breadCrumbs var="item" value="#{menuModel.model}">
- <f:facet name="nodeStamp">
- <tr:commandNavigationItem text="#{messages[item.label]}" action="#{item.getAction}"/>
- </f:facet>
- </tr:breadCrumbs>
- </f:facet>
+##using breadcrumbs ?
+## <f:facet name="location">
+## <tr:breadCrumbs var="item" value="#{menuModel.model}">
+## <f:facet name="nodeStamp">
+## <tr:commandNavigationItem text="#{messages[item.label]}" action="#{item.getAction}"/>
+## </f:facet>
+## </tr:breadCrumbs>
+## </f:facet>
<f:facet name="appCopyright">
<ui:insert name="footer">
<ui:include src="footer.xhtml"/>
</ui:insert>
</f:facet>
- <f:facet name="infoReturn">
- <ui:insert name="return">
- <ui:include src="return.xhtml"/>
- </ui:insert>
- </f:facet>
+## using return ? don't forget to remove de return.xhtml
+## <f:facet name="infoReturn">
+## <ui:insert name="return">
+## <ui:include src="return.xhtml"/>
+## </ui:insert>
+## </f:facet>
<div id="pageContent">
<tr:panelHeader text="#{title}">
<ui:insert name="content"/>
1.6 +4 -1 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.5
retrieving revision 1.6
diff -u -w -r1.5 -r1.6
--- view.xhtml.vsl 20 Feb 2007 10:16:37 -0000 1.5
+++ view.xhtml.vsl 4 Mar 2007 19:08:31 -0000 1.6
@@ -82,6 +82,9 @@
#set ($layout = "/layout/layout.xhtml")
<ui:composition template="$layout">
+ <ui:define name="usesUpload">
+ <c:set var="usesUpload" value="${manageable.needsFileUpload}" scope="request"/>
+ </ui:define>
<ui:define name="title">
<c:set var="title" value="#{messages['${manageable.viewTitleKey}']}" scope="request"/>
</ui:define>
@@ -140,7 +143,7 @@
</h:panelGroup>
</tr:column>
#foreach ($member in $manageable.manageableAttributes)
-#if(!$member.hidden)
+#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']}"/>
1.4 +15 -0 cartridges/andromda-jsf2/src/main/java/org/andromda/cartridges/jsf2/metafacades/JSFManageableEntityLogicImpl.java
Index: JSFManageableEntityLogicImpl.java
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-jsf2/src/main/java/org/andromda/cartridges/jsf2/metafacades/JSFManageableEntityLogicImpl.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -w -r1.3 -r1.4
--- JSFManageableEntityLogicImpl.java 21 Feb 2007 19:41:27 -0000 1.3
+++ JSFManageableEntityLogicImpl.java 4 Mar 2007 19:08:31 -0000 1.4
@@ -584,4 +584,19 @@
}
return rolesBuffer.toString();
}
+
+ /**
+ * @see org.andromda.cartridges.jsf2.metafacades.JSFManageableEntity#isNeedsFileUpload()
+ */
+ protected boolean handleIsNeedsFileUpload()
+ {
+ for (final Iterator iterator = this.getManageableAttributes().iterator(); iterator.hasNext();)
+ {
+ final JSFManageableEntityAttribute attribute = (JSFManageableEntityAttribute)iterator.next();
+ if(attribute.isNeedsFileUpload())
+ return true;
+ }
+ return false;
+ }
+
}
\ No newline at end of file
1.2 +22 -0 cartridges/andromda-jsf2/src/main/java/org/andromda/cartridges/jsf2/metafacades/JSFViewLogicImpl.java
Index: JSFViewLogicImpl.java
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-jsf2/src/main/java/org/andromda/cartridges/jsf2/metafacades/JSFViewLogicImpl.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- JSFViewLogicImpl.java 5 Dec 2006 19:39:09 -0000 1.1
+++ JSFViewLogicImpl.java 4 Mar 2007 19:08:31 -0000 1.2
@@ -375,4 +375,26 @@
{
return JSFUtils.toWebResourceName(this.getUseCase().getName() + "-" + this.getName());
}
+
+ /**
+ * @see org.andromda.cartridges.jsf2.metafacades.JSFView#isNeedsFileUpload()
+ */
+ protected boolean handleIsNeedsFileUpload()
+ {
+ for (final Iterator iterator = this.getAllActionParameters().iterator(); iterator.hasNext();)
+ {
+ final Object object = iterator.next();
+ if (object instanceof JSFParameter){
+ final JSFParameter parameter = (JSFParameter)object;
+ if(parameter.isInputFile())
+ return true;
+ if(parameter.isComplex()){
+ for(final Iterator attributes = parameter.getAttributes().iterator(); iterator.hasNext();)
+ if(((JSFAttribute)attributes.next()).isInputFile())
+ return true;
+ }
+ }
+ }
+ return false;
+ }
}
1.6 +2 -2 cartridges/andromda-jsf2/src/main/resources/templates/jsf2/controllers/crud/Controller.java.vsl
Index: Controller.java.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-jsf2/src/main/resources/templates/jsf2/controllers/crud/Controller.java.vsl,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -w -r1.5 -r1.6
--- Controller.java.vsl 4 Mar 2007 16:06:54 -0000 1.5
+++ Controller.java.vsl 4 Mar 2007 19:08:34 -0000 1.6
@@ -251,7 +251,7 @@
#set ($comma = '')
#foreach ($member in $manageable.manageableMembers)
#if ($member.inputFile)
- ${comma}org.apache.commons.io.IOUtils.toByteArray(form.${member.getterName}().getInputStream())
+ ${comma}form.${member.getterName}()==null?null:org.apache.commons.io.IOUtils.toByteArray(form.${member.getterName}().getInputStream())
#else
${comma}form.${member.getterName}()
#end
@@ -264,7 +264,7 @@
#set ($comma = '')
#foreach ($member in $manageable.manageableMembers)
#if ($member.inputFile)
- ${comma}org.apache.commons.io.IOUtils.toByteArray(form.${member.getterName}().getInputStream())
+ ${comma}form.${member.getterName}()==null?null:org.apache.commons.io.IOUtils.toByteArray(form.${member.getterName}().getInputStream())
#else
${comma}form.${member.getterName}()
#end
1.2 +3 -0 cartridges/andromda-jsf2/src/main/resources/templates/jsf2/views/facelets/view.xhtml.vsl
Index: view.xhtml.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-jsf2/src/main/resources/templates/jsf2/views/facelets/view.xhtml.vsl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- view.xhtml.vsl 5 Dec 2006 19:39:14 -0000 1.1
+++ view.xhtml.vsl 4 Mar 2007 19:08:34 -0000 1.2
@@ -10,6 +10,9 @@
#set ($layout = "/layout/layout.xhtml")
#end
<ui:composition template="$layout">
+ <ui:define name="usesUpload">
+ <c:set var="usesUpload" value="${view.needsFileUpload}" scope="request"/>
+ </ui:define>
<ui:define name="title">
<c:set var="title" value="#{messages['${view.titleKey}']}" scope="request"/>
</ui:define>
1.5 +202 -194 cartridges/andromda-jsf2/src/main/uml/JSFMetafacadeModel.xml.zip
<<Binary file>>
|
