- Wikitty-commits - mailman.cloud.codelutin.com

r1056 - in trunk/wikitty-struts/src/main: java/org/nuiton/wikitty/struts java/org/nuiton/wikitty/struts/component java/org/nuiton/wikitty/struts/tag tld
by sletellier＠users.nuiton.org 05 Jul '11

05 Jul '11

Author: sletellier Date: 2011-07-05 17:40:53 +0200 (Tue, 05 Jul 2011) New Revision: 1056 Url: http://nuiton.org/repositories/revision/wikitty/1056 Log: - Allow using businessEntity Modified: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/WikittyFieldHandler.java trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/AbstractWikittyComponent.java trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/SelectAssociationBean.java trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/AbstractWikittyTag.java trunk/wikitty-struts/src/main/tld/wikitty-struts.tld Modified: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/WikittyFieldHandler.java =================================================================== --- trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/WikittyFieldHandler.java 2011-07-05 15:10:06 UTC (rev 1055) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/WikittyFieldHandler.java 2011-07-05 15:40:53 UTC (rev 1056) @@ -14,6 +14,8 @@ import org.nuiton.util.StringUtil; import org.nuiton.wikitty.WikittyProxy; import org.nuiton.wikitty.WikittyUtil; +import org.nuiton.wikitty.entities.BusinessEntity; +import org.nuiton.wikitty.entities.BusinessEntityImpl; import org.nuiton.wikitty.entities.FieldType; import org.nuiton.wikitty.entities.Wikitty; import org.nuiton.wikitty.entities.WikittyExtension; @@ -27,6 +29,7 @@ static public String FIELD_SEPARATOR = ","; protected Wikitty wikitty; + protected BusinessEntity businessEntity; protected WikittyProxy proxy; protected String include = StringUtils.EMPTY; protected String exclude = StringUtils.EMPTY; @@ -55,6 +58,9 @@ } public Wikitty getWikitty() { + if (wikitty == null) { + wikitty = ((BusinessEntityImpl) getBusinessEntity()).getWikitty(); + } return wikitty; } @@ -62,6 +68,14 @@ this.wikitty = wikitty; } + public BusinessEntity getBusinessEntity() { + return businessEntity; + } + + public void setBusinessEntity(BusinessEntity businessEntity) { + this.businessEntity = businessEntity; + } + public Boolean getOrderBefore() { return orderBefore; } Modified: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/AbstractWikittyComponent.java =================================================================== --- trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/AbstractWikittyComponent.java 2011-07-05 15:10:06 UTC (rev 1055) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/AbstractWikittyComponent.java 2011-07-05 15:40:53 UTC (rev 1056) @@ -6,6 +6,8 @@ import org.apache.commons.logging.LogFactory; import org.apache.struts2.components.ClosingUIBean; import org.nuiton.wikitty.WikittyProxy; +import org.nuiton.wikitty.entities.BusinessEntity; +import org.nuiton.wikitty.entities.BusinessEntityImpl; import org.nuiton.wikitty.entities.Wikitty; import org.nuiton.wikitty.struts.TagUseException; import org.nuiton.wikitty.struts.WikittyFieldHandler; @@ -29,6 +31,11 @@ /** * Never used directly this attribute use the getter */ + protected BusinessEntity businessEntity; + + /** + * Never used directly this attribute use the getter + */ protected WikittyProxy proxy; protected AbstractWikittyComponent(ValueStack stack, @@ -58,23 +65,33 @@ if (handler != null) { return handler.getWikitty(); } + if (wikitty == null) { + wikitty = ((BusinessEntityImpl)getBusinessEntity()).getWikitty(); + } return wikitty; } + public BusinessEntity getBusinessEntity() { + if (handler != null) { + return handler.getBusinessEntity(); + } + return businessEntity; + } + @Override protected void evaluateExtraParams() { super.evaluateExtraParams(); - if (handler == null && wikitty == null) { - log.info("Handler not found in the stack and wikitty not declared"); + if (handler == null && wikitty == null && businessEntity == null) { + log.info("Handler not found in the stack and wikitty or businessEntity not declared"); throw new TagUseException( - "Tag must declare Wikitty attribute if used outside ws:form tag"); + "Tag must declare Wikitty or businessEntity attribute if used outside ws:form tag"); } - if (name!=null && handler ==null) { + if (name != null && handler == null) { addParameter("name", name); } else { addParameter("name", fqFieldName); @@ -120,6 +137,10 @@ this.wikitty = wikitty; } + public void setBusinessEntity(BusinessEntity businessEntity) { + this.businessEntity = businessEntity; + } + public void setProxy(WikittyProxy proxy) { this.proxy = proxy; } Modified: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/SelectAssociationBean.java =================================================================== --- trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/SelectAssociationBean.java 2011-07-05 15:10:06 UTC (rev 1055) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/SelectAssociationBean.java 2011-07-05 15:40:53 UTC (rev 1056) @@ -61,7 +61,7 @@ WikittyFieldHandler.FIELD_SEPARATOR); // iterate wikitty for result construction - for (Wikitty wiki : wikitty.getFieldAsList(ext, fieldName, Wikitty.class)){ + for (Wikitty wiki : getWikitty().getFieldAsList(ext, fieldName, Wikitty.class)){ Option temp = new Option(); temp.setValeur(wiki.getId()); String desc = wiki.getId(); Modified: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/AbstractWikittyTag.java =================================================================== --- trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/AbstractWikittyTag.java 2011-07-05 15:10:06 UTC (rev 1055) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/AbstractWikittyTag.java 2011-07-05 15:40:53 UTC (rev 1056) @@ -2,6 +2,7 @@ import org.apache.struts2.views.jsp.ui.AbstractClosingTag; import org.nuiton.wikitty.WikittyProxy; +import org.nuiton.wikitty.entities.BusinessEntity; import org.nuiton.wikitty.entities.Wikitty; import org.nuiton.wikitty.struts.component.AbstractWikittyComponent; @@ -11,6 +12,7 @@ private static final long serialVersionUID = -3401870606519882751L; protected String fqFieldName; protected Wikitty wikitty; + protected BusinessEntity businessEntity; protected WikittyProxy proxy; public String getFqFieldName() { @@ -30,6 +32,14 @@ this.wikitty = wikitty; } + public BusinessEntity getBusinessEntity() { + return businessEntity; + } + + public void setBusinessEntity(BusinessEntity businessEntity) { + this.businessEntity = businessEntity; + } + public WikittyProxy getProxy() { return proxy; } @@ -45,7 +55,7 @@ wikittyComponent.setFqFieldName(fqFieldName); wikittyComponent.setWikitty(wikitty); wikittyComponent.setProxy(proxy); - + wikittyComponent.setBusinessEntity(businessEntity); } Modified: trunk/wikitty-struts/src/main/tld/wikitty-struts.tld =================================================================== --- trunk/wikitty-struts/src/main/tld/wikitty-struts.tld 2011-07-05 15:10:06 UTC (rev 1055) +++ trunk/wikitty-struts/src/main/tld/wikitty-struts.tld 2011-07-05 15:40:53 UTC (rev 1056) @@ -27,9 +27,15 @@ <description><![CDATA[the wikitty to edit]]></description> <name>wikitty</name> <rtexprvalue>true</rtexprvalue> - <required>true</required> + <required>false</required> </attribute> <attribute> + <description><![CDATA[the businessEntity to edit]]></description> + <name>businessEntity</name> + <rtexprvalue>true</rtexprvalue> + <required>false</required> + </attribute> + <attribute> <description><![CDATA[the proxy from whom search for wikitty]]></description> <name>proxy</name> <rtexprvalue>true</rtexprvalue> @@ -101,9 +107,15 @@ <description><![CDATA[the wikitty to edit]]></description> <name>wikitty</name> <rtexprvalue>true</rtexprvalue> - <required>true</required> + <required>false</required> </attribute> <attribute> + <description><![CDATA[the businessEntity to edit]]></description> + <name>businessEntity</name> + <rtexprvalue>true</rtexprvalue> + <required>false</required> + </attribute> + <attribute> <description><![CDATA[the proxy from whom search for wikitty required if tag not used inside form tag]]></description> <name>proxy</name> <rtexprvalue>true</rtexprvalue> @@ -156,14 +168,19 @@ <name>name</name> <rtexprvalue>true</rtexprvalue> </attribute> - - <attribute> <description><![CDATA[the wikitty to edit]]></description> <name>wikitty</name> <rtexprvalue>true</rtexprvalue> + <required>false</required> </attribute> <attribute> + <description><![CDATA[the businessEntity to edit]]></description> + <name>businessEntity</name> + <rtexprvalue>true</rtexprvalue> + <required>false</required> + </attribute> + <attribute> <description><![CDATA[the proxy from whom search for wikitty required if tag not used inside form tag]]></description> <name>proxy</name> <rtexprvalue>true</rtexprvalue> @@ -212,8 +229,15 @@ <description><![CDATA[the wikitty to edit]]></description> <name>wikitty</name> <rtexprvalue>true</rtexprvalue> + <required>false</required> </attribute> <attribute> + <description><![CDATA[the businessEntity to edit]]></description> + <name>businessEntity</name> + <rtexprvalue>true</rtexprvalue> + <required>false</required> + </attribute> + <attribute> <description><![CDATA[if subtype == fixed, use the list of fixed value as option for a select]]></description> <name>fixvalues</name> <rtexprvalue>true</rtexprvalue> @@ -251,8 +275,15 @@ <description><![CDATA[the wikitty to edit]]></description> <name>wikitty</name> <rtexprvalue>true</rtexprvalue> + <required>false</required> </attribute> <attribute> + <description><![CDATA[the businessEntity to edit]]></description> + <name>businessEntity</name> + <rtexprvalue>true</rtexprvalue> + <required>false</required> + </attribute> + <attribute> <description><![CDATA[the name of the field that have to be specialize]]></description> <name>fqFieldName</name> <rtexprvalue>true</rtexprvalue> @@ -279,8 +310,15 @@ <description><![CDATA[the wikitty to edit]]></description> <name>wikitty</name> <rtexprvalue>true</rtexprvalue> + <required>false</required> </attribute> <attribute> + <description><![CDATA[the businessEntity to edit]]></description> + <name>businessEntity</name> + <rtexprvalue>true</rtexprvalue> + <required>false</required> + </attribute> + <attribute> <description><![CDATA[the name of the field that have to be specialize]]></description> <name>fqFieldName</name> <rtexprvalue>true</rtexprvalue> @@ -317,8 +355,15 @@ <description><![CDATA[the wikitty to edit]]></description> <name>wikitty</name> <rtexprvalue>true</rtexprvalue> + <required>false</required> </attribute> <attribute> + <description><![CDATA[the businessEntity to edit]]></description> + <name>businessEntity</name> + <rtexprvalue>true</rtexprvalue> + <required>false</required> + </attribute> + <attribute> <description><![CDATA[the name of the field that have to be specialize]]></description> <name>fqFieldName</name> <rtexprvalue>true</rtexprvalue> @@ -356,8 +401,15 @@ <description><![CDATA[the wikitty to edit]]></description> <name>wikitty</name> <rtexprvalue>true</rtexprvalue> + <required>false</required> </attribute> <attribute> + <description><![CDATA[the businessEntity to edit]]></description> + <name>businessEntity</name> + <rtexprvalue>true</rtexprvalue> + <required>false</required> + </attribute> + <attribute> <description><![CDATA[the name of the field that have to be specialize]]></description> <name>fqFieldName</name> <rtexprvalue>true</rtexprvalue> @@ -389,8 +441,15 @@ <description><![CDATA[the wikitty to edit]]></description> <name>wikitty</name> <rtexprvalue>true</rtexprvalue> + <required>false</required> </attribute> <attribute> + <description><![CDATA[the businessEntity to edit]]></description> + <name>businessEntity</name> + <rtexprvalue>true</rtexprvalue> + <required>false</required> + </attribute> + <attribute> <description><![CDATA[the name of the field that have to be specialize]]></description> <name>fqFieldName</name> <rtexprvalue>true</rtexprvalue>

