Author: mfortun Date: 2011-06-23 16:11:47 +0200 (Thu, 23 Jun 2011) New Revision: 963 Url: http://nuiton.org/repositories/revision/wikitty/963 Log: * class to handle wikittyField and final rendering inside jsp Added: 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/WikittyFieldHandler.java 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/WikittyTagBean.java trunk/wikitty-struts/src/main/java/template/xhtml/ws-field.ftl Added: 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 (rev 0) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/ExtensionFieldStrutsBean.java 2011-06-23 14:11:47 UTC (rev 963) @@ -0,0 +1,37 @@ +package org.nuiton.wikitty.struts.component; + +public class ExtensionFieldStrutsBean { + + + protected String name; + protected String type; + protected Object Value; + 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) { + Value = value; + } + public ExtensionFieldStrutsBean(String name, String type, Object value) { + this.name = name; + this.type = type; + Value = value; + } + + + + + +} Property changes on: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/ExtensionFieldStrutsBean.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: 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 (rev 0) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/FieldSpecialisation.java 2011-06-23 14:11:47 UTC (rev 963) @@ -0,0 +1,42 @@ +package org.nuiton.wikitty.struts.component; + +public class FieldSpecialisation { + + protected String name; + protected String type; + protected String criteria; + protected String subtype; + + 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; + } + +} Property changes on: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/FieldSpecialisation.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: 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 (rev 0) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/WikittyFieldHandler.java 2011-06-23 14:11:47 UTC (rev 963) @@ -0,0 +1,93 @@ +package org.nuiton.wikitty.struts.component; + +import java.util.List; + +import org.nuiton.wikitty.WikittyProxy; +import org.nuiton.wikitty.entities.Wikitty; + +public class WikittyFieldHandler { + + protected Wikitty wikitty; + protected WikittyProxy proxy; + protected String include; + protected String exclude; + protected String order; + protected List<FieldSpecialisation> field; + + public WikittyFieldHandler() { + super(); + } + + + public Wikitty getWikitty() { + return wikitty; + } + + + public void setWikitty(Wikitty wikitty) { + this.wikitty = wikitty; + } + + + 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 List<FieldSpecialisation> getField() { + return field; + } + + + public void setField(List<FieldSpecialisation> field) { + this.field = field; + } + + + public void specialiseField(FieldSpecialisation fieldSpe){ + + } + + + public List<ExtensionFieldStrutsBean> getWikittyField(){ + return null; + } + + + +} Property changes on: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/WikittyFieldHandler.java ___________________________________________________________________ Added: svn:mime-type + text/plain 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-23 10:52:41 UTC (rev 962) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/WikittyFieldTagBean.java 2011-06-23 14:11:47 UTC (rev 963) @@ -1,7 +1,5 @@ package org.nuiton.wikitty.struts.component; - - import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import org.apache.struts2.components.ClosingUIBean; @@ -9,18 +7,13 @@ import com.opensymphony.xwork2.util.ValueStack; +@StrutsTag(name = "field", tldTagClass = "org.nuiton.wikitty.struts.tag.WikittyFieldTag", description = "Renders an input form", allowDynamicAttributes = false) +public class WikittyFieldTagBean extends ClosingUIBean { -@StrutsTag(name = "Wikitty", - tldTagClass = "org.nuiton.wikitty.struts.tag.WikittyFieldTag", - description = "Renders an input form", allowDynamicAttributes = false) -public class WikittyFieldTagBean extends ClosingUIBean{ - protected String subtype; protected String criteria; protected String type; - - public String getSubtype() { return subtype; } @@ -52,8 +45,7 @@ public static final String OPEN_TEMPLATE = "ws-field"; public static final String TEMPLATE = "ws-field-close"; - - + public String getDefaultOpenTemplate() { return OPEN_TEMPLATE; } @@ -62,58 +54,55 @@ return TEMPLATE; } - @Override protected void evaluateExtraParams() { super.evaluateExtraParams(); - - /*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); - } - } + WikittyFieldHandler handler = (WikittyFieldHandler) stack.getContext() + .get(WikittyTagBean.WIKITTY_STACK_KEY); - if (onsubmit != null) { - addParameter("onsubmit", findString(onsubmit)); - } - - 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)); - }*/ + FieldSpecialisation spe = new FieldSpecialisation(); + spe.setCriteria(criteria); + spe.setName(name); + spe.setSubtype(subtype); + spe.setType(type); + + handler.specialiseField(spe); + + + /* + * 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 (onsubmit != null) { addParameter("onsubmit", + * findString(onsubmit)); } + * + * 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)); } + */ } - } 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-23 10:52:41 UTC (rev 962) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/WikittyTagBean.java 2011-06-23 14:11:47 UTC (rev 963) @@ -20,19 +20,96 @@ protected String type; protected String action; protected String redirect; - + protected String include; protected String exclude; protected String order; protected boolean allowDelete; - - public WikittyTagBean(ValueStack stack, HttpServletRequest request, HttpServletResponse response) { super(stack, request, response); } + @Override + protected void evaluateExtraParams() { + super.evaluateExtraParams(); + + if (action != null) { + addParameter("action", findString(action)); + } + + if (redirect != null) { + addParameter("redirect", findString(redirect)); + } + + Object temp = stack.getContext().get(WIKITTY_STACK_KEY); + WikittyFieldHandler handler; + if (temp == null) { + handler = new WikittyFieldHandler(); + stack.getContext().put(WIKITTY_STACK_KEY, handler); + + handler.setExclude(exclude); + handler.setInclude(include); + handler.setOrder(order); + handler.setWikitty(wikitty); + handler.setProxy(proxy); + + } else { + handler = (WikittyFieldHandler) temp; + handler.getField(); + } + + + + + + /* + * + * si l'élément key est null on l'initialise en y mettant tout les + * éléments du wikitty que l'on veut affiché avec type et tout. + * seulemement dans le contexte on met tout dans un super objet qui + * s'occupe de tout + * + * si il est pas null c'est que on est à la fin donc on va add les + * 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() { return OPEN_TEMPLATE; } Modified: trunk/wikitty-struts/src/main/java/template/xhtml/ws-field.ftl =================================================================== --- trunk/wikitty-struts/src/main/java/template/xhtml/ws-field.ftl 2011-06-23 10:52:41 UTC (rev 962) +++ trunk/wikitty-struts/src/main/java/template/xhtml/ws-field.ftl 2011-06-23 14:11:47 UTC (rev 963) @@ -1 +1,3 @@ <field > +${parameters.name}<#rt/> +${parameters.truc.ig}<#rt/> \ No newline at end of file