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

r995 - trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component
by mfortun＠users.nuiton.org June 29, 2011

June 29, 2011

Author: mfortun Date: 2011-06-29 11:54:51 +0200 (Wed, 29 Jun 2011) New Revision: 995 Url: http://nuiton.org/repositories/revision/wikitty/995 Log: * create a basic abstract component to handle the handler that can be found in the stack Added: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/AbstractWikittyComponent.java Modified: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/BooleanBean.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/WikittySelectBean.java Added: 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 (rev 0) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/AbstractWikittyComponent.java 2011-06-29 09:54:51 UTC (rev 995) @@ -0,0 +1,36 @@ +package org.nuiton.wikitty.struts.component; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.apache.struts2.components.ClosingUIBean; + +import org.nuiton.wikitty.struts.WikittyFieldHandler; + +import com.opensymphony.xwork2.util.ValueStack; + +public abstract class AbstractWikittyComponent extends ClosingUIBean { + + + protected WikittyFieldHandler handler; + + protected AbstractWikittyComponent(ValueStack stack, + HttpServletRequest request, HttpServletResponse response) { + super(stack, request, response); + + handler = (WikittyFieldHandler) stack.getContext() + .get(WikittyTagBean.WIKITTY_STACK_KEY); + + if (handler == null) { + // TODO mfortun-2011-06-29 throw exception if handler not in the stack + } + + + } + + + + + + +} Property changes on: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/AbstractWikittyComponent.java ___________________________________________________________________ Added: svn:mime-type + text/plain 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-29 09:27:04 UTC (rev 994) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/BooleanBean.java 2011-06-29 09:54:51 UTC (rev 995) @@ -2,17 +2,13 @@ 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.struts.WikittyFieldHandler; - 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 class BooleanBean extends AbstractWikittyComponent { public BooleanBean(ValueStack stack, HttpServletRequest request, HttpServletResponse response) { @@ -27,25 +23,18 @@ protected void evaluateExtraParams() { super.evaluateExtraParams(); - WikittyFieldHandler handler = (WikittyFieldHandler) stack.getContext() - .get(WikittyTagBean.WIKITTY_STACK_KEY); - - if (handler != null) { - handler.addAddedField(name); - // 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 + handler.addAddedField(name); + // 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])); } } 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-29 09:27:04 UTC (rev 994) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/FixedSelectBean.java 2011-06-29 09:54:51 UTC (rev 995) @@ -4,16 +4,13 @@ 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.struts.Option; -import org.nuiton.wikitty.struts.WikittyFieldHandler; - import com.opensymphony.xwork2.util.ValueStack; @StrutsTag(name = "fixedSelect", tldTagClass = "org.nuiton.wikitty.struts.tag.FixedSelectTag", description = "", allowDynamicAttributes = false) -public class FixedSelectBean extends ClosingUIBean { +public class FixedSelectBean extends AbstractWikittyComponent { protected String fixvalues; @@ -29,34 +26,27 @@ protected void evaluateExtraParams() { super.evaluateExtraParams(); - WikittyFieldHandler handler = (WikittyFieldHandler) stack.getContext() - .get(WikittyTagBean.WIKITTY_STACK_KEY); + // if field defined as inclued + if (handler.isIncluded(name)) { + handler.addAddedField(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])); - if (handler != null) { - // if field defined as inclued - if (handler.isIncluded(name)) { - handler.addAddedField(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); - + List<Option> fixlist = new LinkedList<Option>(); + String[] values = StringUtil.split(fixvalues, ","); + for (String it : values) { + fixlist.add(new Option(it, it)); } - } else { - // TODO mfortun-2011-06-28 throw exception if handler not in the - // stack + addParameter("fixvalues", fixlist); + } + } public String getDefaultOpenTemplate() { 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-29 09:27:04 UTC (rev 994) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/HiddenBean.java 2011-06-29 09:54:51 UTC (rev 995) @@ -2,17 +2,12 @@ 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.struts.WikittyFieldHandler; - import com.opensymphony.xwork2.util.ValueStack; -@StrutsTag(name = "hidden", tldTagClass = "org.nuiton.wikitty.struts.tag.HiddenTag", - description = "", allowDynamicAttributes = false) -public class HiddenBean extends ClosingUIBean { +@StrutsTag(name = "hidden", tldTagClass = "org.nuiton.wikitty.struts.tag.HiddenTag", description = "", allowDynamicAttributes = false) +public class HiddenBean extends AbstractWikittyComponent { public HiddenBean(ValueStack stack, HttpServletRequest request, HttpServletResponse response) { @@ -26,28 +21,21 @@ 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)) { - handler.addAddedField(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 + // if field defined as inclued + if (handler.isIncluded(name)) { + handler.addAddedField(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])); } + } - + public String getDefaultOpenTemplate() { return OPEN_TEMPLATE; } 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-29 09:27:04 UTC (rev 994) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/TextAreaBean.java 2011-06-29 09:54:51 UTC (rev 995) @@ -2,17 +2,13 @@ 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.struts.WikittyFieldHandler; import com.opensymphony.xwork2.util.ValueStack; -@StrutsTag(name = "textArea", tldTagClass = "org.nuiton.wikitty.struts.tag.TextAreaTag", - description = "", allowDynamicAttributes = false) -public class TextAreaBean extends ClosingUIBean { +@StrutsTag(name = "textArea", tldTagClass = "org.nuiton.wikitty.struts.tag.TextAreaTag", description = "", allowDynamicAttributes = false) +public class TextAreaBean extends AbstractWikittyComponent { public TextAreaBean(ValueStack stack, HttpServletRequest request, HttpServletResponse response) { @@ -22,33 +18,25 @@ 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)) { - handler.addAddedField(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 + // if field defined as inclued + if (handler.isIncluded(name)) { + handler.addAddedField(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])); } + } - + 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-29 09:27:04 UTC (rev 994) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/TextFieldBean.java 2011-06-29 09:54:51 UTC (rev 995) @@ -3,15 +3,13 @@ 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.struts.WikittyFieldHandler; 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 class TextFieldBean extends AbstractWikittyComponent { public TextFieldBean(ValueStack stack, HttpServletRequest request, HttpServletResponse response) { @@ -25,26 +23,19 @@ protected void evaluateExtraParams() { super.evaluateExtraParams(); - WikittyFieldHandler handler = (WikittyFieldHandler) stack.getContext() - .get(WikittyTagBean.WIKITTY_STACK_KEY); - - if (handler != null) { - handler.addAddedField(name); - // 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 + handler.addAddedField(name); + // 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])); } + } public String getDefaultOpenTemplate() { 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-29 09:27:04 UTC (rev 994) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/WikittySelectBean.java 2011-06-29 09:54:51 UTC (rev 995) @@ -2,11 +2,8 @@ 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; @@ -14,12 +11,12 @@ import org.nuiton.wikitty.search.PagedResult; import org.nuiton.wikitty.search.Search; import org.nuiton.wikitty.struts.Option; -import org.nuiton.wikitty.struts.WikittyFieldHandler; + import com.opensymphony.xwork2.util.ValueStack; @StrutsTag(name = "wikittyselect", tldTagClass = "org.nuiton.wikitty.struts.tag.WikittySelectTag", description = "", allowDynamicAttributes = false) -public class WikittySelectBean extends ClosingUIBean { +public class WikittySelectBean extends AbstractWikittyComponent { protected String criteria; protected String descfield; @@ -44,65 +41,58 @@ protected void evaluateExtraParams() { super.evaluateExtraParams(); - WikittyFieldHandler handler = (WikittyFieldHandler) stack.getContext() - .get(WikittyTagBean.WIKITTY_STACK_KEY); + // if field defined as inclued + if (handler.isIncluded(name)) { - if (handler != null) { - // if field defined as inclued - if (handler.isIncluded(name)) { - - handler.addAddedField(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])); + handler.addAddedField(name); - List<Option> fixlist = new LinkedList<Option>(); + // 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])); - // search for the wikitty with the criteria - Criteria criteria = Search.query().keyword(this.criteria) - .criteria(); - PagedResult<Wikitty> wikitties = handler.getProxy() - .findAllByCriteria(criteria); + List<Option> fixlist = new LinkedList<Option>(); - 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(); + // search for the wikitty with the criteria + Criteria criteria = Search.query().keyword(this.criteria) + .criteria(); + PagedResult<Wikitty> wikitties = handler.getProxy() + .findAllByCriteria(criteria); - String desc = wiki.getId(); + String[] descriptor = StringUtil.split(descfield, ","); - // 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.getFieldAsString(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.getFieldAsString(descTable[0], + descTable[1]); } - fixlist.add(new Option(val, desc)); } - addParameter("wikittiesvalues", fixlist); + 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() {

1 0

r994 - trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts
by mfortun＠users.nuiton.org June 29, 2011

June 29, 2011

