Author: sletellier Date: 2011-07-05 17:40:53 +0200 (Tue, 05 Jul 2011) New Revision: 1056 Url: http://nuiton.org/repositories/revision/wikitty/1056 Log: - Allow using businessEntity 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/SelectAssociationBean.java trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/AbstractWikittyTag.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-07-05 15:10:06 UTC (rev 1055) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/WikittyFieldHandler.java 2011-07-05 15:40:53 UTC (rev 1056) @@ -14,6 +14,8 @@ import org.nuiton.util.StringUtil; import org.nuiton.wikitty.WikittyProxy; import org.nuiton.wikitty.WikittyUtil; +import org.nuiton.wikitty.entities.BusinessEntity; +import org.nuiton.wikitty.entities.BusinessEntityImpl; import org.nuiton.wikitty.entities.FieldType; import org.nuiton.wikitty.entities.Wikitty; import org.nuiton.wikitty.entities.WikittyExtension; @@ -27,6 +29,7 @@ static public String FIELD_SEPARATOR = ","; protected Wikitty wikitty; + protected BusinessEntity businessEntity; protected WikittyProxy proxy; protected String include = StringUtils.EMPTY; protected String exclude = StringUtils.EMPTY; @@ -55,6 +58,9 @@ } public Wikitty getWikitty() { + if (wikitty == null) { + wikitty = ((BusinessEntityImpl) getBusinessEntity()).getWikitty(); + } return wikitty; } @@ -62,6 +68,14 @@ this.wikitty = wikitty; } + public BusinessEntity getBusinessEntity() { + return businessEntity; + } + + public void setBusinessEntity(BusinessEntity businessEntity) { + this.businessEntity = businessEntity; + } + public Boolean getOrderBefore() { return orderBefore; } 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:10:06 UTC (rev 1055) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/AbstractWikittyComponent.java 2011-07-05 15:40:53 UTC (rev 1056) @@ -6,6 +6,8 @@ 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; @@ -29,6 +31,11 @@ /** * 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, @@ -58,23 +65,33 @@ if (handler != null) { return handler.getWikitty(); } + if (wikitty == null) { + wikitty = ((BusinessEntityImpl)getBusinessEntity()).getWikitty(); + } return wikitty; } + public BusinessEntity getBusinessEntity() { + if (handler != null) { + return handler.getBusinessEntity(); + } + return businessEntity; + } + @Override protected void evaluateExtraParams() { super.evaluateExtraParams(); - if (handler == null && wikitty == null) { - log.info("Handler not found in the stack and wikitty not declared"); + 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 attribute if used outside ws:form tag"); + "Tag must declare Wikitty or businessEntity attribute if used outside ws:form tag"); } - if (name!=null && handler ==null) { + if (name != null && handler == null) { addParameter("name", name); } else { addParameter("name", fqFieldName); @@ -120,6 +137,10 @@ this.wikitty = wikitty; } + public void setBusinessEntity(BusinessEntity businessEntity) { + this.businessEntity = businessEntity; + } + public void setProxy(WikittyProxy proxy) { this.proxy = proxy; } 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:10:06 UTC (rev 1055) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/SelectAssociationBean.java 2011-07-05 15:40:53 UTC (rev 1056) @@ -61,7 +61,7 @@ WikittyFieldHandler.FIELD_SEPARATOR); // iterate wikitty for result construction - for (Wikitty wiki : wikitty.getFieldAsList(ext, fieldName, Wikitty.class)){ + for (Wikitty wiki : getWikitty().getFieldAsList(ext, fieldName, Wikitty.class)){ Option temp = new Option(); temp.setValeur(wiki.getId()); String desc = wiki.getId(); 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:10:06 UTC (rev 1055) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/AbstractWikittyTag.java 2011-07-05 15:40:53 UTC (rev 1056) @@ -2,6 +2,7 @@ import org.apache.struts2.views.jsp.ui.AbstractClosingTag; import org.nuiton.wikitty.WikittyProxy; +import org.nuiton.wikitty.entities.BusinessEntity; import org.nuiton.wikitty.entities.Wikitty; import org.nuiton.wikitty.struts.component.AbstractWikittyComponent; @@ -11,6 +12,7 @@ private static final long serialVersionUID = -3401870606519882751L; protected String fqFieldName; protected Wikitty wikitty; + protected BusinessEntity businessEntity; protected WikittyProxy proxy; public String getFqFieldName() { @@ -30,6 +32,14 @@ this.wikitty = wikitty; } + public BusinessEntity getBusinessEntity() { + return businessEntity; + } + + public void setBusinessEntity(BusinessEntity businessEntity) { + this.businessEntity = businessEntity; + } + public WikittyProxy getProxy() { return proxy; } @@ -45,7 +55,7 @@ wikittyComponent.setFqFieldName(fqFieldName); wikittyComponent.setWikitty(wikitty); wikittyComponent.setProxy(proxy); - + wikittyComponent.setBusinessEntity(businessEntity); } Modified: trunk/wikitty-struts/src/main/tld/wikitty-struts.tld =================================================================== --- trunk/wikitty-struts/src/main/tld/wikitty-struts.tld 2011-07-05 15:10:06 UTC (rev 1055) +++ trunk/wikitty-struts/src/main/tld/wikitty-struts.tld 2011-07-05 15:40:53 UTC (rev 1056) @@ -27,9 +27,15 @@ <description><![CDATA[the wikitty to edit]]></description> <name>wikitty</name> <rtexprvalue>true</rtexprvalue> - <required>true</required> + <required>false</required> </attribute> <attribute> + <description><![CDATA[the businessEntity to edit]]></description> + <name>businessEntity</name> + <rtexprvalue>true</rtexprvalue> + <required>false</required> + </attribute> + <attribute> <description><![CDATA[the proxy from whom search for wikitty]]></description> <name>proxy</name> <rtexprvalue>true</rtexprvalue> @@ -101,9 +107,15 @@ <description><![CDATA[the wikitty to edit]]></description> <name>wikitty</name> <rtexprvalue>true</rtexprvalue> - <required>true</required> + <required>false</required> </attribute> <attribute> + <description><![CDATA[the businessEntity to edit]]></description> + <name>businessEntity</name> + <rtexprvalue>true</rtexprvalue> + <required>false</required> + </attribute> + <attribute> <description><![CDATA[the proxy from whom search for wikitty required if tag not used inside form tag]]></description> <name>proxy</name> <rtexprvalue>true</rtexprvalue> @@ -156,14 +168,19 @@ <name>name</name> <rtexprvalue>true</rtexprvalue> </attribute> - - <attribute> <description><![CDATA[the wikitty to edit]]></description> <name>wikitty</name> <rtexprvalue>true</rtexprvalue> + <required>false</required> </attribute> <attribute> + <description><![CDATA[the businessEntity to edit]]></description> + <name>businessEntity</name> + <rtexprvalue>true</rtexprvalue> + <required>false</required> + </attribute> + <attribute> <description><![CDATA[the proxy from whom search for wikitty required if tag not used inside form tag]]></description> <name>proxy</name> <rtexprvalue>true</rtexprvalue> @@ -212,8 +229,15 @@ <description><![CDATA[the wikitty to edit]]></description> <name>wikitty</name> <rtexprvalue>true</rtexprvalue> + <required>false</required> </attribute> <attribute> + <description><![CDATA[the businessEntity to edit]]></description> + <name>businessEntity</name> + <rtexprvalue>true</rtexprvalue> + <required>false</required> + </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> @@ -251,8 +275,15 @@ <description><![CDATA[the wikitty to edit]]></description> <name>wikitty</name> <rtexprvalue>true</rtexprvalue> + <required>false</required> </attribute> <attribute> + <description><![CDATA[the businessEntity to edit]]></description> + <name>businessEntity</name> + <rtexprvalue>true</rtexprvalue> + <required>false</required> + </attribute> + <attribute> <description><![CDATA[the name of the field that have to be specialize]]></description> <name>fqFieldName</name> <rtexprvalue>true</rtexprvalue> @@ -279,8 +310,15 @@ <description><![CDATA[the wikitty to edit]]></description> <name>wikitty</name> <rtexprvalue>true</rtexprvalue> + <required>false</required> </attribute> <attribute> + <description><![CDATA[the businessEntity to edit]]></description> + <name>businessEntity</name> + <rtexprvalue>true</rtexprvalue> + <required>false</required> + </attribute> + <attribute> <description><![CDATA[the name of the field that have to be specialize]]></description> <name>fqFieldName</name> <rtexprvalue>true</rtexprvalue> @@ -317,8 +355,15 @@ <description><![CDATA[the wikitty to edit]]></description> <name>wikitty</name> <rtexprvalue>true</rtexprvalue> + <required>false</required> </attribute> <attribute> + <description><![CDATA[the businessEntity to edit]]></description> + <name>businessEntity</name> + <rtexprvalue>true</rtexprvalue> + <required>false</required> + </attribute> + <attribute> <description><![CDATA[the name of the field that have to be specialize]]></description> <name>fqFieldName</name> <rtexprvalue>true</rtexprvalue> @@ -356,8 +401,15 @@ <description><![CDATA[the wikitty to edit]]></description> <name>wikitty</name> <rtexprvalue>true</rtexprvalue> + <required>false</required> </attribute> <attribute> + <description><![CDATA[the businessEntity to edit]]></description> + <name>businessEntity</name> + <rtexprvalue>true</rtexprvalue> + <required>false</required> + </attribute> + <attribute> <description><![CDATA[the name of the field that have to be specialize]]></description> <name>fqFieldName</name> <rtexprvalue>true</rtexprvalue> @@ -389,8 +441,15 @@ <description><![CDATA[the wikitty to edit]]></description> <name>wikitty</name> <rtexprvalue>true</rtexprvalue> + <required>false</required> </attribute> <attribute> + <description><![CDATA[the businessEntity to edit]]></description> + <name>businessEntity</name> + <rtexprvalue>true</rtexprvalue> + <required>false</required> + </attribute> + <attribute> <description><![CDATA[the name of the field that have to be specialize]]></description> <name>fqFieldName</name> <rtexprvalue>true</rtexprvalue>