Author: mfortun Date: 2011-07-01 15:51:39 +0200 (Fri, 01 Jul 2011) New Revision: 1028 Url: http://nuiton.org/repositories/revision/wikitty/1028 Log: * correct order * change local string by common static string Modified: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/ExtensionFieldStrutsBean.java trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/WikittyFieldHandler.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 Modified: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/ExtensionFieldStrutsBean.java =================================================================== --- trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/ExtensionFieldStrutsBean.java 2011-07-01 13:17:48 UTC (rev 1027) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/ExtensionFieldStrutsBean.java 2011-07-01 13:51:39 UTC (rev 1028) @@ -3,13 +3,15 @@ import java.util.Collection; import java.util.LinkedList; +import org.apache.commons.lang.StringUtils; + public class ExtensionFieldStrutsBean { protected String name; protected String type; - protected Object value =""; + protected Object value =StringUtils.EMPTY; protected String label; protected Collection<Option> listOption; 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-01 13:17:48 UTC (rev 1027) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/WikittyFieldHandler.java 2011-07-01 13:51:39 UTC (rev 1028) @@ -8,6 +8,7 @@ import java.util.Map; import java.util.Set; import org.apache.commons.lang.StringEscapeUtils; +import org.apache.commons.lang.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.util.StringUtil; @@ -22,11 +23,14 @@ /** to use log facility, just put in your code: log.info(\"...\"); */ final static private Log log = LogFactory.getLog(WikittyFieldHandler.class); + static public String ALL_EXTENSION_CAR = "*"; + static public String FIELD_SEPARATOR = ","; + protected Wikitty wikitty; protected WikittyProxy proxy; - protected String include = ""; - protected String exclude = ""; - protected String order = ""; + protected String include = StringUtils.EMPTY; + protected String exclude = StringUtils.EMPTY; + protected String order = StringUtils.EMPTY; protected Boolean orderBefore = false; protected Set<String> fieldAdded; @@ -82,6 +86,7 @@ // delegate construction of map includeMap = constructIncludeExcludeMap(include); includeEnable = includeMap.size() != 0; + } public String getExclude() { @@ -105,15 +110,12 @@ /* * Method called two times by wikitty tag - * */ public Collection<ExtensionFieldStrutsBean> getWikittyField() { // if order before selected and none field add, prepare the field list // with another method - if (orderBefore && (fieldAdded.size() == 0)) { - System.out.println("chaucette"); return getFieldOrderedBefore(); } @@ -134,7 +136,7 @@ * if extension excluded or not include while include is enable jump * to the next extension */ - if (!isIncluded(extName, "*")) { + if (!isIncluded(extName, ALL_EXTENSION_CAR)) { continue; } @@ -158,7 +160,7 @@ } } - String[] fieldOrder = StringUtil.split(order, ","); + String[] fieldOrder = StringUtil.split(order, FIELD_SEPARATOR); Collection<ExtensionFieldStrutsBean> result = mapField.values(); @@ -193,23 +195,26 @@ List<ExtensionFieldStrutsBean> result = new LinkedList<ExtensionFieldStrutsBean>(); + // hack TODO mfortun-2011-06-30 need to think again this orderBefore + fieldAdded.add("DUMMY"); + log.debug("orderBefore enable with" + order); - - String[] fieldOrder = StringUtil.split(order, ","); + String[] fieldOrder = StringUtil.split(order, FIELD_SEPARATOR); + /* - * this method is used because ordering before is different. - * We parse the list of the element we want ordered.4 - * If we see a * that mean all the field have to be ordered now - * then add those field to the added field + * this method is used because ordering before is different. We parse + * the list of the element we want ordered. If we see a * that mean all + * the field have to be ordered now then add those field to the added + * field */ - + if (fieldOrder.length != 0) { for (String fieldit : fieldOrder) { - - if (!isIncluded(fieldit)){ + + if (!isIncluded(fieldit)) { continue; - } + } String extname = WikittyUtil .getExtensionNameFromFQFieldName(fieldit); String field = WikittyUtil.getFieldNameFromFQFieldName(fieldit); @@ -233,7 +238,6 @@ } } - return result; } @@ -249,13 +253,14 @@ */ protected Map<String, List<String>> constructIncludeExcludeMap(String entry) { - String[] entryTab = StringUtil.split(entry, ","); + String[] entryTab = StringUtil.split(entry, FIELD_SEPARATOR); Map<String, List<String>> result = new HashMap<String, List<String>>(); // prepare list of excluded field and extension for (String excludeIt : entryTab) { - String[] extfield = StringUtil.split(excludeIt, "."); + String[] extfield = StringUtil.split(excludeIt, + WikittyUtil.FQ_FIELD_NAME_SEPARATOR); if (extfield.length == 2) { List<String> listFields = result.get(extfield[0]); if (listFields == null) { @@ -279,7 +284,8 @@ public boolean isIncluded(String fqFieldName) { - String[] fields = StringUtil.split(fqFieldName, "."); + String[] fields = StringUtil.split(fqFieldName, + WikittyUtil.FQ_FIELD_NAME_SEPARATOR); if (fields.length != 2) { // TODO mfortun-2011-06-29 exception @@ -294,22 +300,22 @@ // check if field is specifically exluded or if all the extention is boolean excluded = excludeMap.containsKey(extName) - && (excludeMap.get(extName).contains("*") || excludeMap.get( - extName).contains(fieldName)); + && (excludeMap.get(extName).contains(ALL_EXTENSION_CAR) || excludeMap + .get(extName).contains(fieldName)); // check if field is specifically included or if all the extention is - boolean notIncluded = includeEnable - && !(includeMap.containsKey(extName) && (includeMap.get(extName) - .contains("*") || includeMap.get(extName).contains(fieldName))); + boolean notIncluded = includeEnable + && !(includeMap.containsKey(extName) && (includeMap + .get(extName).contains(ALL_EXTENSION_CAR) || includeMap + .get(extName).contains(fieldName))); // check if field allready added - boolean added = fieldAdded.contains(extName + "." + fieldName); + boolean added = fieldAdded.contains(extName + + WikittyUtil.FQ_FIELD_NAME_SEPARATOR + fieldName); log.debug("extension: " + extName + " field: " + fieldName + "notInclude:" + notIncluded + " exclude:" + excluded + " alreadyAdd:" + added); - - if (excluded || notIncluded || added) { return false; } @@ -325,9 +331,10 @@ FieldType fieldType = wikitty.getExtension(extName).getFieldType( fieldName); - result.setName(extName + "." + fieldName); + result.setName(extName + WikittyUtil.FQ_FIELD_NAME_SEPARATOR + + fieldName); result.setLabel(result.getName()); - result.setValue(""); + result.setValue(StringUtils.EMPTY); // set the field type. switch (fieldType.getType()) { @@ -343,7 +350,7 @@ break; default: Object valueObject = wikitty.getFieldAsObject(extName, fieldName); - String valueString = ""; + String valueString = StringUtils.EMPTY; if (valueObject != null) { valueString = String.valueOf(valueObject); 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-01 13:17:48 UTC (rev 1027) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/BooleanBean.java 2011-07-01 13:51:39 UTC (rev 1028) @@ -6,6 +6,8 @@ import org.apache.commons.logging.LogFactory; import org.apache.struts2.views.annotations.StrutsTag; import org.nuiton.util.StringUtil; +import org.nuiton.wikitty.WikittyUtil; + import com.opensymphony.xwork2.util.ValueStack; @StrutsTag(name = "boolean", tldTagClass = "org.nuiton.wikitty.struts.tag.BooleanTag", @@ -28,11 +30,12 @@ protected void evaluateExtraParams() { super.evaluateExtraParams(); - handler.addAddedField(fqFieldName); + // if field defined as inclued if (handler.isIncluded(fqFieldName)) { + handler.addAddedField(fqFieldName); // parse extname and field name - String[] fieldsAccess = StringUtil.split(fqFieldName, "."); + String[] fieldsAccess = StringUtil.split(fqFieldName, WikittyUtil.FQ_FIELD_NAME_SEPARATOR); // 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-07-01 13:17:48 UTC (rev 1027) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/FixedSelectBean.java 2011-07-01 13:51:39 UTC (rev 1028) @@ -8,7 +8,10 @@ import org.apache.commons.logging.LogFactory; import org.apache.struts2.views.annotations.StrutsTag; import org.nuiton.util.StringUtil; +import org.nuiton.wikitty.WikittyUtil; import org.nuiton.wikitty.struts.Option; +import org.nuiton.wikitty.struts.WikittyFieldHandler; + import com.opensymphony.xwork2.util.ValueStack; @StrutsTag(name = "fixedSelect", tldTagClass = "org.nuiton.wikitty.struts.tag.FixedSelectTag", description = "", allowDynamicAttributes = false) @@ -35,7 +38,7 @@ if (handler.isIncluded(fqFieldName)) { handler.addAddedField(fqFieldName); // parse extname and field name - String[] fieldsAccess = StringUtil.split(fqFieldName, "."); + String[] fieldsAccess = StringUtil.split(fqFieldName, WikittyUtil.FQ_FIELD_NAME_SEPARATOR); // add parametters to be use by the template addParameter("included", true); addParameter( @@ -44,7 +47,7 @@ fieldsAccess[1])); List<Option> fixlist = new LinkedList<Option>(); - String[] values = StringUtil.split(fixvalues, ","); + String[] values = StringUtil.split(fixvalues, WikittyFieldHandler.FIELD_SEPARATOR); for (String it : values) { fixlist.add(new Option(it, it)); } 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-01 13:17:48 UTC (rev 1027) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/HiddenBean.java 2011-07-01 13:51:39 UTC (rev 1028) @@ -6,6 +6,8 @@ import org.apache.commons.logging.LogFactory; import org.apache.struts2.views.annotations.StrutsTag; import org.nuiton.util.StringUtil; +import org.nuiton.wikitty.WikittyUtil; + import com.opensymphony.xwork2.util.ValueStack; @StrutsTag(name = "hidden", tldTagClass = "org.nuiton.wikitty.struts.tag.HiddenTag", description = "", allowDynamicAttributes = false) @@ -31,7 +33,7 @@ if (handler.isIncluded(fqFieldName)) { handler.addAddedField(fqFieldName); // parse extname and field name - String[] fieldsAccess = StringUtil.split(fqFieldName, "."); + String[] fieldsAccess = StringUtil.split(fqFieldName, WikittyUtil.FQ_FIELD_NAME_SEPARATOR); // 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-07-01 13:17:48 UTC (rev 1027) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/TextAreaBean.java 2011-07-01 13:51:39 UTC (rev 1028) @@ -6,6 +6,8 @@ import org.apache.commons.logging.LogFactory; import org.apache.struts2.views.annotations.StrutsTag; import org.nuiton.util.StringUtil; +import org.nuiton.wikitty.WikittyUtil; + import com.opensymphony.xwork2.util.ValueStack; @StrutsTag(name = "textArea", tldTagClass = "org.nuiton.wikitty.struts.tag.TextAreaTag", description = "", allowDynamicAttributes = false) @@ -30,7 +32,7 @@ if (handler.isIncluded(fqFieldName)) { handler.addAddedField(fqFieldName); // parse extname and field name - String[] fieldsAccess = StringUtil.split(fqFieldName, "."); + String[] fieldsAccess = StringUtil.split(fqFieldName, WikittyUtil.FQ_FIELD_NAME_SEPARATOR); // 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-07-01 13:17:48 UTC (rev 1027) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/TextFieldBean.java 2011-07-01 13:51:39 UTC (rev 1028) @@ -6,6 +6,8 @@ import org.apache.commons.logging.LogFactory; import org.apache.struts2.views.annotations.StrutsTag; import org.nuiton.util.StringUtil; +import org.nuiton.wikitty.WikittyUtil; + import com.opensymphony.xwork2.util.ValueStack; @StrutsTag(name = "textField", tldTagClass = "org.nuiton.wikitty.struts.tag.TextFieldTag", description = "", allowDynamicAttributes = false) @@ -26,17 +28,18 @@ protected void evaluateExtraParams() { super.evaluateExtraParams(); - handler.addAddedField(fqFieldName); + // if field defined as inclued if (handler.isIncluded(fqFieldName)) { // parse extname and field name - String[] fieldsAccess = StringUtil.split(fqFieldName, "."); + String[] fieldsAccess = StringUtil.split(fqFieldName, WikittyUtil.FQ_FIELD_NAME_SEPARATOR); // add parametters to be use by the template addParameter("included", true); addParameter( "value", handler.getWikitty().getFieldAsString(fieldsAccess[0], fieldsAccess[1])); + handler.addAddedField(fqFieldName); } } 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-07-01 13:17:48 UTC (rev 1027) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/WikittySelectBean.java 2011-07-01 13:51:39 UTC (rev 1028) @@ -8,10 +8,13 @@ import org.apache.commons.logging.LogFactory; import org.apache.struts2.views.annotations.StrutsTag; import org.nuiton.util.StringUtil; +import org.nuiton.wikitty.WikittyUtil; import org.nuiton.wikitty.entities.Wikitty; import org.nuiton.wikitty.search.Criteria; import org.nuiton.wikitty.search.PagedResult; import org.nuiton.wikitty.struts.Option; +import org.nuiton.wikitty.struts.WikittyFieldHandler; + import com.opensymphony.xwork2.util.ValueStack; @StrutsTag(name = "wikittyselect", tldTagClass = "org.nuiton.wikitty.struts.tag.WikittySelectTag", description = "", allowDynamicAttributes = false) @@ -45,7 +48,7 @@ handler.addAddedField(fqFieldName); // parse extname and field name - String[] fieldsAccess = StringUtil.split(fqFieldName, "."); + String[] fieldsAccess = StringUtil.split(fqFieldName, WikittyUtil.FQ_FIELD_NAME_SEPARATOR); // add parametters to be use by the template addParameter("included", true); addParameter( @@ -59,7 +62,7 @@ PagedResult<Wikitty> wikitties = handler.getProxy() .findAllByCriteria(criteria); - String[] descriptor = StringUtil.split(descfield, ","); + String[] descriptor = StringUtil.split(descfield, WikittyFieldHandler.FIELD_SEPARATOR); // if wikitties not null contruct option result // with descriptor