Author: mfortun Date: 2011-06-29 11:27:04 +0200 (Wed, 29 Jun 2011) New Revision: 994 Url: http://nuiton.org/repositories/revision/wikitty/994 Log: * correct ordering before/after mechanism Modified: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/WikittyFieldHandler.java 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-06-29 09:07:42 UTC (rev 993) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/WikittyFieldHandler.java 2011-06-29 09:27:04 UTC (rev 994) @@ -182,6 +182,17 @@ } + /* + * save the field that will be write + * only if write befeore is selected because that mean that this + * method will be called two times when write the openning template + * of the wikitty field and when it close the wikitty field + */ + if( orderBefore ){ + fieldAdded.addAll(mapField.keySet()); + } + + String[] fieldOrder = StringUtil.split(order, ",");

1 0

r993 - in trunk/wikitty-struts/src/main: java/org/nuiton/wikitty/struts java/org/nuiton/wikitty/struts/component java/org/nuiton/wikitty/struts/tag java/template/xhtml tld
by mfortun＠users.nuiton.org June 29, 2011

June 29, 2011

Author: mfortun Date: 2011-06-29 11:07:42 +0200 (Wed, 29 Jun 2011) New Revision: 993 Url: http://nuiton.org/repositories/revision/wikitty/993 Log: * remove first version of wikitty tag specialization Removed: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/FieldSpecialisation.java trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/WikittyFieldTagBean.java trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/WikittyFieldTag.java trunk/wikitty-struts/src/main/java/template/xhtml/ws-field-close.ftl trunk/wikitty-struts/src/main/java/template/xhtml/ws-field.ftl Modified: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/WikittyFieldHandler.java trunk/wikitty-struts/src/main/tld/wikitty-struts.tld Deleted: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/FieldSpecialisation.java =================================================================== --- trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/FieldSpecialisation.java 2011-06-29 08:52:25 UTC (rev 992) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/FieldSpecialisation.java 2011-06-29 09:07:42 UTC (rev 993) @@ -1,70 +0,0 @@ -package org.nuiton.wikitty.struts; - -public class FieldSpecialisation { - - protected String name; - protected String type; - protected String criteria; - protected String subtype; - protected String label; - protected String descfields; - protected String fixvalues; - - - public String getDescfields() { - return descfields; - } - - public void setDescfields(String descfields) { - this.descfields = descfields; - } - - public String getFixvalues() { - return fixvalues; - } - - public void setFixvalues(String fixvalues) { - this.fixvalues = fixvalues; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public String getType() { - return type; - } - - public void setType(String type) { - this.type = type; - } - - public String getCriteria() { - return criteria; - } - - public void setCriteria(String criteria) { - this.criteria = criteria; - } - - public String getSubtype() { - return subtype; - } - - public void setSubtype(String subtype) { - this.subtype = subtype; - } - - public String getLabel() { - return label; - } - - public void setLabel(String label) { - this.label = label; - } - -} 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-06-29 08:52:25 UTC (rev 992) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/WikittyFieldHandler.java 2011-06-29 09:07:42 UTC (rev 993) @@ -7,16 +7,12 @@ import java.util.List; import java.util.Map; import java.util.Set; - import org.apache.commons.lang.StringEscapeUtils; import org.nuiton.util.StringUtil; import org.nuiton.wikitty.WikittyProxy; import org.nuiton.wikitty.entities.FieldType; import org.nuiton.wikitty.entities.Wikitty; import org.nuiton.wikitty.entities.WikittyExtension; -import org.nuiton.wikitty.search.Criteria; -import org.nuiton.wikitty.search.PagedResult; -import org.nuiton.wikitty.search.Search; public class WikittyFieldHandler { @@ -28,9 +24,6 @@ protected String order = ""; protected Boolean orderBefore; - - - protected Map<String, FieldSpecialisation> field; protected Set<String> fieldAdded; public Set<String> getFieldAdded() { @@ -42,7 +35,6 @@ } public WikittyFieldHandler() { - field = new HashMap<String, FieldSpecialisation>(); fieldAdded = new HashSet<String>(); } @@ -94,18 +86,7 @@ this.order = order; } - public Map<String, FieldSpecialisation> getField() { - return field; - } - public void setField(Map<String, FieldSpecialisation> field) { - this.field = field; - } - - public void specialiseField(FieldSpecialisation fieldSpe) { - field.put(fieldSpe.getName(), fieldSpe); - } - public Collection<ExtensionFieldStrutsBean> getWikittyField() { Map<String, ExtensionFieldStrutsBean> mapField = new HashMap<String, ExtensionFieldStrutsBean>(); @@ -200,75 +181,8 @@ } } - /* - * specialize field. With name, label, type etc. - */ - for (Map.Entry<String, FieldSpecialisation> speEntry : field.entrySet()) { - ExtensionFieldStrutsBean fieldExtension = mapField.get(speEntry.getKey()); - FieldSpecialisation spe = speEntry.getValue(); - if (fieldExtension != null) { + - if (!"".equals(spe.getLabel())) { - fieldExtension.setLabel(spe.getLabel()); - } - if (!"".equals(spe.getType())) { - fieldExtension.setType(spe.getType()); - } - - // if fixed list of item is passed via fixvalues attribut - if ("fixed".equals(spe.getSubtype())) { - String[] valu = StringUtil.split(spe.getFixvalues(), ","); - for (String va : valu) { - fieldExtension.addOption(va, va); - } - - // if wikitty load all the options values - } else if ("wikitty".equals(spe.getSubtype())) { - PagedResult<Wikitty> wikitties = null; - - // check the criteria and request wikitty - if (!"".equals(spe.getCriteria())) { - - Criteria criteria = Search.query() - .keyword(spe.getCriteria()).criteria(); - wikitties = proxy.findAllByCriteria(criteria); - } - - String[] descriptor = StringUtil.split(spe.getDescfields(), - ","); - - 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]); - - } - } - fieldExtension.addOption(val, desc); - } - - } - - } - - } - - } - String[] fieldOrder = StringUtil.split(order, ","); /* @@ -294,10 +208,6 @@ return mapField.values(); } - protected enum fieldTypeSpecialization { - wikitty, fixed; - } - /** * construct map for exclude or include template * Deleted: 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-29 08:52:25 UTC (rev 992) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/WikittyFieldTagBean.java 2011-06-29 09:07:42 UTC (rev 993) @@ -1,54 +0,0 @@ -package org.nuiton.wikitty.struts.component; - -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.wikitty.struts.FieldSpecialisation; -import org.nuiton.wikitty.struts.WikittyFieldHandler; - -import com.opensymphony.xwork2.util.ValueStack; - -@StrutsTag(name = "field", tldTagClass = "org.nuiton.wikitty.struts.tag.WikittyFieldTag", - description = "", allowDynamicAttributes = false) -public class WikittyFieldTagBean extends ClosingUIBean { - - protected FieldSpecialisation specialize; - - public WikittyFieldTagBean(ValueStack stack, HttpServletRequest request, - HttpServletResponse response) { - super(stack, request, response); - } - - public static final String OPEN_TEMPLATE = "ws-field"; - public static final String TEMPLATE = "ws-field-close"; - - public String getDefaultOpenTemplate() { - return OPEN_TEMPLATE; - } - - protected String getDefaultTemplate() { - return TEMPLATE; - } - - @Override - protected void evaluateExtraParams() { - super.evaluateExtraParams(); - - WikittyFieldHandler handler = (WikittyFieldHandler) stack.getContext() - .get(WikittyTagBean.WIKITTY_STACK_KEY); - - if (handler != null) { - handler.specialiseField(specialize); - } - } - - public FieldSpecialisation getSpecialize() { - return specialize; - } - - public void setSpecialize(FieldSpecialisation specialize) { - this.specialize = specialize; - } - -} Deleted: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/WikittyFieldTag.java =================================================================== --- trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/WikittyFieldTag.java 2011-06-29 08:52:25 UTC (rev 992) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/WikittyFieldTag.java 2011-06-29 09:07:42 UTC (rev 993) @@ -1,97 +0,0 @@ -package org.nuiton.wikitty.struts.tag; - -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.FieldSpecialisation; -import org.nuiton.wikitty.struts.component.WikittyFieldTagBean; - -import com.opensymphony.xwork2.util.ValueStack; - -public class WikittyFieldTag extends AbstractClosingTag { - - /** - * - */ - private static final long serialVersionUID = -1L; - protected String name; - protected String subtype; - protected String criteria; - protected String type; - protected String fixvalues; - protected String descfields; - - public String getFixvalues() { - return fixvalues; - } - - public void setFixvalues(String fixvalues) { - this.fixvalues = fixvalues; - } - - public String getDescfields() { - return descfields; - } - - public void setDescfields(String descfields) { - this.descfields = descfields; - } - - public String getSubtype() { - return subtype; - } - - public void setSubtype(String subtype) { - this.subtype = subtype; - } - - public String getCriteria() { - return criteria; - } - - public void setCriteria(String criteria) { - this.criteria = criteria; - } - - public String getType() { - return type; - } - - public void setType(String type) { - this.type = type; - } - - @Override - public Component getBean(ValueStack stack, HttpServletRequest req, - HttpServletResponse res) { - return new WikittyFieldTagBean(stack, req, res); - - } - - @Override - protected void populateParams() { - super.populateParams(); - WikittyFieldTagBean fieldtag = ((WikittyFieldTagBean) component); - - FieldSpecialisation spe = new FieldSpecialisation(); - spe.setName(name); - spe.setType(type); - spe.setSubtype(subtype); - spe.setCriteria(criteria); - spe.setFixvalues(fixvalues); - spe.setDescfields(descfields); - spe.setLabel(label); - fieldtag.setSpecialize(spe); - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - -} Modified: trunk/wikitty-struts/src/main/tld/wikitty-struts.tld =================================================================== --- trunk/wikitty-struts/src/main/tld/wikitty-struts.tld 2011-06-29 08:52:25 UTC (rev 992) +++ trunk/wikitty-struts/src/main/tld/wikitty-struts.tld 2011-06-29 09:07:42 UTC (rev 993) @@ -1,5 +1,4 @@ -<?xml version="1.0" encoding="ISO-8859-1" ?> -<taglib xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" +<?xml version="1.0" encoding="ISO-8859-1" ?><taglib xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd" version="2.0"> <display-name>"wikitty-struts"</display-name> @@ -128,51 +127,7 @@ </attribute> </tag> - <tag> - <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> - <attribute> - <description><![CDATA[the name of the field that have to be specialize]]></description> - <name>name</name> - <rtexprvalue>true</rtexprvalue> - <required>true</required> - </attribute> - <attribute> - <description><![CDATA[the label of the field]]></description> - <name>label</name> - <rtexprvalue>true</rtexprvalue> - </attribute> - <attribute> - <description><![CDATA[html type to present the field: hidden, textfield, textarea, boolean, file]]></description> - <name>type</name> - <rtexprvalue>true</rtexprvalue> - </attribute> - <attribute> - <description><![CDATA[the sub type if present a fixed list(see fixvalues) or if it will be wikitty found by the proxy]]></description> - <name>subtype</name> - <rtexprvalue>true</rtexprvalue> - </attribute> - <attribute> - <description><![CDATA[if subtype == fixed, use the list of fixed value as option for a select]]></description> - <name>fixvalues</name> - <rtexprvalue>true</rtexprvalue> - </attribute> - <attribute> - <description><![CDATA[if subtype == wikitty, use the list of wikitty found by criteria as option for select]]></description> - <name>criteria</name> - <rtexprvalue>true</rtexprvalue> - </attribute> - <attribute> - <description><![CDATA[if subtype == wikitty, use the name of the descfield of the wikitties as a description value for select's option]]></description> - <name>descfields</name> - <rtexprvalue>true</rtexprvalue> - </attribute> - </tag> - - <tag> <name>hidden</name> <tagclass>org.nuiton.wikitty.struts.tag.HiddenTag</tagclass> <bodycontent>empty</bodycontent>

