Author: mfortun Date: 2011-06-30 16:02:02 +0200 (Thu, 30 Jun 2011) New Revision: 1011 Url: http://nuiton.org/repositories/revision/wikitty/1011 Log: * change name attribut to fqFieldName * change criteria string nature to object criteria Added: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/AbstractWikittyTag.java Modified: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/WikittyFieldHandler.java trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/AbstractWikittyComponent.java trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/BooleanBean.java trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/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 trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/BooleanTag.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/HiddenTag.java trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/TextAreaTag.java trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/TextFieldTag.java trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/WikittySelectTag.java trunk/wikitty-struts/src/main/tld/wikitty-struts.tld Modified: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/WikittyFieldHandler.java =================================================================== --- trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/WikittyFieldHandler.java 2011-06-30 13:34:18 UTC (rev 1010) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/WikittyFieldHandler.java 2011-06-30 14:02:02 UTC (rev 1011) @@ -191,6 +191,8 @@ List<ExtensionFieldStrutsBean> result = new LinkedList<ExtensionFieldStrutsBean>(); + log.debug("orderBefore enable with" + order); + String[] fieldOrder = StringUtil.split(order, ","); /* Modified: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/AbstractWikittyComponent.java =================================================================== --- trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/AbstractWikittyComponent.java 2011-06-30 13:34:18 UTC (rev 1010) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/AbstractWikittyComponent.java 2011-06-30 14:02:02 UTC (rev 1011) @@ -2,40 +2,59 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; - import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.struts2.components.ClosingUIBean; - import org.nuiton.wikitty.struts.WikittyFieldHandler; import com.opensymphony.xwork2.util.ValueStack; public abstract class AbstractWikittyComponent extends ClosingUIBean { - + /** to use log facility, just put in your code: log.info(\"...\"); */ - final static private Log log = LogFactory.getLog(AbstractWikittyComponent.class); - + final static private Log log = LogFactory + .getLog(AbstractWikittyComponent.class); + protected WikittyFieldHandler handler; + protected String fqFieldName; protected AbstractWikittyComponent(ValueStack stack, HttpServletRequest request, HttpServletResponse response) { super(stack, request, response); - handler = (WikittyFieldHandler) stack.getContext() - .get(WikittyTagBean.WIKITTY_STACK_KEY); + handler = (WikittyFieldHandler) stack.getContext().get( + WikittyTagBean.WIKITTY_STACK_KEY); if (handler == null) { - log.info("Handler not found in the stack"); - // TODO mfortun-2011-06-29 throw exception if handler not in the stack + log.info("Handler not found in the stack"); + // TODO mfortun-2011-06-29 throw exception if handler not in the + // stack } - - + } - - - + public WikittyFieldHandler getHandler() { + return handler; + } + public void setHandler(WikittyFieldHandler handler) { + this.handler = handler; + } + public String getFqFieldName() { + return fqFieldName; + } + + public void setFqFieldName(String fqFieldName) { + this.fqFieldName = fqFieldName; + } + + @Override + protected void evaluateExtraParams() { + super.evaluateExtraParams(); + if ( fqFieldName !=null) { + addParameter("fqFieldName", findValue(fqFieldName)); + } + } + } Modified: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/BooleanBean.java =================================================================== --- trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/BooleanBean.java 2011-06-30 13:34:18 UTC (rev 1010) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/BooleanBean.java 2011-06-30 14:02:02 UTC (rev 1011) @@ -28,11 +28,11 @@ protected void evaluateExtraParams() { super.evaluateExtraParams(); - handler.addAddedField(name); + handler.addAddedField(fqFieldName); // if field defined as inclued - if (handler.isIncluded(name)) { + if (handler.isIncluded(fqFieldName)) { // parse extname and field name - String[] fieldsAccess = StringUtil.split(name, "."); + String[] fieldsAccess = StringUtil.split(fqFieldName, "."); // add parametters to be use by the template addParameter( "included",true); 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-30 13:34:18 UTC (rev 1010) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/FixedSelectBean.java 2011-06-30 14:02:02 UTC (rev 1011) @@ -32,10 +32,10 @@ super.evaluateExtraParams(); // if field defined as inclued - if (handler.isIncluded(name)) { - handler.addAddedField(name); + if (handler.isIncluded(fqFieldName)) { + handler.addAddedField(fqFieldName); // parse extname and field name - String[] fieldsAccess = StringUtil.split(name, "."); + String[] fieldsAccess = StringUtil.split(fqFieldName, "."); // add parametters to be use by the template addParameter("included", true); addParameter( 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-30 13:34:18 UTC (rev 1010) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/HiddenBean.java 2011-06-30 14:02:02 UTC (rev 1011) @@ -28,10 +28,10 @@ super.evaluateExtraParams(); // if field defined as inclued - if (handler.isIncluded(name)) { - handler.addAddedField(name); + if (handler.isIncluded(fqFieldName)) { + handler.addAddedField(fqFieldName); // parse extname and field name - String[] fieldsAccess = StringUtil.split(name, "."); + String[] fieldsAccess = StringUtil.split(fqFieldName, "."); // add parametters to be use by the template addParameter("included", true); addParameter( 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-30 13:34:18 UTC (rev 1010) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/TextAreaBean.java 2011-06-30 14:02:02 UTC (rev 1011) @@ -27,10 +27,10 @@ super.evaluateExtraParams(); // if field defined as inclued - if (handler.isIncluded(name)) { - handler.addAddedField(name); + if (handler.isIncluded(fqFieldName)) { + handler.addAddedField(fqFieldName); // parse extname and field name - String[] fieldsAccess = StringUtil.split(name, "."); + String[] fieldsAccess = StringUtil.split(fqFieldName, "."); // add parametters to be use by the template addParameter("included", true); addParameter( 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-30 13:34:18 UTC (rev 1010) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/TextFieldBean.java 2011-06-30 14:02:02 UTC (rev 1011) @@ -26,11 +26,11 @@ protected void evaluateExtraParams() { super.evaluateExtraParams(); - handler.addAddedField(name); + handler.addAddedField(fqFieldName); // if field defined as inclued - if (handler.isIncluded(name)) { + if (handler.isIncluded(fqFieldName)) { // parse extname and field name - String[] fieldsAccess = StringUtil.split(name, "."); + String[] fieldsAccess = StringUtil.split(fqFieldName, "."); // add parametters to be use by the template addParameter("included", true); addParameter( 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-30 13:34:18 UTC (rev 1010) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/WikittySelectBean.java 2011-06-30 14:02:02 UTC (rev 1011) @@ -11,7 +11,6 @@ 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 org.nuiton.wikitty.struts.Option; import com.opensymphony.xwork2.util.ValueStack; @@ -24,7 +23,7 @@ public static final String OPEN_TEMPLATE = "ws-wikittyselect"; public static final String TEMPLATE = "ws-wikittyselect-close"; - protected String criteria; + protected Criteria criteria; protected String descfield; public WikittySelectBean(ValueStack stack, HttpServletRequest request, @@ -52,9 +51,7 @@ List<Option> fixlist = new LinkedList<Option>(); - // search for the wikitty with the criteria - Criteria criteria = Search.query().keyword(this.criteria) - .criteria(); + // search for the wikitty with the criteria PagedResult<Wikitty> wikitties = handler.getProxy() .findAllByCriteria(criteria); @@ -98,11 +95,11 @@ return TEMPLATE; } - public String getCriteria() { + public Criteria getCriteria() { return criteria; } - public void setCriteria(String criteria) { + public void setCriteria(Criteria criteria) { this.criteria = criteria; } Added: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/AbstractWikittyTag.java =================================================================== --- trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/AbstractWikittyTag.java (rev 0) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/AbstractWikittyTag.java 2011-06-30 14:02:02 UTC (rev 1011) @@ -0,0 +1,30 @@ +package org.nuiton.wikitty.struts.tag; + +import org.apache.struts2.views.jsp.ui.AbstractClosingTag; +import org.nuiton.wikitty.struts.component.AbstractWikittyComponent; + +public abstract class AbstractWikittyTag extends AbstractClosingTag { + + + private static final long serialVersionUID = -3401870606519882751L; + protected String fqFieldName; + + public String getFqFieldName() { + return fqFieldName; + } + + public void setFqFieldName(String fqFieldName) { + this.fqFieldName = fqFieldName; + } + + + @Override + protected void populateParams() { + super.populateParams(); + AbstractWikittyComponent wikittyComponent = (AbstractWikittyComponent) component; + wikittyComponent.setFqFieldName(fqFieldName); + + } + + +} Property changes on: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/AbstractWikittyTag.java ___________________________________________________________________ Added: svn:mime-type + text/plain Modified: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/BooleanTag.java =================================================================== --- trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/BooleanTag.java 2011-06-30 13:34:18 UTC (rev 1010) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/BooleanTag.java 2011-06-30 14:02:02 UTC (rev 1011) @@ -9,7 +9,7 @@ import com.opensymphony.xwork2.util.ValueStack; -public class BooleanTag extends AbstractClosingTag { +public class BooleanTag extends AbstractWikittyTag { /** * 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-30 13:34:18 UTC (rev 1010) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/FixedSelectTag.java 2011-06-30 14:02:02 UTC (rev 1011) @@ -9,7 +9,7 @@ import com.opensymphony.xwork2.util.ValueStack; -public class FixedSelectTag extends AbstractClosingTag { +public class FixedSelectTag extends AbstractWikittyTag { /** * Modified: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/HiddenTag.java =================================================================== --- trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/HiddenTag.java 2011-06-30 13:34:18 UTC (rev 1010) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/HiddenTag.java 2011-06-30 14:02:02 UTC (rev 1011) @@ -9,7 +9,7 @@ import com.opensymphony.xwork2.util.ValueStack; -public class HiddenTag extends AbstractClosingTag { +public class HiddenTag extends AbstractWikittyTag { /** * */ Modified: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/TextAreaTag.java =================================================================== --- trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/TextAreaTag.java 2011-06-30 13:34:18 UTC (rev 1010) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/TextAreaTag.java 2011-06-30 14:02:02 UTC (rev 1011) @@ -9,7 +9,7 @@ import com.opensymphony.xwork2.util.ValueStack; -public class TextAreaTag extends AbstractClosingTag{ +public class TextAreaTag extends AbstractWikittyTag{ /** * */ Modified: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/TextFieldTag.java =================================================================== --- trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/TextFieldTag.java 2011-06-30 13:34:18 UTC (rev 1010) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/TextFieldTag.java 2011-06-30 14:02:02 UTC (rev 1011) @@ -9,7 +9,7 @@ import com.opensymphony.xwork2.util.ValueStack; -public class TextFieldTag extends AbstractClosingTag { +public class TextFieldTag extends AbstractWikittyTag { /** * */ Modified: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/WikittySelectTag.java =================================================================== --- trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/WikittySelectTag.java 2011-06-30 13:34:18 UTC (rev 1010) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/WikittySelectTag.java 2011-06-30 14:02:02 UTC (rev 1011) @@ -6,17 +6,18 @@ import org.apache.struts2.components.Component; import org.apache.struts2.views.jsp.ui.AbstractClosingTag; +import org.nuiton.wikitty.search.Criteria; import org.nuiton.wikitty.struts.component.WikittySelectBean; import com.opensymphony.xwork2.util.ValueStack; -public class WikittySelectTag extends AbstractClosingTag { +public class WikittySelectTag extends AbstractWikittyTag { /** * */ private static final long serialVersionUID = 2807198744532780915L; - protected String criteria; + protected Criteria criteria; protected String descfield; @Override @@ -38,11 +39,11 @@ } - public String getCriteria() { + public Criteria getCriteria() { return criteria; } - public void setCriteria(String criteria) { + public void setCriteria(Criteria criteria) { this.criteria = criteria; } Modified: trunk/wikitty-struts/src/main/tld/wikitty-struts.tld =================================================================== --- trunk/wikitty-struts/src/main/tld/wikitty-struts.tld 2011-06-30 13:34:18 UTC (rev 1010) +++ trunk/wikitty-struts/src/main/tld/wikitty-struts.tld 2011-06-30 14:02:02 UTC (rev 1011) @@ -91,7 +91,7 @@ </attribute> <attribute> <description><![CDATA[the name of the field that have to be specialize]]></description> - <name>name</name> + <name>fqFieldName</name> <rtexprvalue>true</rtexprvalue> <required>true</required> </attribute> @@ -116,7 +116,7 @@ </attribute> <attribute> <description><![CDATA[the name of the field that have to be specialize]]></description> - <name>name</name> + <name>fqFieldName</name> <rtexprvalue>true</rtexprvalue> <required>true</required> </attribute> @@ -134,7 +134,7 @@ <bodycontent>empty</bodycontent> <attribute> <description><![CDATA[the name of the field that have to be specialize]]></description> - <name>name</name> + <name>fqFieldName</name> <rtexprvalue>true</rtexprvalue> <required>true</required> </attribute> @@ -147,7 +147,7 @@ <bodycontent>empty</bodycontent> <attribute> <description><![CDATA[the name of the field that have to be specialize]]></description> - <name>name</name> + <name>fqFieldName</name> <rtexprvalue>true</rtexprvalue> <required>true</required> </attribute> @@ -165,7 +165,7 @@ <bodycontent>empty</bodycontent> <attribute> <description><![CDATA[the name of the field that have to be specialize]]></description> - <name>name</name> + <name>fqFieldName</name> <rtexprvalue>true</rtexprvalue> <required>true</required> </attribute> @@ -183,7 +183,7 @@ <bodycontent>empty</bodycontent> <attribute> <description><![CDATA[the name of the field that have to be specialize]]></description> - <name>name</name> + <name>fqFieldName</name> <rtexprvalue>true</rtexprvalue> <required>true</required> </attribute>