Author: mfortun Date: 2011-07-04 18:05:23 +0200 (Mon, 04 Jul 2011) New Revision: 1042 Url: http://nuiton.org/repositories/revision/wikitty/1042 Log: * Correct another error due to ordering 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/HiddenBean.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 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-04 14:10:35 UTC (rev 1041) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/AbstractWikittyComponent.java 2011-07-04 16:05:23 UTC (rev 1042) @@ -77,12 +77,13 @@ if (fqFieldName != null) { addParameter("fqFieldName", fqFieldName); } - if (isIncluded(fqFieldName)) { - if (handler != null) { - handler.addAddedField(fqFieldName); - } + } + + protected void addAddedField (String fieldName) { + // TODO mfortun-2011-07-04 + if (handler != null) { + handler.addAddedField(fqFieldName); } - } public WikittyFieldHandler getHandler() { 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-04 14:10:35 UTC (rev 1041) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/BooleanBean.java 2011-07-04 16:05:23 UTC (rev 1042) @@ -42,6 +42,7 @@ "value", getWikitty().getFieldAsBoolean(fieldsAccess[0], fieldsAccess[1])); + addAddedField(fqFieldName); } } 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-04 14:10:35 UTC (rev 1041) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/DateBean.java 2011-07-04 16:05:23 UTC (rev 1042) @@ -48,7 +48,7 @@ if ( enableHour !=null) { addParameter("enableHour", enableHour); } - + addAddedField(fqFieldName); } 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-04 14:10:35 UTC (rev 1041) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/HiddenBean.java 2011-07-04 16:05:23 UTC (rev 1042) @@ -39,6 +39,7 @@ "value", getWikitty().getFieldAsString(fieldsAccess[0], fieldsAccess[1])); + addAddedField(fqFieldName); } } 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-04 14:10:35 UTC (rev 1041) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/SelectCriteriaBean.java 2011-07-04 16:05:23 UTC (rev 1042) @@ -43,6 +43,7 @@ // if field defined as inclued if (isIncluded(fqFieldName)) { + addAddedField(fqFieldName); // parse extname and field name String[] fieldsAccess = StringUtil.split(fqFieldName, WikittyUtil.FQ_FIELD_NAME_SEPARATOR); // add parametters to be use by the template 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-04 14:10:35 UTC (rev 1041) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/SelectFixedBean.java 2011-07-04 16:05:23 UTC (rev 1042) @@ -36,7 +36,7 @@ // if field defined as inclued if (isIncluded(fqFieldName)) { - + addAddedField(fqFieldName); // parse extname and field name String[] fieldsAccess = StringUtil.split(fqFieldName, WikittyUtil.FQ_FIELD_NAME_SEPARATOR); // 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-07-04 14:10:35 UTC (rev 1041) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/TextAreaBean.java 2011-07-04 16:05:23 UTC (rev 1042) @@ -30,7 +30,7 @@ // if field defined as inclued if (isIncluded(fqFieldName)) { - + addAddedField(fqFieldName); // parse extname and field name String[] fieldsAccess = StringUtil.split(fqFieldName, WikittyUtil.FQ_FIELD_NAME_SEPARATOR); // 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-07-04 14:10:35 UTC (rev 1041) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/TextFieldBean.java 2011-07-04 16:05:23 UTC (rev 1042) @@ -28,7 +28,7 @@ protected void evaluateExtraParams() { super.evaluateExtraParams(); - + addAddedField(fqFieldName); // if field defined as inclued if (isIncluded(fqFieldName)) { // parse extname and field name