1 0

r992 - in trunk/wikitty-struts/src/main: java/org/nuiton/wikitty/struts java/org/nuiton/wikitty/struts/component java/org/nuiton/wikitty/struts/tag tld
by mfortun＠users.nuiton.org June 29, 2011

June 29, 2011

Author: mfortun Date: 2011-06-29 10:52:25 +0200 (Wed, 29 Jun 2011) New Revision: 992 Url: http://nuiton.org/repositories/revision/wikitty/992 Log: * forgot tld in previous commit * basic class to wikitty edit action * organize package (component package only for class that inherit of component class) Added: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/AbstractWikittyEditAction.java trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/ExtensionFieldStrutsBean.java trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/FieldSpecialisation.java trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/Option.java trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/WikittyFieldHandler.java Removed: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/ExtensionFieldStrutsBean.java trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/FieldSpecialisation.java trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/Option.java trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/WikittyFieldHandler.java 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/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/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/WikittyFieldTag.java trunk/wikitty-struts/src/main/tld/wikitty-struts.tld Added: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/AbstractWikittyEditAction.java =================================================================== --- trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/AbstractWikittyEditAction.java (rev 0) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/AbstractWikittyEditAction.java 2011-06-29 08:52:25 UTC (rev 992) @@ -0,0 +1,38 @@ +package org.nuiton.wikitty.struts; + +import org.nuiton.wikitty.WikittyProxy; + +import com.opensymphony.xwork2.ActionSupport; + +public abstract class AbstractWikittyEditAction extends ActionSupport { + + /** + * + */ + private static final long serialVersionUID = 1959245739866183821L; + + + /* + rajouter les attributs par défaut id tout ça + et ensuite on rajoute les méthodes de parsage des arguments + et qui les rajoute dans les wikitty field tout ça. + sauf les file parce que les files compliqué. + + */ + + @Override + public String execute() throws Exception { + + WikittyProxy proxy = getProxy(); + + + + + return SUCCESS; + } + + + public abstract WikittyProxy getProxy(); + + +} Property changes on: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/AbstractWikittyEditAction.java ___________________________________________________________________ Added: svn:mime-type + text/plain Copied: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/ExtensionFieldStrutsBean.java (from rev 991, trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/ExtensionFieldStrutsBean.java) =================================================================== --- trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/ExtensionFieldStrutsBean.java (rev 0) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/ExtensionFieldStrutsBean.java 2011-06-29 08:52:25 UTC (rev 992) @@ -0,0 +1,61 @@ +package org.nuiton.wikitty.struts; + +import java.util.Collection; +import java.util.LinkedList; + + +public class ExtensionFieldStrutsBean { + + + protected String name; + protected String type; + protected Object value =""; + protected String label; + protected Collection<Option> listOption; + + public ExtensionFieldStrutsBean() { + listOption = new LinkedList<Option>(); + } + public Collection<Option> getListOption() { + return listOption; + } + public void setListOption(Collection<Option> listOption) { + this.listOption = listOption; + } + public String getLabel() { + return label; + } + public void setLabel(String label) { + this.label = label; + } + public String getName() { + return name; + } + public void setName(String name) { + this.name = name; + } + public String getType() { + return type; + } + public void setType(String type) { + this.type = type; + } + public Object getValue() { + return value; + } + public void setValue(Object value) { + this.value = value; + } + + + public void addOption(String val, String desc){ + Option opt= new Option(); + opt.setDescription(desc); + opt.setValeur(val); + this.listOption.add(opt); + } + + + + +} Property changes on: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/ExtensionFieldStrutsBean.java ___________________________________________________________________ Added: svn:mime-type + text/plain Copied: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/FieldSpecialisation.java (from rev 979, trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/FieldSpecialisation.java) =================================================================== --- trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/FieldSpecialisation.java (rev 0) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/FieldSpecialisation.java 2011-06-29 08:52:25 UTC (rev 992) @@ -0,0 +1,70 @@ +package org.nuiton.wikitty.struts; + +public class FieldSpecialisation { + + protected String name; + protected String type; + protected String criteria; + protected String subtype; + protected String label; + protected String descfields; + protected String fixvalues; + + + public String getDescfields() { + return descfields; + } + + public void setDescfields(String descfields) { + this.descfields = descfields; + } + + public String getFixvalues() { + return fixvalues; + } + + public void setFixvalues(String fixvalues) { + this.fixvalues = fixvalues; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getType() { + return type; + } + + public void setType(String type) { + this.type = type; + } + + public String getCriteria() { + return criteria; + } + + public void setCriteria(String criteria) { + this.criteria = criteria; + } + + public String getSubtype() { + return subtype; + } + + public void setSubtype(String subtype) { + this.subtype = subtype; + } + + public String getLabel() { + return label; + } + + public void setLabel(String label) { + this.label = label; + } + +} Property changes on: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/FieldSpecialisation.java ___________________________________________________________________ Added: svn:mime-type + text/plain Copied: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/Option.java (from rev 986, trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/Option.java) =================================================================== --- trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/Option.java (rev 0) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/Option.java 2011-06-29 08:52:25 UTC (rev 992) @@ -0,0 +1,30 @@ +package org.nuiton.wikitty.struts; + +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/Option.java ___________________________________________________________________ Added: svn:mime-type + text/plain Copied: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/WikittyFieldHandler.java (from rev 991, trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/WikittyFieldHandler.java) =================================================================== --- trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/WikittyFieldHandler.java (rev 0) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/WikittyFieldHandler.java 2011-06-29 08:52:25 UTC (rev 992) @@ -0,0 +1,342 @@ +package org.nuiton.wikitty.struts; + +import java.util.Collection; +import java.util.HashMap; +import java.util.HashSet; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.Set; + +import org.apache.commons.lang.StringEscapeUtils; +import org.nuiton.util.StringUtil; +import org.nuiton.wikitty.WikittyProxy; +import org.nuiton.wikitty.entities.FieldType; +import org.nuiton.wikitty.entities.Wikitty; +import org.nuiton.wikitty.entities.WikittyExtension; +import org.nuiton.wikitty.search.Criteria; +import org.nuiton.wikitty.search.PagedResult; +import org.nuiton.wikitty.search.Search; + + +public class WikittyFieldHandler { + + protected Wikitty wikitty; + protected WikittyProxy proxy; + protected String include = ""; + protected String exclude = ""; + protected String order = ""; + + protected Boolean orderBefore; + + + protected Map<String, FieldSpecialisation> field; + protected Set<String> fieldAdded; + + public Set<String> getFieldAdded() { + return fieldAdded; + } + + public void setFieldAdded(Set<String> fieldAdded) { + this.fieldAdded = fieldAdded; + } + + public WikittyFieldHandler() { + field = new HashMap<String, FieldSpecialisation>(); + fieldAdded = new HashSet<String>(); + } + + public Wikitty getWikitty() { + return wikitty; + } + + public void setWikitty(Wikitty wikitty) { + this.wikitty = wikitty; + } + + public Boolean getOrderBefore() { + return orderBefore; + } + + public void setOrderBefore(Boolean orderBefore) { + this.orderBefore = orderBefore; + } + + public WikittyProxy getProxy() { + return proxy; + } + + public void setProxy(WikittyProxy proxy) { + this.proxy = proxy; + } + + public String getInclude() { + return include; + } + + public void setInclude(String include) { + this.include = include; + } + + public String getExclude() { + return exclude; + } + + public void setExclude(String exclude) { + this.exclude = exclude; + } + + public String getOrder() { + return order; + } + + public void setOrder(String order) { + this.order = order; + } + + public Map<String, FieldSpecialisation> getField() { + return field; + } + + public void setField(Map<String, FieldSpecialisation> field) { + this.field = field; + } + + public void specialiseField(FieldSpecialisation fieldSpe) { + field.put(fieldSpe.getName(), fieldSpe); + } + + public Collection<ExtensionFieldStrutsBean> getWikittyField() { + + Map<String, ExtensionFieldStrutsBean> mapField = new HashMap<String, ExtensionFieldStrutsBean>(); + + /* + * if no include defined, by default will select all wikitty field + * except ones which are exclude + * + * excluded fields are more important than included, if a field is + * included and excluded, it will not appear in the result + */ + + // delegate construction of map + Map<String, List<String>> excludeMap = constructIncludeExcludeMap(exclude); + Map<String, List<String>> includeMap = constructIncludeExcludeMap(include); + // if include is enable it change how to construct result + boolean includeEnable = includeMap.size() != 0; + + for (WikittyExtension ext : wikitty.getExtensions()) { + String extName = ext.getName(); + + /* + * if extension excluded or not include while include is enable jump + * to the next extension + */ + if ((excludeMap.containsKey(extName) && excludeMap.get(extName) + .contains("*")) + || (includeEnable && !includeMap.containsKey(extName))) { + continue; + + } + + for (String fieldName : ext.getFieldNames()) { + FieldType fieldType = wikitty.getExtension(extName) + .getFieldType(fieldName); + /* + * if field is excluded or field not included while include mode + * jump to the next field or if field allready added to the page + */ + if ((excludeMap.containsKey(extName) && excludeMap.get(extName) + .contains(fieldName)) + || (includeEnable && !includeMap.get(extName).contains( + fieldName)) || fieldAdded.contains(extName+"."+fieldName)) { + continue; + + } + + ExtensionFieldStrutsBean temp = new ExtensionFieldStrutsBean(); + + temp.setName(extName + "." + fieldName); + temp.setLabel(temp.getName()); + temp.setValue(""); + + + // set the field type. + switch (fieldType.getType()) { + case BINARY: + temp.setType("file"); + + break; + case BOOLEAN: + boolean valueBool = wikitty.getFieldAsBoolean( + ext.getName(), fieldName); + temp.setType("boolean"); + temp.setValue(valueBool); + + break; + default: + Object valueObject = wikitty.getFieldAsObject( + ext.getName(), fieldName); + String valueString = ""; + + if (valueObject != null) { + valueString = String.valueOf(valueObject); + } + + temp.setValue(valueString); + + valueString = StringEscapeUtils.escapeHtml(valueString); + if (valueString.contains("\n") + || "true" + .equals(fieldType.getTagValue("multiline"))) { + temp.setType("textarea"); + + } else { + temp.setType("textfield"); + + } + + } + mapField.put(temp.getName(), temp); + } + } + + /* + * specialize field. With name, label, type etc. + */ + for (Map.Entry<String, FieldSpecialisation> speEntry : field.entrySet()) { + ExtensionFieldStrutsBean fieldExtension = mapField.get(speEntry.getKey()); + FieldSpecialisation spe = speEntry.getValue(); + if (fieldExtension != null) { + + if (!"".equals(spe.getLabel())) { + fieldExtension.setLabel(spe.getLabel()); + } + if (!"".equals(spe.getType())) { + fieldExtension.setType(spe.getType()); + } + + // if fixed list of item is passed via fixvalues attribut + if ("fixed".equals(spe.getSubtype())) { + String[] valu = StringUtil.split(spe.getFixvalues(), ","); + for (String va : valu) { + fieldExtension.addOption(va, va); + } + + // if wikitty load all the options values + } else if ("wikitty".equals(spe.getSubtype())) { + PagedResult<Wikitty> wikitties = null; + + // check the criteria and request wikitty + if (!"".equals(spe.getCriteria())) { + + Criteria criteria = Search.query() + .keyword(spe.getCriteria()).criteria(); + wikitties = proxy.findAllByCriteria(criteria); + } + + String[] descriptor = StringUtil.split(spe.getDescfields(), + ","); + + 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]); + + } + } + fieldExtension.addOption(val, desc); + } + + } + + } + + } + + } + + String[] fieldOrder = StringUtil.split(order, ","); + + /* + * if an order is define parse order and construct ordering result if + * all the field are not defined in the order juste add the rest at the + * end of the result list. + */ + if (fieldOrder.length != 0) { + + List<ExtensionFieldStrutsBean> orderedResult = new LinkedList<ExtensionFieldStrutsBean>(); + + for (String orderIt : fieldOrder) { + + if (mapField.containsKey(orderIt)) { + orderedResult.add(mapField.remove(orderIt)); + } + + } + orderedResult.addAll(mapField.values()); + return orderedResult; + } + + return mapField.values(); + } + + protected enum fieldTypeSpecialization { + wikitty, fixed; + } + + /** + * construct map for exclude or include template + * + * @param entry + * the attribut of the wikitty field tag exemple + * include="machin.*, truc.bob, truc.tt" + * @return a map with key the string before the dot and a list with the + * value after the dot example: [machin:[*], truc:[tt,bob]] + */ + protected Map<String, List<String>> constructIncludeExcludeMap(String entry) { + + String[] entryTab = StringUtil.split(entry, ","); + + Map<String, List<String>> result = new HashMap<String, List<String>>(); + + // prepare list of excluded field and extension + for (String excludeIt : entryTab) { + String[] extfield = StringUtil.split(excludeIt, "."); + if (extfield.length == 2) { + List<String> listFields = result.get(extfield[0]); + if (listFields == null) { + listFields = new LinkedList<String>(); + } + listFields.add(extfield[1]); + result.put(extfield[0], listFields); + + } else { + // TODO mfortun-2011-06-24 exception + } + + } + return result; + } + + public void addAddedField(String field) { + fieldAdded.add(field); + } + + public boolean isIncluded(String fieldname) { + return true; + } +} Property changes on: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/WikittyFieldHandler.java ___________________________________________________________________ Added: svn:mime-type + text/plain 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-29 08:50:09 UTC (rev 991) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/BooleanBean.java 2011-06-29 08:52:25 UTC (rev 992) @@ -6,6 +6,7 @@ import org.apache.struts2.components.ClosingUIBean; import org.apache.struts2.views.annotations.StrutsTag; import org.nuiton.util.StringUtil; +import org.nuiton.wikitty.struts.WikittyFieldHandler; import com.opensymphony.xwork2.util.ValueStack; Deleted: 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-29 08:50:09 UTC (rev 991) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/ExtensionFieldStrutsBean.java 2011-06-29 08:52:25 UTC (rev 992) @@ -1,61 +0,0 @@ -package org.nuiton.wikitty.struts.component; - -import java.util.Collection; -import java.util.LinkedList; - - -public class ExtensionFieldStrutsBean { - - - protected String name; - protected String type; - protected Object value =""; - protected String label; - protected Collection<Option> listOption; - - public ExtensionFieldStrutsBean() { - listOption = new LinkedList<Option>(); - } - public Collection<Option> getListOption() { - return listOption; - } - public void setListOption(Collection<Option> listOption) { - this.listOption = listOption; - } - public String getLabel() { - return label; - } - public void setLabel(String label) { - this.label = label; - } - public String getName() { - return name; - } - public void setName(String name) { - this.name = name; - } - public String getType() { - return type; - } - public void setType(String type) { - this.type = type; - } - public Object getValue() { - return value; - } - public void setValue(Object value) { - this.value = value; - } - - - public void addOption(String val, String desc){ - Option opt= new Option(); - opt.setDescription(desc); - opt.setValeur(val); - this.listOption.add(opt); - } - - - - -} Deleted: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/FieldSpecialisation.java =================================================================== --- trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/FieldSpecialisation.java 2011-06-29 08:50:09 UTC (rev 991) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/FieldSpecialisation.java 2011-06-29 08:52:25 UTC (rev 992) @@ -1,70 +0,0 @@ -package org.nuiton.wikitty.struts.component; - -public class FieldSpecialisation { - - protected String name; - protected String type; - protected String criteria; - protected String subtype; - protected String label; - protected String descfields; - protected String fixvalues; - - - public String getDescfields() { - return descfields; - } - - public void setDescfields(String descfields) { - this.descfields = descfields; - } - - public String getFixvalues() { - return fixvalues; - } - - public void setFixvalues(String fixvalues) { - this.fixvalues = fixvalues; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public String getType() { - return type; - } - - public void setType(String type) { - this.type = type; - } - - public String getCriteria() { - return criteria; - } - - public void setCriteria(String criteria) { - this.criteria = criteria; - } - - public String getSubtype() { - return subtype; - } - - public void setSubtype(String subtype) { - this.subtype = subtype; - } - - public String getLabel() { - return label; - } - - public void setLabel(String label) { - this.label = label; - } - -} 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-29 08:50:09 UTC (rev 991) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/FixedSelectBean.java 2011-06-29 08:52:25 UTC (rev 992) @@ -7,6 +7,8 @@ import org.apache.struts2.components.ClosingUIBean; import org.apache.struts2.views.annotations.StrutsTag; import org.nuiton.util.StringUtil; +import org.nuiton.wikitty.struts.Option; +import org.nuiton.wikitty.struts.WikittyFieldHandler; import com.opensymphony.xwork2.util.ValueStack; 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-29 08:50:09 UTC (rev 991) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/HiddenBean.java 2011-06-29 08:52:25 UTC (rev 992) @@ -6,6 +6,7 @@ import org.apache.struts2.components.ClosingUIBean; import org.apache.struts2.views.annotations.StrutsTag; import org.nuiton.util.StringUtil; +import org.nuiton.wikitty.struts.WikittyFieldHandler; import com.opensymphony.xwork2.util.ValueStack; Deleted: 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 2011-06-29 08:50:09 UTC (rev 991) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/Option.java 2011-06-29 08:52:25 UTC (rev 992) @@ -1,30 +0,0 @@ -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 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-29 08:50:09 UTC (rev 991) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/TextAreaBean.java 2011-06-29 08:52:25 UTC (rev 992) @@ -6,6 +6,7 @@ import org.apache.struts2.components.ClosingUIBean; import org.apache.struts2.views.annotations.StrutsTag; import org.nuiton.util.StringUtil; +import org.nuiton.wikitty.struts.WikittyFieldHandler; import com.opensymphony.xwork2.util.ValueStack; 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-29 08:50:09 UTC (rev 991) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/TextFieldBean.java 2011-06-29 08:52:25 UTC (rev 992) @@ -6,6 +6,7 @@ import org.apache.struts2.components.ClosingUIBean; import org.apache.struts2.views.annotations.StrutsTag; import org.nuiton.util.StringUtil; +import org.nuiton.wikitty.struts.WikittyFieldHandler; import com.opensymphony.xwork2.util.ValueStack; Deleted: 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-29 08:50:09 UTC (rev 991) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/WikittyFieldHandler.java 2011-06-29 08:52:25 UTC (rev 992) @@ -1,342 +0,0 @@ -package org.nuiton.wikitty.struts.component; - -import java.util.Collection; -import java.util.HashMap; -import java.util.HashSet; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; -import java.util.Set; - -import org.apache.commons.lang.StringEscapeUtils; -import org.nuiton.util.StringUtil; -import org.nuiton.wikitty.WikittyProxy; -import org.nuiton.wikitty.entities.FieldType; -import org.nuiton.wikitty.entities.Wikitty; -import org.nuiton.wikitty.entities.WikittyExtension; -import org.nuiton.wikitty.search.Criteria; -import org.nuiton.wikitty.search.PagedResult; -import org.nuiton.wikitty.search.Search; - - -public class WikittyFieldHandler { - - protected Wikitty wikitty; - protected WikittyProxy proxy; - protected String include = ""; - protected String exclude = ""; - protected String order = ""; - - protected Boolean orderBefore; - - - protected Map<String, FieldSpecialisation> field; - protected Set<String> fieldAdded; - - public Set<String> getFieldAdded() { - return fieldAdded; - } - - public void setFieldAdded(Set<String> fieldAdded) { - this.fieldAdded = fieldAdded; - } - - public WikittyFieldHandler() { - field = new HashMap<String, FieldSpecialisation>(); - fieldAdded = new HashSet<String>(); - } - - public Wikitty getWikitty() { - return wikitty; - } - - public void setWikitty(Wikitty wikitty) { - this.wikitty = wikitty; - } - - public Boolean getOrderBefore() { - return orderBefore; - } - - public void setOrderBefore(Boolean orderBefore) { - this.orderBefore = orderBefore; - } - - public WikittyProxy getProxy() { - return proxy; - } - - public void setProxy(WikittyProxy proxy) { - this.proxy = proxy; - } - - public String getInclude() { - return include; - } - - public void setInclude(String include) { - this.include = include; - } - - public String getExclude() { - return exclude; - } - - public void setExclude(String exclude) { - this.exclude = exclude; - } - - public String getOrder() { - return order; - } - - public void setOrder(String order) { - this.order = order; - } - - public Map<String, FieldSpecialisation> getField() { - return field; - } - - public void setField(Map<String, FieldSpecialisation> field) { - this.field = field; - } - - public void specialiseField(FieldSpecialisation fieldSpe) { - field.put(fieldSpe.getName(), fieldSpe); - } - - public Collection<ExtensionFieldStrutsBean> getWikittyField() { - - Map<String, ExtensionFieldStrutsBean> mapField = new HashMap<String, ExtensionFieldStrutsBean>(); - - /* - * if no include defined, by default will select all wikitty field - * except ones which are exclude - * - * excluded fields are more important than included, if a field is - * included and excluded, it will not appear in the result - */ - - // delegate construction of map - Map<String, List<String>> excludeMap = constructIncludeExcludeMap(exclude); - Map<String, List<String>> includeMap = constructIncludeExcludeMap(include); - // if include is enable it change how to construct result - boolean includeEnable = includeMap.size() != 0; - - for (WikittyExtension ext : wikitty.getExtensions()) { - String extName = ext.getName(); - - /* - * if extension excluded or not include while include is enable jump - * to the next extension - */ - if ((excludeMap.containsKey(extName) && excludeMap.get(extName) - .contains("*")) - || (includeEnable && !includeMap.containsKey(extName))) { - continue; - - } - - for (String fieldName : ext.getFieldNames()) { - FieldType fieldType = wikitty.getExtension(extName) - .getFieldType(fieldName); - /* - * if field is excluded or field not included while include mode - * jump to the next field or if field allready added to the page - */ - if ((excludeMap.containsKey(extName) && excludeMap.get(extName) - .contains(fieldName)) - || (includeEnable && !includeMap.get(extName).contains( - fieldName)) || fieldAdded.contains(extName+"."+fieldName)) { - continue; - - } - - ExtensionFieldStrutsBean temp = new ExtensionFieldStrutsBean(); - - temp.setName(extName + "." + fieldName); - temp.setLabel(temp.getName()); - temp.setValue(""); - - - // set the field type. - switch (fieldType.getType()) { - case BINARY: - temp.setType("file"); - - break; - case BOOLEAN: - boolean valueBool = wikitty.getFieldAsBoolean( - ext.getName(), fieldName); - temp.setType("boolean"); - temp.setValue(valueBool); - - break; - default: - Object valueObject = wikitty.getFieldAsObject( - ext.getName(), fieldName); - String valueString = ""; - - if (valueObject != null) { - valueString = String.valueOf(valueObject); - } - - temp.setValue(valueString); - - valueString = StringEscapeUtils.escapeHtml(valueString); - if (valueString.contains("\n") - || "true" - .equals(fieldType.getTagValue("multiline"))) { - temp.setType("textarea"); - - } else { - temp.setType("textfield"); - - } - - } - mapField.put(temp.getName(), temp); - } - } - - /* - * specialize field. With name, label, type etc. - */ - for (Map.Entry<String, FieldSpecialisation> speEntry : field.entrySet()) { - ExtensionFieldStrutsBean fieldExtension = mapField.get(speEntry.getKey()); - FieldSpecialisation spe = speEntry.getValue(); - if (fieldExtension != null) { - - if (!"".equals(spe.getLabel())) { - fieldExtension.setLabel(spe.getLabel()); - } - if (!"".equals(spe.getType())) { - fieldExtension.setType(spe.getType()); - } - - // if fixed list of item is passed via fixvalues attribut - if ("fixed".equals(spe.getSubtype())) { - String[] valu = StringUtil.split(spe.getFixvalues(), ","); - for (String va : valu) { - fieldExtension.addOption(va, va); - } - - // if wikitty load all the options values - } else if ("wikitty".equals(spe.getSubtype())) { - PagedResult<Wikitty> wikitties = null; - - // check the criteria and request wikitty - if (!"".equals(spe.getCriteria())) { - - Criteria criteria = Search.query() - .keyword(spe.getCriteria()).criteria(); - wikitties = proxy.findAllByCriteria(criteria); - } - - String[] descriptor = StringUtil.split(spe.getDescfields(), - ","); - - 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]); - - } - } - fieldExtension.addOption(val, desc); - } - - } - - } - - } - - } - - String[] fieldOrder = StringUtil.split(order, ","); - - /* - * if an order is define parse order and construct ordering result if - * all the field are not defined in the order juste add the rest at the - * end of the result list. - */ - if (fieldOrder.length != 0) { - - List<ExtensionFieldStrutsBean> orderedResult = new LinkedList<ExtensionFieldStrutsBean>(); - - for (String orderIt : fieldOrder) { - - if (mapField.containsKey(orderIt)) { - orderedResult.add(mapField.remove(orderIt)); - } - - } - orderedResult.addAll(mapField.values()); - return orderedResult; - } - - return mapField.values(); - } - - protected enum fieldTypeSpecialization { - wikitty, fixed; - } - - /** - * construct map for exclude or include template - * - * @param entry - * the attribut of the wikitty field tag exemple - * include="machin.*, truc.bob, truc.tt" - * @return a map with key the string before the dot and a list with the - * value after the dot example: [machin:[*], truc:[tt,bob]] - */ - protected Map<String, List<String>> constructIncludeExcludeMap(String entry) { - - String[] entryTab = StringUtil.split(entry, ","); - - Map<String, List<String>> result = new HashMap<String, List<String>>(); - - // prepare list of excluded field and extension - for (String excludeIt : entryTab) { - String[] extfield = StringUtil.split(excludeIt, "."); - if (extfield.length == 2) { - List<String> listFields = result.get(extfield[0]); - if (listFields == null) { - listFields = new LinkedList<String>(); - } - listFields.add(extfield[1]); - result.put(extfield[0], listFields); - - } else { - // TODO mfortun-2011-06-24 exception - } - - } - return result; - } - - public void addAddedField(String field) { - fieldAdded.add(field); - } - - 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-29 08:50:09 UTC (rev 991) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/WikittyFieldTagBean.java 2011-06-29 08:52:25 UTC (rev 992) @@ -4,6 +4,8 @@ import javax.servlet.http.HttpServletResponse; import org.apache.struts2.components.ClosingUIBean; import org.apache.struts2.views.annotations.StrutsTag; +import org.nuiton.wikitty.struts.FieldSpecialisation; +import org.nuiton.wikitty.struts.WikittyFieldHandler; import com.opensymphony.xwork2.util.ValueStack; 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-29 08:50:09 UTC (rev 991) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/WikittySelectBean.java 2011-06-29 08:52:25 UTC (rev 992) @@ -13,6 +13,8 @@ import org.nuiton.wikitty.search.Criteria; import org.nuiton.wikitty.search.PagedResult; import org.nuiton.wikitty.search.Search; +import org.nuiton.wikitty.struts.Option; +import org.nuiton.wikitty.struts.WikittyFieldHandler; import com.opensymphony.xwork2.util.ValueStack; 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-29 08:50:09 UTC (rev 991) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/WikittyTagBean.java 2011-06-29 08:52:25 UTC (rev 992) @@ -6,6 +6,7 @@ import org.apache.struts2.views.annotations.StrutsTag; import org.nuiton.wikitty.WikittyProxy; import org.nuiton.wikitty.entities.Wikitty; +import org.nuiton.wikitty.struts.WikittyFieldHandler; import com.opensymphony.xwork2.util.ValueStack; Modified: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/WikittyFieldTag.java =================================================================== --- trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/WikittyFieldTag.java 2011-06-29 08:50:09 UTC (rev 991) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/WikittyFieldTag.java 2011-06-29 08:52:25 UTC (rev 992) @@ -5,7 +5,7 @@ import org.apache.struts2.components.Component; import org.apache.struts2.views.jsp.ui.AbstractClosingTag; -import org.nuiton.wikitty.struts.component.FieldSpecialisation; +import org.nuiton.wikitty.struts.FieldSpecialisation; import org.nuiton.wikitty.struts.component.WikittyFieldTagBean; import com.opensymphony.xwork2.util.ValueStack; Modified: trunk/wikitty-struts/src/main/tld/wikitty-struts.tld =================================================================== --- trunk/wikitty-struts/src/main/tld/wikitty-struts.tld 2011-06-29 08:50:09 UTC (rev 991) +++ trunk/wikitty-struts/src/main/tld/wikitty-struts.tld 2011-06-29 08:52:25 UTC (rev 992) @@ -58,6 +58,13 @@ <rtexprvalue>true</rtexprvalue> </attribute> <attribute> + <description><![CDATA[Used to know if the ordered fields has to be write before or after the custom field]]></description> + <name>orderBefore</name> + <rtexprvalue>true</rtexprvalue> + </attribute> + + + <attribute> <description><![CDATA[If a delele button must be in the form]]></description> <name>allowDelete</name> <rtexprvalue>true</rtexprvalue>