1 0

r1055 - in trunk/wikitty-struts/src/main: resources/template/wikitty tld
by sletellier＠users.nuiton.org 05 Jul '11

05 Jul '11

Author: sletellier Date: 2011-07-05 17:10:06 +0200 (Tue, 05 Jul 2011) New Revision: 1055 Url: http://nuiton.org/repositories/revision/wikitty/1055 Log: Don't force using label Modified: trunk/wikitty-struts/src/main/resources/template/wikitty/ws-label-commons.ftl trunk/wikitty-struts/src/main/tld/wikitty-struts.tld Modified: trunk/wikitty-struts/src/main/resources/template/wikitty/ws-label-commons.ftl =================================================================== --- trunk/wikitty-struts/src/main/resources/template/wikitty/ws-label-commons.ftl 2011-07-05 15:04:27 UTC (rev 1054) +++ trunk/wikitty-struts/src/main/resources/template/wikitty/ws-label-commons.ftl 2011-07-05 15:10:06 UTC (rev 1055) @@ -1 +1,3 @@ -<label for="${parameters.id}">${parameters.label}</label> \ No newline at end of file +<#if parameters.label??> +<label for="${parameters.id}">${parameters.label}</label> +</#if> \ No newline at end of file Modified: trunk/wikitty-struts/src/main/tld/wikitty-struts.tld =================================================================== --- trunk/wikitty-struts/src/main/tld/wikitty-struts.tld 2011-07-05 15:04:27 UTC (rev 1054) +++ trunk/wikitty-struts/src/main/tld/wikitty-struts.tld 2011-07-05 15:10:06 UTC (rev 1055) @@ -124,7 +124,7 @@ <description><![CDATA[the label of the field]]></description> <name>label</name> <rtexprvalue>true</rtexprvalue> - <required>true</required> + <required>false</required> </attribute> <attribute> <description><![CDATA[the label of the field]]></description> @@ -189,7 +189,7 @@ <description><![CDATA[the label of the field]]></description> <name>label</name> <rtexprvalue>true</rtexprvalue> - <required>true</required> + <required>false</required> </attribute> </tag> @@ -229,7 +229,7 @@ <description><![CDATA[the label of the field]]></description> <name>label</name> <rtexprvalue>true</rtexprvalue> - <required>true</required> + <required>false</required> </attribute> </tag> @@ -290,7 +290,7 @@ <description><![CDATA[the label of the field]]></description> <name>label</name> <rtexprvalue>true</rtexprvalue> - <required>true</required> + <required>false</required> </attribute> <attribute> <description><![CDATA[if the textfiel have to hide the content]]></description> @@ -328,7 +328,7 @@ <description><![CDATA[the label of the field]]></description> <name>label</name> <rtexprvalue>true</rtexprvalue> - <required>true</required> + <required>false</required> </attribute> <attribute> <description><![CDATA[the label of the field]]></description> @@ -367,7 +367,7 @@ <description><![CDATA[the label of the field]]></description> <name>label</name> <rtexprvalue>true</rtexprvalue> - <required>true</required> + <required>false</required> </attribute> </tag> @@ -400,7 +400,7 @@ <description><![CDATA[the label of the field]]></description> <name>label</name> <rtexprvalue>true</rtexprvalue> - <required>true</required> + <required>false</required> </attribute> </tag> </taglib>

1 0

r1054 - in trunk/wikitty-struts/src/main: java/org/nuiton/wikitty/struts/component resources/template/wikitty tld
by sletellier＠users.nuiton.org 05 Jul '11

05 Jul '11

Author: sletellier Date: 2011-07-05 17:04:27 +0200 (Tue, 05 Jul 2011) New Revision: 1054 Url: http://nuiton.org/repositories/revision/wikitty/1054 Log: - Rename selectAssociation tag - Add multiple selection option Added: trunk/wikitty-struts/src/main/resources/template/wikitty/ws-selectassociation-close.ftl trunk/wikitty-struts/src/main/resources/template/wikitty/ws-selectassociation.ftl Removed: trunk/wikitty-struts/src/main/resources/template/wikitty/ws-selectAssociation-close.ftl trunk/wikitty-struts/src/main/resources/template/wikitty/ws-selectAssociation.ftl Modified: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/SelectAssociationBean.java trunk/wikitty-struts/src/main/tld/wikitty-struts.tld Modified: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/SelectAssociationBean.java =================================================================== --- trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/SelectAssociationBean.java 2011-07-05 15:02:52 UTC (rev 1053) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/SelectAssociationBean.java 2011-07-05 15:04:27 UTC (rev 1054) @@ -27,6 +27,7 @@ protected String descField; protected int size; + protected Boolean multiple; public SelectAssociationBean(ValueStack stack, HttpServletRequest request, HttpServletResponse response) { @@ -43,8 +44,13 @@ size = 1; } - // add parametter - addParameter("size", size); + // add parameters + addParameter("selectSize", size); + + if (multiple == null) { + multiple = false; + } + addParameter("multiple", multiple); List<Option> listOption = new LinkedList<Option>(); Deleted: trunk/wikitty-struts/src/main/resources/template/wikitty/ws-selectAssociation.ftl =================================================================== --- trunk/wikitty-struts/src/main/resources/template/wikitty/ws-selectAssociation.ftl 2011-07-05 15:02:52 UTC (rev 1053) +++ trunk/wikitty-struts/src/main/resources/template/wikitty/ws-selectAssociation.ftl 2011-07-05 15:04:27 UTC (rev 1054) @@ -1,16 +0,0 @@ -<#if parameters.included?? && parameters.included==true > -<#include "/${parameters.templateDir}/${parameters.theme}/ws-label-commons.ftl" /> -<select -<#include "/${parameters.templateDir}/${parameters.theme}/ws-commons.ftl" /> - size="${parameters.size}" -<#-- <#if parameters.multiple?? && parameters.multiple==true >--> - multiple -<#-- </#if> --> - > -<#assign optionKeys = parameters.value><#t/> - <#list optionKeys as optionKey> - <option value="${optionKey.valeur}"> - ${optionKey.description} </option> - </#list> -</select><#t/> -</#if> \ No newline at end of file Copied: trunk/wikitty-struts/src/main/resources/template/wikitty/ws-selectassociation.ftl (from rev 1052, trunk/wikitty-struts/src/main/resources/template/wikitty/ws-selectAssociation.ftl) =================================================================== --- trunk/wikitty-struts/src/main/resources/template/wikitty/ws-selectassociation.ftl (rev 0) +++ trunk/wikitty-struts/src/main/resources/template/wikitty/ws-selectassociation.ftl 2011-07-05 15:04:27 UTC (rev 1054) @@ -0,0 +1,16 @@ +<#if parameters.included?? && parameters.included==true > +<#include "/${parameters.templateDir}/${parameters.theme}/ws-label-commons.ftl" /> +<select +<#include "/${parameters.templateDir}/${parameters.theme}/ws-commons.ftl" /> + size="${parameters.selectSize}" +<#if parameters.multiple?? && parameters.multiple> + multiple + </#if> + > +<#assign optionKeys = parameters.value><#t/> + <#list optionKeys as optionKey> + <option value="${optionKey.valeur}"> + ${optionKey.description} </option> + </#list> +</select><#t/> +</#if> \ No newline at end of file Modified: trunk/wikitty-struts/src/main/tld/wikitty-struts.tld =================================================================== --- trunk/wikitty-struts/src/main/tld/wikitty-struts.tld 2011-07-05 15:02:52 UTC (rev 1053) +++ trunk/wikitty-struts/src/main/tld/wikitty-struts.tld 2011-07-05 15:04:27 UTC (rev 1054) @@ -132,6 +132,12 @@ <rtexprvalue>true</rtexprvalue> <required>true</required> </attribute> + <attribute> + <description><![CDATA[to enable multiselect]]></description> + <name>multiple</name> + <rtexprvalue>true</rtexprvalue> + <required>false</required> + </attribute> </tag>

