[Wikitty-commits] r1235 - in trunk/wikitty-struts/src/main: java/org/nuiton/wikitty/struts java/org/nuiton/wikitty/struts/component java/org/nuiton/wikitty/struts/tag resources/template/wikitty tld

Author: sletellier Date: 2011-10-12 18:11:29 +0200 (Wed, 12 Oct 2011) New Revision: 1235 Url: http://nuiton.org/repositories/revision/wikitty/1235 Log: - Delete empty templates - Clean code - Add tag to get wikitty field value - Allow to use wikittyId on wikitty-tags Added: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/FieldBean.java trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/FieldTag.java trunk/wikitty-struts/src/main/resources/template/wikitty/ws-empty.ftl trunk/wikitty-struts/src/main/resources/template/wikitty/ws-field.ftl Removed: trunk/wikitty-struts/src/main/resources/template/wikitty/ws-boolean-close.ftl trunk/wikitty-struts/src/main/resources/template/wikitty/ws-date-close.ftl trunk/wikitty-struts/src/main/resources/template/wikitty/ws-hidden-close.ftl trunk/wikitty-struts/src/main/resources/template/wikitty/ws-select-close.ftl trunk/wikitty-struts/src/main/resources/template/wikitty/ws-selectassociation-close.ftl trunk/wikitty-struts/src/main/resources/template/wikitty/ws-selectcriteria-close.ftl trunk/wikitty-struts/src/main/resources/template/wikitty/ws-selectfixed-close.ftl trunk/wikitty-struts/src/main/resources/template/wikitty/ws-textarea-close.ftl trunk/wikitty-struts/src/main/resources/template/wikitty/ws-textfield-close.ftl Modified: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/WikittyFieldHandler.java trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/AbstractWikittyClosingUIBean.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/AbstractWikittyComponentBean.java trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/BooleanBean.java trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/DateBean.java trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/HiddenBean.java trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/SelectAssociationBean.java trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/SelectBean.java trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/SelectCriteriaBean.java trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/SelectFixedBean.java trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/TextAreaBean.java trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/TextFieldBean.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-10-12 07:48:56 UTC (rev 1234) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/WikittyFieldHandler.java 2011-10-12 16:11:29 UTC (rev 1235) @@ -28,6 +28,7 @@ static public String ALL_EXTENSION_CAR = "*"; static public String FIELD_SEPARATOR = ","; + protected String wikittyId; protected Wikitty wikitty; protected BusinessEntity businessEntity; protected WikittyProxy proxy; @@ -57,9 +58,21 @@ fieldAdded = new HashSet<String>(); } + public String getWikittyId() { + return wikittyId; + } + + public void setWikittyId(String wikittyId) { + this.wikittyId = wikittyId; + } + public Wikitty getWikitty() { if (wikitty == null) { - wikitty = ((BusinessEntityImpl) getBusinessEntity()).getWikitty(); + if (StringUtils.isNotEmpty(wikittyId)) { + wikitty = getProxy().restore(wikittyId); + } else { + wikitty = ((BusinessEntityImpl) getBusinessEntity()).getWikitty(); + } } return wikitty; } @@ -145,7 +158,7 @@ * included and excluded, it will not appear in the result */ - for (WikittyExtension ext : wikitty.getExtensions()) { + for (WikittyExtension ext : getWikitty().getExtensions()) { String extName = ext.getName(); /* @@ -237,7 +250,7 @@ // harvest all field of the extension if ("*".equals(field)) { - WikittyExtension ext = wikitty.getExtension(extname); + WikittyExtension ext = getWikitty().getExtension(extname); for (String fieldNameIt : ext.getFieldNames()) { ExtensionFieldStrutsBean temp = constructExtensionFieldFromField( extname, fieldNameIt); @@ -356,13 +369,13 @@ break; case BOOLEAN: - boolean valueBool = wikitty.getFieldAsBoolean(extName, fieldName); + boolean valueBool = getWikitty().getFieldAsBoolean(extName, fieldName); result.setType("boolean"); result.setValue(valueBool); break; default: - Object valueObject = wikitty.getFieldAsObject(extName, fieldName); + Object valueObject = getWikitty().getFieldAsObject(extName, fieldName); String valueString = StringUtils.EMPTY; if (valueObject != null) { @@ -384,5 +397,4 @@ } return result; } - } Modified: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/AbstractWikittyClosingUIBean.java =================================================================== --- trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/AbstractWikittyClosingUIBean.java 2011-10-12 07:48:56 UTC (rev 1234) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/AbstractWikittyClosingUIBean.java 2011-10-12 16:11:29 UTC (rev 1235) @@ -9,6 +9,8 @@ public abstract class AbstractWikittyClosingUIBean extends ClosingUIBean { + protected static final String EMPTY_TEMPLATE = "ws-empty"; + public AbstractWikittyClosingUIBean(ValueStack stack, HttpServletRequest request, HttpServletResponse response) { super(stack, request, response); 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-10-12 07:48:56 UTC (rev 1234) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/AbstractWikittyComponent.java 2011-10-12 16:11:29 UTC (rev 1235) @@ -3,6 +3,7 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import org.apache.commons.lang.StringUtils; import org.nuiton.wikitty.WikittyProxy; import org.nuiton.wikitty.WikittyUtil; import org.nuiton.wikitty.entities.BusinessEntity; @@ -14,6 +15,7 @@ public abstract class AbstractWikittyComponent extends AbstractWikittyClosingUIBean { + protected String wikittyId; /** * Never used directly this attribute use the getter */ @@ -66,9 +68,17 @@ return proxy; } + public String getWikittyId() { + return wikittyId; + } + public Wikitty getWikitty() { if (wikitty == null) { - wikitty = ((BusinessEntityImpl) getBusinessEntity()).getWikitty(); + if (StringUtils.isNotEmpty(getWikittyId())) { + wikitty = getProxy().restore(getWikittyId()); + } else { + wikitty = ((BusinessEntityImpl) getBusinessEntity()).getWikitty(); + } } return wikitty; } @@ -77,6 +87,10 @@ return businessEntity; } + public void setWikittyId(String wikittyId) { + this.wikittyId = wikittyId; + } + public void setWikitty(Wikitty wikitty) { this.wikitty = wikitty; } Modified: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/AbstractWikittyComponentBean.java =================================================================== --- trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/AbstractWikittyComponentBean.java 2011-10-12 07:48:56 UTC (rev 1234) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/AbstractWikittyComponentBean.java 2011-10-12 16:11:29 UTC (rev 1235) @@ -20,7 +20,6 @@ protected WikittyFieldHandler handler; protected String fqFieldName; - protected AbstractWikittyComponentBean(ValueStack stack, HttpServletRequest request, HttpServletResponse response) { @@ -38,6 +37,7 @@ return true; } + @Override public WikittyProxy getProxy() { if (handler != null) { return handler.getProxy(); @@ -45,6 +45,7 @@ return super.getProxy(); } + @Override public Wikitty getWikitty() { if (handler != null) { return handler.getWikitty(); @@ -53,6 +54,7 @@ return super.getWikitty(); } + @Override public BusinessEntity getBusinessEntity() { if (handler != null) { return handler.getBusinessEntity(); @@ -61,14 +63,22 @@ } @Override + public String getWikittyId() { + if (handler != null) { + return handler.getWikittyId(); + } + return super.getWikittyId(); + } + + @Override protected void evaluateExtraParams() { super.evaluateExtraParams(); - if (handler == null && wikitty == null && businessEntity == null) { - log.info("Handler not found in the stack and wikitty or businessEntity not declared"); + if (handler == null && wikitty == null && businessEntity == null && wikittyId == null) { + log.info("Handler not found in the stack and wikittyId, wikitty or businessEntity not declared"); throw new TagUseException( - "Tag must declare Wikitty or businessEntity attribute if used outside ws:form tag"); + "Tag must declare wikittyId, Wikitty or businessEntity attribute if used outside ws:form tag"); } if (!fqFieldName.matches(REGEX_WIKITTY_FQFIELDNAME)) { Modified: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/BooleanBean.java =================================================================== --- trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/BooleanBean.java 2011-10-12 07:48:56 UTC (rev 1234) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/BooleanBean.java 2011-10-12 16:11:29 UTC (rev 1235) @@ -18,9 +18,7 @@ final static private Log log = LogFactory.getLog(BooleanBean.class); public static final String OPEN_TEMPLATE = "ws-boolean"; - public static final String TEMPLATE = "ws-boolean-close"; - public BooleanBean(ValueStack stack, HttpServletRequest request, HttpServletResponse response) { super(stack, request, response); @@ -49,6 +47,6 @@ } protected String getDefaultTemplate() { - return TEMPLATE; + return EMPTY_TEMPLATE; } } 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-10-12 07:48:56 UTC (rev 1234) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/DateBean.java 2011-10-12 16:11:29 UTC (rev 1235) @@ -18,7 +18,6 @@ final static private Log log = LogFactory.getLog(DateBean.class); public static final String OPEN_TEMPLATE = "ws-date"; - public static final String TEMPLATE = "ws-date-close"; protected Boolean enableHour = false; @@ -49,12 +48,14 @@ } + @Override public String getDefaultOpenTemplate() { return OPEN_TEMPLATE; } + @Override protected String getDefaultTemplate() { - return TEMPLATE; + return EMPTY_TEMPLATE; } public Boolean getEnableHour() { Added: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/FieldBean.java =================================================================== --- trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/FieldBean.java (rev 0) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/FieldBean.java 2011-10-12 16:11:29 UTC (rev 1235) @@ -0,0 +1,52 @@ +package org.nuiton.wikitty.struts.component; + +import javax.servlet.http.HttpServletRequest; +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 = "field", tldTagClass = "org.nuiton.wikitty.struts.tag.FieldTag", + description = "") +public class FieldBean extends AbstractWikittyComponentBean { + + /** to use log facility, just put in your code: log.info(\"...\"); */ + final static private Log log = LogFactory.getLog(FieldBean.class); + + public static final String OPEN_TEMPLATE = "ws-field"; + + public FieldBean(ValueStack stack, HttpServletRequest request, + HttpServletResponse response) { + super(stack, request, response); + } + + @Override + protected void evaluateExtraParams() { + super.evaluateExtraParams(); + + // parse extname and field name + String[] fieldsAccess = StringUtil.split(fqFieldName, WikittyUtil.FQ_FIELD_NAME_SEPARATOR); + // add parametters to be use by the template + + addParameter( + "value", + getWikitty().getFieldAsString(fieldsAccess[0], + fieldsAccess[1])); + + + } + + @Override + public String getDefaultOpenTemplate() { + return OPEN_TEMPLATE; + } + + @Override + protected String getDefaultTemplate() { + return EMPTY_TEMPLATE; + } +} Modified: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/HiddenBean.java =================================================================== --- trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/HiddenBean.java 2011-10-12 07:48:56 UTC (rev 1234) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/HiddenBean.java 2011-10-12 16:11:29 UTC (rev 1235) @@ -17,7 +17,6 @@ final static private Log log = LogFactory.getLog(HiddenBean.class); public static final String OPEN_TEMPLATE = "ws-hidden"; - public static final String TEMPLATE = "ws-hidden-close"; public HiddenBean(ValueStack stack, HttpServletRequest request, HttpServletResponse response) { @@ -47,6 +46,6 @@ } protected String getDefaultTemplate() { - return TEMPLATE; + return EMPTY_TEMPLATE; } } 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-10-12 07:48:56 UTC (rev 1234) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/SelectAssociationBean.java 2011-10-12 16:11:29 UTC (rev 1235) @@ -1,6 +1,5 @@ package org.nuiton.wikitty.struts.component; -import java.util.Collection; import java.util.LinkedList; import java.util.List; @@ -27,7 +26,6 @@ .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; @@ -112,7 +110,7 @@ } protected String getDefaultTemplate() { - return TEMPLATE; + return EMPTY_TEMPLATE; } } Modified: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/SelectBean.java =================================================================== --- trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/SelectBean.java 2011-10-12 07:48:56 UTC (rev 1234) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/SelectBean.java 2011-10-12 16:11:29 UTC (rev 1235) @@ -28,7 +28,6 @@ .getLog(SelectBean.class); public static final String OPEN_TEMPLATE = "ws-select"; - public static final String TEMPLATE = "ws-select-close"; protected Integer size; protected String descField; @@ -127,7 +126,7 @@ @Override protected String getDefaultTemplate() { - return TEMPLATE; + return EMPTY_TEMPLATE; } public Integer getSize() { 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-10-12 07:48:56 UTC (rev 1234) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/SelectCriteriaBean.java 2011-10-12 16:11:29 UTC (rev 1235) @@ -26,7 +26,6 @@ final static private Log log = LogFactory.getLog(SelectCriteriaBean.class); public static final String OPEN_TEMPLATE = "ws-selectcriteria"; - public static final String TEMPLATE = "ws-selectcriteria-close"; protected Criteria criteria; protected String descField; @@ -99,7 +98,7 @@ } protected String getDefaultTemplate() { - return TEMPLATE; + return EMPTY_TEMPLATE; } public Criteria getCriteria() { Modified: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/SelectFixedBean.java =================================================================== --- trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/SelectFixedBean.java 2011-10-12 07:48:56 UTC (rev 1234) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/SelectFixedBean.java 2011-10-12 16:11:29 UTC (rev 1235) @@ -21,7 +21,6 @@ final static private Log log = LogFactory.getLog(SelectFixedBean.class); public static final String OPEN_TEMPLATE = "ws-selectfixed"; - public static final String TEMPLATE = "ws-selectfixed-close"; protected String fixvalues; @@ -57,7 +56,7 @@ } protected String getDefaultTemplate() { - return TEMPLATE; + return EMPTY_TEMPLATE; } public String getFixvalues() { Modified: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/TextAreaBean.java =================================================================== --- trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/TextAreaBean.java 2011-10-12 07:48:56 UTC (rev 1234) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/TextAreaBean.java 2011-10-12 16:11:29 UTC (rev 1235) @@ -17,7 +17,6 @@ final static private Log log = LogFactory.getLog(TextAreaBean.class); public static final String OPEN_TEMPLATE = "ws-textarea"; - public static final String TEMPLATE = "ws-textarea-close"; public TextAreaBean(ValueStack stack, HttpServletRequest request, HttpServletResponse response) { @@ -43,6 +42,6 @@ } protected String getDefaultTemplate() { - return TEMPLATE; + return EMPTY_TEMPLATE; } } Modified: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/TextFieldBean.java =================================================================== --- trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/TextFieldBean.java 2011-10-12 07:48:56 UTC (rev 1234) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/TextFieldBean.java 2011-10-12 16:11:29 UTC (rev 1235) @@ -17,7 +17,6 @@ final static private Log log = LogFactory.getLog(TextFieldBean.class); public static final String OPEN_TEMPLATE = "ws-textfield"; - public static final String TEMPLATE = "ws-textfield-close"; protected Boolean password; @@ -45,7 +44,7 @@ } protected String getDefaultTemplate() { - return TEMPLATE; + return EMPTY_TEMPLATE; } public Boolean getPassword() { 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-10-12 07:48:56 UTC (rev 1234) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/AbstractWikittyTag.java 2011-10-12 16:11:29 UTC (rev 1235) @@ -15,11 +15,20 @@ protected Wikitty wikitty; protected BusinessEntity businessEntity; protected WikittyProxy proxy; + protected String wikittyId; public AbstractWikittyTag() { super(); } + public String getWikittyId() { + return wikittyId; + } + + public void setWikittyId(String wikittyId) { + this.wikittyId = wikittyId; + } + public Wikitty getWikitty() { return wikitty; } @@ -48,7 +57,8 @@ @Override protected void populateParams() { super.populateParams(); - AbstractWikittyComponent wikittyComponent = (AbstractWikittyComponent) component; + AbstractWikittyComponent wikittyComponent = (AbstractWikittyComponent) component; + wikittyComponent.setWikittyId(wikittyId); wikittyComponent.setWikitty(wikitty); wikittyComponent.setProxy(proxy); wikittyComponent.setBusinessEntity(businessEntity); Added: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/FieldTag.java =================================================================== --- trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/FieldTag.java (rev 0) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/FieldTag.java 2011-10-12 16:11:29 UTC (rev 1235) @@ -0,0 +1,30 @@ +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.FieldBean; +import org.nuiton.wikitty.struts.component.SelectAssociationBean; + +import com.opensymphony.xwork2.util.ValueStack; + +public class FieldTag extends AbstractWikittyTagComponent{ + + /** + * + */ + private static final long serialVersionUID = 1341902299150448705L; + + @Override + public Component getBean(ValueStack stack, HttpServletRequest req, + HttpServletResponse res) { + return new FieldBean(stack, req, res); + + } + + @Override + protected void populateParams() { + super.populateParams(); + } +} Added: trunk/wikitty-struts/src/main/resources/template/wikitty/ws-field.ftl =================================================================== --- trunk/wikitty-struts/src/main/resources/template/wikitty/ws-field.ftl (rev 0) +++ trunk/wikitty-struts/src/main/resources/template/wikitty/ws-field.ftl 2011-10-12 16:11:29 UTC (rev 1235) @@ -0,0 +1,3 @@ +<#if parameters.included?? && parameters.included==true > +${parameters.value} +</#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-10-12 07:48:56 UTC (rev 1234) +++ trunk/wikitty-struts/src/main/tld/wikitty-struts.tld 2011-10-12 16:11:29 UTC (rev 1235) @@ -21,8 +21,13 @@ <name>name</name> <rtexprvalue>true</rtexprvalue> </attribute> - <attribute> + <description><![CDATA[the wikitty target (needed if businessEntity not set)]]></description> + <name>wikittyId</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <attribute> <description><![CDATA[the wikitty to edit]]></description> <name>wikitty</name> <required>false</required> @@ -87,8 +92,58 @@ </attribute> </tag> - <tag> + <description><![CDATA[Tag used to get field value of wikitty]]></description> + <name>field</name> + <tag-class>org.nuiton.wikitty.struts.tag.FieldTag</tag-class> + <body-content>empty</body-content> + <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 target (needed if businessEntity not set)]]></description> + <name>wikittyId</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <attribute> + <description><![CDATA[the wikitty target (needed if businessEntity not set)]]></description> + <name>wikitty</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <attribute> + <description><![CDATA[the businessEntity target (needed if wikitty not set)]]></description> + <name>businessEntity</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <attribute> + <description><![CDATA[the proxy from whom search for wikitty required if tag not used inside form tag]]></description> + <name>proxy</name> + <required>true</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <attribute> + <description><![CDATA[The field value showed in list/combobox default wikitty-id]]></description> + <name>descField</name> + <rtexprvalue>true</rtexprvalue> + </attribute> + <attribute> + <description><![CDATA[the name of the field concerned by the tag]]></description> + <name>fqFieldName</name> + <required>true</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + </tag> + <tag> <description><![CDATA[Tag used for wikittyField that are wikitty collection and show them as combobox or list]]></description> <name>selectAssociation</name> <tag-class>org.nuiton.wikitty.struts.tag.SelectAssociationTag</tag-class> @@ -105,6 +160,12 @@ </attribute> <attribute> <description><![CDATA[the wikitty target (needed if businessEntity not set)]]></description> + <name>wikittyId</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <attribute> + <description><![CDATA[the wikitty target (needed if businessEntity not set)]]></description> <name>wikitty</name> <required>false</required> <rtexprvalue>true</rtexprvalue> @@ -178,6 +239,12 @@ <rtexprvalue>true</rtexprvalue> </attribute> <attribute> + <description><![CDATA[the wikitty target (needed if businessEntity not set)]]></description> + <name>wikittyId</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <attribute> <description><![CDATA[Collection of wikitty that will be showed inside the combobox/list (needed if entityValues Not set)]]></description> <name>wikittyValues</name> <rtexprvalue>true</rtexprvalue> @@ -194,9 +261,6 @@ <rtexprvalue>true</rtexprvalue> </attribute> </tag> - - - <tag> <description><![CDATA[Tag used to construct a combobox to select /set a wikitty, when the wikitty field is a wikitty]]></description> <name>selectCriteria</name> @@ -213,6 +277,12 @@ <rtexprvalue>true</rtexprvalue> </attribute> <attribute> + <description><![CDATA[the wikitty target (needed if businessEntity not set)]]></description> + <name>wikittyId</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <attribute> <description><![CDATA[the wikitty to edit]]></description> <name>wikitty</name> <required>false</required> @@ -271,6 +341,12 @@ <rtexprvalue>true</rtexprvalue> </attribute> <attribute> + <description><![CDATA[the wikitty target (needed if businessEntity not set)]]></description> + <name>wikittyId</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <attribute> <description><![CDATA[the wikitty to edit(needed if businessEntity not set)]]></description> <name>wikitty</name> <required>false</required> @@ -318,6 +394,12 @@ <rtexprvalue>true</rtexprvalue> </attribute> <attribute> + <description><![CDATA[the wikitty target (needed if businessEntity not set)]]></description> + <name>wikittyId</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <attribute> <description><![CDATA[the wikitty to edit(needed if businessEntity not set)]]></description> <name>wikitty</name> <required>false</required> @@ -354,6 +436,12 @@ <rtexprvalue>true</rtexprvalue> </attribute> <attribute> + <description><![CDATA[the wikitty target (needed if businessEntity not set)]]></description> + <name>wikittyId</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <attribute> <description><![CDATA[the wikitty to edit(needed if businessEntity not set)]]></description> <name>wikitty</name> <required>false</required> @@ -400,6 +488,12 @@ <rtexprvalue>true</rtexprvalue> </attribute> <attribute> + <description><![CDATA[the wikitty target (needed if businessEntity not set)]]></description> + <name>wikittyId</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <attribute> <description><![CDATA[the wikitty to edit(needed if businessEntity not set)]]></description> <name>wikitty</name> <required>false</required> @@ -447,6 +541,12 @@ <rtexprvalue>true</rtexprvalue> </attribute> <attribute> + <description><![CDATA[the wikitty target (needed if businessEntity not set)]]></description> + <name>wikittyId</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <attribute> <description><![CDATA[the wikitty to edit(needed if businessEntity not set)]]></description> <name>wikitty</name> <required>false</required> @@ -488,6 +588,12 @@ <rtexprvalue>true</rtexprvalue> </attribute> <attribute> + <description><![CDATA[the wikitty target (needed if businessEntity not set)]]></description> + <name>wikittyId</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <attribute> <description><![CDATA[the wikitty to edit(needed if businessEntity not set)]]></description> <name>wikitty</name> <required>false</required>