1 0

r991 - in trunk/wikitty-struts/src/main/java: org/nuiton/wikitty/struts/component org/nuiton/wikitty/struts/tag template/xhtml
by mfortun＠users.nuiton.org June 29, 2011

June 29, 2011

Author: mfortun Date: 2011-06-29 10:50:09 +0200 (Wed, 29 Jun 2011) New Revision: 991 Url: http://nuiton.org/repositories/revision/wikitty/991 Log: * work on ordering before or after specific field Added: trunk/wikitty-struts/src/main/java/template/xhtml/wikitty-commons.ftl 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/FixedSelectBean.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/WikittyTagBean.java trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/WikittyTag.java trunk/wikitty-struts/src/main/java/template/xhtml/wikitty-close.ftl trunk/wikitty-struts/src/main/java/template/xhtml/wikitty.ftl trunk/wikitty-struts/src/main/java/template/xhtml/ws-fixedselect.ftl trunk/wikitty-struts/src/main/java/template/xhtml/ws-textfield.ftl 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 16:20:28 UTC (rev 990) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/ExtensionFieldStrutsBean.java 2011-06-29 08:50:09 UTC (rev 991) @@ -3,6 +3,7 @@ import java.util.Collection; import java.util.LinkedList; + public class ExtensionFieldStrutsBean { 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 16:20:28 UTC (rev 990) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/FixedSelectBean.java 2011-06-29 08:50:09 UTC (rev 991) @@ -7,6 +7,7 @@ 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 = "fixedSelect", tldTagClass = "org.nuiton.wikitty.struts.tag.FixedSelectTag", description = "", allowDynamicAttributes = false) 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 16:20:28 UTC (rev 990) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/WikittyFieldHandler.java 2011-06-29 08:50:09 UTC (rev 991) @@ -2,6 +2,7 @@ import java.util.Collection; import java.util.HashMap; +import java.util.HashSet; import java.util.LinkedList; import java.util.List; import java.util.Map; @@ -25,6 +26,10 @@ protected String include = ""; protected String exclude = ""; protected String order = ""; + + protected Boolean orderBefore; + + protected Map<String, FieldSpecialisation> field; protected Set<String> fieldAdded; @@ -38,6 +43,7 @@ public WikittyFieldHandler() { field = new HashMap<String, FieldSpecialisation>(); + fieldAdded = new HashSet<String>(); } public Wikitty getWikitty() { @@ -48,6 +54,14 @@ this.wikitty = wikitty; } + public Boolean getOrderBefore() { + return orderBefore; + } + + public void setOrderBefore(Boolean orderBefore) { + this.orderBefore = orderBefore; + } + public WikittyProxy getProxy() { return proxy; } @@ -134,7 +148,7 @@ if ((excludeMap.containsKey(extName) && excludeMap.get(extName) .contains(fieldName)) || (includeEnable && !includeMap.get(extName).contains( - fieldName)) || fieldAdded.contains(fieldName)) { + fieldName)) || fieldAdded.contains(extName+"."+fieldName)) { continue; } 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 16:20:28 UTC (rev 990) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/WikittyTagBean.java 2011-06-29 08:50:09 UTC (rev 991) @@ -6,6 +6,7 @@ import org.apache.struts2.views.annotations.StrutsTag; import org.nuiton.wikitty.WikittyProxy; import org.nuiton.wikitty.entities.Wikitty; + import com.opensymphony.xwork2.util.ValueStack; @StrutsTag(name = "Wikitty", tldTagClass = "org.nuiton.wikitty.struts.tag.WikittyTag", @@ -24,9 +25,29 @@ protected String include; protected String exclude; + protected String order; + protected Boolean orderBefore; + protected Boolean allowDelete; + + public Boolean getOrderBefore() { + return orderBefore; + } + + public void setOrderBefore(Boolean orderBefore) { + this.orderBefore = orderBefore; + } + + public Boolean getAllowDelete() { + return allowDelete; + } + + public void setAllowDelete(Boolean allowDelete) { + this.allowDelete = allowDelete; + } + public WikittyTagBean(ValueStack stack, HttpServletRequest request, HttpServletResponse response) { super(stack, request, response); @@ -48,6 +69,10 @@ if (allowDelete != null) { addParameter("allowDelete", allowDelete); } + + if (orderBefore!=null) { + addParameter("orderBefore", orderBefore); + } if (wikitty != null) { addParameter("wikittyid", findString(wikitty.getId())); @@ -67,12 +92,12 @@ handler.setOrder(order); handler.setWikitty(wikitty); handler.setProxy(proxy); + handler.setOrderBefore(orderBefore); } else { - handler = (WikittyFieldHandler) temp; - addParameter("wikittyfields", handler.getWikittyField()); + handler = (WikittyFieldHandler) temp; } - + addParameter("wikittyfields", handler.getWikittyField()); /* * * si l'élément key est null on l'initialise en y mettant tout les 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 16:20:28 UTC (rev 990) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/WikittyTag.java 2011-06-29 08:50:09 UTC (rev 991) @@ -20,12 +20,20 @@ protected WikittyProxy proxy; protected String action; protected String redirect; - protected String include; protected String exclude; protected String order; protected boolean allowDelete; + protected boolean orderBefore; + public boolean isOrderBefore() { + return orderBefore; + } + + public void setOrderBefore(boolean orderBefore) { + this.orderBefore = orderBefore; + } + public String getInclude() { return include; } @@ -74,6 +82,7 @@ wikittyTag.setWikitty(wikitty); wikittyTag.setProxy(proxy); wikittyTag.setOrder(order); + wikittyTag.setOrderBefore(orderBefore); wikittyTag.setAllowDelete(allowDelete); wikittyTag.setInclude(include); wikittyTag.setExclude(exclude); Modified: trunk/wikitty-struts/src/main/java/template/xhtml/wikitty-close.ftl =================================================================== --- trunk/wikitty-struts/src/main/java/template/xhtml/wikitty-close.ftl 2011-06-28 16:20:28 UTC (rev 990) +++ trunk/wikitty-struts/src/main/java/template/xhtml/wikitty-close.ftl 2011-06-29 08:50:09 UTC (rev 991) @@ -1,58 +1,4 @@ - -<#assign aKeys = parameters.wikittyfields><#t/> - <#list aKeys as aKey><#t/> - -<#if aKey.type=="file"> -<input type="hidden" name="${aKey.name}" value="BINARY" /> -${aKey.label} : <input type="file" name="File" label ="File"/> -</#if> - -<#if aKey.type=="hidden"> -<input type="hidden" name="${aKey.name}" value="${aKey.value}" /> -</#if> - - -<#if aKey.type=="textarea" > -${aKey.label} : <textarea id="${aKey.name}" cols="80" rows="20" name="${aKey.name}">${aKey.value}</textarea> -</#if> -<#if aKey.type=="textfield" > -${aKey.label} : <input type="text" name="${aKey.name}" value="${aKey.value}" > -</#if> - -<#if aKey.type=="boolean" > -${aKey.label} : <input type="checkbox" name="${aKey.name}" value="true" - <#if aKey.value=="true" > - checked='true' - </#if> - /> -</#if> -<#-- - ---> -<#if aKey.type=="select" > -${aKey.label} : -<select name="${aKey.name}" size="1"> -<#assign optionKeys = aKey.listOption><#t/> - <#list optionKeys as optionKey><#t/> - <option value="${optionKey.valeur}" - <#if optionKey.valeur==aKey.value > - selected - </#if> - > ${optionKey.description} </option> - </#list><#t/> - -</select> -</#if> - - - - - - -</br> -</#list><#t/> - - +<#include "/${parameters.templateDir}/xhtml/wikitty-commons.ftl" /> <input type="submit" name="store" value="Store" /> <#if parameters.allowDelete?? && parameters.allowDelete==true > <input type="submit" name="delete" value="Delete" /> Added: trunk/wikitty-struts/src/main/java/template/xhtml/wikitty-commons.ftl =================================================================== --- trunk/wikitty-struts/src/main/java/template/xhtml/wikitty-commons.ftl (rev 0) +++ trunk/wikitty-struts/src/main/java/template/xhtml/wikitty-commons.ftl 2011-06-29 08:50:09 UTC (rev 991) @@ -0,0 +1,47 @@ + +<#assign aKeys = parameters.wikittyfields><#t/> + <#list aKeys as aKey><#t/> + +<#if aKey.type=="file"> +<input type="hidden" name="${aKey.name}" value="BINARY" /> +${aKey.label} : <input type="file" name="File" label ="File"/> +</#if> + +<#if aKey.type=="hidden"> +<input type="hidden" name="${aKey.name}" value="${aKey.value}" /> +</#if> + + +<#if aKey.type=="textarea" > +${aKey.label} : <textarea id="${aKey.name}" cols="80" rows="20" name="${aKey.name}">${aKey.value}</textarea> +</#if> +<#if aKey.type=="textfield" > +${aKey.label} : <input type="text" name="${aKey.name}" value="${aKey.value}" > +</#if> + +<#if aKey.type=="boolean" > +${aKey.label} : <input type="checkbox" name="${aKey.name}" value="true" + <#if aKey.value=="true" > + checked='true' + </#if> + /> +</#if> +<#-- + +--> +<#if aKey.type=="select" > +${aKey.label} : +<select name="${aKey.name}" size="1"> +<#assign optionKeys = aKey.listOption><#t/> + <#list optionKeys as optionKey><#t/> + <option value="${optionKey.valeur}" + <#if optionKey.valeur==aKey.value > + selected + </#if> + > ${optionKey.description} </option> + </#list><#t/> + +</select> +</#if> +</br> +</#list><#t/> Modified: trunk/wikitty-struts/src/main/java/template/xhtml/wikitty.ftl =================================================================== --- trunk/wikitty-struts/src/main/java/template/xhtml/wikitty.ftl 2011-06-28 16:20:28 UTC (rev 990) +++ trunk/wikitty-struts/src/main/java/template/xhtml/wikitty.ftl 2011-06-29 08:50:09 UTC (rev 991) @@ -4,4 +4,9 @@ <input type="hidden" name="extensions" value="${parameters.wikittyextensions}"/> <#if parameters.redirect??> <input type="hidden" name="redirect" value="${parameters.redirect}" /> -</#if> \ No newline at end of file +</#if> +<#if parameters.orderBefore?? && parameters.orderBefore==true > +<#include "/${parameters.templateDir}/xhtml/wikitty-commons.ftl" /> +</#if> + + 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 16:20:28 UTC (rev 990) +++ trunk/wikitty-struts/src/main/java/template/xhtml/ws-fixedselect.ftl 2011-06-29 08:50:09 UTC (rev 991) @@ -2,11 +2,11 @@ ${parameters.label} :<select name="${parameters.name}" size="1"> <#assign optionKeys = parameters.fixvalues><#t/> <#list optionKeys as optionKey><#t/> - <option value="${optionKey.valeur}" + <option value="${optionKey.valeur}" <#t/> <#if optionKey.valeur==parameters.value > - selected - </#if> + selected <#t/> + </#if> <#t/> > ${optionKey.description} </option> - </#list><#t/> -</select> + </#list> +</select><#t/> </#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 16:20:28 UTC (rev 990) +++ trunk/wikitty-struts/src/main/java/template/xhtml/ws-textfield.ftl 2011-06-29 08:50:09 UTC (rev 991) @@ -1,3 +1,3 @@ -<#if parameters.included?? && parameters.included==true > -${parameters.label} : <input type="text" name="${parameters.name}" value="${parameters.value}" > -</#if> \ No newline at end of file +<#if parameters.included?? && parameters.included==true ><#t/> +${parameters.label} : <input type="text" name="${parameters.name}" value="${parameters.value}" ><#t/> +</#if><#t/> \ No newline at end of file