1 0

r1053 - trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator
by echatellier＠users.nuiton.org 05 Jul '11

05 Jul '11

Author: echatellier Date: 2011-07-05 17:02:52 +0200 (Tue, 05 Jul 2011) New Revision: 1053 Url: http://nuiton.org/repositories/revision/wikitty/1053 Log: Generate multiples requires. Modified: trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyAbstractGenerator.java Modified: trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyAbstractGenerator.java =================================================================== --- trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyAbstractGenerator.java 2011-07-05 14:23:24 UTC (rev 1052) +++ trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyAbstractGenerator.java 2011-07-05 15:02:52 UTC (rev 1053) @@ -58,7 +58,7 @@ public class WikittyAbstractGenerator extends ObjectModelTransformerToJava { private static final Log log = LogFactory.getLog(WikittyAbstractGenerator.class); - + /** map busines entity from source model to generated abstract class */ protected Map<ObjectModelClass, ObjectModelClass> processedClasses = new HashMap<ObjectModelClass, ObjectModelClass>(); @@ -163,7 +163,7 @@ addImport(clazz, Date.class); addImport(clazz, LinkedHashSet.class); } - + protected void addSerialVersionUID(ObjectModelClass clazz) { // adding a generated serialVersionUID Random random = new Random(); @@ -174,9 +174,9 @@ serialVersionUIDs.toString() + "L", ObjectModelModifier.PRIVATE); } - + protected void addConstructors(ObjectModelClass clazz) { - + ObjectModelOperation constructor = addConstructor(clazz, ObjectModelModifier.PUBLIC); setOperationBody(constructor, "" /*{ @@ -196,9 +196,9 @@ /*{ super(businessEntityImpl.getWikitty()); }*/); - + } - + protected void addConstants(ObjectModelClass businessEntity, ObjectModelClass abstractClass) { // adding some constants about extension to abstract addConstant(abstractClass, "extensions", "List<WikittyExtension>", null, ObjectModelModifier.PUBLIC); @@ -236,7 +236,7 @@ + (attribute.getMaxMultiplicity() == -1 ? "*" : attribute.getMaxMultiplicity()) + "]"; } - + // // generate a string line like " deprecated=true" or "" // String deprecated = attribute.hasTagValue("deprecated") ? " deprecated=" + attribute.getTagValue("deprecated") : ""; // // generate a string line like ' documentation="my documentation"' or "" @@ -271,12 +271,14 @@ } // a piece of code used in the static block - String requires = null; + String requires = ""; + String requiresSep = ""; for (ObjectModelClass superClass : businessEntity.getSuperclasses()) { // using "for" but there will be 0 or 1 iteration addImport(abstractClass, superClass); addImport(abstractClass, superClass.getQualifiedName() + "Abstract"); - requires = WikittyTransformerUtil.classToExtensionVariableName(superClass, true); + requires += requiresSep + WikittyTransformerUtil.classToExtensionVariableName(superClass, true); + requiresSep = ","; } String buildFieldMapExtensionParametersInLine = StringUtils.join(buildFieldMapExtensionParameters, ", \n"); @@ -335,10 +337,10 @@ if (WikittyTransformerUtil.isAttributeCollection(attribute)) { // attributed is a collection, we will generate operations get, add, remove and clear - + String attributeTypeSimpleNameInSet = WikittyTransformerUtil.generateResultType(attribute, true); String getFieldMethodName = WikittyTransformerUtil.generateGetFieldAsCall(attribute); - + // now, for this attribute, we will generate add, remove and clear methods // adding operations to contract getterName = "get" + StringUtils.capitalize(attributeName); @@ -348,7 +350,7 @@ /*{ <%=attributeTypeSimpleNameInSet%> result = <%=helperClassName%>.<%=getterName%>(getWikitty()); return result; -}*/; +}*/; setOperationBody(getter, getterBody); String setterName = "set" + capitalizedAttributeName; @@ -431,7 +433,7 @@ getPropertyChangeSupport().firePropertyChange(<%=fieldVariableName%>, oldValue, <%=getter.getName()%>()); }*/); } - + // save the getter name for this attribute attributeToGetterName.put(businessEntity.getName() + "." + attributeName, getterName); } @@ -515,7 +517,7 @@ entitiesWithInheritedOperations.add(businessEntity); } } - + /** add a toString method * if a toString is tagValue is attached to businessEntity, it will be used * to generate a toString as this : @@ -530,7 +532,7 @@ protected void addToString(ObjectModelClass businessEntity, ObjectModelClass abstractClass) { String toStringOperationBody = null; - + if (businessEntity.hasTagValue(WikittyTransformerUtil.TAG_TO_STRING)) { String toStringPattern = businessEntity.getTagValue(WikittyTransformerUtil.TAG_TO_STRING); @@ -603,7 +605,7 @@ // needed below, in templates String fieldVariableName = WikittyTransformerUtil.attributeToFielVariableName(attribute, true); String attributeType = WikittyTransformerUtil.generateResultType(attribute, false); - + String attributeName = attribute.getName(); if (attribute.hasTagValue(WikittyTransformerUtil.TAG_ALTERNATIVE_NAME)) { // there is a conflict, purifier transformer give as the right name to use @@ -614,11 +616,11 @@ if (WikittyTransformerUtil.isAttributeCollection(attribute)) { // attributed is a collection, we will generate operations get, add, remove and clear - + String attributeTypeSimpleNameInSet = WikittyTransformerUtil.generateResultType(attribute, true); String getFieldMethodName = WikittyTransformerUtil.generateGetFieldAsCall(attribute); String attributeNameCapitalized = StringUtils.capitalize(attributeName); - + // now, for this attribute, we will generate add, remove and clear methods // adding operations to contract getterName = "get" + attributeNameCapitalized; @@ -719,11 +721,11 @@ } }*/; setOperationBody(clear, clearBody); - - + + } else { String getFieldMethodName = WikittyTransformerUtil.generateGetFieldAsCall(attribute); - + // adding getter and setter to contract getterName = "get" + StringUtils.capitalize(attributeName); ObjectModelOperation getter = addOperation(abstractClassForThisMetaExtension, getterName, attributeType); @@ -738,7 +740,7 @@ } return value; }*/); - + String setterName = "set" + StringUtils.capitalize(attributeName); ObjectModelOperation setter = addOperation(abstractClassForThisMetaExtension, setterName, "void"); addAnnotation(abstractClassForThisMetaExtension, setter, "Override");

1 0

r1052 - trunk/wikitty-struts/src/main/resources/template/wikitty
by mfortun＠users.nuiton.org 05 Jul '11

05 Jul '11

Author: mfortun Date: 2011-07-05 16:23:24 +0200 (Tue, 05 Jul 2011) New Revision: 1052 Url: http://nuiton.org/repositories/revision/wikitty/1052 Log: * forgotten multiple inside tag Modified: trunk/wikitty-struts/src/main/resources/template/wikitty/ws-selectAssociation.ftl Modified: trunk/wikitty-struts/src/main/resources/template/wikitty/ws-selectAssociation.ftl =================================================================== --- trunk/wikitty-struts/src/main/resources/template/wikitty/ws-selectAssociation.ftl 2011-07-05 14:13:10 UTC (rev 1051) +++ trunk/wikitty-struts/src/main/resources/template/wikitty/ws-selectAssociation.ftl 2011-07-05 14:23:24 UTC (rev 1052) @@ -2,7 +2,11 @@ <#include "/${parameters.templateDir}/${parameters.theme}/ws-label-commons.ftl" /> <select <#include "/${parameters.templateDir}/${parameters.theme}/ws-commons.ftl" /> - size="${parameters.size}"> + size="${parameters.size}" +<#-- <#if parameters.multiple?? && parameters.multiple==true >--> + multiple +<#-- </#if> --> + > <#assign optionKeys = parameters.value><#t/> <#list optionKeys as optionKey> <option value="${optionKey.valeur}">

1 0

r1051 - trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator
by echatellier＠users.nuiton.org 05 Jul '11

05 Jul '11

