r1057 - in trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts: component tag
Author: mfortun Date: 2011-07-05 18:07:49 +0200 (Tue, 05 Jul 2011) New Revision: 1057 Url: http://nuiton.org/repositories/revision/wikitty/1057 Log: * new abstract class to encapsulate common attribute and logic like: proxy, wikitty, businessEntity and theme handler Added: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/AbstractWikittyComponentBean.java trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/AbstractWikittyTagComponent.java 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/BooleanBean.java trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/DateBean.java trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/FormTagBean.java trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/HiddenBean.java trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/SelectAssociationBean.java trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/SelectCriteriaBean.java trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/SelectFixedBean.java trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/TextAreaBean.java trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/TextFieldBean.java trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/AbstractWikittyTag.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/DateTag.java trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/FormTag.java trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/HiddenTag.java trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/SelectAssociationTag.java trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/SelectCriteriaTag.java trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/SelectFixedTag.java trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/TextAreaTag.java trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/TextFieldTag.java Modified: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/AbstractWikittyComponent.java =================================================================== --- trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/AbstractWikittyComponent.java 2011-07-05 15:40:53 UTC (rev 1056) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/AbstractWikittyComponent.java 2011-07-05 16:07:49 UTC (rev 1057) @@ -2,69 +2,40 @@ 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.WikittyProxy; import org.nuiton.wikitty.entities.BusinessEntity; import org.nuiton.wikitty.entities.BusinessEntityImpl; import org.nuiton.wikitty.entities.Wikitty; -import org.nuiton.wikitty.struts.TagUseException; -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); - - protected WikittyFieldHandler handler; - protected String fqFieldName; - /** * Never used directly this attribute use the getter */ protected Wikitty wikitty; - /** * Never used directly this attribute use the getter */ protected BusinessEntity businessEntity; - /** * Never used directly this attribute use the getter */ protected WikittyProxy proxy; - protected AbstractWikittyComponent(ValueStack stack, + public AbstractWikittyComponent(ValueStack stack, HttpServletRequest request, HttpServletResponse response) { super(stack, request, response); - - handler = (WikittyFieldHandler) stack.getContext().get( - WikittyFieldHandler.WIKITTY_STACK_KEY); - - } - - public boolean isIncluded(String fieldName) { - if (handler != null) { - return handler.isIncluded(fieldName); - } - return true; } public WikittyProxy getProxy() { - if (handler != null) { - return handler.getProxy(); - } return proxy; } public Wikitty getWikitty() { - if (handler != null) { - return handler.getWikitty(); - } if (wikitty == null) { wikitty = ((BusinessEntityImpl)getBusinessEntity()).getWikitty(); } @@ -72,67 +43,14 @@ } public BusinessEntity getBusinessEntity() { - if (handler != null) { - return handler.getBusinessEntity(); - } return businessEntity; } @Override - protected void evaluateExtraParams() { - super.evaluateExtraParams(); - - if (handler == null && wikitty == null && businessEntity == null) { - log.info("Handler not found in the stack and wikitty or businessEntity not declared"); - - - throw new TagUseException( - "Tag must declare Wikitty or businessEntity attribute if used outside ws:form tag"); - - } - - if (name != null && handler == null) { - addParameter("name", name); - } else { - addParameter("name", fqFieldName); - } - addParameter("theme", getTheme()); - - // check if field included - // if so add the parametter included - // and add the field to the addedfield (usefull if inside - - - - if (isIncluded(fqFieldName)){ - addParameter("included", true); - if (handler != null) { - handler.addAddedField(fqFieldName); - } - } - } - - @Override public String getTheme() { return "wikitty"; } - 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; - } - public void setWikitty(Wikitty wikitty) { this.wikitty = wikitty; } @@ -145,4 +63,4 @@ this.proxy = proxy; } -} +} \ No newline at end of file Copied: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/AbstractWikittyComponentBean.java (from rev 1056, trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/AbstractWikittyComponent.java) =================================================================== --- trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/AbstractWikittyComponentBean.java (rev 0) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/AbstractWikittyComponentBean.java 2011-07-05 16:07:49 UTC (rev 1057) @@ -0,0 +1,121 @@ +package org.nuiton.wikitty.struts.component; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.nuiton.wikitty.WikittyProxy; +import org.nuiton.wikitty.entities.BusinessEntity; +import org.nuiton.wikitty.entities.BusinessEntityImpl; +import org.nuiton.wikitty.entities.Wikitty; +import org.nuiton.wikitty.struts.TagUseException; +import org.nuiton.wikitty.struts.WikittyFieldHandler; + +import com.opensymphony.xwork2.util.ValueStack; + +public abstract class AbstractWikittyComponentBean extends AbstractWikittyComponent { + + /** to use log facility, just put in your code: log.info(\"...\"); */ + final static private Log log = LogFactory + .getLog(AbstractWikittyComponentBean.class); + + protected WikittyFieldHandler handler; + protected String fqFieldName; + + protected AbstractWikittyComponentBean(ValueStack stack, + HttpServletRequest request, HttpServletResponse response) { + super(stack, request, response); + + handler = (WikittyFieldHandler) stack.getContext().get( + WikittyFieldHandler.WIKITTY_STACK_KEY); + + } + + public boolean isIncluded(String fieldName) { + if (handler != null) { + return handler.isIncluded(fieldName); + } + return true; + } + + public WikittyProxy getProxy() { + if (handler != null) { + return handler.getProxy(); + } + return super.getProxy(); + } + + public Wikitty getWikitty() { + if (handler != null) { + return handler.getWikitty(); + } + + return super.getWikitty(); + } + + public BusinessEntity getBusinessEntity() { + if (handler != null) { + return handler.getBusinessEntity(); + } + return super.getBusinessEntity(); + } + + + + + @Override + protected void evaluateExtraParams() { + super.evaluateExtraParams(); + + if (handler == null && wikitty == null && businessEntity == null) { + log.info("Handler not found in the stack and wikitty or businessEntity not declared"); + + throw new TagUseException( + "Tag must declare Wikitty or businessEntity attribute if used outside ws:form tag"); + } + + if (name != null && handler == null) { + addParameter("name", name); + } else { + addParameter("name", fqFieldName); + } + addParameter("theme", getTheme()); + + /* + if (id!=null || id.equals("")) { + id = name==null?fqFieldName:name; + } else { + addParameter("name", fqFieldName); + }*/ + + // check if field included + // if so add the parametter included + // and add the field to the addedfield (usefull if inside + + + + if (isIncluded(fqFieldName)){ + addParameter("included", true); + if (handler != null) { + handler.addAddedField(fqFieldName); + } + } + } + + 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; + } + +} Property changes on: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/AbstractWikittyComponentBean.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-07-05 15:40:53 UTC (rev 1056) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/BooleanBean.java 2011-07-05 16:07:49 UTC (rev 1057) @@ -12,7 +12,7 @@ @StrutsTag(name = "boolean", tldTagClass = "org.nuiton.wikitty.struts.tag.BooleanTag", description = "", allowDynamicAttributes = false) -public class BooleanBean extends AbstractWikittyComponent { +public class BooleanBean extends AbstractWikittyComponentBean { /** to use log facility, just put in your code: log.info(\"...\"); */ final static private Log log = LogFactory.getLog(BooleanBean.class); Modified: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/DateBean.java =================================================================== --- trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/DateBean.java 2011-07-05 15:40:53 UTC (rev 1056) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/DateBean.java 2011-07-05 16:07:49 UTC (rev 1057) @@ -12,7 +12,7 @@ @StrutsTag(name = "boolean", tldTagClass = "org.nuiton.wikitty.struts.tag.DateTag", description = "", allowDynamicAttributes = false) -public class DateBean extends AbstractWikittyComponent { +public class DateBean extends AbstractWikittyComponentBean { /** to use log facility, just put in your code: log.info(\"...\"); */ final static private Log log = LogFactory.getLog(DateBean.class); Modified: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/FormTagBean.java =================================================================== --- trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/FormTagBean.java 2011-07-05 15:40:53 UTC (rev 1056) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/FormTagBean.java 2011-07-05 16:07:49 UTC (rev 1057) @@ -17,7 +17,7 @@ @StrutsTag(name = "Wikitty", tldTagClass = "org.nuiton.wikitty.struts.tag.FormTag", description = "", allowDynamicAttributes = false) -public class FormTagBean extends ClosingUIBean { +public class FormTagBean extends AbstractWikittyComponent { /** to use log facility, just put in your code: log.info(\"...\"); */ final static private Log log = LogFactory.getLog(FormTagBean.class); @@ -25,9 +25,8 @@ public static final String OPEN_TEMPLATE = "ws-form"; public static final String TEMPLATE = "ws-form-close"; - protected Wikitty wikitty; - protected WikittyProxy proxy; + protected String action; protected String redirect; @@ -49,11 +48,16 @@ super.evaluateExtraParams(); - if (wikitty == null) { - throw new TagUseException("Wikitty must be a valid wikitty"); + if ( wikitty == null && businessEntity == null) { + log.info("wikitty and businessEntity not declared"); + + throw new TagUseException( + "Tag must declare a valid Wikitty or businessEntity attribute"); } + + /* this methode is called two times: * - first when the wikitty open tag is red * - second when the wikitty closing tag is red @@ -83,12 +87,12 @@ if (name==null || name.equals(StringUtils.EMPTY)) { - name = "wikitty-form-"+wikitty.getId(); + name = "wikitty-form-"+getWikitty().getId(); } - addParameter("wikittyid", findString(wikitty.getId())); + addParameter("wikittyid", findString(getWikitty().getId())); // no uses finally: // addParameter("wikittyversion", findString(wikitty.getVersion())); // addParameter("wikittyextensions", findString(wikitty @@ -111,7 +115,7 @@ handler.setExclude(exclude); handler.setInclude(include); handler.setOrder(order); - handler.setWikitty(wikitty); + handler.setWikitty(getWikitty()); handler.setProxy(proxy); handler.setOrderBefore(orderBefore); @@ -129,12 +133,8 @@ } - - @Override - public String getTheme() { - return "wikitty"; - } + public String getDefaultOpenTemplate() { return OPEN_TEMPLATE; } @@ -143,22 +143,8 @@ return TEMPLATE; } - 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 getAction() { return action; } Modified: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/HiddenBean.java =================================================================== --- trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/HiddenBean.java 2011-07-05 15:40:53 UTC (rev 1056) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/HiddenBean.java 2011-07-05 16:07:49 UTC (rev 1057) @@ -11,7 +11,7 @@ import com.opensymphony.xwork2.util.ValueStack; @StrutsTag(name = "hidden", tldTagClass = "org.nuiton.wikitty.struts.tag.HiddenTag", description = "", allowDynamicAttributes = false) -public class HiddenBean extends AbstractWikittyComponent { +public class HiddenBean extends AbstractWikittyComponentBean { /** to use log facility, just put in your code: log.info(\"...\"); */ final static private Log log = LogFactory.getLog(HiddenBean.class); Modified: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/SelectAssociationBean.java =================================================================== --- trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/SelectAssociationBean.java 2011-07-05 15:40:53 UTC (rev 1056) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/SelectAssociationBean.java 2011-07-05 16:07:49 UTC (rev 1057) @@ -16,7 +16,7 @@ import com.opensymphony.xwork2.util.ValueStack; -public class SelectAssociationBean extends AbstractWikittyComponent { +public class SelectAssociationBean extends AbstractWikittyComponentBean { /** to use log facility, just put in your code: log.info(\"...\"); */ final static private Log log = LogFactory Modified: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/SelectCriteriaBean.java =================================================================== --- trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/SelectCriteriaBean.java 2011-07-05 15:40:53 UTC (rev 1056) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/SelectCriteriaBean.java 2011-07-05 16:07:49 UTC (rev 1057) @@ -20,7 +20,7 @@ import com.opensymphony.xwork2.util.ValueStack; @StrutsTag(name = "wikittyselect", tldTagClass = "org.nuiton.wikitty.struts.tag.SelectCriteriaTag", description = "", allowDynamicAttributes = false) -public class SelectCriteriaBean extends AbstractWikittyComponent { +public class SelectCriteriaBean extends AbstractWikittyComponentBean { /** to use log facility, just put in your code: log.info(\"...\"); */ final static private Log log = LogFactory.getLog(SelectCriteriaBean.class); Modified: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/SelectFixedBean.java =================================================================== --- trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/SelectFixedBean.java 2011-07-05 15:40:53 UTC (rev 1056) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/SelectFixedBean.java 2011-07-05 16:07:49 UTC (rev 1057) @@ -15,7 +15,7 @@ import com.opensymphony.xwork2.util.ValueStack; @StrutsTag(name = "fixedSelect", tldTagClass = "org.nuiton.wikitty.struts.tag.SelectFixedTag", description = "", allowDynamicAttributes = false) -public class SelectFixedBean extends AbstractWikittyComponent { +public class SelectFixedBean extends AbstractWikittyComponentBean { /** to use log facility, just put in your code: log.info(\"...\"); */ final static private Log log = LogFactory.getLog(SelectFixedBean.class); Modified: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/TextAreaBean.java =================================================================== --- trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/TextAreaBean.java 2011-07-05 15:40:53 UTC (rev 1056) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/TextAreaBean.java 2011-07-05 16:07:49 UTC (rev 1057) @@ -11,7 +11,7 @@ import com.opensymphony.xwork2.util.ValueStack; @StrutsTag(name = "textArea", tldTagClass = "org.nuiton.wikitty.struts.tag.TextAreaTag", description = "", allowDynamicAttributes = false) -public class TextAreaBean extends AbstractWikittyComponent { +public class TextAreaBean extends AbstractWikittyComponentBean { /** to use log facility, just put in your code: log.info(\"...\"); */ final static private Log log = LogFactory.getLog(TextAreaBean.class); Modified: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/TextFieldBean.java =================================================================== --- trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/TextFieldBean.java 2011-07-05 15:40:53 UTC (rev 1056) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/TextFieldBean.java 2011-07-05 16:07:49 UTC (rev 1057) @@ -11,7 +11,7 @@ import com.opensymphony.xwork2.util.ValueStack; @StrutsTag(name = "textField", tldTagClass = "org.nuiton.wikitty.struts.tag.TextFieldTag", description = "", allowDynamicAttributes = false) -public class TextFieldBean extends AbstractWikittyComponent { +public class TextFieldBean extends AbstractWikittyComponentBean { /** to use log facility, just put in your code: log.info(\"...\"); */ final static private Log log = LogFactory.getLog(TextFieldBean.class); Modified: 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 2011-07-05 15:40:53 UTC (rev 1056) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/AbstractWikittyTag.java 2011-07-05 16:07:49 UTC (rev 1057) @@ -5,25 +5,22 @@ import org.nuiton.wikitty.entities.BusinessEntity; import org.nuiton.wikitty.entities.Wikitty; import org.nuiton.wikitty.struts.component.AbstractWikittyComponent; +import org.nuiton.wikitty.struts.component.AbstractWikittyComponentBean; public abstract class AbstractWikittyTag extends AbstractClosingTag { - - private static final long serialVersionUID = -3401870606519882751L; - protected String fqFieldName; + /** + * + */ + private static final long serialVersionUID = -2804975141932256704L; protected Wikitty wikitty; protected BusinessEntity businessEntity; protected WikittyProxy proxy; - public String getFqFieldName() { - return fqFieldName; + public AbstractWikittyTag() { + super(); } - public void setFqFieldName(String fqFieldName) { - this.fqFieldName = fqFieldName; - } - - public Wikitty getWikitty() { return wikitty; } @@ -48,15 +45,15 @@ this.proxy = proxy; } + @Override protected void populateParams() { super.populateParams(); AbstractWikittyComponent wikittyComponent = (AbstractWikittyComponent) component; - wikittyComponent.setFqFieldName(fqFieldName); wikittyComponent.setWikitty(wikitty); wikittyComponent.setProxy(proxy); wikittyComponent.setBusinessEntity(businessEntity); } -} +} \ No newline at end of file Copied: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/AbstractWikittyTagComponent.java (from rev 1056, trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/AbstractWikittyTag.java) =================================================================== --- trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/AbstractWikittyTagComponent.java (rev 0) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/AbstractWikittyTagComponent.java 2011-07-05 16:07:49 UTC (rev 1057) @@ -0,0 +1,29 @@ +package org.nuiton.wikitty.struts.tag; + +import org.nuiton.wikitty.struts.component.AbstractWikittyComponentBean; + +public abstract class AbstractWikittyTagComponent extends AbstractWikittyTag { + + + 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(); + AbstractWikittyComponentBean wikittyComponent = (AbstractWikittyComponentBean) component; + wikittyComponent.setFqFieldName(fqFieldName); + + } + + +} Property changes on: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/AbstractWikittyTagComponent.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-07-05 15:40:53 UTC (rev 1056) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/BooleanTag.java 2011-07-05 16:07:49 UTC (rev 1057) @@ -6,7 +6,7 @@ import org.nuiton.wikitty.struts.component.BooleanBean; import com.opensymphony.xwork2.util.ValueStack; -public class BooleanTag extends AbstractWikittyTag { +public class BooleanTag extends AbstractWikittyTagComponent { /** * Modified: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/DateTag.java =================================================================== --- trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/DateTag.java 2011-07-05 15:40:53 UTC (rev 1056) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/DateTag.java 2011-07-05 16:07:49 UTC (rev 1057) @@ -6,7 +6,7 @@ import org.nuiton.wikitty.struts.component.DateBean; import com.opensymphony.xwork2.util.ValueStack; -public class DateTag extends AbstractWikittyTag{ +public class DateTag extends AbstractWikittyTagComponent{ /** * Modified: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/FormTag.java =================================================================== --- trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/FormTag.java 2011-07-05 15:40:53 UTC (rev 1056) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/FormTag.java 2011-07-05 16:07:49 UTC (rev 1057) @@ -3,20 +3,15 @@ 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.WikittyProxy; -import org.nuiton.wikitty.entities.Wikitty; import org.nuiton.wikitty.struts.component.FormTagBean; import com.opensymphony.xwork2.util.ValueStack; -public class FormTag extends AbstractClosingTag { +public class FormTag extends AbstractWikittyTag { /** * */ private static final long serialVersionUID = 258152544560583399L; - protected Wikitty wikitty; - protected WikittyProxy proxy; protected String action; protected String redirect; protected String include; @@ -78,8 +73,6 @@ FormTagBean wikittyTag = ((FormTagBean) component); wikittyTag.setAction(action); wikittyTag.setRedirect(redirect); - wikittyTag.setWikitty(wikitty); - wikittyTag.setProxy(proxy); wikittyTag.setOrder(order); wikittyTag.setOrderBefore(orderBefore); wikittyTag.setAllowDelete(allowDelete); @@ -87,22 +80,7 @@ wikittyTag.setExclude(exclude); } - 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 getAction() { return action; } Modified: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/HiddenTag.java =================================================================== --- trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/HiddenTag.java 2011-07-05 15:40:53 UTC (rev 1056) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/HiddenTag.java 2011-07-05 16:07:49 UTC (rev 1057) @@ -6,7 +6,7 @@ import org.nuiton.wikitty.struts.component.HiddenBean; import com.opensymphony.xwork2.util.ValueStack; -public class HiddenTag extends AbstractWikittyTag { +public class HiddenTag extends AbstractWikittyTagComponent { /** * */ Modified: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/SelectAssociationTag.java =================================================================== --- trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/SelectAssociationTag.java 2011-07-05 15:40:53 UTC (rev 1056) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/SelectAssociationTag.java 2011-07-05 16:07:49 UTC (rev 1057) @@ -8,7 +8,7 @@ import com.opensymphony.xwork2.util.ValueStack; -public class SelectAssociationTag extends AbstractWikittyTag{ +public class SelectAssociationTag extends AbstractWikittyTagComponent{ /** * Modified: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/SelectCriteriaTag.java =================================================================== --- trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/SelectCriteriaTag.java 2011-07-05 15:40:53 UTC (rev 1056) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/SelectCriteriaTag.java 2011-07-05 16:07:49 UTC (rev 1057) @@ -7,7 +7,7 @@ import org.nuiton.wikitty.struts.component.SelectCriteriaBean; import com.opensymphony.xwork2.util.ValueStack; -public class SelectCriteriaTag extends AbstractWikittyTag { +public class SelectCriteriaTag extends AbstractWikittyTagComponent { /** * Modified: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/SelectFixedTag.java =================================================================== --- trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/SelectFixedTag.java 2011-07-05 15:40:53 UTC (rev 1056) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/SelectFixedTag.java 2011-07-05 16:07:49 UTC (rev 1057) @@ -6,7 +6,7 @@ import org.nuiton.wikitty.struts.component.SelectFixedBean; import com.opensymphony.xwork2.util.ValueStack; -public class SelectFixedTag extends AbstractWikittyTag { +public class SelectFixedTag extends AbstractWikittyTagComponent { /** * Modified: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/TextAreaTag.java =================================================================== --- trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/TextAreaTag.java 2011-07-05 15:40:53 UTC (rev 1056) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/TextAreaTag.java 2011-07-05 16:07:49 UTC (rev 1057) @@ -7,7 +7,7 @@ import com.opensymphony.xwork2.util.ValueStack; -public class TextAreaTag extends AbstractWikittyTag{ +public class TextAreaTag extends AbstractWikittyTagComponent{ /** * */ Modified: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/TextFieldTag.java =================================================================== --- trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/TextFieldTag.java 2011-07-05 15:40:53 UTC (rev 1056) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/TextFieldTag.java 2011-07-05 16:07:49 UTC (rev 1057) @@ -6,7 +6,7 @@ import org.nuiton.wikitty.struts.component.TextFieldBean; import com.opensymphony.xwork2.util.ValueStack; -public class TextFieldTag extends AbstractWikittyTag { +public class TextFieldTag extends AbstractWikittyTagComponent { protected Boolean password;
participants (1)
-
mfortun＠users.nuiton.org