r1046 - 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/xhtml tld
Author: mfortun Date: 2011-07-05 13:54:44 +0200 (Tue, 05 Jul 2011) New Revision: 1046 Url: http://nuiton.org/repositories/revision/wikitty/1046 Log: * add attribute name used to specified the html name of specified field if outside wikitty form * move commons code to abstractWikittyComponent * rework commons template * add option to specified textfield as pasword field 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/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/FormTagBean.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/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/BooleanTag.java trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/FormTag.java trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/HiddenTag.java trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/SelectCriteriaTag.java trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/SelectFixedTag.java trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/TextAreaTag.java trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/TextFieldTag.java trunk/wikitty-struts/src/main/resources/template/xhtml/ws-boolean.ftl trunk/wikitty-struts/src/main/resources/template/xhtml/ws-commons.ftl trunk/wikitty-struts/src/main/resources/template/xhtml/ws-date.ftl trunk/wikitty-struts/src/main/resources/template/xhtml/ws-hidden.ftl trunk/wikitty-struts/src/main/resources/template/xhtml/ws-selectcriteria.ftl trunk/wikitty-struts/src/main/resources/template/xhtml/ws-selectfixed.ftl trunk/wikitty-struts/src/main/resources/template/xhtml/ws-textarea.ftl trunk/wikitty-struts/src/main/resources/template/xhtml/ws-textfield.ftl 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-04 16:27:20 UTC (rev 1045) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/WikittyFieldHandler.java 2011-07-05 11:54:44 UTC (rev 1046) @@ -305,17 +305,18 @@ && (excludeMap.get(extName).contains(ALL_EXTENSION_CAR) || excludeMap .get(extName).contains(fieldName)); + // check if field is specifically included or if all the extention is - boolean notIncluded = includeEnable - && !(includeMap.containsKey(extName) && (includeMap - .get(extName).contains(ALL_EXTENSION_CAR) || includeMap - .get(extName).contains(fieldName))); + boolean notIncluded = includeEnable && ! ( includeMap.containsKey(extName) && ((includeMap + .get(extName).contains(ALL_EXTENSION_CAR) || includeMap + .get(extName).contains(fieldName)))); + // check if field allready added boolean added = fieldAdded.contains(extName + WikittyUtil.FQ_FIELD_NAME_SEPARATOR + fieldName); - log.debug("extension: " + extName + " field: " + fieldName - + "notInclude:" + notIncluded + " exclude:" + excluded + log.debug("extension: " + extName + "." + fieldName + + " - notInclude:" + notIncluded + " exclude:" + excluded + " alreadyAdd:" + added); if (excluded || notIncluded || added) { 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-04 16:27:20 UTC (rev 1045) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/AbstractWikittyComponent.java 2011-07-05 11:54:44 UTC (rev 1046) @@ -74,17 +74,26 @@ } - if (fqFieldName != null) { - addParameter("fqFieldName", fqFieldName); + if (name!=null && handler ==null) { + addParameter("name", name); + } else { + addParameter("name", fqFieldName); } + + // check if field included + // if so add the parametter included + // and add the field to the addedfield (usefull if inside + + + + if (isIncluded(fqFieldName)){ + addParameter("included", true); + if (handler != null) { + handler.addAddedField(fqFieldName); + } + } } - protected void addAddedField (String fieldName) { - // TODO mfortun-2011-07-04 - if (handler != null) { - handler.addAddedField(fqFieldName); - } - } public WikittyFieldHandler getHandler() { return handler; 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-07-04 16:27:20 UTC (rev 1045) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/BooleanBean.java 2011-07-05 11:54:44 UTC (rev 1046) @@ -31,19 +31,17 @@ super.evaluateExtraParams(); - // if field defined as inclued - if (isIncluded(fqFieldName)) { + // parse extname and field name String[] fieldsAccess = StringUtil.split(fqFieldName, WikittyUtil.FQ_FIELD_NAME_SEPARATOR); // add parametters to be use by the template + addParameter( - "included",true); - addParameter( "value", getWikitty().getFieldAsBoolean(fieldsAccess[0], fieldsAccess[1])); - addAddedField(fqFieldName); - } + + } public String getDefaultOpenTemplate() { 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-04 16:27:20 UTC (rev 1045) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/DateBean.java 2011-07-05 11:54:44 UTC (rev 1046) @@ -16,46 +16,36 @@ public static final String OPEN_TEMPLATE = "ws-date"; public static final String TEMPLATE = "ws-date-close"; - - + protected Boolean enableHour = false; - + public DateBean(ValueStack stack, HttpServletRequest request, HttpServletResponse response) { super(stack, request, response); } - + @Override protected void evaluateExtraParams() { super.evaluateExtraParams(); - - - + // if field defined as inclued - if (isIncluded(fqFieldName)) { - // parse extname and field name - String[] fieldsAccess = StringUtil.split(fqFieldName, WikittyUtil.FQ_FIELD_NAME_SEPARATOR); - // add parametters to be use by the template - addParameter("included", true); - - Object val = getWikitty().getFieldAsDate(fieldsAccess[0], - fieldsAccess[1]); - val = val==null?"":val; - - - addParameter("value",val); - if ( enableHour !=null) { - addParameter("enableHour", enableHour); - } - addAddedField(fqFieldName); + // parse extname and field name + String[] fieldsAccess = StringUtil.split(fqFieldName, + WikittyUtil.FQ_FIELD_NAME_SEPARATOR); + // add parametters to be use by the template + + Object val = getWikitty().getFieldAsDate(fieldsAccess[0], + fieldsAccess[1]); + val = val == null ? "" : val; + + addParameter("value", val); + if (enableHour != null) { + addParameter("enableHour", enableHour); } - - - - + } - + public String getDefaultOpenTemplate() { return OPEN_TEMPLATE; } 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-04 16:27:20 UTC (rev 1045) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/FormTagBean.java 2011-07-05 11:54:44 UTC (rev 1046) @@ -2,12 +2,15 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; + +import org.apache.commons.lang.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.struts2.components.ClosingUIBean; import org.apache.struts2.views.annotations.StrutsTag; import org.nuiton.wikitty.WikittyProxy; import org.nuiton.wikitty.entities.Wikitty; +import org.nuiton.wikitty.struts.TagUseException; import org.nuiton.wikitty.struts.WikittyFieldHandler; import com.opensymphony.xwork2.util.ValueStack; @@ -46,6 +49,11 @@ super.evaluateExtraParams(); + if (wikitty == null) { + throw new TagUseException("Wikitty must be a valid wikitty"); + } + + /* this methode is called two times: * - first when the wikitty open tag is red * - second when the wikitty closing tag is red @@ -72,15 +80,22 @@ if (orderBefore!=null) { addParameter("orderBefore", orderBefore); } + + + if (name==null || name.equals(StringUtils.EMPTY)) { + name = "wikitty-form-"+wikitty.getId(); + + } + + + addParameter("wikittyid", findString(wikitty.getId())); + // no uses finally: + // addParameter("wikittyversion", findString(wikitty.getVersion())); + // addParameter("wikittyextensions", findString(wikitty + // .getExtensionNames().toString())); - if (wikitty != null) { - addParameter("wikittyid", findString(wikitty.getId())); - //no uses finally: - //addParameter("wikittyversion", findString(wikitty.getVersion())); - //addParameter("wikittyextensions", findString(wikitty - // .getExtensionNames().toString())); - } - + addParameter("name", name); + Object temp = stack.getContext().get(WikittyFieldHandler.WIKITTY_STACK_KEY); WikittyFieldHandler handler; if (temp == null) { 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-07-04 16:27:20 UTC (rev 1045) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/HiddenBean.java 2011-07-05 11:54:44 UTC (rev 1046) @@ -29,19 +29,17 @@ protected void evaluateExtraParams() { super.evaluateExtraParams(); - // if field defined as inclued - if (isIncluded(fqFieldName)) { + // parse extname and field name String[] fieldsAccess = StringUtil.split(fqFieldName, WikittyUtil.FQ_FIELD_NAME_SEPARATOR); // add parametters to be use by the template - addParameter("included", true); + addParameter( "value", getWikitty().getFieldAsString(fieldsAccess[0], fieldsAccess[1])); - addAddedField(fqFieldName); - } + } public String getDefaultOpenTemplate() { 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-04 16:27:20 UTC (rev 1045) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/SelectCriteriaBean.java 2011-07-05 11:54:44 UTC (rev 1046) @@ -41,60 +41,55 @@ super.evaluateExtraParams(); - // if field defined as inclued - if (isIncluded(fqFieldName)) { - addAddedField(fqFieldName); - // parse extname and field name - String[] fieldsAccess = StringUtil.split(fqFieldName, WikittyUtil.FQ_FIELD_NAME_SEPARATOR); - // add parametters to be use by the template - addParameter("included", true); - addParameter( - "value", - getWikitty().getFieldAsString(fieldsAccess[0], - fieldsAccess[1])); + + + // 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])); - List<Option> fixlist = new LinkedList<Option>(); + List<Option> fixlist = new LinkedList<Option>(); - WikittyProxy proxy= getProxy(); - - if (proxy == null) { - throw new TagUseException( - "Tag must declare a valid proxy attribute if used outside ws:form tag"); - } - - - // search for the wikitty with the criteria - PagedResult<Wikitty> wikitties = proxy - .findAllByCriteria(criteria); + WikittyProxy proxy = getProxy(); - String[] descriptor = StringUtil.split(descfield, WikittyFieldHandler.FIELD_SEPARATOR); + if (proxy == null) { + throw new TagUseException( + "Tag must declare a valid proxy attribute if used outside ws:form tag"); + } - // 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(); + // search for the wikitty with the criteria + PagedResult<Wikitty> wikitties = proxy.findAllByCriteria(criteria); - String desc = wiki.getId(); + String[] descriptor = StringUtil.split(descfield, + WikittyFieldHandler.FIELD_SEPARATOR); - // 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, - "."); + // 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(); - desc += wiki.getFieldAsWikitty(descTable[0], - descTable[1]); - } + 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.getFieldAsWikitty(descTable[0], + descTable[1]); } - fixlist.add(new Option(val, desc)); } - addParameter("wikittiesvalues", fixlist); + fixlist.add(new Option(val, desc)); } + addParameter("wikittiesvalues", fixlist); } } 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-07-04 16:27:20 UTC (rev 1045) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/SelectFixedBean.java 2011-07-05 11:54:44 UTC (rev 1046) @@ -34,26 +34,20 @@ protected void evaluateExtraParams() { super.evaluateExtraParams(); - // if field defined as inclued - if (isIncluded(fqFieldName)) { - addAddedField(fqFieldName); - // parse extname and field name - String[] fieldsAccess = StringUtil.split(fqFieldName, WikittyUtil.FQ_FIELD_NAME_SEPARATOR); - // add parametters to be use by the template - addParameter("included", true); - addParameter( - "value", - getWikitty().getFieldAsString(fieldsAccess[0], - fieldsAccess[1])); + // 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])); - List<Option> fixlist = new LinkedList<Option>(); - String[] values = StringUtil.split(fixvalues, WikittyFieldHandler.FIELD_SEPARATOR); - for (String it : values) { - fixlist.add(new Option(it, it)); - } - addParameter("fixvalues", fixlist); - + List<Option> fixlist = new LinkedList<Option>(); + String[] values = StringUtil.split(fixvalues, + WikittyFieldHandler.FIELD_SEPARATOR); + for (String it : values) { + fixlist.add(new Option(it, it)); } + addParameter("fixvalues", fixlist); } 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-07-04 16:27:20 UTC (rev 1045) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/TextAreaBean.java 2011-07-05 11:54:44 UTC (rev 1046) @@ -28,19 +28,14 @@ protected void evaluateExtraParams() { super.evaluateExtraParams(); - // if field defined as inclued - if (isIncluded(fqFieldName)) { - addAddedField(fqFieldName); - // parse extname and field name - String[] fieldsAccess = StringUtil.split(fqFieldName, WikittyUtil.FQ_FIELD_NAME_SEPARATOR); - // add parametters to be use by the template - addParameter("included", true); - addParameter( - "value", - getWikitty().getFieldAsString(fieldsAccess[0], - fieldsAccess[1])); - } + // 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])); + } public String getDefaultOpenTemplate() { 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-07-04 16:27:20 UTC (rev 1045) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/TextFieldBean.java 2011-07-05 11:54:44 UTC (rev 1046) @@ -19,6 +19,8 @@ public static final String OPEN_TEMPLATE = "ws-textfield"; public static final String TEMPLATE = "ws-textfield-close"; + protected Boolean password; + public TextFieldBean(ValueStack stack, HttpServletRequest request, HttpServletResponse response) { super(stack, request, response); @@ -28,20 +30,14 @@ protected void evaluateExtraParams() { super.evaluateExtraParams(); - - // if field defined as inclued - if (isIncluded(fqFieldName)) { - // parse extname and field name - String[] fieldsAccess = StringUtil.split(fqFieldName, WikittyUtil.FQ_FIELD_NAME_SEPARATOR); - // add parametters to be use by the template - addParameter("included", true); - addParameter( - "value", - getWikitty().getFieldAsString(fieldsAccess[0], - fieldsAccess[1])); - addAddedField(fqFieldName); - } + // 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])); + } public String getDefaultOpenTemplate() { @@ -51,4 +47,12 @@ protected String getDefaultTemplate() { return TEMPLATE; } + + public Boolean getPassword() { + return password; + } + + public void setPassword(Boolean password) { + this.password = password; + } } Modified: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/BooleanTag.java =================================================================== --- trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/BooleanTag.java 2011-07-04 16:27:20 UTC (rev 1045) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/BooleanTag.java 2011-07-05 11:54:44 UTC (rev 1046) @@ -2,11 +2,8 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; - import org.apache.struts2.components.Component; -import org.apache.struts2.views.jsp.ui.AbstractClosingTag; import org.nuiton.wikitty.struts.component.BooleanBean; - import com.opensymphony.xwork2.util.ValueStack; public class BooleanTag extends AbstractWikittyTag { Modified: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/FormTag.java =================================================================== --- trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/FormTag.java 2011-07-04 16:27:20 UTC (rev 1045) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/FormTag.java 2011-07-05 11:54:44 UTC (rev 1046) @@ -7,7 +7,6 @@ import org.nuiton.wikitty.WikittyProxy; import org.nuiton.wikitty.entities.Wikitty; import org.nuiton.wikitty.struts.component.FormTagBean; - import com.opensymphony.xwork2.util.ValueStack; public class FormTag extends AbstractClosingTag { Modified: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/HiddenTag.java =================================================================== --- trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/HiddenTag.java 2011-07-04 16:27:20 UTC (rev 1045) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/HiddenTag.java 2011-07-05 11:54:44 UTC (rev 1046) @@ -2,11 +2,8 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; - import org.apache.struts2.components.Component; -import org.apache.struts2.views.jsp.ui.AbstractClosingTag; import org.nuiton.wikitty.struts.component.HiddenBean; - import com.opensymphony.xwork2.util.ValueStack; public class HiddenTag extends AbstractWikittyTag { 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-04 16:27:20 UTC (rev 1045) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/SelectCriteriaTag.java 2011-07-05 11:54:44 UTC (rev 1046) @@ -2,13 +2,9 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; - import org.apache.struts2.components.Component; -import org.apache.struts2.views.jsp.ui.AbstractClosingTag; - import org.nuiton.wikitty.search.Criteria; import org.nuiton.wikitty.struts.component.SelectCriteriaBean; - import com.opensymphony.xwork2.util.ValueStack; public class SelectCriteriaTag extends AbstractWikittyTag { Modified: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/SelectFixedTag.java =================================================================== --- trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/SelectFixedTag.java 2011-07-04 16:27:20 UTC (rev 1045) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/SelectFixedTag.java 2011-07-05 11:54:44 UTC (rev 1046) @@ -2,11 +2,8 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; - import org.apache.struts2.components.Component; -import org.apache.struts2.views.jsp.ui.AbstractClosingTag; import org.nuiton.wikitty.struts.component.SelectFixedBean; - import com.opensymphony.xwork2.util.ValueStack; public class SelectFixedTag extends AbstractWikittyTag { Modified: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/TextAreaTag.java =================================================================== --- trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/TextAreaTag.java 2011-07-04 16:27:20 UTC (rev 1045) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/TextAreaTag.java 2011-07-05 11:54:44 UTC (rev 1046) @@ -2,9 +2,7 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; - import org.apache.struts2.components.Component; -import org.apache.struts2.views.jsp.ui.AbstractClosingTag; import org.nuiton.wikitty.struts.component.TextAreaBean; import com.opensymphony.xwork2.util.ValueStack; Modified: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/TextFieldTag.java =================================================================== --- trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/TextFieldTag.java 2011-07-04 16:27:20 UTC (rev 1045) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/TextFieldTag.java 2011-07-05 11:54:44 UTC (rev 1046) @@ -2,14 +2,24 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; - import org.apache.struts2.components.Component; -import org.apache.struts2.views.jsp.ui.AbstractClosingTag; import org.nuiton.wikitty.struts.component.TextFieldBean; - import com.opensymphony.xwork2.util.ValueStack; public class TextFieldTag extends AbstractWikittyTag { + + + protected Boolean password; + + + public Boolean getPassword() { + return password; + } + + public void setPassword(Boolean password) { + this.password = password; + } + /** * */ @@ -20,4 +30,14 @@ HttpServletResponse res) { return new TextFieldBean(stack, req, res); } + + @Override + protected void populateParams() { + super.populateParams(); + TextFieldBean fieldtag = ((TextFieldBean) component); + + fieldtag.setPassword(password); + + } + } Modified: trunk/wikitty-struts/src/main/resources/template/xhtml/ws-boolean.ftl =================================================================== --- trunk/wikitty-struts/src/main/resources/template/xhtml/ws-boolean.ftl 2011-07-04 16:27:20 UTC (rev 1045) +++ trunk/wikitty-struts/src/main/resources/template/xhtml/ws-boolean.ftl 2011-07-05 11:54:44 UTC (rev 1046) @@ -1,7 +1,7 @@ <#if parameters.included?? && parameters.included==true > ${parameters.label} : <input <#include "/${parameters.templateDir}/xhtml/ws-commons.ftl" /> - type="checkbox" name="${parameters.fqFieldName}" value="true" <#t/> + type="checkbox" value="true" <#t/> <#if aKey.value=="true" > <#t/> checked='true'<#t/> </#if> Modified: trunk/wikitty-struts/src/main/resources/template/xhtml/ws-commons.ftl =================================================================== --- trunk/wikitty-struts/src/main/resources/template/xhtml/ws-commons.ftl 2011-07-04 16:27:20 UTC (rev 1045) +++ trunk/wikitty-struts/src/main/resources/template/xhtml/ws-commons.ftl 2011-07-05 11:54:44 UTC (rev 1046) @@ -1,3 +1,4 @@ +name=${parameters.name} <#if parameters.id?? ><#t/> id="${parameters.id}"<#t/> </#if><#t/> \ No newline at end of file Modified: trunk/wikitty-struts/src/main/resources/template/xhtml/ws-date.ftl =================================================================== --- trunk/wikitty-struts/src/main/resources/template/xhtml/ws-date.ftl 2011-07-04 16:27:20 UTC (rev 1045) +++ trunk/wikitty-struts/src/main/resources/template/xhtml/ws-date.ftl 2011-07-05 11:54:44 UTC (rev 1046) @@ -1,7 +1,7 @@ <#if parameters.included?? && parameters.included==true > ${parameters.label} : <input <#include "/${parameters.templateDir}/xhtml/ws-commons.ftl" /> - name="${parameters.fqFieldName}" type="text" value="${parameters.value}"> </p> + type="text" value="${parameters.value}"> </p> </#if><#t/> Modified: trunk/wikitty-struts/src/main/resources/template/xhtml/ws-hidden.ftl =================================================================== --- trunk/wikitty-struts/src/main/resources/template/xhtml/ws-hidden.ftl 2011-07-04 16:27:20 UTC (rev 1045) +++ trunk/wikitty-struts/src/main/resources/template/xhtml/ws-hidden.ftl 2011-07-05 11:54:44 UTC (rev 1046) @@ -1,5 +1,5 @@ <#if parameters.included?? && parameters.included==true > <input <#include "/${parameters.templateDir}/xhtml/ws-commons.ftl" /> -type="hidden" name="${parameters.fqFieldName}" value="${parameters.value}" /><#t/> +type="hidden" value="${parameters.value}" /><#t/> </#if> \ No newline at end of file Modified: trunk/wikitty-struts/src/main/resources/template/xhtml/ws-selectcriteria.ftl =================================================================== --- trunk/wikitty-struts/src/main/resources/template/xhtml/ws-selectcriteria.ftl 2011-07-04 16:27:20 UTC (rev 1045) +++ trunk/wikitty-struts/src/main/resources/template/xhtml/ws-selectcriteria.ftl 2011-07-05 11:54:44 UTC (rev 1046) @@ -1,7 +1,7 @@ <#if parameters.included?? && parameters.included==true > ${parameters.label} :<select <#include "/${parameters.templateDir}/xhtml/ws-commons.ftl" /> - name="${parameters.fqFieldName}" size="1"> + size="1"> <#assign optionKeys = parameters.wikittiesvalues> <#list optionKeys as optionKey> <option value="${optionKey.valeur}"<#t/> Modified: trunk/wikitty-struts/src/main/resources/template/xhtml/ws-selectfixed.ftl =================================================================== --- trunk/wikitty-struts/src/main/resources/template/xhtml/ws-selectfixed.ftl 2011-07-04 16:27:20 UTC (rev 1045) +++ trunk/wikitty-struts/src/main/resources/template/xhtml/ws-selectfixed.ftl 2011-07-05 11:54:44 UTC (rev 1046) @@ -1,7 +1,7 @@ <#if parameters.included?? && parameters.included==true > ${parameters.label} :<select <#include "/${parameters.templateDir}/xhtml/ws-commons.ftl" /> -name="${parameters.fqFieldName}" size="1"> + size="1"> <#assign optionKeys = parameters.fixvalues><#t/> <#list optionKeys as optionKey><#t/> <option value="${optionKey.valeur}" <#t/> Modified: trunk/wikitty-struts/src/main/resources/template/xhtml/ws-textarea.ftl =================================================================== --- trunk/wikitty-struts/src/main/resources/template/xhtml/ws-textarea.ftl 2011-07-04 16:27:20 UTC (rev 1045) +++ trunk/wikitty-struts/src/main/resources/template/xhtml/ws-textarea.ftl 2011-07-05 11:54:44 UTC (rev 1046) @@ -1,5 +1,5 @@ <#if parameters.included?? && parameters.included==true > ${parameters.label} : <textarea <#include "/${parameters.templateDir}/xhtml/ws-commons.ftl" /> - cols="80" rows="20" name="${parameters.fqFieldName}">${parameters.value}</textarea><#t/> + cols="80" rows="20" >${parameters.value}</textarea><#t/> </#if><#t/> \ No newline at end of file Modified: trunk/wikitty-struts/src/main/resources/template/xhtml/ws-textfield.ftl =================================================================== --- trunk/wikitty-struts/src/main/resources/template/xhtml/ws-textfield.ftl 2011-07-04 16:27:20 UTC (rev 1045) +++ trunk/wikitty-struts/src/main/resources/template/xhtml/ws-textfield.ftl 2011-07-05 11:54:44 UTC (rev 1046) @@ -1,5 +1,11 @@ <#if parameters.included?? && parameters.included==true > ${parameters.label} : <input <#include "/${parameters.templateDir}/xhtml/ws-commons.ftl" /> -type="text" name="${parameters.fqFieldName}" value="${parameters.value}" ><#t/> + +<#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 Modified: trunk/wikitty-struts/src/main/tld/wikitty-struts.tld =================================================================== --- trunk/wikitty-struts/src/main/tld/wikitty-struts.tld 2011-07-04 16:27:20 UTC (rev 1045) +++ trunk/wikitty-struts/src/main/tld/wikitty-struts.tld 2011-07-05 11:54:44 UTC (rev 1046) @@ -18,6 +18,12 @@ <rtexprvalue>true</rtexprvalue> </attribute> <attribute> + <description><![CDATA[name for the form]]></description> + <name>name</name> + <rtexprvalue>true</rtexprvalue> + </attribute> + + <attribute> <description><![CDATA[the wikitty to edit]]></description> <name>wikitty</name> <rtexprvalue>true</rtexprvalue> @@ -88,6 +94,13 @@ <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> @@ -109,7 +122,7 @@ <rtexprvalue>true</rtexprvalue> </attribute> <attribute> - <description><![CDATA[the name of the field that have to be specialize]]></description> + <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> @@ -133,6 +146,11 @@ <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> @@ -167,6 +185,11 @@ <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> @@ -190,6 +213,11 @@ <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> @@ -206,6 +234,11 @@ <rtexprvalue>true</rtexprvalue> <required>true</required> </attribute> + <attribute> + <description><![CDATA[if the textfiel have to hide the content]]></description> + <name>password</name> + <rtexprvalue>true</rtexprvalue> + </attribute> </tag> <tag> @@ -218,6 +251,11 @@ <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> @@ -252,6 +290,11 @@ <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> @@ -280,6 +323,11 @@ <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>
participants (1)
-
mfortun＠users.nuiton.org