Author: echatellier Date: 2011-07-05 16:13:10 +0200 (Tue, 05 Jul 2011) New Revision: 1051 Url: http://nuiton.org/repositories/revision/wikitty/1051 Log: Fix model transformation (to generate new modele instead of java) Modified: trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyPurifierTransformer.java Modified: trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyPurifierTransformer.java =================================================================== --- trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyPurifierTransformer.java 2011-07-05 14:12:19 UTC (rev 1050) +++ trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyPurifierTransformer.java 2011-07-05 14:13:10 UTC (rev 1051) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2010 CodeLutin, Benjamin Poussin + * Copyright (C) 2009 - 2011 CodeLutin, Benjamin Poussin, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as @@ -25,35 +25,53 @@ package org.nuiton.wikitty.generator; import java.util.ArrayList; +import java.util.Collection; import java.util.HashMap; import java.util.List; import java.util.Map; +import org.apache.commons.collections.CollectionUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.nuiton.eugene.java.ObjectModelTransformerToJava; +import org.nuiton.eugene.GeneratorUtil; +import org.nuiton.eugene.Template; import org.nuiton.eugene.models.object.ObjectModel; import org.nuiton.eugene.models.object.ObjectModelAttribute; +import org.nuiton.eugene.models.object.ObjectModelBuilder; import org.nuiton.eugene.models.object.ObjectModelClass; +import org.nuiton.eugene.models.object.ObjectModelClassifier; +import org.nuiton.eugene.models.object.ObjectModelElement; +import org.nuiton.eugene.models.object.ObjectModelEnumeration; +import org.nuiton.eugene.models.object.ObjectModelGenerator; +import org.nuiton.eugene.models.object.ObjectModelInterface; +import org.nuiton.eugene.models.object.ObjectModelModifier; +import org.nuiton.eugene.models.object.ObjectModelOperation; +import org.nuiton.eugene.models.object.ObjectModelParameter; +import org.nuiton.eugene.models.object.ObjectModelTransformer; +import org.nuiton.eugene.models.object.ObjectModelType; /** - * this transformer read the original user model and generate the intermediate - * model needed by generators. + * This transformer read the original user model and generate the intermediate + * model needed by generators. * - * - * + * Currently: + * - manage name collision for attributes or methods inherited from two + * different classes */ -public class WikittyPurifierTransformer extends ObjectModelTransformerToJava { +public class WikittyPurifierTransformer extends ObjectModelTransformer<ObjectModel> { private static final Log log = LogFactory.getLog(WikittyPurifierTransformer.class); /** for a given class, store all the names used by this class and subClasses */ - Map<ObjectModelClass, List<String>> namesUsedByClass = new HashMap<ObjectModelClass, List<String>>(); + protected Map<ObjectModelClass, List<String>> namesUsedByClass = new HashMap<ObjectModelClass, List<String>>(); /** class of the original model that are already processed */ - List<ObjectModelClass> processedClasses = new ArrayList<ObjectModelClass>(); + protected List<ObjectModelClass> processedClasses = new ArrayList<ObjectModelClass>(); + /** Generated model builder. */ + protected ObjectModelBuilder builder; + /** * for a given, class read all attributes name and try to find conflicts * with parent classes attributes names. @@ -129,7 +147,7 @@ // using alternative name lead to a conflict attributeName = null; } else { - addTagValue(attribute, WikittyTransformerUtil.TAG_ALTERNATIVE_NAME, attributeName); + builder.addTagValue(attribute, WikittyTransformerUtil.TAG_ALTERNATIVE_NAME, attributeName); } } @@ -142,8 +160,17 @@ WikittyTransformerUtil.TAG_ALTERNATIVE_NAME + "\" on this attribute"); } else { + + if (isVerbose()) { + if (!attributeName.equals(attribute.getName())) { + log.info("attribute " + attribute.getName() + " purified to " + attributeName); + } + } + allUsedNames.add(attributeName); } + + } // saving all names we used in current class will permit to sub classes @@ -163,4 +190,304 @@ } } } + + @Override + protected Template<ObjectModel> initOutputTemplate() { + return new ObjectModelGenerator(); + } + + /* + * @see org.nuiton.eugene.models.object.ObjectModelTransformer#debugOutputModel() + */ + @Override + protected void debugOutputModel() { + + } + + /* + * @see org.nuiton.eugene.Transformer#initOutputModel() + */ + @Override + protected ObjectModel initOutputModel() { + builder = new ObjectModelBuilder(getModel().getName()); + ObjectModel model = builder.getModel(); + return model; + } + + /** + * creates a clone of the given {@code source} class in the output model + * and clones attributes, inheritance declarations and operations into the + * clone + * + * @param source the class to clone from the source model + * @param cloneDocumentation flag to add documentation if some found in model + * @return the clone of the given class + */ + public ObjectModelClass cloneClass(ObjectModelClass source, + boolean cloneDocumentation) { + ObjectModelClass outputClass = + builder.createClass(source.getName(), source.getPackageName()); + + cloneClassifier(source, outputClass, cloneDocumentation); + + for (ObjectModelClass superClass : source.getSuperclasses()) { + builder.addSuperclass(outputClass, superClass.getQualifiedName()); + } + + if (!CollectionUtils.isEmpty(source.getInnerClassifiers())) { + for (ObjectModelClassifier classifier : source.getInnerClassifiers()) { + ObjectModelClassifier innerClassifierClone = + cloneClassifier(classifier, cloneDocumentation); + builder.addInnerClassifier(outputClass, + ObjectModelType.OBJECT_MODEL_CLASSIFIER, + innerClassifierClone.getName()); + } + } + return outputClass; + } + + /** + * creates a clone of the given {@code source} classifier in the output + * model and clones attributes, inheritance declaration and operations + * + * class-specific, enumeration-specific and interface-specific features + * of the given classifier <strong>will</strong> be present in the clone + * + * @param source the classifier to clone from the source model + * @param cloneDocumentation flag to add documentation if some found in model + * @return the clone of the given classifier + */ + public ObjectModelClassifier cloneClassifier(ObjectModelClassifier source, + boolean cloneDocumentation) { + ObjectModelClassifier clone = null; + if (source.isInterface()) { + clone = cloneInterface((ObjectModelInterface) source, cloneDocumentation); + } else if (source.isClass()) { + clone = cloneClass((ObjectModelClass) source, cloneDocumentation); + } else if (source.isEnum()) { + clone = cloneEnumeration((ObjectModelEnumeration) source, cloneDocumentation); + } else { + // should never occur + log.error("strange classifier " + source); + } + return clone; + } + + /** + * creates a clone of the given {@code source} interface in the output model + * and clones attributes, inheritance declaration and operations into the + * clone + * + * @param source the interface to clone from the source model + * @param cloneDocumentation flag to add documentation if some found in model + * @return the clone of the given interface + */ + public ObjectModelInterface cloneInterface(ObjectModelInterface source, + boolean cloneDocumentation) { + ObjectModelInterface outputInterface = + builder.createInterface(source.getName(), source.getPackageName()); + + cloneClassifier(source, outputInterface, cloneDocumentation); + // nothing more to do. copyClassifier already done the job + + return outputInterface; + } + + /** + * creates a clone of the given {@code source} enumeration in the output + * model and clones attributes, inheritance declaration, operations and + * literals into the clone + * + * @param source the enumeration to clone from the source model + * @param cloneDocumentation flag to add documentation if some found in model + * @return the clone of the given enumeration + */ + public ObjectModelEnumeration cloneEnumeration(ObjectModelEnumeration source, + boolean cloneDocumentation) { + ObjectModelEnumeration outputEnumeration = + builder.createEnumeration(source.getName(), source.getPackageName()); + + cloneClassifier(source, outputEnumeration, cloneDocumentation); + + for (String literal : source.getLiterals()) { + builder.addLiteral(outputEnumeration, literal); + } + + return outputEnumeration; + } + + /** + * copy attributes, interfaces declaration and operation of a given classifier + * into another classifier. + * + * class-specific, enumeration-specific and interface-specific features + * of the given classifier <strong>will not</strong> be present in the clone. + * To copy those specific elements, use {@link #cloneClassifier(ObjectModelClassifier, boolean)} + * + * @param source the classifier to clone from the source model + * @param destination where to clone the given source one + * @param copyDocumentation flag to add documentation if some found in model + */ + protected void cloneClassifier(ObjectModelClassifier source, + ObjectModelClassifier destination, + boolean copyDocumentation) { + + cloneTagValues(source, destination); + + cloneStereotypes(source, destination); + + for (ObjectModelAttribute attribute : source.getAttributes()) { + cloneAttribute(attribute, destination, copyDocumentation); + } + + for (ObjectModelInterface interfacez : source.getInterfaces()) { + builder.addInterface(destination, interfacez.getQualifiedName()); + } + + for (ObjectModelOperation operation : source.getOperations()) { + cloneOperation(operation, destination, copyDocumentation); + } + } + + /** + * Clone the {@code source} operation into the {@code destination} classifier. + * whole signature, tagValues and body code will be cloned. You can specify + * {@code modifiers} for the result operation. + * + * @param source operation to clone + * @param destination classifier where result operation will be added + * @param cloneDocumentation flag to add documentation if some found in model + * @param modifiers extra modifiers + * @return the new operation created in destination classifier + */ + public ObjectModelOperation cloneOperation(ObjectModelOperation source, + ObjectModelClassifier destination, + boolean cloneDocumentation, + ObjectModelModifier... modifiers) { + ObjectModelOperation outputOperation = cloneOperationSignature( + source, + destination, + cloneDocumentation, + modifiers + ); + + // add body only if operation is not abstract + boolean opAbstract = false; + for (ObjectModelModifier modifier : modifiers) { + if (modifier == ObjectModelModifier.ABSTRACT) { + opAbstract = true; + break; + } + } + if (!opAbstract) { + builder.setOperationBody(outputOperation, source.getBodyCode()); + } + return outputOperation; + } + + /** + * Copy all tag values for the given {@code source} to the given + * {@code destination}. + * + * @param source the source element + * @param destination the destination element + */ + protected void cloneTagValues(ObjectModelElement source, + ObjectModelElement destination) { + Map<String, String> tags = source.getTagValues(); + for (Map.Entry<String, String> entry : tags.entrySet()) { + builder.addTagValue(destination,entry.getKey(),entry.getValue()); + } + } + + /** + * + * @param source + * @param destination + */ + protected void cloneStereotypes(ObjectModelClassifier source, + ObjectModelClassifier destination) { + + Collection<String> stereotypes = source.getStereotypes(); + for (String stereotype : stereotypes) { + builder.addStereotype(destination,stereotype); + } + } + + /** + * Clone the {@code source} operation into the {@code destination} classifier. + * name, returnType, parameters, exceptions and tagValues will be cloned. + * You can specify {@code modifiers} for the result operation. + * + * @param source operation to clone + * @param destination classifier where result operation will be added + * @param cloneDocumentation flag to add documentation if some found in model + * @param modifiers extra modifiers + * @return the new operation created in destination classifier + */ + public ObjectModelOperation cloneOperationSignature(ObjectModelOperation source, + ObjectModelClassifier destination, + boolean cloneDocumentation, + ObjectModelModifier... modifiers) { + + ObjectModelOperation outputOperation = + builder.addOperation(destination, source.getName(), source.getReturnType(), modifiers); + + if (cloneDocumentation && GeneratorUtil.hasDocumentation(source)) { + builder.setDocumentation(outputOperation, source.getDocumentation()); + } + + for (ObjectModelParameter parameter : source.getParameters()) { + + ObjectModelParameter outputParam = + builder.addParameter(outputOperation, parameter.getType(), parameter.getName()); + + if (cloneDocumentation && GeneratorUtil.hasDocumentation(parameter)) { + builder.setDocumentation(outputParam, parameter.getDocumentation()); + } + } + + for (String exception : source.getExceptions()) { + builder.addException(outputOperation, exception); + } + + cloneTagValues(source, outputOperation); + + return outputOperation; + } + + /** + * clone a given attribute into a classifier of the output model + * + * @param source the original attribute + * @param destination classifier where the clone will be added + * @param cloneDocumentation flag to add documentation if some found in model + * @param modifiers extra modifiers + * @return the clone attribute + */ + protected ObjectModelAttribute cloneAttribute(ObjectModelAttribute source, + ObjectModelClassifier destination, + boolean cloneDocumentation, + ObjectModelModifier... modifiers) { + + ObjectModelAttribute outputAttribute = builder.addAttribute(destination, + source.getName(), source.getType(), + source.getDefaultValue(), modifiers); + + cloneTagValues(source, outputAttribute); + + if (cloneDocumentation) { + builder.setDocumentation(outputAttribute, source.getDocumentation()); + } + + for (String comment : source.getComments()) { + builder.addComment(outputAttribute, comment); + } + + builder.setMinMultiplicity(outputAttribute, source.getMinMultiplicity()); + builder.setMaxMultiplicity(outputAttribute, source.getMaxMultiplicity()); + builder.setNavigable(outputAttribute,source.isNavigable()); + + return outputAttribute; + } }