1 0

r990 - trunk/wikitty-lucene/src/test/resources
by echatellier＠users.nuiton.org June 28, 2011

June 28, 2011

Author: echatellier Date: 2011-06-28 18:20:28 +0200 (Tue, 28 Jun 2011) New Revision: 990 Url: http://nuiton.org/repositories/revision/wikitty/990 Log: jbossts file is mandatory Added: trunk/wikitty-lucene/src/test/resources/jbossts-properties.xml Added: trunk/wikitty-lucene/src/test/resources/jbossts-properties.xml =================================================================== --- trunk/wikitty-lucene/src/test/resources/jbossts-properties.xml (rev 0) +++ trunk/wikitty-lucene/src/test/resources/jbossts-properties.xml 2011-06-28 16:20:28 UTC (rev 990) @@ -0,0 +1,138 @@ +<?xml version="1.0" encoding="UTF-8"?> + + +<!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd"> +<properties> +  + +  + <entry key="LoggingEnvironmentBean.debugLevel">0x00000000</entry> + +  + <entry key="CoordinatorEnvironmentBean.commitOnePhase">YES</entry> + +  + <entry key="ObjectStoreEnvironmentBean.objectStoreDir">target${/}jbosstm</entry> + +  + <entry key="ObjectStoreEnvironmentBean.transactionSync">ON</entry> + +  + <entry key="CoreEnvironmentBean.nodeIdentifier">1</entry> + +  + <entry key="JTAEnvironmentBean.xaRecoveryNodes">1</entry> + +  + <entry key="CoreEnvironmentBean.socketProcessIdPort">0</entry> + + + +  + <entry key="RecoveryEnvironmentBean.recoveryExtensions"> + com.arjuna.ats.internal.arjuna.recovery.AtomicActionRecoveryModule + com.arjuna.ats.internal.txoj.recovery.TORecoveryModule + com.arjuna.ats.internal.jta.recovery.arjunacore.XARecoveryModule + </entry> + +  + <entry key="RecoveryEnvironmentBean.expiryScanners"> + com.arjuna.ats.internal.arjuna.recovery.ExpiredTransactionStatusManagerScanner + </entry> + +  + +  + <entry key="RecoveryEnvironmentBean.recoveryPort">4712</entry> + + <entry key="RecoveryEnvironmentBean.recoveryAddress"></entry> + +  + <entry key="RecoveryEnvironmentBean.transactionStatusManagerPort">0</entry> + +  + <entry key="RecoveryEnvironmentBean.transactionStatusManagerAddress"></entry> + +  + <entry key="RecoveryEnvironmentBean.recoveryListener">YES</entry> + +</properties>

