Author: mfortun Date: 2011-06-28 17:38:39 +0200 (Tue, 28 Jun 2011) New Revision: 986 Url: http://nuiton.org/repositories/revision/wikitty/986 Log: * continue migration to new taglib architecture Added: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/Option.java Removed: trunk/wikitty-struts/src/main/java/template/xhtml/ws-wikittyfield-close.ftl trunk/wikitty-struts/src/main/java/template/xhtml/ws-wikittyfield.ftl 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/ExtensionFieldStrutsBean.java trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/FixedSelectBean.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/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/component/WikittyFieldHandler.java trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/WikittyFieldTagBean.java trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/WikittySelectBean.java trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/WikittyTagBean.java trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/FixedSelectTag.java trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/WikittyTag.java trunk/wikitty-struts/src/main/java/template/xhtml/ws-boolean.ftl trunk/wikitty-struts/src/main/java/template/xhtml/ws-fixedselect.ftl trunk/wikitty-struts/src/main/java/template/xhtml/ws-hidden.ftl trunk/wikitty-struts/src/main/java/template/xhtml/ws-textarea.ftl trunk/wikitty-struts/src/main/java/template/xhtml/ws-textfield.ftl trunk/wikitty-struts/src/main/java/template/xhtml/ws-wikittyselect.ftl trunk/wikitty-struts/src/main/tld/wikitty-struts.tld 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-06-28 15:28:07 UTC (rev 985) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/BooleanBean.java 2011-06-28 15:38:39 UTC (rev 986) @@ -4,20 +4,49 @@ import javax.servlet.http.HttpServletResponse; import org.apache.struts2.components.ClosingUIBean; +import org.apache.struts2.views.annotations.StrutsTag; +import org.nuiton.util.StringUtil; import com.opensymphony.xwork2.util.ValueStack; +@StrutsTag(name = "boolean", tldTagClass = "org.nuiton.wikitty.struts.tag.BooleanTag", + description = "", allowDynamicAttributes = false) public class BooleanBean extends ClosingUIBean { public BooleanBean(ValueStack stack, HttpServletRequest request, HttpServletResponse response) { super(stack, request, response); - // TODO mfortun } - public static final String OPEN_TEMPLATE = "ws-field"; - public static final String TEMPLATE = "ws-field-close"; + public static final String OPEN_TEMPLATE = "ws-boolean"; + public static final String TEMPLATE = "ws-boolean-close"; + + @Override + protected void evaluateExtraParams() { + super.evaluateExtraParams(); + + WikittyFieldHandler handler = (WikittyFieldHandler) stack.getContext() + .get(WikittyTagBean.WIKITTY_STACK_KEY); + + if (handler != null) { + // if field defined as inclued + if (handler.isIncluded(name)) { + // parse extname and field name + String[] fieldsAccess = StringUtil.split(name, "."); + // add parametters to be use by the template + addParameter( + "included",true); + addParameter( + "value", + handler.getWikitty().getFieldAsBoolean(fieldsAccess[0], + fieldsAccess[1])); + } + } else { + // TODO mfortun-2011-06-28 throw exception if handler not in the stack + } + } + public String getDefaultOpenTemplate() { return OPEN_TEMPLATE; } Modified: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/ExtensionFieldStrutsBean.java =================================================================== --- trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/ExtensionFieldStrutsBean.java 2011-06-28 15:28:07 UTC (rev 985) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/ExtensionFieldStrutsBean.java 2011-06-28 15:38:39 UTC (rev 986) @@ -8,12 +8,12 @@ protected String name; protected String type; - protected Object value; + protected Object value =""; protected String label; protected Collection<Option> listOption; public ExtensionFieldStrutsBean() { - listOption = new LinkedList<ExtensionFieldStrutsBean.Option>(); + listOption = new LinkedList<Option>(); } public Collection<Option> getListOption() { return listOption; @@ -55,24 +55,6 @@ } - public class Option { - - protected String valeur; - protected String description; - public String getValeur() { - return valeur; - } - public void setValeur(String valeur) { - this.valeur = valeur; - } - public String getDescription() { - return description; - } - public void setDescription(String description) { - this.description = description; - } - - } } Modified: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/FixedSelectBean.java =================================================================== --- trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/FixedSelectBean.java 2011-06-28 15:28:07 UTC (rev 985) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/FixedSelectBean.java 2011-06-28 15:38:39 UTC (rev 986) @@ -1,26 +1,60 @@ package org.nuiton.wikitty.struts.component; +import java.util.LinkedList; +import java.util.List; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; - import org.apache.struts2.components.ClosingUIBean; - +import org.apache.struts2.views.annotations.StrutsTag; +import org.nuiton.util.StringUtil; import com.opensymphony.xwork2.util.ValueStack; -public class FixedSelectBean extends ClosingUIBean { - - +@StrutsTag(name = "fixedSelect", tldTagClass = "org.nuiton.wikitty.struts.tag.FixedSelectTag", description = "", allowDynamicAttributes = false) +public class FixedSelectBean extends ClosingUIBean { + protected String fixvalues; public FixedSelectBean(ValueStack stack, HttpServletRequest request, HttpServletResponse response) { super(stack, request, response); - // TODO mfortun } - public static final String OPEN_TEMPLATE = "ws-field"; - public static final String TEMPLATE = "ws-field-close"; + public static final String OPEN_TEMPLATE = "ws-fixedselect"; + public static final String TEMPLATE = "ws-fixedselect-close"; + @Override + protected void evaluateExtraParams() { + super.evaluateExtraParams(); + + WikittyFieldHandler handler = (WikittyFieldHandler) stack.getContext() + .get(WikittyTagBean.WIKITTY_STACK_KEY); + + if (handler != null) { + // if field defined as inclued + if (handler.isIncluded(name)) { + // parse extname and field name + String[] fieldsAccess = StringUtil.split(name, "."); + // add parametters to be use by the template + addParameter("included", true); + addParameter( + "value", + handler.getWikitty().getFieldAsString(fieldsAccess[0], + fieldsAccess[1])); + + List<Option> fixlist = new LinkedList<Option>(); + String[] values = StringUtil.split(fixvalues, ","); + for (String it : values) { + fixlist.add(new Option(it,it)); + } + addParameter("fixvalues", fixlist); + + } + } else { + // TODO mfortun-2011-06-28 throw exception if handler not in the + // stack + } + } + public String getDefaultOpenTemplate() { return OPEN_TEMPLATE; } @@ -36,5 +70,5 @@ public void setFixvalues(String fixvalues) { this.fixvalues = fixvalues; } - + } 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-06-28 15:28:07 UTC (rev 985) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/HiddenBean.java 2011-06-28 15:38:39 UTC (rev 986) @@ -4,20 +4,48 @@ import javax.servlet.http.HttpServletResponse; import org.apache.struts2.components.ClosingUIBean; +import org.apache.struts2.views.annotations.StrutsTag; +import org.nuiton.util.StringUtil; import com.opensymphony.xwork2.util.ValueStack; +@StrutsTag(name = "hidden", tldTagClass = "org.nuiton.wikitty.struts.tag.HiddenTag", + description = "", allowDynamicAttributes = false) public class HiddenBean extends ClosingUIBean { public HiddenBean(ValueStack stack, HttpServletRequest request, HttpServletResponse response) { super(stack, request, response); - // TODO mfortun } - public static final String OPEN_TEMPLATE = "ws-field"; - public static final String TEMPLATE = "ws-field-close"; + public static final String OPEN_TEMPLATE = "ws-hidden"; + public static final String TEMPLATE = "ws-hidden-close"; + @Override + protected void evaluateExtraParams() { + super.evaluateExtraParams(); + + WikittyFieldHandler handler = (WikittyFieldHandler) stack.getContext() + .get(WikittyTagBean.WIKITTY_STACK_KEY); + + if (handler != null) { + // if field defined as inclued + if (handler.isIncluded(name)) { + // parse extname and field name + String[] fieldsAccess = StringUtil.split(name, "."); + // add parametters to be use by the template + addParameter( + "included",true); + addParameter( + "value", + handler.getWikitty().getFieldAsString(fieldsAccess[0], + fieldsAccess[1])); + } + } else { + // TODO mfortun-2011-06-28 throw exception if handler not in the stack + } + } + public String getDefaultOpenTemplate() { return OPEN_TEMPLATE; } Added: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/Option.java =================================================================== --- trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/Option.java (rev 0) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/Option.java 2011-06-28 15:38:39 UTC (rev 986) @@ -0,0 +1,30 @@ +package org.nuiton.wikitty.struts.component; + +public class Option { + + protected String valeur; + protected String description; + public String getValeur() { + return valeur; + } + public void setValeur(String valeur) { + this.valeur = valeur; + } + public String getDescription() { + return description; + } + public void setDescription(String description) { + this.description = description; + } + + public Option() { + + } + public Option(String valeur, String description) { + this.valeur = valeur; + this.description = description; + } + + + +} \ No newline at end of file Property changes on: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/Option.java ___________________________________________________________________ Added: svn:mime-type + text/plain 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-06-28 15:28:07 UTC (rev 985) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/TextAreaBean.java 2011-06-28 15:38:39 UTC (rev 986) @@ -4,20 +4,49 @@ import javax.servlet.http.HttpServletResponse; import org.apache.struts2.components.ClosingUIBean; +import org.apache.struts2.views.annotations.StrutsTag; +import org.nuiton.util.StringUtil; import com.opensymphony.xwork2.util.ValueStack; +@StrutsTag(name = "textArea", tldTagClass = "org.nuiton.wikitty.struts.tag.TextAreaTag", + description = "", allowDynamicAttributes = false) public class TextAreaBean extends ClosingUIBean { public TextAreaBean(ValueStack stack, HttpServletRequest request, HttpServletResponse response) { super(stack, request, response); - // TODO mfortun } - public static final String OPEN_TEMPLATE = "ws-field"; - public static final String TEMPLATE = "ws-field-close"; + public static final String OPEN_TEMPLATE = "ws-textarea"; + public static final String TEMPLATE = "ws-textarea-close"; + + @Override + protected void evaluateExtraParams() { + super.evaluateExtraParams(); + + WikittyFieldHandler handler = (WikittyFieldHandler) stack.getContext() + .get(WikittyTagBean.WIKITTY_STACK_KEY); + + if (handler != null) { + // if field defined as inclued + if (handler.isIncluded(name)) { + // parse extname and field name + String[] fieldsAccess = StringUtil.split(name, "."); + // add parametters to be use by the template + addParameter( + "included",true); + addParameter( + "value", + handler.getWikitty().getFieldAsString(fieldsAccess[0], + fieldsAccess[1])); + } + } else { + // TODO mfortun-2011-06-28 throw exception if handler not in the stack + } + } + public String getDefaultOpenTemplate() { return OPEN_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-06-28 15:28:07 UTC (rev 985) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/TextFieldBean.java 2011-06-28 15:38:39 UTC (rev 986) @@ -4,20 +4,47 @@ import javax.servlet.http.HttpServletResponse; import org.apache.struts2.components.ClosingUIBean; +import org.apache.struts2.views.annotations.StrutsTag; +import org.nuiton.util.StringUtil; import com.opensymphony.xwork2.util.ValueStack; +@StrutsTag(name = "textField", tldTagClass = "org.nuiton.wikitty.struts.tag.TextFieldTag", description = "", allowDynamicAttributes = false) public class TextFieldBean extends ClosingUIBean { - + public TextFieldBean(ValueStack stack, HttpServletRequest request, HttpServletResponse response) { super(stack, request, response); - // TODO mfortun } - public static final String OPEN_TEMPLATE = "ws-field"; - public static final String TEMPLATE = "ws-field-close"; + public static final String OPEN_TEMPLATE = "ws-textfield"; + public static final String TEMPLATE = "ws-textfield-close"; + @Override + protected void evaluateExtraParams() { + super.evaluateExtraParams(); + + WikittyFieldHandler handler = (WikittyFieldHandler) stack.getContext() + .get(WikittyTagBean.WIKITTY_STACK_KEY); + + if (handler != null) { + // if field defined as inclued + if (handler.isIncluded(name)) { + // parse extname and field name + String[] fieldsAccess = StringUtil.split(name, "."); + // add parametters to be use by the template + addParameter( + "included",true); + addParameter( + "value", + handler.getWikitty().getFieldAsString(fieldsAccess[0], + fieldsAccess[1])); + } + } else { + // TODO mfortun-2011-06-28 throw exception if handler not in the stack + } + } + public String getDefaultOpenTemplate() { return OPEN_TEMPLATE; } Modified: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/WikittyFieldHandler.java =================================================================== --- trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/WikittyFieldHandler.java 2011-06-28 15:28:07 UTC (rev 985) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/WikittyFieldHandler.java 2011-06-28 15:38:39 UTC (rev 986) @@ -306,5 +306,8 @@ } return result; } - + + public boolean isIncluded(String fieldname) { + return true; + } } Modified: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/WikittyFieldTagBean.java =================================================================== --- trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/WikittyFieldTagBean.java 2011-06-28 15:28:07 UTC (rev 985) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/WikittyFieldTagBean.java 2011-06-28 15:38:39 UTC (rev 986) @@ -7,7 +7,8 @@ import com.opensymphony.xwork2.util.ValueStack; -@StrutsTag(name = "field", tldTagClass = "org.nuiton.wikitty.struts.tag.WikittyFieldTag", description = "Renders an input form", allowDynamicAttributes = false) +@StrutsTag(name = "field", tldTagClass = "org.nuiton.wikitty.struts.tag.WikittyFieldTag", + description = "", allowDynamicAttributes = false) public class WikittyFieldTagBean extends ClosingUIBean { protected FieldSpecialisation specialize; Modified: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/WikittySelectBean.java =================================================================== --- trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/WikittySelectBean.java 2011-06-28 15:28:07 UTC (rev 985) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/WikittySelectBean.java 2011-06-28 15:38:39 UTC (rev 986) @@ -1,12 +1,22 @@ package org.nuiton.wikitty.struts.component; +import java.util.LinkedList; +import java.util.List; + import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import org.apache.struts2.components.ClosingUIBean; +import org.apache.struts2.views.annotations.StrutsTag; +import org.nuiton.util.StringUtil; +import org.nuiton.wikitty.entities.Wikitty; +import org.nuiton.wikitty.search.Criteria; +import org.nuiton.wikitty.search.PagedResult; +import org.nuiton.wikitty.search.Search; import com.opensymphony.xwork2.util.ValueStack; +@StrutsTag(name = "wikittyselect", tldTagClass = "org.nuiton.wikitty.struts.tag.WikittySelectTag", description = "", allowDynamicAttributes = false) public class WikittySelectBean extends ClosingUIBean { protected String criteria; @@ -15,11 +25,10 @@ public WikittySelectBean(ValueStack stack, HttpServletRequest request, HttpServletResponse response) { super(stack, request, response); - // TODO mfortun } - public static final String OPEN_TEMPLATE = "ws-field"; - public static final String TEMPLATE = "ws-field-close"; + public static final String OPEN_TEMPLATE = "ws-wikittyselect"; + public static final String TEMPLATE = "ws-wikittyselect-close"; public String getDefaultOpenTemplate() { return OPEN_TEMPLATE; @@ -29,6 +38,68 @@ return TEMPLATE; } + @Override + protected void evaluateExtraParams() { + super.evaluateExtraParams(); + + WikittyFieldHandler handler = (WikittyFieldHandler) stack.getContext() + .get(WikittyTagBean.WIKITTY_STACK_KEY); + + if (handler != null) { + // if field defined as inclued + if (handler.isIncluded(name)) { + // parse extname and field name + String[] fieldsAccess = StringUtil.split(name, "."); + // add parametters to be use by the template + addParameter("included", true); + addParameter( + "value", + handler.getWikitty().getFieldAsString(fieldsAccess[0], + fieldsAccess[1])); + + List<Option> fixlist = new LinkedList<Option>(); + + // search for the wikitty with the criteria + Criteria criteria = Search.query().keyword(this.criteria) + .criteria(); + PagedResult<Wikitty> wikitties = handler.getProxy() + .findAllByCriteria(criteria); + + String[] descriptor = StringUtil.split(descfield, ","); + + // if wikitties not null contruct option result + // with descriptor + if (wikitties != null) { + for (Wikitty wiki : wikitties) { + // by default value and description are the same + // wikitty id + String val = 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, "."); + + desc += wiki.getFieldAsString(descTable[0], + descTable[1]); + } + } + fixlist.add(new Option(val, desc)); + } + addParameter("wikittiesvalues", fixlist); + } + } + } else { + // TODO mfortun-2011-06-28 throw exception if handler not in the + // stack + } + } + public String getCriteria() { return criteria; } Modified: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/WikittyTagBean.java =================================================================== --- trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/WikittyTagBean.java 2011-06-28 15:28:07 UTC (rev 985) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/WikittyTagBean.java 2011-06-28 15:38:39 UTC (rev 986) @@ -8,7 +8,8 @@ import org.nuiton.wikitty.entities.Wikitty; import com.opensymphony.xwork2.util.ValueStack; -@StrutsTag(name = "Wikitty", tldTagClass = "org.nuiton.wikitty.struts.tag.WikittyTag", description = "Renders an input form", allowDynamicAttributes = false) +@StrutsTag(name = "Wikitty", tldTagClass = "org.nuiton.wikitty.struts.tag.WikittyTag", + description = "", allowDynamicAttributes = false) public class WikittyTagBean extends ClosingUIBean { public static final String OPEN_TEMPLATE = "wikitty"; @@ -17,7 +18,7 @@ protected Wikitty wikitty; protected WikittyProxy proxy; - protected String type; + protected String action; protected String redirect; @@ -83,39 +84,6 @@ * parametters à écrire dans le template on va correctement ajouter le * tout. */ - - /* - * if (validate != null) { addParameter("validate", findValue(validate, - * Boolean.class)); } - * - * if (name == null) { //make the name the same as the id String id = - * (String) getParameters().get("id"); if (StringUtils.isNotEmpty(id)) { - * addParameter("name", id); } } - * - * - * - * if (onreset != null) { addParameter("onreset", findString(onreset)); - * } - * - * if (target != null) { addParameter("target", findString(target)); } - * - * if (enctype != null) { addParameter("enctype", findString(enctype)); - * } - * - * if (method != null) { addParameter("method", findString(method)); } - * - * if (acceptcharset != null) { addParameter("acceptcharset", - * findString(acceptcharset)); } - * - * // keep a collection of the tag names for anything special the - * templates might want to do (such as pure client // side validation) - * if (!parameters.containsKey("tagNames")) { // we have this if check - * so we don't do this twice (on open and close of the template) - * addParameter("tagNames", new ArrayList()); } - * - * if (focusElement != null) { addParameter("focusElement", - * findString(focusElement)); } - */ } public String getDefaultOpenTemplate() { @@ -142,14 +110,6 @@ this.proxy = proxy; } - public String getType() { - return type; - } - - public void setType(String type) { - this.type = type; - } - public String getAction() { return action; } Modified: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/FixedSelectTag.java =================================================================== --- trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/FixedSelectTag.java 2011-06-28 15:28:07 UTC (rev 985) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/FixedSelectTag.java 2011-06-28 15:38:39 UTC (rev 986) @@ -9,28 +9,35 @@ import com.opensymphony.xwork2.util.ValueStack; -public class FixedSelectTag extends AbstractClosingTag{ - +public class FixedSelectTag extends AbstractClosingTag { + /** * */ private static final long serialVersionUID = -8415432856577152486L; protected String fixvalues; - + @Override public Component getBean(ValueStack stack, HttpServletRequest req, HttpServletResponse res) { return new FixedSelectBean(stack, req, res); } - - + @Override protected void populateParams() { super.populateParams(); FixedSelectBean fieldtag = ((FixedSelectBean) component); - + fieldtag.setFixvalues(fixvalues); - + } - + + public String getFixvalues() { + return fixvalues; + } + + public void setFixvalues(String fixvalues) { + this.fixvalues = fixvalues; + } + } Modified: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/WikittyTag.java =================================================================== --- trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/WikittyTag.java 2011-06-28 15:28:07 UTC (rev 985) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/WikittyTag.java 2011-06-28 15:38:39 UTC (rev 986) @@ -18,7 +18,6 @@ private static final long serialVersionUID = 258152544560583399L; protected Wikitty wikitty; protected WikittyProxy proxy; - protected String type; protected String action; protected String redirect; @@ -74,7 +73,6 @@ wikittyTag.setRedirect(redirect); wikittyTag.setWikitty(wikitty); wikittyTag.setProxy(proxy); - wikittyTag.setType(type); wikittyTag.setOrder(order); wikittyTag.setAllowDelete(allowDelete); wikittyTag.setInclude(include); @@ -97,14 +95,6 @@ this.proxy = proxy; } - public String getType() { - return type; - } - - public void setType(String type) { - this.type = type; - } - public String getAction() { return action; } Modified: trunk/wikitty-struts/src/main/java/template/xhtml/ws-boolean.ftl =================================================================== --- trunk/wikitty-struts/src/main/java/template/xhtml/ws-boolean.ftl 2011-06-28 15:28:07 UTC (rev 985) +++ trunk/wikitty-struts/src/main/java/template/xhtml/ws-boolean.ftl 2011-06-28 15:38:39 UTC (rev 986) @@ -0,0 +1,7 @@ +<#if parameters.included?? && parameters.included==true > +${parameters.label} : <input type="checkbox" name="${parameters.name}" value="true" + <#if aKey.value=="true" > + checked='true' + </#if> + /> +</#if> \ No newline at end of file Modified: trunk/wikitty-struts/src/main/java/template/xhtml/ws-fixedselect.ftl =================================================================== --- trunk/wikitty-struts/src/main/java/template/xhtml/ws-fixedselect.ftl 2011-06-28 15:28:07 UTC (rev 985) +++ trunk/wikitty-struts/src/main/java/template/xhtml/ws-fixedselect.ftl 2011-06-28 15:38:39 UTC (rev 986) @@ -0,0 +1,12 @@ +<#if parameters.included?? && parameters.included==true > +${parameters.label} :<select name="${parameters.name}" size="1"> +<#assign optionKeys = parameters.fixvalues><#t/> + <#list optionKeys as optionKey><#t/> + <option value="${optionKey.valeur}" + <#if optionKey.valeur==parameters.value > + selected + </#if> + > ${optionKey.description} </option> + </#list><#t/> +</select> +</#if> \ No newline at end of file Modified: trunk/wikitty-struts/src/main/java/template/xhtml/ws-hidden.ftl =================================================================== --- trunk/wikitty-struts/src/main/java/template/xhtml/ws-hidden.ftl 2011-06-28 15:28:07 UTC (rev 985) +++ trunk/wikitty-struts/src/main/java/template/xhtml/ws-hidden.ftl 2011-06-28 15:38:39 UTC (rev 986) @@ -1 +1,3 @@ -<input type="hidden" name="${parameters.name}" value="${parameters.value}" /> \ No newline at end of file +<#if parameters.included?? && parameters.included==true > +<input type="hidden" name="${parameters.name}" value="${parameters.value}" /> +</#if> \ No newline at end of file Modified: trunk/wikitty-struts/src/main/java/template/xhtml/ws-textarea.ftl =================================================================== --- trunk/wikitty-struts/src/main/java/template/xhtml/ws-textarea.ftl 2011-06-28 15:28:07 UTC (rev 985) +++ trunk/wikitty-struts/src/main/java/template/xhtml/ws-textarea.ftl 2011-06-28 15:38:39 UTC (rev 986) @@ -1 +1,3 @@ -${parameters.label} : <textarea id="${parameters.name}" cols="80" rows="20" name="${parameters.name}">${parameters.value}</textarea> \ No newline at end of file +<#if parameters.included?? && parameters.included==true > +${parameters.label} : <textarea id="${parameters.name}" cols="80" rows="20" name="${parameters.name}">${parameters.value}</textarea> +</#if> \ No newline at end of file Modified: trunk/wikitty-struts/src/main/java/template/xhtml/ws-textfield.ftl =================================================================== --- trunk/wikitty-struts/src/main/java/template/xhtml/ws-textfield.ftl 2011-06-28 15:28:07 UTC (rev 985) +++ trunk/wikitty-struts/src/main/java/template/xhtml/ws-textfield.ftl 2011-06-28 15:38:39 UTC (rev 986) @@ -1 +1,3 @@ -${parameters.label} : <input type="text" name="${parameters.name}" value="${parameters.value}" > \ No newline at end of file +<#if parameters.included?? && parameters.included==true > +${parameters.label} : <input type="text" name="${parameters.name}" value="${parameters.value}" > +</#if> \ No newline at end of file Modified: trunk/wikitty-struts/src/main/java/template/xhtml/ws-wikittyselect.ftl =================================================================== --- trunk/wikitty-struts/src/main/java/template/xhtml/ws-wikittyselect.ftl 2011-06-28 15:28:07 UTC (rev 985) +++ trunk/wikitty-struts/src/main/java/template/xhtml/ws-wikittyselect.ftl 2011-06-28 15:38:39 UTC (rev 986) @@ -1,2 +1,12 @@ -parameters - +<#if parameters.included?? && parameters.included==true > +${parameters.label} :<select name="${parameters.name}" size="1"> +<#assign optionKeys = parameters.wikittiesvalues><#t/> + <#list optionKeys as optionKey><#t/> + <option value="${optionKey.valeur}" + <#if optionKey.valeur==parameters.value > + selected + </#if> + > ${optionKey.description} </option> + </#list><#t/> +</select> +</#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-06-28 15:28:07 UTC (rev 985) +++ trunk/wikitty-struts/src/main/tld/wikitty-struts.tld 2011-06-28 15:38:39 UTC (rev 986) @@ -35,11 +35,6 @@ <rtexprvalue>true</rtexprvalue> </attribute> <attribute> - <description><![CDATA[Type of the form: Form classic or pop-up form]]></description> - <name>type</name> - <rtexprvalue>true</rtexprvalue> - </attribute> - <attribute> <description><![CDATA[Field/extention that must appear in the form, if defined other wikitty field will be ignored. if not defined all wikitty field will be presented. @@ -97,6 +92,7 @@ <description><![CDATA[the label of the field]]></description> <name>label</name> <rtexprvalue>true</rtexprvalue> + <required>true</required> </attribute> </tag> @@ -109,6 +105,7 @@ <description><![CDATA[if subtype == fixed, use the list of fixed value as option for a select]]></description> <name>fixvalues</name> <rtexprvalue>true</rtexprvalue> + <required>true</required> </attribute> <attribute> <description><![CDATA[the name of the field that have to be specialize]]></description> @@ -120,12 +117,13 @@ <description><![CDATA[the label of the field]]></description> <name>label</name> <rtexprvalue>true</rtexprvalue> + <required>true</required> </attribute> </tag> <tag> - <name>wikittyField</name> + <name>Field</name> <tagclass>org.nuiton.wikitty.struts.tag.WikittyFieldTag</tagclass> <bodycontent>empty</bodycontent> <description><![CDATA[Field to specialise how wikitty field will be presented]]></description> @@ -139,7 +137,7 @@ <description><![CDATA[the label of the field]]></description> <name>label</name> <rtexprvalue>true</rtexprvalue> - </attribute> + </attribute> <attribute> <description><![CDATA[html type to present the field: hidden, textfield, textarea, boolean, file]]></description> <name>type</name> @@ -194,6 +192,7 @@ <description><![CDATA[the label of the field]]></description> <name>label</name> <rtexprvalue>true</rtexprvalue> + <required>true</required> </attribute> </tag> @@ -211,6 +210,7 @@ <description><![CDATA[the label of the field]]></description> <name>label</name> <rtexprvalue>true</rtexprvalue> + <required>true</required> </attribute> </tag> @@ -228,10 +228,7 @@ <description><![CDATA[the label of the field]]></description> <name>label</name> <rtexprvalue>true</rtexprvalue> + <required>true</required> </attribute> </tag> - - - - </taglib>