2 1

r1050 - trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator
by echatellier＠users.nuiton.org 05 Jul '11

05 Jul '11

Author: echatellier Date: 2011-07-05 16:12:19 +0200 (Tue, 05 Jul 2011) New Revision: 1050 Url: http://nuiton.org/repositories/revision/wikitty/1050 Log: Fix void generation Modified: trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyContractGenerator.java Modified: trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyContractGenerator.java =================================================================== --- trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyContractGenerator.java 2011-07-05 14:05:19 UTC (rev 1049) +++ trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyContractGenerator.java 2011-07-05 14:12:19 UTC (rev 1050) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2010 CodeLutin, Benjamin Poussin + * Copyright (C) 2009 - 2011 CodeLutin, Benjamin Poussin, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as @@ -175,7 +175,12 @@ // add all method describe in model in contract interfaces // this method must be writed by developer in Impl for (ObjectModelOperation operation : businessEntity.getOperations()) { - addOperation(contract, operation); + //FIXME echatellier 20110705 mayb fix it to eugene + if (operation.getReturnType() == null || operation.getReturnType().isEmpty()) { + addOperation(contract, operation.getName(), "void"); + } else { + addOperation(contract, operation); + } } for(ObjectModelAttribute attribute : businessEntity.getAttributes()) { @@ -204,7 +209,7 @@ for (ObjectModelAttribute attribute : businessEntity.getAttributes()) { if (attribute.isNavigable()) { // needed below, in templates - String fieldVariableName = WikittyTransformerUtil.attributeToFielVariableName(attribute, true); + //String fieldVariableName = WikittyTransformerUtil.attributeToFielVariableName(attribute, true); String attributeType = WikittyTransformerUtil.generateResultType(attribute, false); String attributeName = attribute.getName(); @@ -266,7 +271,7 @@ addInterface(contract, superClass.getQualifiedName()); if (WikittyTransformerUtil.isBusinessEntity(superClass)) { // superclass must have been processed first to have its operations set - if ( ! processedEntities.contains(superClass)) { + if ( !processedEntities.contains(superClass)) { log.debug(businessEntity.getName() + " require to process " + superClass.getName() + " first"); processEntity(superClass);

1 0

r1049 - trunk/wikitty-struts/src/main/resources/template/wikitty
by mfortun＠users.nuiton.org 05 Jul '11

05 Jul '11

Author: mfortun Date: 2011-07-05 16:05:19 +0200 (Tue, 05 Jul 2011) New Revision: 1049 Url: http://nuiton.org/repositories/revision/wikitty/1049 Log: * correct commons template for name element Modified: trunk/wikitty-struts/src/main/resources/template/wikitty/ws-commons.ftl Modified: trunk/wikitty-struts/src/main/resources/template/wikitty/ws-commons.ftl =================================================================== --- trunk/wikitty-struts/src/main/resources/template/wikitty/ws-commons.ftl 2011-07-05 14:04:04 UTC (rev 1048) +++ trunk/wikitty-struts/src/main/resources/template/wikitty/ws-commons.ftl 2011-07-05 14:05:19 UTC (rev 1049) @@ -1,4 +1,4 @@ -name=${parameters.name} +name="${parameters.name}" <#if parameters.id?? ><#t/> id="${parameters.id}"<#t/> </#if><#t/> \ No newline at end of file

1 0

r1048 - in trunk/wikitty-struts/src/main: java/org/nuiton/wikitty/struts/component java/org/nuiton/wikitty/struts/tag resources/template/wikitty tld
by mfortun＠users.nuiton.org 05 Jul '11

05 Jul '11