1 0

r989 - trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component
by mfortun＠users.nuiton.org June 28, 2011

June 28, 2011

Author: mfortun Date: 2011-06-28 18:17:16 +0200 (Tue, 28 Jun 2011) New Revision: 989 Url: http://nuiton.org/repositories/revision/wikitty/989 Log: * save the fields that have been write to the page to ignore them when wikitty closing tag is match 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/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/WikittySelectBean.java 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:56:42 UTC (rev 988) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/BooleanBean.java 2011-06-28 16:17:16 UTC (rev 989) @@ -30,6 +30,7 @@ .get(WikittyTagBean.WIKITTY_STACK_KEY); if (handler != null) { + handler.addAddedField(name); // if field defined as inclued if (handler.isIncluded(name)) { // parse extname and field name 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:56:42 UTC (rev 988) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/FixedSelectBean.java 2011-06-28 16:17:16 UTC (rev 989) @@ -32,6 +32,7 @@ if (handler != null) { // if field defined as inclued if (handler.isIncluded(name)) { + handler.addAddedField(name); // parse extname and field name String[] fieldsAccess = StringUtil.split(name, "."); // add parametters to be use by the 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-06-28 15:56:42 UTC (rev 988) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/HiddenBean.java 2011-06-28 16:17:16 UTC (rev 989) @@ -31,6 +31,7 @@ if (handler != null) { // if field defined as inclued if (handler.isIncluded(name)) { + handler.addAddedField(name); // parse extname and field name String[] fieldsAccess = StringUtil.split(name, "."); // add parametters to be use by the template 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:56:42 UTC (rev 988) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/TextAreaBean.java 2011-06-28 16:17:16 UTC (rev 989) @@ -32,6 +32,7 @@ if (handler != null) { // if field defined as inclued if (handler.isIncluded(name)) { + handler.addAddedField(name); // parse extname and field name String[] fieldsAccess = StringUtil.split(name, "."); // add parametters to be use by the 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:56:42 UTC (rev 988) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/TextFieldBean.java 2011-06-28 16:17:16 UTC (rev 989) @@ -28,6 +28,7 @@ .get(WikittyTagBean.WIKITTY_STACK_KEY); if (handler != null) { + handler.addAddedField(name); // if field defined as inclued if (handler.isIncluded(name)) { // parse extname and field name 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:56:42 UTC (rev 988) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/WikittyFieldHandler.java 2011-06-28 16:17:16 UTC (rev 989) @@ -5,6 +5,8 @@ import java.util.LinkedList; import java.util.List; import java.util.Map; +import java.util.Set; + import org.apache.commons.lang.StringEscapeUtils; import org.nuiton.util.StringUtil; import org.nuiton.wikitty.WikittyProxy; @@ -24,7 +26,16 @@ protected String exclude = ""; protected String order = ""; protected Map<String, FieldSpecialisation> field; + protected Set<String> fieldAdded; + + public Set<String> getFieldAdded() { + return fieldAdded; + } + public void setFieldAdded(Set<String> fieldAdded) { + this.fieldAdded = fieldAdded; + } + public WikittyFieldHandler() { field = new HashMap<String, FieldSpecialisation>(); } @@ -118,12 +129,12 @@ .getFieldType(fieldName); /* * if field is excluded or field not included while include mode - * jump to the next field + * jump to the next field or if field allready added to the page */ if ((excludeMap.containsKey(extName) && excludeMap.get(extName) .contains(fieldName)) || (includeEnable && !includeMap.get(extName).contains( - fieldName))) { + fieldName)) || fieldAdded.contains(fieldName)) { continue; } @@ -306,6 +317,10 @@ } return result; } + + public void addAddedField(String field) { + fieldAdded.add(field); + } public boolean isIncluded(String fieldname) { return true; 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:56:42 UTC (rev 988) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/WikittySelectBean.java 2011-06-28 16:17:16 UTC (rev 989) @@ -48,6 +48,9 @@ if (handler != null) { // if field defined as inclued if (handler.isIncluded(name)) { + + handler.addAddedField(name); + // parse extname and field name String[] fieldsAccess = StringUtil.split(name, "."); // add parametters to be use by the template

