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>