Author: mfortun Date: 2011-07-05 16:04:04 +0200 (Tue, 05 Jul 2011) New Revision: 1048 Url: http://nuiton.org/repositories/revision/wikitty/1048 Log: * correct template location with theme for form tag * add label element in template * add new tag for wikitty collection Added: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/SelectAssociationBean.java trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/SelectAssociationTag.java trunk/wikitty-struts/src/main/resources/template/wikitty/ws-label-commons.ftl trunk/wikitty-struts/src/main/resources/template/wikitty/ws-selectAssociation-close.ftl trunk/wikitty-struts/src/main/resources/template/wikitty/ws-selectAssociation.ftl Modified: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/DateBean.java trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/FormTagBean.java trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/SelectCriteriaBean.java trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/SelectCriteriaTag.java trunk/wikitty-struts/src/main/resources/template/wikitty/ws-boolean.ftl trunk/wikitty-struts/src/main/resources/template/wikitty/ws-date.ftl trunk/wikitty-struts/src/main/resources/template/wikitty/ws-selectcriteria.ftl trunk/wikitty-struts/src/main/resources/template/wikitty/ws-selectfixed.ftl trunk/wikitty-struts/src/main/resources/template/wikitty/ws-textarea.ftl trunk/wikitty-struts/src/main/resources/template/wikitty/ws-textfield.ftl trunk/wikitty-struts/src/main/tld/wikitty-struts.tld Modified: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/DateBean.java =================================================================== --- trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/DateBean.java 2011-07-05 13:42:02 UTC (rev 1047) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/DateBean.java 2011-07-05 14:04:04 UTC (rev 1048) @@ -4,11 +4,14 @@ import javax.servlet.http.HttpServletResponse; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.apache.struts2.views.annotations.StrutsTag; import org.nuiton.util.StringUtil; import org.nuiton.wikitty.WikittyUtil; import com.opensymphony.xwork2.util.ValueStack; +@StrutsTag(name = "boolean", tldTagClass = "org.nuiton.wikitty.struts.tag.DateTag", + description = "", allowDynamicAttributes = false) public class DateBean extends AbstractWikittyComponent { /** to use log facility, just put in your code: log.info(\"...\"); */ Modified: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/FormTagBean.java =================================================================== --- trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/FormTagBean.java 2011-07-05 13:42:02 UTC (rev 1047) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/FormTagBean.java 2011-07-05 14:04:04 UTC (rev 1048) @@ -128,6 +128,12 @@ } + + + @Override + public String getTheme() { + return "wikitty"; + } public String getDefaultOpenTemplate() { return OPEN_TEMPLATE; Added: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/SelectAssociationBean.java =================================================================== --- trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/SelectAssociationBean.java (rev 0) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/SelectAssociationBean.java 2011-07-05 14:04:04 UTC (rev 1048) @@ -0,0 +1,108 @@ +package org.nuiton.wikitty.struts.component; + +import java.util.Collection; +import java.util.LinkedList; +import java.util.List; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.nuiton.util.StringUtil; +import org.nuiton.wikitty.WikittyUtil; +import org.nuiton.wikitty.entities.Wikitty; +import org.nuiton.wikitty.struts.Option; +import org.nuiton.wikitty.struts.WikittyFieldHandler; + +import com.opensymphony.xwork2.util.ValueStack; + +public class SelectAssociationBean extends AbstractWikittyComponent { + + /** to use log facility, just put in your code: log.info(\"...\"); */ + final static private Log log = LogFactory + .getLog(SelectAssociationBean.class); + + public static final String OPEN_TEMPLATE = "ws-selectassociation"; + public static final String TEMPLATE = "ws-selectassociation-close"; + + protected String descField; + protected int size; + + public SelectAssociationBean(ValueStack stack, HttpServletRequest request, + HttpServletResponse response) { + super(stack, request, response); + } + + + @Override + protected void evaluateExtraParams() { + super.evaluateExtraParams(); + + // the select constructed must be positive + if (size <= 0 ){ + size = 1; + } + + // add parametter + addParameter("size", size); + + List<Option> listOption = new LinkedList<Option>(); + + String ext = WikittyUtil.getExtensionNameFromFQFieldName(fqFieldName); + String fieldName = WikittyUtil.getFieldNameFromFQFieldName(fqFieldName); + + String[] descriptor = StringUtil.split(descField, + WikittyFieldHandler.FIELD_SEPARATOR); + + // iterate wikitty for result construction + for (Wikitty wiki : wikitty.getFieldAsList(ext, fieldName, Wikitty.class)){ + Option temp = new Option(); + temp.setValeur(wiki.getId()); + String desc = wiki.getId(); + + // if attribute descripteur fill with something + // extract from wikitty corresponding field value + if (descriptor.length != 0) { + desc = ""; + for (String descriptorIt : descriptor) { + String[] descTable = StringUtil + .split(descriptorIt, WikittyUtil.FQ_FIELD_NAME_SEPARATOR); + + desc += wiki.getFieldAsWikitty(descTable[0], + descTable[1]); + } + } + temp.setDescription(desc); + listOption.add(temp); + + } + + addParameter("value", listOption); + } + + + public String getDescField() { + return descField; + } + + public void setDescField(String descField) { + this.descField = descField; + } + + public int getSize() { + return size; + } + + public void setSize(int size) { + this.size = size; + } + + public String getDefaultOpenTemplate() { + return OPEN_TEMPLATE; + } + + protected String getDefaultTemplate() { + return TEMPLATE; + } + +} Property changes on: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/SelectAssociationBean.java ___________________________________________________________________ Added: svn:mime-type + text/plain Modified: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/SelectCriteriaBean.java =================================================================== --- trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/SelectCriteriaBean.java 2011-07-05 13:42:02 UTC (rev 1047) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/SelectCriteriaBean.java 2011-07-05 14:04:04 UTC (rev 1048) @@ -29,7 +29,7 @@ public static final String TEMPLATE = "ws-selectcriteria-close"; protected Criteria criteria; - protected String descfield; + protected String descField; public SelectCriteriaBean(ValueStack stack, HttpServletRequest request, HttpServletResponse response) { @@ -62,7 +62,7 @@ // search for the wikitty with the criteria PagedResult<Wikitty> wikitties = proxy.findAllByCriteria(criteria); - String[] descriptor = StringUtil.split(descfield, + String[] descriptor = StringUtil.split(descField, WikittyFieldHandler.FIELD_SEPARATOR); // if wikitties not null contruct option result @@ -81,7 +81,7 @@ desc = ""; for (String descriptorIt : descriptor) { String[] descTable = StringUtil - .split(descriptorIt, "."); + .split(descriptorIt, WikittyUtil.FQ_FIELD_NAME_SEPARATOR); desc += wiki.getFieldAsWikitty(descTable[0], descTable[1]); @@ -110,12 +110,12 @@ this.criteria = criteria; } - public String getDescfield() { - return descfield; + public String getDescField() { + return descField; } - public void setDescfield(String descfield) { - this.descfield = descfield; + public void setDescField(String descfield) { + this.descField = descfield; } } Added: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/SelectAssociationTag.java =================================================================== --- trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/SelectAssociationTag.java (rev 0) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/SelectAssociationTag.java 2011-07-05 14:04:04 UTC (rev 1048) @@ -0,0 +1,57 @@ +package org.nuiton.wikitty.struts.tag; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.apache.struts2.components.Component; +import org.nuiton.wikitty.struts.component.SelectAssociationBean; + +import com.opensymphony.xwork2.util.ValueStack; + +public class SelectAssociationTag extends AbstractWikittyTag{ + + /** + * + */ + private static final long serialVersionUID = 1341902299150448705L; + + + protected String descField; + protected int size; + + @Override + public Component getBean(ValueStack stack, HttpServletRequest req, + HttpServletResponse res) { + return new SelectAssociationBean(stack, req, res); + + } + + + @Override + protected void populateParams() { + super.populateParams(); + + SelectAssociationBean select= (SelectAssociationBean) component; + select.setDescField(descField); + select.setSize(size); + } + + public String getDescField() { + return descField; + } + + public void setDescField(String descField) { + this.descField = descField; + } + + public int getSize() { + return size; + } + + public void setSize(int size) { + this.size = size; + } + + + +} Property changes on: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/SelectAssociationTag.java ___________________________________________________________________ Added: svn:mime-type + text/plain Modified: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/SelectCriteriaTag.java =================================================================== --- trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/SelectCriteriaTag.java 2011-07-05 13:42:02 UTC (rev 1047) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/SelectCriteriaTag.java 2011-07-05 14:04:04 UTC (rev 1048) @@ -14,7 +14,7 @@ */ private static final long serialVersionUID = 2807198744532780915L; protected Criteria criteria; - protected String descfield; + protected String descField; @Override public Component getBean(ValueStack stack, HttpServletRequest req, @@ -31,7 +31,7 @@ SelectCriteriaBean fieldtag = ((SelectCriteriaBean) component); fieldtag.setCriteria(criteria); - fieldtag.setDescfield(descfield); + fieldtag.setDescField(descField); } @@ -43,12 +43,12 @@ this.criteria = criteria; } - public String getDescfield() { - return descfield; + public String getDescField() { + return descField; } - public void setDescfield(String descfield) { - this.descfield = descfield; + public void setDescField(String descField) { + this.descField = descField; } } Modified: trunk/wikitty-struts/src/main/resources/template/wikitty/ws-boolean.ftl =================================================================== --- trunk/wikitty-struts/src/main/resources/template/wikitty/ws-boolean.ftl 2011-07-05 13:42:02 UTC (rev 1047) +++ trunk/wikitty-struts/src/main/resources/template/wikitty/ws-boolean.ftl 2011-07-05 14:04:04 UTC (rev 1048) @@ -1,5 +1,6 @@ <#if parameters.included?? && parameters.included==true > -${parameters.label} : <input +<#include "/${parameters.templateDir}/${parameters.theme}/ws-label-commons.ftl" /> +<input <#include "/${parameters.templateDir}/${parameters.theme}/ws-commons.ftl" /> type="checkbox" value="true" <#t/> <#if aKey.value=="true" > <#t/> Modified: trunk/wikitty-struts/src/main/resources/template/wikitty/ws-date.ftl =================================================================== --- trunk/wikitty-struts/src/main/resources/template/wikitty/ws-date.ftl 2011-07-05 13:42:02 UTC (rev 1047) +++ trunk/wikitty-struts/src/main/resources/template/wikitty/ws-date.ftl 2011-07-05 14:04:04 UTC (rev 1048) @@ -1,5 +1,6 @@ <#if parameters.included?? && parameters.included==true > -${parameters.label} : <input +<#include "/${parameters.templateDir}/${parameters.theme}/ws-label-commons.ftl" /> +<input <#include "/${parameters.templateDir}/${parameters.theme}/ws-commons.ftl" /> type="text" value="${parameters.value}"> </p> </#if><#t/> Added: trunk/wikitty-struts/src/main/resources/template/wikitty/ws-label-commons.ftl =================================================================== --- trunk/wikitty-struts/src/main/resources/template/wikitty/ws-label-commons.ftl (rev 0) +++ trunk/wikitty-struts/src/main/resources/template/wikitty/ws-label-commons.ftl 2011-07-05 14:04:04 UTC (rev 1048) @@ -0,0 +1 @@ +<label for="${parameters.id}">${parameters.label}</label> \ No newline at end of file Added: trunk/wikitty-struts/src/main/resources/template/wikitty/ws-selectAssociation.ftl =================================================================== --- trunk/wikitty-struts/src/main/resources/template/wikitty/ws-selectAssociation.ftl (rev 0) +++ trunk/wikitty-struts/src/main/resources/template/wikitty/ws-selectAssociation.ftl 2011-07-05 14:04:04 UTC (rev 1048) @@ -0,0 +1,12 @@ +<#if parameters.included?? && parameters.included==true > +<#include "/${parameters.templateDir}/${parameters.theme}/ws-label-commons.ftl" /> +<select +<#include "/${parameters.templateDir}/${parameters.theme}/ws-commons.ftl" /> + size="${parameters.size}"> +<#assign optionKeys = parameters.value><#t/> + <#list optionKeys as optionKey> + <option value="${optionKey.valeur}"> + ${optionKey.description} </option> + </#list> +</select><#t/> +</#if> \ No newline at end of file Modified: trunk/wikitty-struts/src/main/resources/template/wikitty/ws-selectcriteria.ftl =================================================================== --- trunk/wikitty-struts/src/main/resources/template/wikitty/ws-selectcriteria.ftl 2011-07-05 13:42:02 UTC (rev 1047) +++ trunk/wikitty-struts/src/main/resources/template/wikitty/ws-selectcriteria.ftl 2011-07-05 14:04:04 UTC (rev 1048) @@ -1,5 +1,6 @@ <#if parameters.included?? && parameters.included==true > -${parameters.label} :<select +<#include "/${parameters.templateDir}/${parameters.theme}/ws-label-commons.ftl" /> +<select <#include "/${parameters.templateDir}/${parameters.theme}/ws-commons.ftl" /> size="1"> <#assign optionKeys = parameters.wikittiesvalues> Modified: trunk/wikitty-struts/src/main/resources/template/wikitty/ws-selectfixed.ftl =================================================================== --- trunk/wikitty-struts/src/main/resources/template/wikitty/ws-selectfixed.ftl 2011-07-05 13:42:02 UTC (rev 1047) +++ trunk/wikitty-struts/src/main/resources/template/wikitty/ws-selectfixed.ftl 2011-07-05 14:04:04 UTC (rev 1048) @@ -1,5 +1,6 @@ <#if parameters.included?? && parameters.included==true > -${parameters.label} :<select +<#include "/${parameters.templateDir}/${parameters.theme}/ws-label-commons.ftl" /> +<select <#include "/${parameters.templateDir}/${parameters.theme}/ws-commons.ftl" /> size="1"> <#assign optionKeys = parameters.fixvalues><#t/> Modified: trunk/wikitty-struts/src/main/resources/template/wikitty/ws-textarea.ftl =================================================================== --- trunk/wikitty-struts/src/main/resources/template/wikitty/ws-textarea.ftl 2011-07-05 13:42:02 UTC (rev 1047) +++ trunk/wikitty-struts/src/main/resources/template/wikitty/ws-textarea.ftl 2011-07-05 14:04:04 UTC (rev 1048) @@ -1,5 +1,6 @@ <#if parameters.included?? && parameters.included==true > -${parameters.label} : <textarea +<#include "/${parameters.templateDir}/${parameters.theme}/ws-label-commons.ftl" /> +<textarea <#include "/${parameters.templateDir}/${parameters.theme}/ws-commons.ftl" /> cols="80" rows="20" >${parameters.value}</textarea><#t/> </#if><#t/> \ No newline at end of file Modified: trunk/wikitty-struts/src/main/resources/template/wikitty/ws-textfield.ftl =================================================================== --- trunk/wikitty-struts/src/main/resources/template/wikitty/ws-textfield.ftl 2011-07-05 13:42:02 UTC (rev 1047) +++ trunk/wikitty-struts/src/main/resources/template/wikitty/ws-textfield.ftl 2011-07-05 14:04:04 UTC (rev 1048) @@ -1,5 +1,6 @@ <#if parameters.included?? && parameters.included==true > -${parameters.label} : <input +<#include "/${parameters.templateDir}/${parameters.theme}/ws-label-commons.ftl" /> +<input <#include "/${parameters.templateDir}/${parameters.theme}/ws-commons.ftl" /> <#if parameters.password?? && parameters.password==true ><#t/> Modified: trunk/wikitty-struts/src/main/tld/wikitty-struts.tld =================================================================== --- trunk/wikitty-struts/src/main/tld/wikitty-struts.tld 2011-07-05 13:42:02 UTC (rev 1047) +++ trunk/wikitty-struts/src/main/tld/wikitty-struts.tld 2011-07-05 14:04:04 UTC (rev 1048) @@ -82,6 +82,58 @@ </attribute> </tag> + + <tag> + <name>selectAssociation</name> + <tagclass>org.nuiton.wikitty.struts.tag.SelectAssociationTag</tagclass> + <bodycontent>empty</bodycontent> + <attribute> + <description><![CDATA[id for the field]]></description> + <name>id</name> + <rtexprvalue>true</rtexprvalue> + </attribute> + <attribute> + <description><![CDATA[name for html element. Ignored if tag used inside tag form.]]></description> + <name>name</name> + <rtexprvalue>true</rtexprvalue> + </attribute> + <attribute> + <description><![CDATA[the wikitty to edit]]></description> + <name>wikitty</name> + <rtexprvalue>true</rtexprvalue> + <required>true</required> + </attribute> + <attribute> + <description><![CDATA[the proxy from whom search for wikitty required if tag not used inside form tag]]></description> + <name>proxy</name> + <rtexprvalue>true</rtexprvalue> + <required>true</required> + </attribute> + <attribute> + <description><![CDATA[if subtype == wikitty, use the name of the descfield of the wikitties as a description value for select's option]]></description> + <name>descField</name> + <rtexprvalue>true</rtexprvalue> + </attribute> + <attribute> + <description><![CDATA[the name of the field that have to be specialize, it will be the name of the html element]]></description> + <name>fqFieldName</name> + <rtexprvalue>true</rtexprvalue> + <required>true</required> + </attribute> + <attribute> + <description><![CDATA[the label of the field]]></description> + <name>label</name> + <rtexprvalue>true</rtexprvalue> + <required>true</required> + </attribute> + <attribute> + <description><![CDATA[the label of the field]]></description> + <name>size</name> + <rtexprvalue>true</rtexprvalue> + <required>true</required> + </attribute> + </tag> + <tag> @@ -118,7 +170,7 @@ </attribute> <attribute> <description><![CDATA[if subtype == wikitty, use the name of the descfield of the wikitties as a description value for select's option]]></description> - <name>descfield</name> + <name>descField</name> <rtexprvalue>true</rtexprvalue> </attribute> <attribute>