1 0

r988 - trunk/wikitty-api/src/main/java/org/nuiton/wikitty
by echatellier＠users.nuiton.org June 28, 2011

June 28, 2011

Author: echatellier Date: 2011-06-28 17:56:42 +0200 (Tue, 28 Jun 2011) New Revision: 988 Url: http://nuiton.org/repositories/revision/wikitty/988 Log: Add lucene module configuration Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyConfigOption.java Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyConfigOption.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyConfigOption.java 2011-06-28 15:55:23 UTC (rev 987) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyConfigOption.java 2011-06-28 15:56:42 UTC (rev 988) @@ -133,6 +133,15 @@ + " (or when solr 4.0 will be used org.apache.solr.core.RAMDirectoryFactory)"), "solr.StandardDirectoryFactory", String.class, false, false), + WIKITTY_SEARCHENGINE_LUCENE_INDEX_DIRECTORY( + "wikitty.searchengine.lucene.index.directory", + n_("Lucene index directory"), + "${" + WIKITTY_DATA_DIR.getKey() + "}/lucene", + String.class, false, false), + WIKITTY_SEARCHENGINE_LUCENE_INDEX_ANALYZER( + "wikitty.searchengine.lucene.index.analyzer", + n_("Lucene index analyzer (default to lucene's standard analyzer)"), + null, String.class, false, false), WIKITTY_WIKITTYSERVICE_COMPONENTS( "wikitty.WikittyService.components", n_("WikittyService to use (list must be in right order. "

