Author: mfortun Date: 2011-06-28 18:17:16 +0200 (Tue, 28 Jun 2011) New Revision: 989 Url: http://nuiton.org/repositories/revision/wikitty/989 Log: * save the fields that have been write to the page to ignore them when wikitty closing tag is match 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/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/WikittyFieldHandler.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/component/BooleanBean.java =================================================================== --- trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/BooleanBean.java 2011-06-28 15:56:42 UTC (rev 988) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/BooleanBean.java 2011-06-28 16:17:16 UTC (rev 989) @@ -30,6 +30,7 @@ .get(WikittyTagBean.WIKITTY_STACK_KEY); if (handler != null) { + handler.addAddedField(name); // if field defined as inclued if (handler.isIncluded(name)) { // parse extname and field name 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-28 15:56:42 UTC (rev 988) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/FixedSelectBean.java 2011-06-28 16:17:16 UTC (rev 989) @@ -32,6 +32,7 @@ if (handler != null) { // if field defined as inclued if (handler.isIncluded(name)) { + handler.addAddedField(name); // parse extname and field name String[] fieldsAccess = StringUtil.split(name, "."); // add parametters to be use by the template 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-28 15:56:42 UTC (rev 988) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/HiddenBean.java 2011-06-28 16:17:16 UTC (rev 989) @@ -31,6 +31,7 @@ if (handler != null) { // if field defined as inclued if (handler.isIncluded(name)) { + handler.addAddedField(name); // parse extname and field name String[] fieldsAccess = StringUtil.split(name, "."); // add parametters to be use by the template 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-28 15:56:42 UTC (rev 988) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/TextAreaBean.java 2011-06-28 16:17:16 UTC (rev 989) @@ -32,6 +32,7 @@ if (handler != null) { // if field defined as inclued if (handler.isIncluded(name)) { + handler.addAddedField(name); // parse extname and field name String[] fieldsAccess = StringUtil.split(name, "."); // add parametters to be use by the template 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-28 15:56:42 UTC (rev 988) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/TextFieldBean.java 2011-06-28 16:17:16 UTC (rev 989) @@ -28,6 +28,7 @@ .get(WikittyTagBean.WIKITTY_STACK_KEY); if (handler != null) { + handler.addAddedField(name); // if field defined as inclued if (handler.isIncluded(name)) { // parse extname and field name Modified: 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 2011-06-28 15:56:42 UTC (rev 988) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/WikittyFieldHandler.java 2011-06-28 16:17:16 UTC (rev 989) @@ -5,6 +5,8 @@ import java.util.LinkedList; import java.util.List; import java.util.Map; +import java.util.Set; + import org.apache.commons.lang.StringEscapeUtils; import org.nuiton.util.StringUtil; import org.nuiton.wikitty.WikittyProxy; @@ -24,7 +26,16 @@ protected String exclude = ""; protected String order = ""; protected Map<String, FieldSpecialisation> field; + protected Set<String> fieldAdded; + + public Set<String> getFieldAdded() { + return fieldAdded; + } + public void setFieldAdded(Set<String> fieldAdded) { + this.fieldAdded = fieldAdded; + } + public WikittyFieldHandler() { field = new HashMap<String, FieldSpecialisation>(); } @@ -118,12 +129,12 @@ .getFieldType(fieldName); /* * if field is excluded or field not included while include mode - * jump to the next field + * jump to the next field or if field allready added to the page */ if ((excludeMap.containsKey(extName) && excludeMap.get(extName) .contains(fieldName)) || (includeEnable && !includeMap.get(extName).contains( - fieldName))) { + fieldName)) || fieldAdded.contains(fieldName)) { continue; } @@ -306,6 +317,10 @@ } return result; } + + public void addAddedField(String field) { + fieldAdded.add(field); + } public boolean isIncluded(String fieldname) { return true; 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-28 15:56:42 UTC (rev 988) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/WikittySelectBean.java 2011-06-28 16:17:16 UTC (rev 989) @@ -48,6 +48,9 @@ if (handler != null) { // if field defined as inclued if (handler.isIncluded(name)) { + + handler.addAddedField(name); + // parse extname and field name String[] fieldsAccess = StringUtil.split(name, "."); // add parametters to be use by the template