1 0

r1047 - in trunk/wikitty-struts/src/main: java/org/nuiton/wikitty/struts/component resources/template resources/template/wikitty
by sletellier＠users.nuiton.org 05 Jul '11

05 Jul '11

Author: sletellier Date: 2011-07-05 15:42:02 +0200 (Tue, 05 Jul 2011) New Revision: 1047 Url: http://nuiton.org/repositories/revision/wikitty/1047 Log: - Set as parent theme css_xhtml - Move templates to wikitty directory - Set wikitty theme name in abstract component Added: trunk/wikitty-struts/src/main/resources/template/wikitty/ trunk/wikitty-struts/src/main/resources/template/wikitty/theme.properties trunk/wikitty-struts/src/main/resources/template/wikitty/ws-boolean-close.ftl trunk/wikitty-struts/src/main/resources/template/wikitty/ws-boolean.ftl trunk/wikitty-struts/src/main/resources/template/wikitty/ws-commons.ftl trunk/wikitty-struts/src/main/resources/template/wikitty/ws-date-close.ftl trunk/wikitty-struts/src/main/resources/template/wikitty/ws-date.ftl trunk/wikitty-struts/src/main/resources/template/wikitty/ws-form-close.ftl trunk/wikitty-struts/src/main/resources/template/wikitty/ws-form-commons.ftl trunk/wikitty-struts/src/main/resources/template/wikitty/ws-form.ftl trunk/wikitty-struts/src/main/resources/template/wikitty/ws-hidden-close.ftl trunk/wikitty-struts/src/main/resources/template/wikitty/ws-hidden.ftl trunk/wikitty-struts/src/main/resources/template/wikitty/ws-selectcriteria-close.ftl trunk/wikitty-struts/src/main/resources/template/wikitty/ws-selectcriteria.ftl trunk/wikitty-struts/src/main/resources/template/wikitty/ws-selectfixed-close.ftl trunk/wikitty-struts/src/main/resources/template/wikitty/ws-selectfixed.ftl trunk/wikitty-struts/src/main/resources/template/wikitty/ws-textarea-close.ftl trunk/wikitty-struts/src/main/resources/template/wikitty/ws-textarea.ftl trunk/wikitty-struts/src/main/resources/template/wikitty/ws-textfield-close.ftl trunk/wikitty-struts/src/main/resources/template/wikitty/ws-textfield.ftl Removed: trunk/wikitty-struts/src/main/resources/template/xhtml/ Modified: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/AbstractWikittyComponent.java Modified: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/AbstractWikittyComponent.java =================================================================== --- trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/AbstractWikittyComponent.java 2011-07-05 11:54:44 UTC (rev 1046) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/AbstractWikittyComponent.java 2011-07-05 13:42:02 UTC (rev 1047) @@ -79,6 +79,7 @@ } else { addParameter("name", fqFieldName); } + addParameter("theme", getTheme()); // check if field included // if so add the parametter included @@ -93,8 +94,12 @@ } } } - + @Override + public String getTheme() { + return "wikitty"; + } + public WikittyFieldHandler getHandler() { return handler; } Added: trunk/wikitty-struts/src/main/resources/template/wikitty/theme.properties =================================================================== --- trunk/wikitty-struts/src/main/resources/template/wikitty/theme.properties (rev 0) +++ trunk/wikitty-struts/src/main/resources/template/wikitty/theme.properties 2011-07-05 13:42:02 UTC (rev 1047) @@ -0,0 +1 @@ +parent = css_xhtml Copied: trunk/wikitty-struts/src/main/resources/template/wikitty/ws-boolean.ftl (from rev 1046, trunk/wikitty-struts/src/main/resources/template/xhtml/ws-boolean.ftl) =================================================================== --- trunk/wikitty-struts/src/main/resources/template/wikitty/ws-boolean.ftl (rev 0) +++ trunk/wikitty-struts/src/main/resources/template/wikitty/ws-boolean.ftl 2011-07-05 13:42:02 UTC (rev 1047) @@ -0,0 +1,9 @@ +<#if parameters.included?? && parameters.included==true > +${parameters.label} : <input +<#include "/${parameters.templateDir}/${parameters.theme}/ws-commons.ftl" /> + type="checkbox" value="true" <#t/> + <#if aKey.value=="true" > <#t/> + checked='true'<#t/> + </#if> + /> +</#if> \ No newline at end of file Copied: trunk/wikitty-struts/src/main/resources/template/wikitty/ws-commons.ftl (from rev 1046, trunk/wikitty-struts/src/main/resources/template/xhtml/ws-commons.ftl) =================================================================== --- trunk/wikitty-struts/src/main/resources/template/wikitty/ws-commons.ftl (rev 0) +++ trunk/wikitty-struts/src/main/resources/template/wikitty/ws-commons.ftl 2011-07-05 13:42:02 UTC (rev 1047) @@ -0,0 +1,4 @@ +name=${parameters.name} +<#if parameters.id?? ><#t/> +id="${parameters.id}"<#t/> +</#if><#t/> \ No newline at end of file Copied: trunk/wikitty-struts/src/main/resources/template/wikitty/ws-date.ftl (from rev 1046, trunk/wikitty-struts/src/main/resources/template/xhtml/ws-date.ftl) =================================================================== --- trunk/wikitty-struts/src/main/resources/template/wikitty/ws-date.ftl (rev 0) +++ trunk/wikitty-struts/src/main/resources/template/wikitty/ws-date.ftl 2011-07-05 13:42:02 UTC (rev 1047) @@ -0,0 +1,7 @@ +<#if parameters.included?? && parameters.included==true > +${parameters.label} : <input +<#include "/${parameters.templateDir}/${parameters.theme}/ws-commons.ftl" /> + type="text" value="${parameters.value}"> </p> +</#if><#t/> + + Copied: trunk/wikitty-struts/src/main/resources/template/wikitty/ws-form-close.ftl (from rev 1046, trunk/wikitty-struts/src/main/resources/template/xhtml/ws-form-close.ftl) =================================================================== --- trunk/wikitty-struts/src/main/resources/template/wikitty/ws-form-close.ftl (rev 0) +++ trunk/wikitty-struts/src/main/resources/template/wikitty/ws-form-close.ftl 2011-07-05 13:42:02 UTC (rev 1047) @@ -0,0 +1,6 @@ +<#include "/${parameters.templateDir}/${parameters.theme}/ws-form-commons.ftl" /> +<input type="submit" name="store" value="Store" /> +<#if parameters.allowDelete?? && parameters.allowDelete==true > +<input type="submit" name="delete" value="Delete" /> +</#if> +</form> \ No newline at end of file Copied: trunk/wikitty-struts/src/main/resources/template/wikitty/ws-form-commons.ftl (from rev 1046, trunk/wikitty-struts/src/main/resources/template/xhtml/ws-form-commons.ftl) =================================================================== --- trunk/wikitty-struts/src/main/resources/template/wikitty/ws-form-commons.ftl (rev 0) +++ trunk/wikitty-struts/src/main/resources/template/wikitty/ws-form-commons.ftl 2011-07-05 13:42:02 UTC (rev 1047) @@ -0,0 +1,50 @@ +<#assign aKeys = parameters.wikittyfields><#t/> + <#list aKeys as aKey><#t/> +<#--<#if aKey.type=="file"> +<input type="hidden" name="${aKey.name}" value="BINARY" /> +${aKey.label} : <input type="file" name="File" label ="File"/> +</#if>--> +<#if aKey.type=="hidden"> +<input +<#include "/${parameters.templateDir}/${parameters.theme}/ws-commons.ftl" /> + type="hidden" name="${aKey.name}" value="${aKey.value}" /> +</#if> +<#if aKey.type=="textarea" > +${aKey.label} : <textarea +<#include "/${parameters.templateDir}/${parameters.theme}/ws-commons.ftl" /> + cols="80" rows="20" name="${aKey.name}">${aKey.value}</textarea> +</#if> +<#if aKey.type=="textfield" > +${aKey.label} : <input +<#include "/${parameters.templateDir}/${parameters.theme}/ws-commons.ftl" /> + type="text" name="${aKey.name}" value="${aKey.value}" > +</#if> +<#if aKey.type=="boolean" > +${aKey.label} : <input +<#include "/${parameters.templateDir}/${parameters.theme}/ws-commons.ftl" /> + type="checkbox" name="${aKey.name}" value="true" + <#if aKey.value=="true" > + checked='true' + </#if> + /> +</#if> +<#-- + +--> +<#if aKey.type=="select" > +${aKey.label} : +<select +<#include "/${parameters.templateDir}/${parameters.theme}/ws-commons.ftl" /> + name="${aKey.name}" size="1"> +<#assign optionKeys = aKey.listOption><#t/> + <#list optionKeys as optionKey><#t/> + <option value="${optionKey.valeur}" + <#if optionKey.valeur==aKey.value > + selected + </#if> + > ${optionKey.description} </option> + </#list><#t/> +</select> +</#if> +</br> +</#list><#t/> Copied: trunk/wikitty-struts/src/main/resources/template/wikitty/ws-form.ftl (from rev 1046, trunk/wikitty-struts/src/main/resources/template/xhtml/ws-form.ftl) =================================================================== --- trunk/wikitty-struts/src/main/resources/template/wikitty/ws-form.ftl (rev 0) +++ trunk/wikitty-struts/src/main/resources/template/wikitty/ws-form.ftl 2011-07-05 13:42:02 UTC (rev 1047) @@ -0,0 +1,10 @@ +<form +<#include "/${parameters.templateDir}/${parameters.theme}/ws-commons.ftl" /> +class="edit" action="${parameters.action}" method="post" enctype="multipart/form-data" > +<input type="hidden" name="id" value="${parameters.wikittyid}" /> +<#if parameters.redirect??> +<input type="hidden" name="redirect" value="${parameters.redirect}" /> +</#if><#t/> +<#if parameters.orderBefore?? && parameters.orderBefore==true > +<#include "/${parameters.templateDir}/${parameters.theme}/ws-form-commons.ftl" /> +</#if><#t/> \ No newline at end of file Copied: trunk/wikitty-struts/src/main/resources/template/wikitty/ws-hidden.ftl (from rev 1046, trunk/wikitty-struts/src/main/resources/template/xhtml/ws-hidden.ftl) =================================================================== --- trunk/wikitty-struts/src/main/resources/template/wikitty/ws-hidden.ftl (rev 0) +++ trunk/wikitty-struts/src/main/resources/template/wikitty/ws-hidden.ftl 2011-07-05 13:42:02 UTC (rev 1047) @@ -0,0 +1,5 @@ +<#if parameters.included?? && parameters.included==true > +<input +<#include "/${parameters.templateDir}/${parameters.theme}/ws-commons.ftl" /> +type="hidden" value="${parameters.value}" /><#t/> +</#if> \ No newline at end of file Copied: trunk/wikitty-struts/src/main/resources/template/wikitty/ws-selectcriteria.ftl (from rev 1046, trunk/wikitty-struts/src/main/resources/template/xhtml/ws-selectcriteria.ftl) =================================================================== --- trunk/wikitty-struts/src/main/resources/template/wikitty/ws-selectcriteria.ftl (rev 0) +++ trunk/wikitty-struts/src/main/resources/template/wikitty/ws-selectcriteria.ftl 2011-07-05 13:42:02 UTC (rev 1047) @@ -0,0 +1,14 @@ +<#if parameters.included?? && parameters.included==true > +${parameters.label} :<select +<#include "/${parameters.templateDir}/${parameters.theme}/ws-commons.ftl" /> + size="1"> +<#assign optionKeys = parameters.wikittiesvalues> + <#list optionKeys as optionKey> + <option value="${optionKey.valeur}"<#t/> + <#if optionKey.valeur==parameters.value > + selected <#t/> + </#if> <#t/> + > ${optionKey.description} </option> + </#list> +</select><#t/> +</#if> \ No newline at end of file Copied: trunk/wikitty-struts/src/main/resources/template/wikitty/ws-selectfixed.ftl (from rev 1046, trunk/wikitty-struts/src/main/resources/template/xhtml/ws-selectfixed.ftl) =================================================================== --- trunk/wikitty-struts/src/main/resources/template/wikitty/ws-selectfixed.ftl (rev 0) +++ trunk/wikitty-struts/src/main/resources/template/wikitty/ws-selectfixed.ftl 2011-07-05 13:42:02 UTC (rev 1047) @@ -0,0 +1,14 @@ +<#if parameters.included?? && parameters.included==true > +${parameters.label} :<select +<#include "/${parameters.templateDir}/${parameters.theme}/ws-commons.ftl" /> + size="1"> +<#assign optionKeys = parameters.fixvalues><#t/> + <#list optionKeys as optionKey><#t/> + <option value="${optionKey.valeur}" <#t/> + <#if optionKey.valeur==parameters.value > + selected <#t/> + </#if> <#t/> + > ${optionKey.description} </option> + </#list> +</select><#t/> +</#if> \ No newline at end of file Copied: trunk/wikitty-struts/src/main/resources/template/wikitty/ws-textarea.ftl (from rev 1046, trunk/wikitty-struts/src/main/resources/template/xhtml/ws-textarea.ftl) =================================================================== --- trunk/wikitty-struts/src/main/resources/template/wikitty/ws-textarea.ftl (rev 0) +++ trunk/wikitty-struts/src/main/resources/template/wikitty/ws-textarea.ftl 2011-07-05 13:42:02 UTC (rev 1047) @@ -0,0 +1,5 @@ +<#if parameters.included?? && parameters.included==true > +${parameters.label} : <textarea +<#include "/${parameters.templateDir}/${parameters.theme}/ws-commons.ftl" /> + cols="80" rows="20" >${parameters.value}</textarea><#t/> +</#if><#t/> \ No newline at end of file Copied: trunk/wikitty-struts/src/main/resources/template/wikitty/ws-textfield.ftl (from rev 1046, trunk/wikitty-struts/src/main/resources/template/xhtml/ws-textfield.ftl) =================================================================== --- trunk/wikitty-struts/src/main/resources/template/wikitty/ws-textfield.ftl (rev 0) +++ trunk/wikitty-struts/src/main/resources/template/wikitty/ws-textfield.ftl 2011-07-05 13:42:02 UTC (rev 1047) @@ -0,0 +1,11 @@ +<#if parameters.included?? && parameters.included==true > +${parameters.label} : <input +<#include "/${parameters.templateDir}/${parameters.theme}/ws-commons.ftl" /> + +<#if parameters.password?? && parameters.password==true ><#t/> +type="password" +<#else><#t/> +type="text" +</#if><#t/> + value="${parameters.value}" ><#t/> +</#if><#t/> \ No newline at end of file

1 0