1 0

r987 - trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search
by echatellier＠users.nuiton.org June 28, 2011

June 28, 2011

Author: echatellier Date: 2011-06-28 17:55:23 +0200 (Tue, 28 Jun 2011) New Revision: 987 Url: http://nuiton.org/repositories/revision/wikitty/987 Log: Add doc Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/PagedResult.java Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/PagedResult.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/PagedResult.java 2011-06-28 15:38:39 UTC (rev 986) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/PagedResult.java 2011-06-28 15:55:23 UTC (rev 987) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2010 CodeLutin, Benjamin Poussin + * Copyright (C) 2009 - 2011 CodeLutin, Benjamin Poussin, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as @@ -82,13 +82,15 @@ /** + * Init paged result. + * * we don't initialize securityToken * - * @param firstIndice - * @param numFound - * @param queryString - * @param facets - * @param results + * @param firstIndice indice element in global search result + * @param numFound total number of result if we call the query for all possible result + * @param queryString query really executed + * @param facets facet asked or null if no facet + * @param results list of result in the wanted interval */ public PagedResult(int firstIndice, int numFound, String queryString, Map<String, List<FacetTopic>> facets, List<T> results) {

1 0

r986 - in trunk/wikitty-struts/src/main: java/org/nuiton/wikitty/struts/component java/org/nuiton/wikitty/struts/tag java/template/xhtml tld
by mfortun＠users.nuiton.org June 28, 2011

June 28, 2011

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>

1 0