Wikitty-commits
Threads by month
- ----- 2026 -----
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2025 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2024 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2013 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2012 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2011 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2010 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- 1653 discussions
r1046 - in trunk/wikitty-struts/src/main: java/org/nuiton/wikitty/struts java/org/nuiton/wikitty/struts/component java/org/nuiton/wikitty/struts/tag resources/template/xhtml tld
by mfortunï¼ users.nuiton.org July 5, 2011
by mfortunï¼ users.nuiton.org July 5, 2011
July 5, 2011
Author: mfortun
Date: 2011-07-05 13:54:44 +0200 (Tue, 05 Jul 2011)
New Revision: 1046
Url: http://nuiton.org/repositories/revision/wikitty/1046
Log:
* add attribute name used to specified the html name of specified field if outside wikitty form
* move commons code to abstractWikittyComponent
* rework commons template
* add option to specified textfield as pasword field
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/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/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/BooleanTag.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/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
trunk/wikitty-struts/src/main/resources/template/xhtml/ws-boolean.ftl
trunk/wikitty-struts/src/main/resources/template/xhtml/ws-commons.ftl
trunk/wikitty-struts/src/main/resources/template/xhtml/ws-date.ftl
trunk/wikitty-struts/src/main/resources/template/xhtml/ws-hidden.ftl
trunk/wikitty-struts/src/main/resources/template/xhtml/ws-selectcriteria.ftl
trunk/wikitty-struts/src/main/resources/template/xhtml/ws-selectfixed.ftl
trunk/wikitty-struts/src/main/resources/template/xhtml/ws-textarea.ftl
trunk/wikitty-struts/src/main/resources/template/xhtml/ws-textfield.ftl
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-04 16:27:20 UTC (rev 1045)
+++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/WikittyFieldHandler.java 2011-07-05 11:54:44 UTC (rev 1046)
@@ -305,17 +305,18 @@
&& (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(ALL_EXTENSION_CAR) || 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
+ WikittyUtil.FQ_FIELD_NAME_SEPARATOR + fieldName);
- log.debug("extension: " + extName + " field: " + fieldName
- + "notInclude:" + notIncluded + " exclude:" + excluded
+ log.debug("extension: " + extName + "." + fieldName
+ + " - notInclude:" + notIncluded + " exclude:" + excluded
+ " alreadyAdd:" + added);
if (excluded || notIncluded || added) {
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 16:27:20 UTC (rev 1045)
+++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/AbstractWikittyComponent.java 2011-07-05 11:54:44 UTC (rev 1046)
@@ -74,17 +74,26 @@
}
- if (fqFieldName != null) {
- addParameter("fqFieldName", fqFieldName);
+ if (name!=null && handler ==null) {
+ addParameter("name", 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);
+ }
+ }
}
- protected void addAddedField (String fieldName) {
- // TODO mfortun-2011-07-04
- if (handler != null) {
- handler.addAddedField(fqFieldName);
- }
- }
public WikittyFieldHandler getHandler() {
return handler;
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 16:27:20 UTC (rev 1045)
+++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/BooleanBean.java 2011-07-05 11:54:44 UTC (rev 1046)
@@ -31,19 +31,17 @@
super.evaluateExtraParams();
- // if field defined as inclued
- if (isIncluded(fqFieldName)) {
+
// parse extname and field name
String[] fieldsAccess = StringUtil.split(fqFieldName, WikittyUtil.FQ_FIELD_NAME_SEPARATOR);
// add parametters to be use by the template
+
addParameter(
- "included",true);
- addParameter(
"value",
getWikitty().getFieldAsBoolean(fieldsAccess[0],
fieldsAccess[1]));
- addAddedField(fqFieldName);
- }
+
+
}
public String getDefaultOpenTemplate() {
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 16:27:20 UTC (rev 1045)
+++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/DateBean.java 2011-07-05 11:54:44 UTC (rev 1046)
@@ -16,46 +16,36 @@
public static final String OPEN_TEMPLATE = "ws-date";
public static final String TEMPLATE = "ws-date-close";
-
-
+
protected Boolean enableHour = false;
-
+
public DateBean(ValueStack stack, HttpServletRequest request,
HttpServletResponse response) {
super(stack, request, response);
}
-
+
@Override
protected void evaluateExtraParams() {
super.evaluateExtraParams();
-
-
-
+
// if field defined as inclued
- if (isIncluded(fqFieldName)) {
- // parse extname and field name
- String[] fieldsAccess = StringUtil.split(fqFieldName, WikittyUtil.FQ_FIELD_NAME_SEPARATOR);
- // add parametters to be use by the template
- addParameter("included", true);
-
- Object val = getWikitty().getFieldAsDate(fieldsAccess[0],
- fieldsAccess[1]);
- val = val==null?"":val;
-
-
- addParameter("value",val);
- if ( enableHour !=null) {
- addParameter("enableHour", enableHour);
- }
- 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
+
+ Object val = getWikitty().getFieldAsDate(fieldsAccess[0],
+ fieldsAccess[1]);
+ val = val == null ? "" : val;
+
+ addParameter("value", val);
+ if (enableHour != null) {
+ addParameter("enableHour", enableHour);
}
-
-
-
-
+
}
-
+
public String getDefaultOpenTemplate() {
return OPEN_TEMPLATE;
}
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-04 16:27:20 UTC (rev 1045)
+++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/FormTagBean.java 2011-07-05 11:54:44 UTC (rev 1046)
@@ -2,12 +2,15 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+
+import org.apache.commons.lang.StringUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.struts2.components.ClosingUIBean;
import org.apache.struts2.views.annotations.StrutsTag;
import org.nuiton.wikitty.WikittyProxy;
import org.nuiton.wikitty.entities.Wikitty;
+import org.nuiton.wikitty.struts.TagUseException;
import org.nuiton.wikitty.struts.WikittyFieldHandler;
import com.opensymphony.xwork2.util.ValueStack;
@@ -46,6 +49,11 @@
super.evaluateExtraParams();
+ if (wikitty == null) {
+ throw new TagUseException("Wikitty must be a valid wikitty");
+ }
+
+
/* this methode is called two times:
* - first when the wikitty open tag is red
* - second when the wikitty closing tag is red
@@ -72,15 +80,22 @@
if (orderBefore!=null) {
addParameter("orderBefore", orderBefore);
}
+
+
+ if (name==null || name.equals(StringUtils.EMPTY)) {
+ name = "wikitty-form-"+wikitty.getId();
+
+ }
+
+
+ addParameter("wikittyid", findString(wikitty.getId()));
+ // no uses finally:
+ // addParameter("wikittyversion", findString(wikitty.getVersion()));
+ // addParameter("wikittyextensions", findString(wikitty
+ // .getExtensionNames().toString()));
- if (wikitty != null) {
- addParameter("wikittyid", findString(wikitty.getId()));
- //no uses finally:
- //addParameter("wikittyversion", findString(wikitty.getVersion()));
- //addParameter("wikittyextensions", findString(wikitty
- // .getExtensionNames().toString()));
- }
-
+ addParameter("name", name);
+
Object temp = stack.getContext().get(WikittyFieldHandler.WIKITTY_STACK_KEY);
WikittyFieldHandler handler;
if (temp == null) {
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 16:27:20 UTC (rev 1045)
+++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/HiddenBean.java 2011-07-05 11:54:44 UTC (rev 1046)
@@ -29,19 +29,17 @@
protected void evaluateExtraParams() {
super.evaluateExtraParams();
- // if field defined as inclued
- if (isIncluded(fqFieldName)) {
+
// parse extname and field name
String[] fieldsAccess = StringUtil.split(fqFieldName, WikittyUtil.FQ_FIELD_NAME_SEPARATOR);
// add parametters to be use by the template
- addParameter("included", true);
+
addParameter(
"value",
getWikitty().getFieldAsString(fieldsAccess[0],
fieldsAccess[1]));
- addAddedField(fqFieldName);
- }
+
}
public String getDefaultOpenTemplate() {
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 16:27:20 UTC (rev 1045)
+++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/SelectCriteriaBean.java 2011-07-05 11:54:44 UTC (rev 1046)
@@ -41,60 +41,55 @@
super.evaluateExtraParams();
- // 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
- addParameter("included", true);
- addParameter(
- "value",
- getWikitty().getFieldAsString(fieldsAccess[0],
- fieldsAccess[1]));
+
+
+ // parse extname and field name
+ String[] fieldsAccess = StringUtil.split(fqFieldName,
+ WikittyUtil.FQ_FIELD_NAME_SEPARATOR);
+ // add parametters to be use by the template
+ addParameter("value",
+ getWikitty().getFieldAsString(fieldsAccess[0], fieldsAccess[1]));
- List<Option> fixlist = new LinkedList<Option>();
+ List<Option> fixlist = new LinkedList<Option>();
- WikittyProxy proxy= getProxy();
-
- if (proxy == null) {
- throw new TagUseException(
- "Tag must declare a valid proxy attribute if used outside ws:form tag");
- }
-
-
- // search for the wikitty with the criteria
- PagedResult<Wikitty> wikitties = proxy
- .findAllByCriteria(criteria);
+ WikittyProxy proxy = getProxy();
- String[] descriptor = StringUtil.split(descfield, WikittyFieldHandler.FIELD_SEPARATOR);
+ if (proxy == null) {
+ throw new TagUseException(
+ "Tag must declare a valid proxy attribute if used outside ws:form tag");
+ }
- // if wikitties not null contruct option result
- // with descriptor
- if (wikitties != null) {
- for (Wikitty wiki : wikitties) {
- // by default value and description are the same
- // wikitty id
- String val = wiki.getId();
+ // search for the wikitty with the criteria
+ PagedResult<Wikitty> wikitties = proxy.findAllByCriteria(criteria);
- String desc = wiki.getId();
+ String[] descriptor = StringUtil.split(descfield,
+ WikittyFieldHandler.FIELD_SEPARATOR);
- // if attribute descripteur fill with something
- // extract from wikitty corresponding field value
- if (descriptor.length != 0) {
- desc = "";
- for (String descriptorIt : descriptor) {
- String[] descTable = StringUtil.split(descriptorIt,
- ".");
+ // if wikitties not null contruct option result
+ // with descriptor
+ if (wikitties != null) {
+ for (Wikitty wiki : wikitties) {
+ // by default value and description are the same
+ // wikitty id
+ String val = wiki.getId();
- desc += wiki.getFieldAsWikitty(descTable[0],
- descTable[1]);
- }
+ String desc = wiki.getId();
+
+ // if attribute descripteur fill with something
+ // extract from wikitty corresponding field value
+ if (descriptor.length != 0) {
+ desc = "";
+ for (String descriptorIt : descriptor) {
+ String[] descTable = StringUtil
+ .split(descriptorIt, ".");
+
+ desc += wiki.getFieldAsWikitty(descTable[0],
+ descTable[1]);
}
- fixlist.add(new Option(val, desc));
}
- addParameter("wikittiesvalues", fixlist);
+ fixlist.add(new Option(val, desc));
}
+ addParameter("wikittiesvalues", fixlist);
}
}
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 16:27:20 UTC (rev 1045)
+++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/SelectFixedBean.java 2011-07-05 11:54:44 UTC (rev 1046)
@@ -34,26 +34,20 @@
protected void evaluateExtraParams() {
super.evaluateExtraParams();
- // 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
- addParameter("included", true);
- addParameter(
- "value",
- getWikitty().getFieldAsString(fieldsAccess[0],
- fieldsAccess[1]));
+ // parse extname and field name
+ String[] fieldsAccess = StringUtil.split(fqFieldName,
+ WikittyUtil.FQ_FIELD_NAME_SEPARATOR);
+ // add parametters to be use by the template
+ addParameter("value",
+ getWikitty().getFieldAsString(fieldsAccess[0], fieldsAccess[1]));
- List<Option> fixlist = new LinkedList<Option>();
- String[] values = StringUtil.split(fixvalues, WikittyFieldHandler.FIELD_SEPARATOR);
- for (String it : values) {
- fixlist.add(new Option(it, it));
- }
- addParameter("fixvalues", fixlist);
-
+ List<Option> fixlist = new LinkedList<Option>();
+ String[] values = StringUtil.split(fixvalues,
+ WikittyFieldHandler.FIELD_SEPARATOR);
+ for (String it : values) {
+ fixlist.add(new Option(it, it));
}
+ addParameter("fixvalues", fixlist);
}
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 16:27:20 UTC (rev 1045)
+++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/TextAreaBean.java 2011-07-05 11:54:44 UTC (rev 1046)
@@ -28,19 +28,14 @@
protected void evaluateExtraParams() {
super.evaluateExtraParams();
- // 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
- addParameter("included", true);
- addParameter(
- "value",
- getWikitty().getFieldAsString(fieldsAccess[0],
- fieldsAccess[1]));
- }
+ // parse extname and field name
+ String[] fieldsAccess = StringUtil.split(fqFieldName,
+ WikittyUtil.FQ_FIELD_NAME_SEPARATOR);
+ // add parametters to be use by the template
+ addParameter("value",
+ getWikitty().getFieldAsString(fieldsAccess[0], fieldsAccess[1]));
+
}
public String getDefaultOpenTemplate() {
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 16:27:20 UTC (rev 1045)
+++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/TextFieldBean.java 2011-07-05 11:54:44 UTC (rev 1046)
@@ -19,6 +19,8 @@
public static final String OPEN_TEMPLATE = "ws-textfield";
public static final String TEMPLATE = "ws-textfield-close";
+ protected Boolean password;
+
public TextFieldBean(ValueStack stack, HttpServletRequest request,
HttpServletResponse response) {
super(stack, request, response);
@@ -28,20 +30,14 @@
protected void evaluateExtraParams() {
super.evaluateExtraParams();
-
- // if field defined as inclued
- if (isIncluded(fqFieldName)) {
- // parse extname and field name
- String[] fieldsAccess = StringUtil.split(fqFieldName, WikittyUtil.FQ_FIELD_NAME_SEPARATOR);
- // add parametters to be use by the template
- addParameter("included", true);
- addParameter(
- "value",
- getWikitty().getFieldAsString(fieldsAccess[0],
- fieldsAccess[1]));
- 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
+ addParameter("value",
+ getWikitty().getFieldAsString(fieldsAccess[0], fieldsAccess[1]));
+
}
public String getDefaultOpenTemplate() {
@@ -51,4 +47,12 @@
protected String getDefaultTemplate() {
return TEMPLATE;
}
+
+ public Boolean getPassword() {
+ return password;
+ }
+
+ public void setPassword(Boolean password) {
+ this.password = password;
+ }
}
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-04 16:27:20 UTC (rev 1045)
+++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/BooleanTag.java 2011-07-05 11:54:44 UTC (rev 1046)
@@ -2,11 +2,8 @@
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.struts.component.BooleanBean;
-
import com.opensymphony.xwork2.util.ValueStack;
public class BooleanTag extends AbstractWikittyTag {
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-04 16:27:20 UTC (rev 1045)
+++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/FormTag.java 2011-07-05 11:54:44 UTC (rev 1046)
@@ -7,7 +7,6 @@
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 {
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-04 16:27:20 UTC (rev 1045)
+++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/HiddenTag.java 2011-07-05 11:54:44 UTC (rev 1046)
@@ -2,11 +2,8 @@
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.struts.component.HiddenBean;
-
import com.opensymphony.xwork2.util.ValueStack;
public class HiddenTag extends AbstractWikittyTag {
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-04 16:27:20 UTC (rev 1045)
+++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/SelectCriteriaTag.java 2011-07-05 11:54:44 UTC (rev 1046)
@@ -2,13 +2,9 @@
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.search.Criteria;
import org.nuiton.wikitty.struts.component.SelectCriteriaBean;
-
import com.opensymphony.xwork2.util.ValueStack;
public class SelectCriteriaTag extends AbstractWikittyTag {
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-04 16:27:20 UTC (rev 1045)
+++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/SelectFixedTag.java 2011-07-05 11:54:44 UTC (rev 1046)
@@ -2,11 +2,8 @@
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.struts.component.SelectFixedBean;
-
import com.opensymphony.xwork2.util.ValueStack;
public class SelectFixedTag extends AbstractWikittyTag {
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-04 16:27:20 UTC (rev 1045)
+++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/TextAreaTag.java 2011-07-05 11:54:44 UTC (rev 1046)
@@ -2,9 +2,7 @@
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.struts.component.TextAreaBean;
import com.opensymphony.xwork2.util.ValueStack;
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-04 16:27:20 UTC (rev 1045)
+++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/TextFieldTag.java 2011-07-05 11:54:44 UTC (rev 1046)
@@ -2,14 +2,24 @@
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.struts.component.TextFieldBean;
-
import com.opensymphony.xwork2.util.ValueStack;
public class TextFieldTag extends AbstractWikittyTag {
+
+
+ protected Boolean password;
+
+
+ public Boolean getPassword() {
+ return password;
+ }
+
+ public void setPassword(Boolean password) {
+ this.password = password;
+ }
+
/**
*
*/
@@ -20,4 +30,14 @@
HttpServletResponse res) {
return new TextFieldBean(stack, req, res);
}
+
+ @Override
+ protected void populateParams() {
+ super.populateParams();
+ TextFieldBean fieldtag = ((TextFieldBean) component);
+
+ fieldtag.setPassword(password);
+
+ }
+
}
Modified: trunk/wikitty-struts/src/main/resources/template/xhtml/ws-boolean.ftl
===================================================================
--- trunk/wikitty-struts/src/main/resources/template/xhtml/ws-boolean.ftl 2011-07-04 16:27:20 UTC (rev 1045)
+++ trunk/wikitty-struts/src/main/resources/template/xhtml/ws-boolean.ftl 2011-07-05 11:54:44 UTC (rev 1046)
@@ -1,7 +1,7 @@
<#if parameters.included?? && parameters.included==true >
${parameters.label} : <input
<#include "/${parameters.templateDir}/xhtml/ws-commons.ftl" />
- type="checkbox" name="${parameters.fqFieldName}" value="true" <#t/>
+ type="checkbox" value="true" <#t/>
<#if aKey.value=="true" > <#t/>
checked='true'<#t/>
</#if>
Modified: trunk/wikitty-struts/src/main/resources/template/xhtml/ws-commons.ftl
===================================================================
--- trunk/wikitty-struts/src/main/resources/template/xhtml/ws-commons.ftl 2011-07-04 16:27:20 UTC (rev 1045)
+++ trunk/wikitty-struts/src/main/resources/template/xhtml/ws-commons.ftl 2011-07-05 11:54:44 UTC (rev 1046)
@@ -1,3 +1,4 @@
+name=${parameters.name}
<#if parameters.id?? ><#t/>
id="${parameters.id}"<#t/>
</#if><#t/>
\ No newline at end of file
Modified: trunk/wikitty-struts/src/main/resources/template/xhtml/ws-date.ftl
===================================================================
--- trunk/wikitty-struts/src/main/resources/template/xhtml/ws-date.ftl 2011-07-04 16:27:20 UTC (rev 1045)
+++ trunk/wikitty-struts/src/main/resources/template/xhtml/ws-date.ftl 2011-07-05 11:54:44 UTC (rev 1046)
@@ -1,7 +1,7 @@
<#if parameters.included?? && parameters.included==true >
${parameters.label} : <input
<#include "/${parameters.templateDir}/xhtml/ws-commons.ftl" />
- name="${parameters.fqFieldName}" type="text" value="${parameters.value}"> </p>
+ type="text" value="${parameters.value}"> </p>
</#if><#t/>
Modified: trunk/wikitty-struts/src/main/resources/template/xhtml/ws-hidden.ftl
===================================================================
--- trunk/wikitty-struts/src/main/resources/template/xhtml/ws-hidden.ftl 2011-07-04 16:27:20 UTC (rev 1045)
+++ trunk/wikitty-struts/src/main/resources/template/xhtml/ws-hidden.ftl 2011-07-05 11:54:44 UTC (rev 1046)
@@ -1,5 +1,5 @@
<#if parameters.included?? && parameters.included==true >
<input
<#include "/${parameters.templateDir}/xhtml/ws-commons.ftl" />
-type="hidden" name="${parameters.fqFieldName}" value="${parameters.value}" /><#t/>
+type="hidden" value="${parameters.value}" /><#t/>
</#if>
\ No newline at end of file
Modified: trunk/wikitty-struts/src/main/resources/template/xhtml/ws-selectcriteria.ftl
===================================================================
--- trunk/wikitty-struts/src/main/resources/template/xhtml/ws-selectcriteria.ftl 2011-07-04 16:27:20 UTC (rev 1045)
+++ trunk/wikitty-struts/src/main/resources/template/xhtml/ws-selectcriteria.ftl 2011-07-05 11:54:44 UTC (rev 1046)
@@ -1,7 +1,7 @@
<#if parameters.included?? && parameters.included==true >
${parameters.label} :<select
<#include "/${parameters.templateDir}/xhtml/ws-commons.ftl" />
- name="${parameters.fqFieldName}" size="1">
+ size="1">
<#assign optionKeys = parameters.wikittiesvalues>
<#list optionKeys as optionKey>
<option value="${optionKey.valeur}"<#t/>
Modified: trunk/wikitty-struts/src/main/resources/template/xhtml/ws-selectfixed.ftl
===================================================================
--- trunk/wikitty-struts/src/main/resources/template/xhtml/ws-selectfixed.ftl 2011-07-04 16:27:20 UTC (rev 1045)
+++ trunk/wikitty-struts/src/main/resources/template/xhtml/ws-selectfixed.ftl 2011-07-05 11:54:44 UTC (rev 1046)
@@ -1,7 +1,7 @@
<#if parameters.included?? && parameters.included==true >
${parameters.label} :<select
<#include "/${parameters.templateDir}/xhtml/ws-commons.ftl" />
-name="${parameters.fqFieldName}" size="1">
+ size="1">
<#assign optionKeys = parameters.fixvalues><#t/>
<#list optionKeys as optionKey><#t/>
<option value="${optionKey.valeur}" <#t/>
Modified: trunk/wikitty-struts/src/main/resources/template/xhtml/ws-textarea.ftl
===================================================================
--- trunk/wikitty-struts/src/main/resources/template/xhtml/ws-textarea.ftl 2011-07-04 16:27:20 UTC (rev 1045)
+++ trunk/wikitty-struts/src/main/resources/template/xhtml/ws-textarea.ftl 2011-07-05 11:54:44 UTC (rev 1046)
@@ -1,5 +1,5 @@
<#if parameters.included?? && parameters.included==true >
${parameters.label} : <textarea
<#include "/${parameters.templateDir}/xhtml/ws-commons.ftl" />
- cols="80" rows="20" name="${parameters.fqFieldName}">${parameters.value}</textarea><#t/>
+ cols="80" rows="20" >${parameters.value}</textarea><#t/>
</#if><#t/>
\ No newline at end of file
Modified: trunk/wikitty-struts/src/main/resources/template/xhtml/ws-textfield.ftl
===================================================================
--- trunk/wikitty-struts/src/main/resources/template/xhtml/ws-textfield.ftl 2011-07-04 16:27:20 UTC (rev 1045)
+++ trunk/wikitty-struts/src/main/resources/template/xhtml/ws-textfield.ftl 2011-07-05 11:54:44 UTC (rev 1046)
@@ -1,5 +1,11 @@
<#if parameters.included?? && parameters.included==true >
${parameters.label} : <input
<#include "/${parameters.templateDir}/xhtml/ws-commons.ftl" />
-type="text" name="${parameters.fqFieldName}" value="${parameters.value}" ><#t/>
+
+<#if parameters.password?? && parameters.password==true ><#t/>
+type="password"
+<#else><#t/>
+type="text"
+</#if><#t/>
+ value="${parameters.value}" ><#t/>
</#if><#t/>
\ No newline at end of file
Modified: trunk/wikitty-struts/src/main/tld/wikitty-struts.tld
===================================================================
--- trunk/wikitty-struts/src/main/tld/wikitty-struts.tld 2011-07-04 16:27:20 UTC (rev 1045)
+++ trunk/wikitty-struts/src/main/tld/wikitty-struts.tld 2011-07-05 11:54:44 UTC (rev 1046)
@@ -18,6 +18,12 @@
<rtexprvalue>true</rtexprvalue>
</attribute>
<attribute>
+ <description><![CDATA[name for the form]]></description>
+ <name>name</name>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+
+ <attribute>
<description><![CDATA[the wikitty to edit]]></description>
<name>wikitty</name>
<rtexprvalue>true</rtexprvalue>
@@ -88,6 +94,13 @@
<rtexprvalue>true</rtexprvalue>
</attribute>
<attribute>
+ <description><![CDATA[name for html element. Ignored if tag used inside tag form.]]></description>
+ <name>name</name>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+
+
+ <attribute>
<description><![CDATA[the wikitty to edit]]></description>
<name>wikitty</name>
<rtexprvalue>true</rtexprvalue>
@@ -109,7 +122,7 @@
<rtexprvalue>true</rtexprvalue>
</attribute>
<attribute>
- <description><![CDATA[the name of the field that have to be specialize]]></description>
+ <description><![CDATA[the name of the field that have to be specialize, it will be the name of the html element]]></description>
<name>fqFieldName</name>
<rtexprvalue>true</rtexprvalue>
<required>true</required>
@@ -133,6 +146,11 @@
<rtexprvalue>true</rtexprvalue>
</attribute>
<attribute>
+ <description><![CDATA[name for html element. Ignored if tag used inside tag form.]]></description>
+ <name>name</name>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
<description><![CDATA[the wikitty to edit]]></description>
<name>wikitty</name>
<rtexprvalue>true</rtexprvalue>
@@ -167,6 +185,11 @@
<rtexprvalue>true</rtexprvalue>
</attribute>
<attribute>
+ <description><![CDATA[name for html element. Ignored if tag used inside tag form.]]></description>
+ <name>name</name>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
<description><![CDATA[the wikitty to edit]]></description>
<name>wikitty</name>
<rtexprvalue>true</rtexprvalue>
@@ -190,6 +213,11 @@
<rtexprvalue>true</rtexprvalue>
</attribute>
<attribute>
+ <description><![CDATA[name for html element. Ignored if tag used inside tag form.]]></description>
+ <name>name</name>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
<description><![CDATA[the wikitty to edit]]></description>
<name>wikitty</name>
<rtexprvalue>true</rtexprvalue>
@@ -206,6 +234,11 @@
<rtexprvalue>true</rtexprvalue>
<required>true</required>
</attribute>
+ <attribute>
+ <description><![CDATA[if the textfiel have to hide the content]]></description>
+ <name>password</name>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
</tag>
<tag>
@@ -218,6 +251,11 @@
<rtexprvalue>true</rtexprvalue>
</attribute>
<attribute>
+ <description><![CDATA[name for html element. Ignored if tag used inside tag form.]]></description>
+ <name>name</name>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
<description><![CDATA[the wikitty to edit]]></description>
<name>wikitty</name>
<rtexprvalue>true</rtexprvalue>
@@ -252,6 +290,11 @@
<rtexprvalue>true</rtexprvalue>
</attribute>
<attribute>
+ <description><![CDATA[name for html element. Ignored if tag used inside tag form.]]></description>
+ <name>name</name>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
<description><![CDATA[the wikitty to edit]]></description>
<name>wikitty</name>
<rtexprvalue>true</rtexprvalue>
@@ -280,6 +323,11 @@
<rtexprvalue>true</rtexprvalue>
</attribute>
<attribute>
+ <description><![CDATA[name for html element. Ignored if tag used inside tag form.]]></description>
+ <name>name</name>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
<description><![CDATA[the wikitty to edit]]></description>
<name>wikitty</name>
<rtexprvalue>true</rtexprvalue>
1
0
r1045 - trunk/wikitty-lucene/src/main/java/org/nuiton/wikitty/storage/lucene
by echatellierï¼ users.nuiton.org July 4, 2011
by echatellierï¼ users.nuiton.org July 4, 2011
July 4, 2011
Author: echatellier
Date: 2011-07-04 18:27:20 +0200 (Mon, 04 Jul 2011)
New Revision: 1045
Url: http://nuiton.org/repositories/revision/wikitty/1045
Log:
Fix import
Modified:
trunk/wikitty-lucene/src/main/java/org/nuiton/wikitty/storage/lucene/Restriction2Lucene.java
Modified: trunk/wikitty-lucene/src/main/java/org/nuiton/wikitty/storage/lucene/Restriction2Lucene.java
===================================================================
--- trunk/wikitty-lucene/src/main/java/org/nuiton/wikitty/storage/lucene/Restriction2Lucene.java 2011-07-04 16:27:13 UTC (rev 1044)
+++ trunk/wikitty-lucene/src/main/java/org/nuiton/wikitty/storage/lucene/Restriction2Lucene.java 2011-07-04 16:27:20 UTC (rev 1045)
@@ -30,7 +30,6 @@
import org.apache.lucene.index.Term;
import org.apache.lucene.queryParser.ParseException;
import org.apache.lucene.queryParser.QueryParser;
-import org.apache.lucene.search.BooleanClause;
import org.apache.lucene.search.BooleanClause.Occur;
import org.apache.lucene.search.BooleanQuery;
import org.apache.lucene.search.MatchAllDocsQuery;
1
0
July 4, 2011
Author: echatellier
Date: 2011-07-04 18:27:13 +0200 (Mon, 04 Jul 2011)
New Revision: 1044
Url: http://nuiton.org/repositories/revision/wikitty/1044
Log:
jta is not a module dependencies
Modified:
trunk/wikitty-lucene/pom.xml
trunk/wikitty-solr/pom.xml
Modified: trunk/wikitty-lucene/pom.xml
===================================================================
--- trunk/wikitty-lucene/pom.xml 2011-07-04 16:08:35 UTC (rev 1043)
+++ trunk/wikitty-lucene/pom.xml 2011-07-04 16:27:13 UTC (rev 1044)
@@ -33,11 +33,6 @@
</dependency>
<dependency>
- <groupId>org.jboss.jbossts</groupId>
- <artifactId>jbossjta</artifactId>
- </dependency>
-
- <dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
Modified: trunk/wikitty-solr/pom.xml
===================================================================
--- trunk/wikitty-solr/pom.xml 2011-07-04 16:08:35 UTC (rev 1043)
+++ trunk/wikitty-solr/pom.xml 2011-07-04 16:27:13 UTC (rev 1044)
@@ -31,11 +31,6 @@
<classifier>tests</classifier>
<scope>test</scope>
</dependency>
-
- <dependency>
- <groupId>org.jboss.jbossts</groupId>
- <artifactId>jbossjta</artifactId>
- </dependency>
<dependency>
<groupId>org.nuiton</groupId>
1
0
r1043 - trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component
by mfortunï¼ users.nuiton.org July 4, 2011
by mfortunï¼ users.nuiton.org July 4, 2011
July 4, 2011
Author: mfortun
Date: 2011-07-04 18:08:35 +0200 (Mon, 04 Jul 2011)
New Revision: 1043
Url: http://nuiton.org/repositories/revision/wikitty/1043
Log:
* correct the last commit
Modified:
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/TextFieldBean.java
===================================================================
--- trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/TextFieldBean.java 2011-07-04 16:05:23 UTC (rev 1042)
+++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/TextFieldBean.java 2011-07-04 16:08:35 UTC (rev 1043)
@@ -28,7 +28,7 @@
protected void evaluateExtraParams() {
super.evaluateExtraParams();
- addAddedField(fqFieldName);
+
// if field defined as inclued
if (isIncluded(fqFieldName)) {
// parse extname and field name
@@ -39,6 +39,7 @@
"value",
getWikitty().getFieldAsString(fieldsAccess[0],
fieldsAccess[1]));
+ addAddedField(fqFieldName);
}
}
1
0
r1042 - trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component
by mfortunï¼ users.nuiton.org July 4, 2011
by mfortunï¼ users.nuiton.org July 4, 2011
July 4, 2011
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
1
0
r1041 - trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component
by mfortunï¼ users.nuiton.org July 4, 2011
by mfortunï¼ users.nuiton.org July 4, 2011
July 4, 2011
Author: mfortun
Date: 2011-07-04 16:10:35 +0200 (Mon, 04 Jul 2011)
New Revision: 1041
Url: http://nuiton.org/repositories/revision/wikitty/1041
Log:
* correction for an exception throwed to soon
Modified:
trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/AbstractWikittyComponent.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 13:23:21 UTC (rev 1040)
+++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/AbstractWikittyComponent.java 2011-07-04 14:10:35 UTC (rev 1041)
@@ -38,17 +38,8 @@
handler = (WikittyFieldHandler) stack.getContext().get(
WikittyFieldHandler.WIKITTY_STACK_KEY);
- if (handler == null && wikitty == null) {
- log.info("Handler not found in the stack");
- // TODO mfortun-2011-06-29 throw exception if handler not in the
- // stack
+ }
- throw new TagUseException(
- "Tag must declare Wikitty attribute if used outside ws:form tag");
- }
-
- }
-
public boolean isIncluded(String fieldName) {
if (handler != null) {
return handler.isIncluded(fieldName);
@@ -73,6 +64,16 @@
@Override
protected void evaluateExtraParams() {
super.evaluateExtraParams();
+
+ if (handler == null && wikitty == null) {
+ log.info("Handler not found in the stack and wikitty not declared");
+
+
+ throw new TagUseException(
+ "Tag must declare Wikitty attribute if used outside ws:form tag");
+
+ }
+
if (fqFieldName != null) {
addParameter("fqFieldName", fqFieldName);
}
1
0
r1040 - in trunk/wikitty-struts/src/main: java/org/nuiton/wikitty/struts java/org/nuiton/wikitty/struts/component java/org/nuiton/wikitty/struts/tag tld
by mfortunï¼ users.nuiton.org July 4, 2011
by mfortunï¼ users.nuiton.org July 4, 2011
July 4, 2011
Author: mfortun
Date: 2011-07-04 15:23:21 +0200 (Mon, 04 Jul 2011)
New Revision: 1040
Url: http://nuiton.org/repositories/revision/wikitty/1040
Log:
* allow tag to be used outside form tag, but in this case wikitty attribute and proxy must be defined
Added:
trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/TagUseException.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/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/tld/wikitty-struts.tld
Added: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/TagUseException.java
===================================================================
--- trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/TagUseException.java (rev 0)
+++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/TagUseException.java 2011-07-04 13:23:21 UTC (rev 1040)
@@ -0,0 +1,25 @@
+package org.nuiton.wikitty.struts;
+
+public class TagUseException extends RuntimeException {
+
+ /**
+ *
+ */
+ private static final long serialVersionUID = 5985271991430090753L;
+
+ public TagUseException() {
+ }
+
+ public TagUseException(String message, Throwable cause) {
+ super(message, cause);
+ }
+
+ public TagUseException(String message) {
+ super(message);
+ }
+
+ public TagUseException(Throwable cause) {
+ super(cause);
+ }
+
+}
Property changes on: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/TagUseException.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
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 12:57:41 UTC (rev 1039)
+++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/AbstractWikittyComponent.java 2011-07-04 13:23:21 UTC (rev 1040)
@@ -5,6 +5,9 @@
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.Wikitty;
+import org.nuiton.wikitty.struts.TagUseException;
import org.nuiton.wikitty.struts.WikittyFieldHandler;
import com.opensymphony.xwork2.util.ValueStack;
@@ -18,6 +21,16 @@
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 WikittyProxy proxy;
+
protected AbstractWikittyComponent(ValueStack stack,
HttpServletRequest request, HttpServletResponse response) {
super(stack, request, response);
@@ -25,14 +38,52 @@
handler = (WikittyFieldHandler) stack.getContext().get(
WikittyFieldHandler.WIKITTY_STACK_KEY);
- if (handler == null) {
+ if (handler == null && wikitty == null) {
log.info("Handler not found in the stack");
// TODO mfortun-2011-06-29 throw exception if handler not in the
// stack
+
+ throw new TagUseException(
+ "Tag must declare Wikitty attribute if used outside ws:form tag");
}
}
+ 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();
+ }
+ return wikitty;
+ }
+
+ @Override
+ protected void evaluateExtraParams() {
+ super.evaluateExtraParams();
+ if (fqFieldName != null) {
+ addParameter("fqFieldName", fqFieldName);
+ }
+ if (isIncluded(fqFieldName)) {
+ if (handler != null) {
+ handler.addAddedField(fqFieldName);
+ }
+ }
+
+ }
+
public WikittyFieldHandler getHandler() {
return handler;
}
@@ -49,12 +100,12 @@
this.fqFieldName = fqFieldName;
}
- @Override
- protected void evaluateExtraParams() {
- super.evaluateExtraParams();
- if ( fqFieldName !=null) {
- addParameter("fqFieldName", fqFieldName);
- }
+ public void setWikitty(Wikitty wikitty) {
+ this.wikitty = wikitty;
}
+ public void setProxy(WikittyProxy proxy) {
+ this.proxy = proxy;
+ }
+
}
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 12:57:41 UTC (rev 1039)
+++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/BooleanBean.java 2011-07-04 13:23:21 UTC (rev 1040)
@@ -32,8 +32,7 @@
// if field defined as inclued
- if (handler.isIncluded(fqFieldName)) {
- handler.addAddedField(fqFieldName);
+ if (isIncluded(fqFieldName)) {
// parse extname and field name
String[] fieldsAccess = StringUtil.split(fqFieldName, WikittyUtil.FQ_FIELD_NAME_SEPARATOR);
// add parametters to be use by the template
@@ -41,7 +40,7 @@
"included",true);
addParameter(
"value",
- handler.getWikitty().getFieldAsBoolean(fieldsAccess[0],
+ getWikitty().getFieldAsBoolean(fieldsAccess[0],
fieldsAccess[1]));
}
}
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 12:57:41 UTC (rev 1039)
+++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/DateBean.java 2011-07-04 13:23:21 UTC (rev 1040)
@@ -33,13 +33,13 @@
// if field defined as inclued
- if (handler.isIncluded(fqFieldName)) {
+ if (isIncluded(fqFieldName)) {
// parse extname and field name
String[] fieldsAccess = StringUtil.split(fqFieldName, WikittyUtil.FQ_FIELD_NAME_SEPARATOR);
// add parametters to be use by the template
addParameter("included", true);
- Object val = handler.getWikitty().getFieldAsDate(fieldsAccess[0],
+ Object val = getWikitty().getFieldAsDate(fieldsAccess[0],
fieldsAccess[1]);
val = val==null?"":val;
@@ -49,7 +49,6 @@
addParameter("enableHour", enableHour);
}
- handler.addAddedField(fqFieldName);
}
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-04 12:57:41 UTC (rev 1039)
+++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/FormTagBean.java 2011-07-04 13:23:21 UTC (rev 1040)
@@ -101,6 +101,10 @@
handler.setOrderBefore(orderBefore);
} else {
+ // when the tag is closing remove the handler from the stack
+ stack.getContext().remove(WikittyFieldHandler.WIKITTY_STACK_KEY);
+
+
handler = (WikittyFieldHandler) temp;
}
// add field that have to be write inside the page
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 12:57:41 UTC (rev 1039)
+++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/HiddenBean.java 2011-07-04 13:23:21 UTC (rev 1040)
@@ -30,15 +30,14 @@
super.evaluateExtraParams();
// if field defined as inclued
- if (handler.isIncluded(fqFieldName)) {
- handler.addAddedField(fqFieldName);
+ if (isIncluded(fqFieldName)) {
// parse extname and field name
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],
+ getWikitty().getFieldAsString(fieldsAccess[0],
fieldsAccess[1]));
}
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 12:57:41 UTC (rev 1039)
+++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/SelectCriteriaBean.java 2011-07-04 13:23:21 UTC (rev 1040)
@@ -8,11 +8,13 @@
import org.apache.commons.logging.LogFactory;
import org.apache.struts2.views.annotations.StrutsTag;
import org.nuiton.util.StringUtil;
+import org.nuiton.wikitty.WikittyProxy;
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.TagUseException;
import org.nuiton.wikitty.struts.WikittyFieldHandler;
import com.opensymphony.xwork2.util.ValueStack;
@@ -40,26 +42,28 @@
// if field defined as inclued
- if (handler.isIncluded(fqFieldName)) {
-
-
-
-
- handler.addAddedField(fqFieldName);
-
- // parse extname and field name
+ if (isIncluded(fqFieldName)) {
+ // parse extname and field name
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],
+ getWikitty().getFieldAsString(fieldsAccess[0],
fieldsAccess[1]));
List<Option> fixlist = new LinkedList<Option>();
+ WikittyProxy proxy= getProxy();
+
+ if (proxy == null) {
+ throw new TagUseException(
+ "Tag must declare a valid proxy attribute if used outside ws:form tag");
+ }
+
+
// search for the wikitty with the criteria
- PagedResult<Wikitty> wikitties = handler.getProxy()
+ PagedResult<Wikitty> wikitties = proxy
.findAllByCriteria(criteria);
String[] descriptor = StringUtil.split(descfield, WikittyFieldHandler.FIELD_SEPARATOR);
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 12:57:41 UTC (rev 1039)
+++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/SelectFixedBean.java 2011-07-04 13:23:21 UTC (rev 1040)
@@ -35,15 +35,15 @@
super.evaluateExtraParams();
// if field defined as inclued
- if (handler.isIncluded(fqFieldName)) {
- handler.addAddedField(fqFieldName);
+ if (isIncluded(fqFieldName)) {
+
// parse extname and field name
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],
+ getWikitty().getFieldAsString(fieldsAccess[0],
fieldsAccess[1]));
List<Option> fixlist = new LinkedList<Option>();
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 12:57:41 UTC (rev 1039)
+++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/TextAreaBean.java 2011-07-04 13:23:21 UTC (rev 1040)
@@ -29,15 +29,15 @@
super.evaluateExtraParams();
// if field defined as inclued
- if (handler.isIncluded(fqFieldName)) {
- handler.addAddedField(fqFieldName);
+ if (isIncluded(fqFieldName)) {
+
// parse extname and field name
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],
+ getWikitty().getFieldAsString(fieldsAccess[0],
fieldsAccess[1]));
}
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 12:57:41 UTC (rev 1039)
+++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/TextFieldBean.java 2011-07-04 13:23:21 UTC (rev 1040)
@@ -30,16 +30,15 @@
// if field defined as inclued
- if (handler.isIncluded(fqFieldName)) {
+ if (isIncluded(fqFieldName)) {
// parse extname and field name
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],
+ getWikitty().getFieldAsString(fieldsAccess[0],
fieldsAccess[1]));
- handler.addAddedField(fqFieldName);
}
}
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-04 12:57:41 UTC (rev 1039)
+++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/AbstractWikittyTag.java 2011-07-04 13:23:21 UTC (rev 1040)
@@ -1,6 +1,8 @@
package org.nuiton.wikitty.struts.tag;
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.AbstractWikittyComponent;
public abstract class AbstractWikittyTag extends AbstractClosingTag {
@@ -8,6 +10,8 @@
private static final long serialVersionUID = -3401870606519882751L;
protected String fqFieldName;
+ protected Wikitty wikitty;
+ protected WikittyProxy proxy;
public String getFqFieldName() {
return fqFieldName;
@@ -18,11 +22,29 @@
}
+ 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;
+ }
+
@Override
protected void populateParams() {
super.populateParams();
AbstractWikittyComponent wikittyComponent = (AbstractWikittyComponent) component;
wikittyComponent.setFqFieldName(fqFieldName);
+ wikittyComponent.setWikitty(wikitty);
+ wikittyComponent.setProxy(proxy);
}
Modified: trunk/wikitty-struts/src/main/tld/wikitty-struts.tld
===================================================================
--- trunk/wikitty-struts/src/main/tld/wikitty-struts.tld 2011-07-04 12:57:41 UTC (rev 1039)
+++ trunk/wikitty-struts/src/main/tld/wikitty-struts.tld 2011-07-04 13:23:21 UTC (rev 1040)
@@ -15,7 +15,7 @@
<attribute>
<description><![CDATA[id for the field]]></description>
<name>id</name>
- <rtexprvalue>true</rtexprvalue>
+ <rtexprvalue>true</rtexprvalue>
</attribute>
<attribute>
<description><![CDATA[the wikitty to edit]]></description>
@@ -67,8 +67,8 @@
<name>orderBefore</name>
<rtexprvalue>true</rtexprvalue>
</attribute>
-
-
+
+
<attribute>
<description><![CDATA[If a delele button must be in the form]]></description>
<name>allowDelete</name>
@@ -85,9 +85,19 @@
<attribute>
<description><![CDATA[id for the field]]></description>
<name>id</name>
- <rtexprvalue>true</rtexprvalue>
+ <rtexprvalue>true</rtexprvalue>
</attribute>
<attribute>
+ <description><![CDATA[the wikitty to edit]]></description>
+ <name>wikitty</name>
+ <rtexprvalue>true</rtexprvalue>
+ </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>
+ </attribute>
+ <attribute>
<description><![CDATA[if subtype == wikitty, use the list of wikitty found by criteria as option for select]]></description>
<name>criteria</name>
<rtexprvalue>true</rtexprvalue>
@@ -120,9 +130,14 @@
<attribute>
<description><![CDATA[id for the field]]></description>
<name>id</name>
- <rtexprvalue>true</rtexprvalue>
+ <rtexprvalue>true</rtexprvalue>
</attribute>
<attribute>
+ <description><![CDATA[the wikitty to edit]]></description>
+ <name>wikitty</name>
+ <rtexprvalue>true</rtexprvalue>
+ </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>
@@ -149,9 +164,14 @@
<attribute>
<description><![CDATA[id for the field]]></description>
<name>id</name>
- <rtexprvalue>true</rtexprvalue>
+ <rtexprvalue>true</rtexprvalue>
</attribute>
<attribute>
+ <description><![CDATA[the wikitty to edit]]></description>
+ <name>wikitty</name>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
<description><![CDATA[the name of the field that have to be specialize]]></description>
<name>fqFieldName</name>
<rtexprvalue>true</rtexprvalue>
@@ -167,9 +187,14 @@
<attribute>
<description><![CDATA[id for the field]]></description>
<name>id</name>
- <rtexprvalue>true</rtexprvalue>
+ <rtexprvalue>true</rtexprvalue>
</attribute>
<attribute>
+ <description><![CDATA[the wikitty to edit]]></description>
+ <name>wikitty</name>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
<description><![CDATA[the name of the field that have to be specialize]]></description>
<name>fqFieldName</name>
<rtexprvalue>true</rtexprvalue>
@@ -182,7 +207,7 @@
<required>true</required>
</attribute>
</tag>
-
+
<tag>
<name>date</name>
<tagclass>org.nuiton.wikitty.struts.tag.DateTag</tagclass>
@@ -190,9 +215,14 @@
<attribute>
<description><![CDATA[id for the field]]></description>
<name>id</name>
- <rtexprvalue>true</rtexprvalue>
+ <rtexprvalue>true</rtexprvalue>
</attribute>
<attribute>
+ <description><![CDATA[the wikitty to edit]]></description>
+ <name>wikitty</name>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
<description><![CDATA[the name of the field that have to be specialize]]></description>
<name>fqFieldName</name>
<rtexprvalue>true</rtexprvalue>
@@ -210,8 +240,8 @@
<rtexprvalue>true</rtexprvalue>
</attribute>
</tag>
-
+
<tag>
<name>textArea</name>
<tagclass>org.nuiton.wikitty.struts.tag.TextAreaTag</tagclass>
@@ -219,9 +249,14 @@
<attribute>
<description><![CDATA[id for the field]]></description>
<name>id</name>
- <rtexprvalue>true</rtexprvalue>
+ <rtexprvalue>true</rtexprvalue>
</attribute>
<attribute>
+ <description><![CDATA[the wikitty to edit]]></description>
+ <name>wikitty</name>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
<description><![CDATA[the name of the field that have to be specialize]]></description>
<name>fqFieldName</name>
<rtexprvalue>true</rtexprvalue>
@@ -242,9 +277,14 @@
<attribute>
<description><![CDATA[id for the field]]></description>
<name>id</name>
- <rtexprvalue>true</rtexprvalue>
+ <rtexprvalue>true</rtexprvalue>
</attribute>
<attribute>
+ <description><![CDATA[the wikitty to edit]]></description>
+ <name>wikitty</name>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
<description><![CDATA[the name of the field that have to be specialize]]></description>
<name>fqFieldName</name>
<rtexprvalue>true</rtexprvalue>
1
0
r1039 - in trunk/wikitty-struts/src/main: java resources resources/template resources/template/xhtml
by sletellierï¼ users.nuiton.org July 4, 2011
by sletellierï¼ users.nuiton.org July 4, 2011
July 4, 2011
Author: sletellier
Date: 2011-07-04 14:57:41 +0200 (Mon, 04 Jul 2011)
New Revision: 1039
Url: http://nuiton.org/repositories/revision/wikitty/1039
Log:
Move template to correct directory
Added:
trunk/wikitty-struts/src/main/resources/template/
trunk/wikitty-struts/src/main/resources/template/xhtml/
trunk/wikitty-struts/src/main/resources/template/xhtml/ws-boolean-close.ftl
trunk/wikitty-struts/src/main/resources/template/xhtml/ws-boolean.ftl
trunk/wikitty-struts/src/main/resources/template/xhtml/ws-commons.ftl
trunk/wikitty-struts/src/main/resources/template/xhtml/ws-date-close.ftl
trunk/wikitty-struts/src/main/resources/template/xhtml/ws-date.ftl
trunk/wikitty-struts/src/main/resources/template/xhtml/ws-form-close.ftl
trunk/wikitty-struts/src/main/resources/template/xhtml/ws-form-commons.ftl
trunk/wikitty-struts/src/main/resources/template/xhtml/ws-form.ftl
trunk/wikitty-struts/src/main/resources/template/xhtml/ws-hidden-close.ftl
trunk/wikitty-struts/src/main/resources/template/xhtml/ws-hidden.ftl
trunk/wikitty-struts/src/main/resources/template/xhtml/ws-selectcriteria-close.ftl
trunk/wikitty-struts/src/main/resources/template/xhtml/ws-selectcriteria.ftl
trunk/wikitty-struts/src/main/resources/template/xhtml/ws-selectfixed-close.ftl
trunk/wikitty-struts/src/main/resources/template/xhtml/ws-selectfixed.ftl
trunk/wikitty-struts/src/main/resources/template/xhtml/ws-textarea-close.ftl
trunk/wikitty-struts/src/main/resources/template/xhtml/ws-textarea.ftl
trunk/wikitty-struts/src/main/resources/template/xhtml/ws-textfield-close.ftl
trunk/wikitty-struts/src/main/resources/template/xhtml/ws-textfield.ftl
Removed:
trunk/wikitty-struts/src/main/java/template/
Copied: trunk/wikitty-struts/src/main/resources/template/xhtml/ws-boolean.ftl (from rev 1038, trunk/wikitty-struts/src/main/java/template/xhtml/ws-boolean.ftl)
===================================================================
--- trunk/wikitty-struts/src/main/resources/template/xhtml/ws-boolean.ftl (rev 0)
+++ trunk/wikitty-struts/src/main/resources/template/xhtml/ws-boolean.ftl 2011-07-04 12:57:41 UTC (rev 1039)
@@ -0,0 +1,9 @@
+<#if parameters.included?? && parameters.included==true >
+${parameters.label} : <input
+<#include "/${parameters.templateDir}/xhtml/ws-commons.ftl" />
+ type="checkbox" name="${parameters.fqFieldName}" value="true" <#t/>
+ <#if aKey.value=="true" > <#t/>
+ checked='true'<#t/>
+ </#if>
+ />
+</#if>
\ No newline at end of file
Copied: trunk/wikitty-struts/src/main/resources/template/xhtml/ws-commons.ftl (from rev 1038, trunk/wikitty-struts/src/main/java/template/xhtml/ws-commons.ftl)
===================================================================
--- trunk/wikitty-struts/src/main/resources/template/xhtml/ws-commons.ftl (rev 0)
+++ trunk/wikitty-struts/src/main/resources/template/xhtml/ws-commons.ftl 2011-07-04 12:57:41 UTC (rev 1039)
@@ -0,0 +1,3 @@
+<#if parameters.id?? ><#t/>
+id="${parameters.id}"<#t/>
+</#if><#t/>
\ No newline at end of file
Copied: trunk/wikitty-struts/src/main/resources/template/xhtml/ws-date.ftl (from rev 1038, trunk/wikitty-struts/src/main/java/template/xhtml/ws-date.ftl)
===================================================================
--- trunk/wikitty-struts/src/main/resources/template/xhtml/ws-date.ftl (rev 0)
+++ trunk/wikitty-struts/src/main/resources/template/xhtml/ws-date.ftl 2011-07-04 12:57:41 UTC (rev 1039)
@@ -0,0 +1,7 @@
+<#if parameters.included?? && parameters.included==true >
+${parameters.label} : <input
+<#include "/${parameters.templateDir}/xhtml/ws-commons.ftl" />
+ name="${parameters.fqFieldName}" type="text" value="${parameters.value}"> </p>
+</#if><#t/>
+
+
Copied: trunk/wikitty-struts/src/main/resources/template/xhtml/ws-form-close.ftl (from rev 1038, trunk/wikitty-struts/src/main/java/template/xhtml/ws-form-close.ftl)
===================================================================
--- trunk/wikitty-struts/src/main/resources/template/xhtml/ws-form-close.ftl (rev 0)
+++ trunk/wikitty-struts/src/main/resources/template/xhtml/ws-form-close.ftl 2011-07-04 12:57:41 UTC (rev 1039)
@@ -0,0 +1,6 @@
+<#include "/${parameters.templateDir}/xhtml/ws-form-commons.ftl" />
+<input type="submit" name="store" value="Store" />
+<#if parameters.allowDelete?? && parameters.allowDelete==true >
+<input type="submit" name="delete" value="Delete" />
+</#if>
+</form>
\ No newline at end of file
Copied: trunk/wikitty-struts/src/main/resources/template/xhtml/ws-form-commons.ftl (from rev 1038, trunk/wikitty-struts/src/main/java/template/xhtml/ws-form-commons.ftl)
===================================================================
--- trunk/wikitty-struts/src/main/resources/template/xhtml/ws-form-commons.ftl (rev 0)
+++ trunk/wikitty-struts/src/main/resources/template/xhtml/ws-form-commons.ftl 2011-07-04 12:57:41 UTC (rev 1039)
@@ -0,0 +1,50 @@
+<#assign aKeys = parameters.wikittyfields><#t/>
+ <#list aKeys as aKey><#t/>
+<#--<#if aKey.type=="file">
+<input type="hidden" name="${aKey.name}" value="BINARY" />
+${aKey.label} : <input type="file" name="File" label ="File"/>
+</#if>-->
+<#if aKey.type=="hidden">
+<input
+<#include "/${parameters.templateDir}/xhtml/ws-commons.ftl" />
+ type="hidden" name="${aKey.name}" value="${aKey.value}" />
+</#if>
+<#if aKey.type=="textarea" >
+${aKey.label} : <textarea
+<#include "/${parameters.templateDir}/xhtml/ws-commons.ftl" />
+ cols="80" rows="20" name="${aKey.name}">${aKey.value}</textarea>
+</#if>
+<#if aKey.type=="textfield" >
+${aKey.label} : <input
+<#include "/${parameters.templateDir}/xhtml/ws-commons.ftl" />
+ type="text" name="${aKey.name}" value="${aKey.value}" >
+</#if>
+<#if aKey.type=="boolean" >
+${aKey.label} : <input
+<#include "/${parameters.templateDir}/xhtml/ws-commons.ftl" />
+ type="checkbox" name="${aKey.name}" value="true"
+ <#if aKey.value=="true" >
+ checked='true'
+ </#if>
+ />
+</#if>
+<#--
+
+-->
+<#if aKey.type=="select" >
+${aKey.label} :
+<select
+<#include "/${parameters.templateDir}/xhtml/ws-commons.ftl" />
+ name="${aKey.name}" size="1">
+<#assign optionKeys = aKey.listOption><#t/>
+ <#list optionKeys as optionKey><#t/>
+ <option value="${optionKey.valeur}"
+ <#if optionKey.valeur==aKey.value >
+ selected
+ </#if>
+ > ${optionKey.description} </option>
+ </#list><#t/>
+</select>
+</#if>
+</br>
+</#list><#t/>
Copied: trunk/wikitty-struts/src/main/resources/template/xhtml/ws-form.ftl (from rev 1038, trunk/wikitty-struts/src/main/java/template/xhtml/ws-form.ftl)
===================================================================
--- trunk/wikitty-struts/src/main/resources/template/xhtml/ws-form.ftl (rev 0)
+++ trunk/wikitty-struts/src/main/resources/template/xhtml/ws-form.ftl 2011-07-04 12:57:41 UTC (rev 1039)
@@ -0,0 +1,10 @@
+<form
+<#include "/${parameters.templateDir}/xhtml/ws-commons.ftl" />
+class="edit" action="${parameters.action}" method="post" enctype="multipart/form-data" >
+<input type="hidden" name="id" value="${parameters.wikittyid}" />
+<#if parameters.redirect??>
+<input type="hidden" name="redirect" value="${parameters.redirect}" />
+</#if><#t/>
+<#if parameters.orderBefore?? && parameters.orderBefore==true >
+<#include "/${parameters.templateDir}/xhtml/ws-form-commons.ftl" />
+</#if><#t/>
\ No newline at end of file
Copied: trunk/wikitty-struts/src/main/resources/template/xhtml/ws-hidden.ftl (from rev 1038, trunk/wikitty-struts/src/main/java/template/xhtml/ws-hidden.ftl)
===================================================================
--- trunk/wikitty-struts/src/main/resources/template/xhtml/ws-hidden.ftl (rev 0)
+++ trunk/wikitty-struts/src/main/resources/template/xhtml/ws-hidden.ftl 2011-07-04 12:57:41 UTC (rev 1039)
@@ -0,0 +1,5 @@
+<#if parameters.included?? && parameters.included==true >
+<input
+<#include "/${parameters.templateDir}/xhtml/ws-commons.ftl" />
+type="hidden" name="${parameters.fqFieldName}" value="${parameters.value}" /><#t/>
+</#if>
\ No newline at end of file
Copied: trunk/wikitty-struts/src/main/resources/template/xhtml/ws-selectcriteria.ftl (from rev 1038, trunk/wikitty-struts/src/main/java/template/xhtml/ws-selectcriteria.ftl)
===================================================================
--- trunk/wikitty-struts/src/main/resources/template/xhtml/ws-selectcriteria.ftl (rev 0)
+++ trunk/wikitty-struts/src/main/resources/template/xhtml/ws-selectcriteria.ftl 2011-07-04 12:57:41 UTC (rev 1039)
@@ -0,0 +1,14 @@
+<#if parameters.included?? && parameters.included==true >
+${parameters.label} :<select
+<#include "/${parameters.templateDir}/xhtml/ws-commons.ftl" />
+ name="${parameters.fqFieldName}" size="1">
+<#assign optionKeys = parameters.wikittiesvalues>
+ <#list optionKeys as optionKey>
+ <option value="${optionKey.valeur}"<#t/>
+ <#if optionKey.valeur==parameters.value >
+ selected <#t/>
+ </#if> <#t/>
+ > ${optionKey.description} </option>
+ </#list>
+</select><#t/>
+</#if>
\ No newline at end of file
Copied: trunk/wikitty-struts/src/main/resources/template/xhtml/ws-selectfixed.ftl (from rev 1038, trunk/wikitty-struts/src/main/java/template/xhtml/ws-selectfixed.ftl)
===================================================================
--- trunk/wikitty-struts/src/main/resources/template/xhtml/ws-selectfixed.ftl (rev 0)
+++ trunk/wikitty-struts/src/main/resources/template/xhtml/ws-selectfixed.ftl 2011-07-04 12:57:41 UTC (rev 1039)
@@ -0,0 +1,14 @@
+<#if parameters.included?? && parameters.included==true >
+${parameters.label} :<select
+<#include "/${parameters.templateDir}/xhtml/ws-commons.ftl" />
+name="${parameters.fqFieldName}" size="1">
+<#assign optionKeys = parameters.fixvalues><#t/>
+ <#list optionKeys as optionKey><#t/>
+ <option value="${optionKey.valeur}" <#t/>
+ <#if optionKey.valeur==parameters.value >
+ selected <#t/>
+ </#if> <#t/>
+ > ${optionKey.description} </option>
+ </#list>
+</select><#t/>
+</#if>
\ No newline at end of file
Copied: trunk/wikitty-struts/src/main/resources/template/xhtml/ws-textarea.ftl (from rev 1038, trunk/wikitty-struts/src/main/java/template/xhtml/ws-textarea.ftl)
===================================================================
--- trunk/wikitty-struts/src/main/resources/template/xhtml/ws-textarea.ftl (rev 0)
+++ trunk/wikitty-struts/src/main/resources/template/xhtml/ws-textarea.ftl 2011-07-04 12:57:41 UTC (rev 1039)
@@ -0,0 +1,5 @@
+<#if parameters.included?? && parameters.included==true >
+${parameters.label} : <textarea
+<#include "/${parameters.templateDir}/xhtml/ws-commons.ftl" />
+ cols="80" rows="20" name="${parameters.fqFieldName}">${parameters.value}</textarea><#t/>
+</#if><#t/>
\ No newline at end of file
Copied: trunk/wikitty-struts/src/main/resources/template/xhtml/ws-textfield.ftl (from rev 1038, trunk/wikitty-struts/src/main/java/template/xhtml/ws-textfield.ftl)
===================================================================
--- trunk/wikitty-struts/src/main/resources/template/xhtml/ws-textfield.ftl (rev 0)
+++ trunk/wikitty-struts/src/main/resources/template/xhtml/ws-textfield.ftl 2011-07-04 12:57:41 UTC (rev 1039)
@@ -0,0 +1,5 @@
+<#if parameters.included?? && parameters.included==true >
+${parameters.label} : <input
+<#include "/${parameters.templateDir}/xhtml/ws-commons.ftl" />
+type="text" name="${parameters.fqFieldName}" value="${parameters.value}" ><#t/>
+</#if><#t/>
\ No newline at end of file
1
0
July 4, 2011
Author: mfortun
Date: 2011-07-04 14:13:13 +0200 (Mon, 04 Jul 2011)
New Revision: 1038
Url: http://nuiton.org/repositories/revision/wikitty/1038
Log:
* add an example of the tag lib use, need to be completed
Added:
trunk/wikitty-struts/src/main/webapps/
trunk/wikitty-struts/src/main/webapps/example.jsp
Added: trunk/wikitty-struts/src/main/webapps/example.jsp
===================================================================
--- trunk/wikitty-struts/src/main/webapps/example.jsp (rev 0)
+++ trunk/wikitty-struts/src/main/webapps/example.jsp 2011-07-04 12:13:13 UTC (rev 1038)
@@ -0,0 +1,42 @@
+<%@page import="org.apache.commons.lang.StringEscapeUtils"%>
+<%@page import="org.nuiton.wikitty.entities.Wikitty"%>
+
+<%@ taglib prefix="s" uri="/struts-tags" %>
+<%@taglib prefix="ws" uri="/wikitty-struts"%>
+
+
+<%
+
+// temp action inherit of the AbstractWikittyEditAction
+TempAction action = TempAction.getAction();
+
+Wikitty wikitty = action.getWikitty();
+
+%>
+
+<% if (wikitty != null) { %>
+<pre><%=StringEscapeUtils.escapeHtml(String.valueOf(wikitty))%></pre>
+<% } %>
+
+<ws:form wikitty="<%=wikitty%>"
+ proxy="<%=action.getProxy()%>"
+ action="/wikitty-publication/temp.action" allowDelete="true"
+ exclude="WikittyToken.date"
+
+>
+
+ <ws:selectCriteria fqFieldName="WikittyToken.user" label="user" criteria="<%=action.getCrit() %>"/>
+ <ws:date fqFieldName="WikittyToken.date" label="dateuh"/>
+ <ws:selectFixed fqFieldName="WikittyUser.password" fixvalues="password,truc,passwordPourri" label="motdepasse"/>
+
+ <!-- exclude="WikittyToken.date"
+ <s:url var="urlFragment" action="temp" />
+ <sj:submit targets="wikittyInfo" href="%{#urlFragment}"> </sj:submit> -->
+</ws:form>
+
+
+
+
+
+
+
Property changes on: trunk/wikitty-struts/src/main/webapps/example.jsp
___________________________________________________________________
Added: svn:mime-type
+ text/plain
1
0
r1037 - in trunk/wikitty-struts/src/main: java/org/nuiton/wikitty/struts java/org/nuiton/wikitty/struts/component java/org/nuiton/wikitty/struts/tag java/template/xhtml tld
by mfortunï¼ users.nuiton.org July 4, 2011
by mfortunï¼ users.nuiton.org July 4, 2011
July 4, 2011
Author: mfortun
Date: 2011-07-04 12:16:24 +0200 (Mon, 04 Jul 2011)
New Revision: 1037
Url: http://nuiton.org/repositories/revision/wikitty/1037
Log:
* add support for id attribute
* rename tag
* change location of stack key for handler
Added:
trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/FormTagBean.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/tag/FormTag.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/template/xhtml/ws-commons.ftl
trunk/wikitty-struts/src/main/java/template/xhtml/ws-form-close.ftl
trunk/wikitty-struts/src/main/java/template/xhtml/ws-form-commons.ftl
trunk/wikitty-struts/src/main/java/template/xhtml/ws-form.ftl
trunk/wikitty-struts/src/main/java/template/xhtml/ws-selectcriteria-close.ftl
trunk/wikitty-struts/src/main/java/template/xhtml/ws-selectcriteria.ftl
trunk/wikitty-struts/src/main/java/template/xhtml/ws-selectfixed-close.ftl
trunk/wikitty-struts/src/main/java/template/xhtml/ws-selectfixed.ftl
Removed:
trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/FixedSelectBean.java
trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/WikittySelectBean.java
trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/WikittyTagBean.java
trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/FixedSelectTag.java
trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/WikittySelectTag.java
trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/WikittyTag.java
trunk/wikitty-struts/src/main/java/template/xhtml/wikitty-close.ftl
trunk/wikitty-struts/src/main/java/template/xhtml/wikitty-commons.ftl
trunk/wikitty-struts/src/main/java/template/xhtml/wikitty.ftl
trunk/wikitty-struts/src/main/java/template/xhtml/ws-fixedselect-close.ftl
trunk/wikitty-struts/src/main/java/template/xhtml/ws-fixedselect.ftl
trunk/wikitty-struts/src/main/java/template/xhtml/ws-wikittyselect-close.ftl
trunk/wikitty-struts/src/main/java/template/xhtml/ws-wikittyselect.ftl
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/template/xhtml/ws-boolean.ftl
trunk/wikitty-struts/src/main/java/template/xhtml/ws-date.ftl
trunk/wikitty-struts/src/main/java/template/xhtml/ws-hidden.ftl
trunk/wikitty-struts/src/main/java/template/xhtml/ws-textarea.ftl
trunk/wikitty-struts/src/main/java/template/xhtml/ws-textfield.ftl
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-01 15:45:35 UTC (rev 1036)
+++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/WikittyFieldHandler.java 2011-07-04 10:16:24 UTC (rev 1037)
@@ -40,6 +40,8 @@
// if include is enable it change how to construct result
protected boolean includeEnable = false;
+ public static final String WIKITTY_STACK_KEY = "wikitty_key";
+
public Set<String> getFieldAdded() {
return fieldAdded;
}
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-01 15:45:35 UTC (rev 1036)
+++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/AbstractWikittyComponent.java 2011-07-04 10:16:24 UTC (rev 1037)
@@ -23,7 +23,7 @@
super(stack, request, response);
handler = (WikittyFieldHandler) stack.getContext().get(
- WikittyTagBean.WIKITTY_STACK_KEY);
+ WikittyFieldHandler.WIKITTY_STACK_KEY);
if (handler == null) {
log.info("Handler not found in the stack");
Deleted: 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 15:45:35 UTC (rev 1036)
+++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/FixedSelectBean.java 2011-07-04 10:16:24 UTC (rev 1037)
@@ -1,76 +0,0 @@
-package org.nuiton.wikitty.struts.component;
-
-import java.util.LinkedList;
-import java.util.List;
-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.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)
-public class FixedSelectBean extends AbstractWikittyComponent {
-
- /** to use log facility, just put in your code: log.info(\"...\"); */
- final static private Log log = LogFactory.getLog(FixedSelectBean.class);
-
- public static final String OPEN_TEMPLATE = "ws-fixedselect";
- public static final String TEMPLATE = "ws-fixedselect-close";
-
- protected String fixvalues;
-
- public FixedSelectBean(ValueStack stack, HttpServletRequest request,
- HttpServletResponse response) {
- super(stack, request, response);
- }
-
- @Override
- protected void evaluateExtraParams() {
- super.evaluateExtraParams();
-
- // if field defined as inclued
- if (handler.isIncluded(fqFieldName)) {
- handler.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
- addParameter("included", true);
- addParameter(
- "value",
- handler.getWikitty().getFieldAsString(fieldsAccess[0],
- fieldsAccess[1]));
-
- List<Option> fixlist = new LinkedList<Option>();
- String[] values = StringUtil.split(fixvalues, WikittyFieldHandler.FIELD_SEPARATOR);
- for (String it : values) {
- fixlist.add(new Option(it, it));
- }
- addParameter("fixvalues", fixlist);
-
- }
-
- }
-
- public String getDefaultOpenTemplate() {
- return OPEN_TEMPLATE;
- }
-
- protected String getDefaultTemplate() {
- return TEMPLATE;
- }
-
- public String getFixvalues() {
- return fixvalues;
- }
-
- public void setFixvalues(String fixvalues) {
- this.fixvalues = fixvalues;
- }
-
-}
Copied: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/FormTagBean.java (from rev 1033, trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/WikittyTagBean.java)
===================================================================
--- trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/FormTagBean.java (rev 0)
+++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/FormTagBean.java 2011-07-04 10:16:24 UTC (rev 1037)
@@ -0,0 +1,201 @@
+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.apache.struts2.components.ClosingUIBean;
+import org.apache.struts2.views.annotations.StrutsTag;
+import org.nuiton.wikitty.WikittyProxy;
+import org.nuiton.wikitty.entities.Wikitty;
+import org.nuiton.wikitty.struts.WikittyFieldHandler;
+
+import com.opensymphony.xwork2.util.ValueStack;
+
+@StrutsTag(name = "Wikitty", tldTagClass = "org.nuiton.wikitty.struts.tag.FormTag",
+ description = "", allowDynamicAttributes = false)
+public class FormTagBean extends ClosingUIBean {
+
+ /** to use log facility, just put in your code: log.info(\"...\"); */
+ final static private Log log = LogFactory.getLog(FormTagBean.class);
+
+
+ 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;
+
+ protected String include;
+ protected String exclude;
+
+ protected String order;
+ protected Boolean orderBefore;
+
+ protected Boolean allowDelete;
+
+ public FormTagBean(ValueStack stack, HttpServletRequest request,
+ HttpServletResponse response) {
+ super(stack, request, response);
+ }
+
+ @Override
+ protected void evaluateExtraParams() {
+ super.evaluateExtraParams();
+
+
+ /* this methode is called two times:
+ * - first when the wikitty open tag is red
+ * - second when the wikitty closing tag is red
+ *
+ * for the first called this create an object wikittyfieldhandler
+ * that will be store inside the stack and used by the included tag (
+ * inside the wikitty tags to store)
+ *
+ *
+ */
+
+ if (action != null) {
+ addParameter("action", findString(action));
+ }
+
+ if (redirect != null) {
+ addParameter("redirect", findString(redirect));
+ }
+
+ if (allowDelete != null) {
+ addParameter("allowDelete", allowDelete);
+ }
+
+ if (orderBefore!=null) {
+ addParameter("orderBefore", orderBefore);
+ }
+
+ if (wikitty != null) {
+ addParameter("wikittyid", findString(wikitty.getId()));
+ //no uses finally:
+ //addParameter("wikittyversion", findString(wikitty.getVersion()));
+ //addParameter("wikittyextensions", findString(wikitty
+ // .getExtensionNames().toString()));
+ }
+
+ Object temp = stack.getContext().get(WikittyFieldHandler.WIKITTY_STACK_KEY);
+ WikittyFieldHandler handler;
+ if (temp == null) {
+
+ // construct wikitty field handler withh
+ // all required param and put it in the stack
+ handler = new WikittyFieldHandler();
+
+ log.info(handler + " Added to the stack");
+
+ stack.getContext().put(WikittyFieldHandler.WIKITTY_STACK_KEY, handler);
+
+ handler.setExclude(exclude);
+ handler.setInclude(include);
+ handler.setOrder(order);
+ handler.setWikitty(wikitty);
+ handler.setProxy(proxy);
+ handler.setOrderBefore(orderBefore);
+
+ } else {
+ handler = (WikittyFieldHandler) temp;
+ }
+ // add field that have to be write inside the page
+ log.info("add wikitty fields to the parametters");
+ addParameter("wikittyfields", handler.getWikittyField());
+
+
+ }
+
+ public String getDefaultOpenTemplate() {
+ return OPEN_TEMPLATE;
+ }
+
+ protected String getDefaultTemplate() {
+ 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;
+ }
+
+ public void setAction(String action) {
+ this.action = action;
+ }
+
+ public String getRedirect() {
+ return redirect;
+ }
+
+ public void setRedirect(String redirect) {
+ this.redirect = redirect;
+ }
+
+ public String getInclude() {
+ return include;
+ }
+
+ public void setInclude(String include) {
+ this.include = include;
+ }
+
+ public String getExclude() {
+ return exclude;
+ }
+
+ public void setExclude(String exclude) {
+ this.exclude = exclude;
+ }
+
+ public String getOrder() {
+ return order;
+ }
+
+ public void setOrder(String order) {
+ this.order = order;
+ }
+
+ public boolean isAllowDelete() {
+ return allowDelete;
+ }
+
+ public void setAllowDelete(boolean allowDelete) {
+ this.allowDelete = allowDelete;
+ }
+
+ public Boolean getOrderBefore() {
+ return orderBefore;
+ }
+
+ public void setOrderBefore(Boolean orderBefore) {
+ this.orderBefore = orderBefore;
+ }
+
+ public Boolean getAllowDelete() {
+ return allowDelete;
+ }
+
+ public void setAllowDelete(Boolean allowDelete) {
+ this.allowDelete = allowDelete;
+ }
+
+}
Property changes on: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/FormTagBean.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Copied: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/SelectCriteriaBean.java (from rev 1033, trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/WikittySelectBean.java)
===================================================================
--- trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/SelectCriteriaBean.java (rev 0)
+++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/SelectCriteriaBean.java 2011-07-04 10:16:24 UTC (rev 1037)
@@ -0,0 +1,121 @@
+package org.nuiton.wikitty.struts.component;
+
+import java.util.LinkedList;
+import java.util.List;
+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.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.SelectCriteriaTag", description = "", allowDynamicAttributes = false)
+public class SelectCriteriaBean extends AbstractWikittyComponent {
+
+ /** to use log facility, just put in your code: log.info(\"...\"); */
+ final static private Log log = LogFactory.getLog(SelectCriteriaBean.class);
+
+ public static final String OPEN_TEMPLATE = "ws-selectcriteria";
+ public static final String TEMPLATE = "ws-selectcriteria-close";
+
+ protected Criteria criteria;
+ protected String descfield;
+
+ public SelectCriteriaBean(ValueStack stack, HttpServletRequest request,
+ HttpServletResponse response) {
+ super(stack, request, response);
+ }
+
+ @Override
+ protected void evaluateExtraParams() {
+ super.evaluateExtraParams();
+
+
+ // if field defined as inclued
+ if (handler.isIncluded(fqFieldName)) {
+
+
+
+
+ handler.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
+ addParameter("included", true);
+ addParameter(
+ "value",
+ handler.getWikitty().getFieldAsString(fieldsAccess[0],
+ fieldsAccess[1]));
+
+ List<Option> fixlist = new LinkedList<Option>();
+
+ // search for the wikitty with the criteria
+ PagedResult<Wikitty> wikitties = handler.getProxy()
+ .findAllByCriteria(criteria);
+
+ String[] descriptor = StringUtil.split(descfield, WikittyFieldHandler.FIELD_SEPARATOR);
+
+ // if wikitties not null contruct option result
+ // with descriptor
+ if (wikitties != null) {
+ for (Wikitty wiki : wikitties) {
+ // by default value and description are the same
+ // wikitty id
+ String val = wiki.getId();
+
+ String desc = wiki.getId();
+
+ // if attribute descripteur fill with something
+ // extract from wikitty corresponding field value
+ if (descriptor.length != 0) {
+ desc = "";
+ for (String descriptorIt : descriptor) {
+ String[] descTable = StringUtil.split(descriptorIt,
+ ".");
+
+ desc += wiki.getFieldAsWikitty(descTable[0],
+ descTable[1]);
+ }
+ }
+ fixlist.add(new Option(val, desc));
+ }
+ addParameter("wikittiesvalues", fixlist);
+ }
+ }
+
+ }
+
+ public String getDefaultOpenTemplate() {
+ return OPEN_TEMPLATE;
+ }
+
+ protected String getDefaultTemplate() {
+ return TEMPLATE;
+ }
+
+ public Criteria getCriteria() {
+ return criteria;
+ }
+
+ public void setCriteria(Criteria criteria) {
+ this.criteria = criteria;
+ }
+
+ public String getDescfield() {
+ return descfield;
+ }
+
+ public void setDescfield(String descfield) {
+ this.descfield = descfield;
+ }
+
+}
Property changes on: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/SelectCriteriaBean.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Copied: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/SelectFixedBean.java (from rev 1033, trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/FixedSelectBean.java)
===================================================================
--- trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/SelectFixedBean.java (rev 0)
+++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/SelectFixedBean.java 2011-07-04 10:16:24 UTC (rev 1037)
@@ -0,0 +1,76 @@
+package org.nuiton.wikitty.struts.component;
+
+import java.util.LinkedList;
+import java.util.List;
+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.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.SelectFixedTag", description = "", allowDynamicAttributes = false)
+public class SelectFixedBean extends AbstractWikittyComponent {
+
+ /** to use log facility, just put in your code: log.info(\"...\"); */
+ final static private Log log = LogFactory.getLog(SelectFixedBean.class);
+
+ public static final String OPEN_TEMPLATE = "ws-selectfixed";
+ public static final String TEMPLATE = "ws-selectfixed-close";
+
+ protected String fixvalues;
+
+ public SelectFixedBean(ValueStack stack, HttpServletRequest request,
+ HttpServletResponse response) {
+ super(stack, request, response);
+ }
+
+ @Override
+ protected void evaluateExtraParams() {
+ super.evaluateExtraParams();
+
+ // if field defined as inclued
+ if (handler.isIncluded(fqFieldName)) {
+ handler.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
+ addParameter("included", true);
+ addParameter(
+ "value",
+ handler.getWikitty().getFieldAsString(fieldsAccess[0],
+ fieldsAccess[1]));
+
+ List<Option> fixlist = new LinkedList<Option>();
+ String[] values = StringUtil.split(fixvalues, WikittyFieldHandler.FIELD_SEPARATOR);
+ for (String it : values) {
+ fixlist.add(new Option(it, it));
+ }
+ addParameter("fixvalues", fixlist);
+
+ }
+
+ }
+
+ public String getDefaultOpenTemplate() {
+ return OPEN_TEMPLATE;
+ }
+
+ protected String getDefaultTemplate() {
+ return TEMPLATE;
+ }
+
+ public String getFixvalues() {
+ return fixvalues;
+ }
+
+ public void setFixvalues(String fixvalues) {
+ this.fixvalues = fixvalues;
+ }
+
+}
Property changes on: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/SelectFixedBean.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Deleted: 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 15:45:35 UTC (rev 1036)
+++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/WikittySelectBean.java 2011-07-04 10:16:24 UTC (rev 1037)
@@ -1,121 +0,0 @@
-package org.nuiton.wikitty.struts.component;
-
-import java.util.LinkedList;
-import java.util.List;
-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.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)
-public class WikittySelectBean extends AbstractWikittyComponent {
-
- /** to use log facility, just put in your code: log.info(\"...\"); */
- final static private Log log = LogFactory.getLog(WikittySelectBean.class);
-
- public static final String OPEN_TEMPLATE = "ws-wikittyselect";
- public static final String TEMPLATE = "ws-wikittyselect-close";
-
- protected Criteria criteria;
- protected String descfield;
-
- public WikittySelectBean(ValueStack stack, HttpServletRequest request,
- HttpServletResponse response) {
- super(stack, request, response);
- }
-
- @Override
- protected void evaluateExtraParams() {
- super.evaluateExtraParams();
-
-
- // if field defined as inclued
- if (handler.isIncluded(fqFieldName)) {
-
-
-
-
- handler.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
- addParameter("included", true);
- addParameter(
- "value",
- handler.getWikitty().getFieldAsString(fieldsAccess[0],
- fieldsAccess[1]));
-
- List<Option> fixlist = new LinkedList<Option>();
-
- // search for the wikitty with the criteria
- PagedResult<Wikitty> wikitties = handler.getProxy()
- .findAllByCriteria(criteria);
-
- String[] descriptor = StringUtil.split(descfield, WikittyFieldHandler.FIELD_SEPARATOR);
-
- // if wikitties not null contruct option result
- // with descriptor
- if (wikitties != null) {
- for (Wikitty wiki : wikitties) {
- // by default value and description are the same
- // wikitty id
- String val = wiki.getId();
-
- String desc = wiki.getId();
-
- // if attribute descripteur fill with something
- // extract from wikitty corresponding field value
- if (descriptor.length != 0) {
- desc = "";
- for (String descriptorIt : descriptor) {
- String[] descTable = StringUtil.split(descriptorIt,
- ".");
-
- desc += wiki.getFieldAsWikitty(descTable[0],
- descTable[1]);
- }
- }
- fixlist.add(new Option(val, desc));
- }
- addParameter("wikittiesvalues", fixlist);
- }
- }
-
- }
-
- public String getDefaultOpenTemplate() {
- return OPEN_TEMPLATE;
- }
-
- protected String getDefaultTemplate() {
- return TEMPLATE;
- }
-
- public Criteria getCriteria() {
- return criteria;
- }
-
- public void setCriteria(Criteria criteria) {
- this.criteria = criteria;
- }
-
- public String getDescfield() {
- return descfield;
- }
-
- public void setDescfield(String descfield) {
- this.descfield = descfield;
- }
-
-}
Deleted: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/WikittyTagBean.java
===================================================================
--- trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/WikittyTagBean.java 2011-07-01 15:45:35 UTC (rev 1036)
+++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/WikittyTagBean.java 2011-07-04 10:16:24 UTC (rev 1037)
@@ -1,203 +0,0 @@
-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.apache.struts2.components.ClosingUIBean;
-import org.apache.struts2.views.annotations.StrutsTag;
-import org.nuiton.wikitty.WikittyProxy;
-import org.nuiton.wikitty.entities.Wikitty;
-import org.nuiton.wikitty.struts.WikittyFieldHandler;
-
-import com.opensymphony.xwork2.util.ValueStack;
-
-@StrutsTag(name = "Wikitty", tldTagClass = "org.nuiton.wikitty.struts.tag.WikittyTag",
- description = "", allowDynamicAttributes = false)
-public class WikittyTagBean extends ClosingUIBean {
-
- /** to use log facility, just put in your code: log.info(\"...\"); */
- final static private Log log = LogFactory.getLog(WikittyTagBean.class);
-
-
- public static final String OPEN_TEMPLATE = "wikitty";
- public static final String TEMPLATE = "wikitty-close";
- public static final String WIKITTY_STACK_KEY = "wikitty_key";
-
- protected Wikitty wikitty;
- protected WikittyProxy proxy;
-
- protected String action;
- protected String redirect;
-
- protected String include;
- protected String exclude;
-
- protected String order;
- protected Boolean orderBefore;
-
- protected Boolean allowDelete;
-
- public WikittyTagBean(ValueStack stack, HttpServletRequest request,
- HttpServletResponse response) {
- super(stack, request, response);
- }
-
- @Override
- protected void evaluateExtraParams() {
- super.evaluateExtraParams();
-
-
- /* this methode is called two times:
- * - first when the wikitty open tag is red
- * - second when the wikitty closing tag is red
- *
- * for the first called this create an object wikittyfieldhandler
- * that will be store inside the stack and used by the included tag (
- * inside the wikitty tags to store)
- *
- *
- */
-
- if (action != null) {
- addParameter("action", findString(action));
- }
-
- if (redirect != null) {
- addParameter("redirect", findString(redirect));
- }
-
- if (allowDelete != null) {
- addParameter("allowDelete", allowDelete);
- }
-
- if (orderBefore!=null) {
- addParameter("orderBefore", orderBefore);
- }
-
- if (wikitty != null) {
- addParameter("wikittyid", findString(wikitty.getId()));
- //no uses finally:
- //addParameter("wikittyversion", findString(wikitty.getVersion()));
- //addParameter("wikittyextensions", findString(wikitty
- // .getExtensionNames().toString()));
- }
-
- Object temp = stack.getContext().get(WIKITTY_STACK_KEY);
- WikittyFieldHandler handler;
- if (temp == null) {
-
- // construct wikitty field handler withh
- // all required param and put it in the stack
- handler = new WikittyFieldHandler();
-
- log.info(handler + " Added to the stack");
-
- stack.getContext().put(WIKITTY_STACK_KEY, handler);
-
- handler.setExclude(exclude);
- handler.setInclude(include);
- handler.setOrder(order);
- handler.setWikitty(wikitty);
- handler.setProxy(proxy);
- handler.setOrderBefore(orderBefore);
-
- } else {
- handler = (WikittyFieldHandler) temp;
- }
- // add field that have to be write inside the page
- log.info("add wikitty fields to the parametters");
- addParameter("wikittyfields", handler.getWikittyField());
-
-
- }
-
- public String getDefaultOpenTemplate() {
- return OPEN_TEMPLATE;
- }
-
- protected String getDefaultTemplate() {
- 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;
- }
-
- public void setAction(String action) {
- this.action = action;
- }
-
- public String getRedirect() {
- return redirect;
- }
-
- public void setRedirect(String redirect) {
- this.redirect = redirect;
- }
-
- public String getInclude() {
- return include;
- }
-
- public void setInclude(String include) {
- this.include = include;
- }
-
- public String getExclude() {
- return exclude;
- }
-
- public void setExclude(String exclude) {
- this.exclude = exclude;
- }
-
- public String getOrder() {
- return order;
- }
-
- public void setOrder(String order) {
- this.order = order;
- }
-
- public boolean isAllowDelete() {
- return allowDelete;
- }
-
- public void setAllowDelete(boolean allowDelete) {
- this.allowDelete = allowDelete;
- }
-
- public Boolean getOrderBefore() {
- return orderBefore;
- }
-
- public void setOrderBefore(Boolean orderBefore) {
- this.orderBefore = orderBefore;
- }
-
- public Boolean getAllowDelete() {
- return allowDelete;
- }
-
- public void setAllowDelete(Boolean allowDelete) {
- this.allowDelete = allowDelete;
- }
-
-}
Deleted: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/FixedSelectTag.java
===================================================================
--- trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/FixedSelectTag.java 2011-07-01 15:45:35 UTC (rev 1036)
+++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/FixedSelectTag.java 2011-07-04 10:16:24 UTC (rev 1037)
@@ -1,43 +0,0 @@
-package org.nuiton.wikitty.struts.tag;
-
-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.struts.component.FixedSelectBean;
-
-import com.opensymphony.xwork2.util.ValueStack;
-
-public class FixedSelectTag extends AbstractWikittyTag {
-
- /**
- *
- */
- private static final long serialVersionUID = -8415432856577152486L;
- protected String fixvalues;
-
- @Override
- public Component getBean(ValueStack stack, HttpServletRequest req,
- HttpServletResponse res) {
- return new FixedSelectBean(stack, req, res);
- }
-
- @Override
- protected void populateParams() {
- super.populateParams();
- FixedSelectBean fieldtag = ((FixedSelectBean) component);
-
- fieldtag.setFixvalues(fixvalues);
-
- }
-
- public String getFixvalues() {
- return fixvalues;
- }
-
- public void setFixvalues(String fixvalues) {
- this.fixvalues = fixvalues;
- }
-
-}
Copied: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/FormTag.java (from rev 1033, trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/WikittyTag.java)
===================================================================
--- trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/FormTag.java (rev 0)
+++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/FormTag.java 2011-07-04 10:16:24 UTC (rev 1037)
@@ -0,0 +1,123 @@
+package org.nuiton.wikitty.struts.tag;
+
+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 {
+
+ /**
+ *
+ */
+ private static final long serialVersionUID = 258152544560583399L;
+ protected Wikitty wikitty;
+ protected WikittyProxy proxy;
+ protected String action;
+ protected String redirect;
+ protected String include;
+ protected String exclude;
+ protected String order;
+ protected boolean allowDelete;
+ protected boolean orderBefore;
+
+ public boolean isOrderBefore() {
+ return orderBefore;
+ }
+
+ public void setOrderBefore(boolean orderBefore) {
+ this.orderBefore = orderBefore;
+ }
+
+ public String getInclude() {
+ return include;
+ }
+
+ public void setInclude(String include) {
+ this.include = include;
+ }
+
+ public String getExclude() {
+ return exclude;
+ }
+
+ public void setExclude(String exclude) {
+ this.exclude = exclude;
+ }
+
+ public String getOrder() {
+ return order;
+ }
+
+ public void setOrder(String order) {
+ this.order = order;
+ }
+
+ public boolean isAllowDelete() {
+ return allowDelete;
+ }
+
+ public void setAllowDelete(boolean allowDelete) {
+ this.allowDelete = allowDelete;
+ }
+
+ @Override
+ public Component getBean(ValueStack stack, HttpServletRequest req,
+ HttpServletResponse res) {
+ return new FormTagBean(stack, req, res);
+
+ }
+
+ @Override
+ protected void populateParams() {
+ super.populateParams();
+ 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);
+ wikittyTag.setInclude(include);
+ 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;
+ }
+
+ public void setAction(String action) {
+ this.action = action;
+ }
+
+ public String getRedirect() {
+ return redirect;
+ }
+
+ public void setRedirect(String redirect) {
+ this.redirect = redirect;
+ }
+
+}
Property changes on: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/FormTag.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Copied: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/SelectCriteriaTag.java (from rev 1033, trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/WikittySelectTag.java)
===================================================================
--- trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/SelectCriteriaTag.java (rev 0)
+++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/SelectCriteriaTag.java 2011-07-04 10:16:24 UTC (rev 1037)
@@ -0,0 +1,58 @@
+package org.nuiton.wikitty.struts.tag;
+
+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.search.Criteria;
+import org.nuiton.wikitty.struts.component.SelectCriteriaBean;
+
+import com.opensymphony.xwork2.util.ValueStack;
+
+public class SelectCriteriaTag extends AbstractWikittyTag {
+
+ /**
+ *
+ */
+ private static final long serialVersionUID = 2807198744532780915L;
+ protected Criteria criteria;
+ protected String descfield;
+
+ @Override
+ public Component getBean(ValueStack stack, HttpServletRequest req,
+ HttpServletResponse res) {
+ return new SelectCriteriaBean(stack, req, res);
+
+ }
+
+
+
+ @Override
+ protected void populateParams() {
+ super.populateParams();
+ SelectCriteriaBean fieldtag = ((SelectCriteriaBean) component);
+
+ fieldtag.setCriteria(criteria);
+ fieldtag.setDescfield(descfield);
+ }
+
+
+ public Criteria getCriteria() {
+ return criteria;
+ }
+
+ public void setCriteria(Criteria criteria) {
+ this.criteria = criteria;
+ }
+
+ public String getDescfield() {
+ return descfield;
+ }
+
+ public void setDescfield(String descfield) {
+ this.descfield = descfield;
+ }
+
+}
Property changes on: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/SelectCriteriaTag.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Copied: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/SelectFixedTag.java (from rev 1033, trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/FixedSelectTag.java)
===================================================================
--- trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/SelectFixedTag.java (rev 0)
+++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/SelectFixedTag.java 2011-07-04 10:16:24 UTC (rev 1037)
@@ -0,0 +1,43 @@
+package org.nuiton.wikitty.struts.tag;
+
+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.struts.component.SelectFixedBean;
+
+import com.opensymphony.xwork2.util.ValueStack;
+
+public class SelectFixedTag extends AbstractWikittyTag {
+
+ /**
+ *
+ */
+ private static final long serialVersionUID = -8415432856577152486L;
+ protected String fixvalues;
+
+ @Override
+ public Component getBean(ValueStack stack, HttpServletRequest req,
+ HttpServletResponse res) {
+ return new SelectFixedBean(stack, req, res);
+ }
+
+ @Override
+ protected void populateParams() {
+ super.populateParams();
+ SelectFixedBean fieldtag = ((SelectFixedBean) component);
+
+ fieldtag.setFixvalues(fixvalues);
+
+ }
+
+ public String getFixvalues() {
+ return fixvalues;
+ }
+
+ public void setFixvalues(String fixvalues) {
+ this.fixvalues = fixvalues;
+ }
+
+}
Property changes on: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/SelectFixedTag.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Deleted: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/WikittySelectTag.java
===================================================================
--- trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/WikittySelectTag.java 2011-07-01 15:45:35 UTC (rev 1036)
+++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/WikittySelectTag.java 2011-07-04 10:16:24 UTC (rev 1037)
@@ -1,58 +0,0 @@
-package org.nuiton.wikitty.struts.tag;
-
-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.search.Criteria;
-import org.nuiton.wikitty.struts.component.WikittySelectBean;
-
-import com.opensymphony.xwork2.util.ValueStack;
-
-public class WikittySelectTag extends AbstractWikittyTag {
-
- /**
- *
- */
- private static final long serialVersionUID = 2807198744532780915L;
- protected Criteria criteria;
- protected String descfield;
-
- @Override
- public Component getBean(ValueStack stack, HttpServletRequest req,
- HttpServletResponse res) {
- return new WikittySelectBean(stack, req, res);
-
- }
-
-
-
- @Override
- protected void populateParams() {
- super.populateParams();
- WikittySelectBean fieldtag = ((WikittySelectBean) component);
-
- fieldtag.setCriteria(criteria);
- fieldtag.setDescfield(descfield);
- }
-
-
- public Criteria getCriteria() {
- return criteria;
- }
-
- public void setCriteria(Criteria criteria) {
- this.criteria = criteria;
- }
-
- public String getDescfield() {
- return descfield;
- }
-
- public void setDescfield(String descfield) {
- this.descfield = descfield;
- }
-
-}
Deleted: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/WikittyTag.java
===================================================================
--- trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/WikittyTag.java 2011-07-01 15:45:35 UTC (rev 1036)
+++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/WikittyTag.java 2011-07-04 10:16:24 UTC (rev 1037)
@@ -1,123 +0,0 @@
-package org.nuiton.wikitty.struts.tag;
-
-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.WikittyTagBean;
-
-import com.opensymphony.xwork2.util.ValueStack;
-
-public class WikittyTag extends AbstractClosingTag {
-
- /**
- *
- */
- private static final long serialVersionUID = 258152544560583399L;
- protected Wikitty wikitty;
- protected WikittyProxy proxy;
- protected String action;
- protected String redirect;
- protected String include;
- protected String exclude;
- protected String order;
- protected boolean allowDelete;
- protected boolean orderBefore;
-
- public boolean isOrderBefore() {
- return orderBefore;
- }
-
- public void setOrderBefore(boolean orderBefore) {
- this.orderBefore = orderBefore;
- }
-
- public String getInclude() {
- return include;
- }
-
- public void setInclude(String include) {
- this.include = include;
- }
-
- public String getExclude() {
- return exclude;
- }
-
- public void setExclude(String exclude) {
- this.exclude = exclude;
- }
-
- public String getOrder() {
- return order;
- }
-
- public void setOrder(String order) {
- this.order = order;
- }
-
- public boolean isAllowDelete() {
- return allowDelete;
- }
-
- public void setAllowDelete(boolean allowDelete) {
- this.allowDelete = allowDelete;
- }
-
- @Override
- public Component getBean(ValueStack stack, HttpServletRequest req,
- HttpServletResponse res) {
- return new WikittyTagBean(stack, req, res);
-
- }
-
- @Override
- protected void populateParams() {
- super.populateParams();
- WikittyTagBean wikittyTag = ((WikittyTagBean) component);
- wikittyTag.setAction(action);
- wikittyTag.setRedirect(redirect);
- wikittyTag.setWikitty(wikitty);
- wikittyTag.setProxy(proxy);
- wikittyTag.setOrder(order);
- wikittyTag.setOrderBefore(orderBefore);
- wikittyTag.setAllowDelete(allowDelete);
- wikittyTag.setInclude(include);
- 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;
- }
-
- public void setAction(String action) {
- this.action = action;
- }
-
- public String getRedirect() {
- return redirect;
- }
-
- public void setRedirect(String redirect) {
- this.redirect = redirect;
- }
-
-}
Deleted: trunk/wikitty-struts/src/main/java/template/xhtml/wikitty-close.ftl
===================================================================
--- trunk/wikitty-struts/src/main/java/template/xhtml/wikitty-close.ftl 2011-07-01 15:45:35 UTC (rev 1036)
+++ trunk/wikitty-struts/src/main/java/template/xhtml/wikitty-close.ftl 2011-07-04 10:16:24 UTC (rev 1037)
@@ -1,6 +0,0 @@
-<#include "/${parameters.templateDir}/xhtml/wikitty-commons.ftl" />
-<input type="submit" name="store" value="Store" />
-<#if parameters.allowDelete?? && parameters.allowDelete==true >
-<input type="submit" name="delete" value="Delete" />
-</#if>
-</form>
\ No newline at end of file
Deleted: trunk/wikitty-struts/src/main/java/template/xhtml/wikitty-commons.ftl
===================================================================
--- trunk/wikitty-struts/src/main/java/template/xhtml/wikitty-commons.ftl 2011-07-01 15:45:35 UTC (rev 1036)
+++ trunk/wikitty-struts/src/main/java/template/xhtml/wikitty-commons.ftl 2011-07-04 10:16:24 UTC (rev 1037)
@@ -1,40 +0,0 @@
-<#assign aKeys = parameters.wikittyfields><#t/>
- <#list aKeys as aKey><#t/>
-<#--<#if aKey.type=="file">
-<input type="hidden" name="${aKey.name}" value="BINARY" />
-${aKey.label} : <input type="file" name="File" label ="File"/>
-</#if>-->
-<#if aKey.type=="hidden">
-<input type="hidden" name="${aKey.name}" value="${aKey.value}" />
-</#if>
-<#if aKey.type=="textarea" >
-${aKey.label} : <textarea id="${aKey.name}" cols="80" rows="20" name="${aKey.name}">${aKey.value}</textarea>
-</#if>
-<#if aKey.type=="textfield" >
-${aKey.label} : <input type="text" name="${aKey.name}" value="${aKey.value}" >
-</#if>
-<#if aKey.type=="boolean" >
-${aKey.label} : <input type="checkbox" name="${aKey.name}" value="true"
- <#if aKey.value=="true" >
- checked='true'
- </#if>
- />
-</#if>
-<#--
-
--->
-<#if aKey.type=="select" >
-${aKey.label} :
-<select name="${aKey.name}" size="1">
-<#assign optionKeys = aKey.listOption><#t/>
- <#list optionKeys as optionKey><#t/>
- <option value="${optionKey.valeur}"
- <#if optionKey.valeur==aKey.value >
- selected
- </#if>
- > ${optionKey.description} </option>
- </#list><#t/>
-</select>
-</#if>
-</br>
-</#list><#t/>
Deleted: trunk/wikitty-struts/src/main/java/template/xhtml/wikitty.ftl
===================================================================
--- trunk/wikitty-struts/src/main/java/template/xhtml/wikitty.ftl 2011-07-01 15:45:35 UTC (rev 1036)
+++ trunk/wikitty-struts/src/main/java/template/xhtml/wikitty.ftl 2011-07-04 10:16:24 UTC (rev 1037)
@@ -1,8 +0,0 @@
-<form class="edit" action="${parameters.action}" method="post" enctype="multipart/form-data" >
-<input type="hidden" name="id" value="${parameters.wikittyid}" />
-<#if parameters.redirect??>
-<input type="hidden" name="redirect" value="${parameters.redirect}" />
-</#if><#t/>
-<#if parameters.orderBefore?? && parameters.orderBefore==true >
-<#include "/${parameters.templateDir}/xhtml/wikitty-commons.ftl" />
-</#if><#t/>
\ No newline at end of file
Modified: trunk/wikitty-struts/src/main/java/template/xhtml/ws-boolean.ftl
===================================================================
--- trunk/wikitty-struts/src/main/java/template/xhtml/ws-boolean.ftl 2011-07-01 15:45:35 UTC (rev 1036)
+++ trunk/wikitty-struts/src/main/java/template/xhtml/ws-boolean.ftl 2011-07-04 10:16:24 UTC (rev 1037)
@@ -1,5 +1,7 @@
<#if parameters.included?? && parameters.included==true >
-${parameters.label} : <input type="checkbox" name="${parameters.fqFieldName}" value="true" <#t/>
+${parameters.label} : <input
+<#include "/${parameters.templateDir}/xhtml/ws-commons.ftl" />
+ type="checkbox" name="${parameters.fqFieldName}" value="true" <#t/>
<#if aKey.value=="true" > <#t/>
checked='true'<#t/>
</#if>
Added: trunk/wikitty-struts/src/main/java/template/xhtml/ws-commons.ftl
===================================================================
--- trunk/wikitty-struts/src/main/java/template/xhtml/ws-commons.ftl (rev 0)
+++ trunk/wikitty-struts/src/main/java/template/xhtml/ws-commons.ftl 2011-07-04 10:16:24 UTC (rev 1037)
@@ -0,0 +1,3 @@
+<#if parameters.id?? ><#t/>
+id="${parameters.id}"<#t/>
+</#if><#t/>
\ No newline at end of file
Modified: trunk/wikitty-struts/src/main/java/template/xhtml/ws-date.ftl
===================================================================
--- trunk/wikitty-struts/src/main/java/template/xhtml/ws-date.ftl 2011-07-01 15:45:35 UTC (rev 1036)
+++ trunk/wikitty-struts/src/main/java/template/xhtml/ws-date.ftl 2011-07-04 10:16:24 UTC (rev 1037)
@@ -1,5 +1,7 @@
<#if parameters.included?? && parameters.included==true >
-${parameters.label} : <input id="datepicker" name="${parameters.fqFieldName}" type="text" value="${parameters.value}"> </p>
+${parameters.label} : <input
+<#include "/${parameters.templateDir}/xhtml/ws-commons.ftl" />
+ name="${parameters.fqFieldName}" type="text" value="${parameters.value}"> </p>
</#if><#t/>
Deleted: trunk/wikitty-struts/src/main/java/template/xhtml/ws-fixedselect.ftl
===================================================================
--- trunk/wikitty-struts/src/main/java/template/xhtml/ws-fixedselect.ftl 2011-07-01 15:45:35 UTC (rev 1036)
+++ trunk/wikitty-struts/src/main/java/template/xhtml/ws-fixedselect.ftl 2011-07-04 10:16:24 UTC (rev 1037)
@@ -1,12 +0,0 @@
-<#if parameters.included?? && parameters.included==true >
-${parameters.label} :<select name="${parameters.fqFieldName}" size="1">
-<#assign optionKeys = parameters.fixvalues><#t/>
- <#list optionKeys as optionKey><#t/>
- <option value="${optionKey.valeur}" <#t/>
- <#if optionKey.valeur==parameters.value >
- selected <#t/>
- </#if> <#t/>
- > ${optionKey.description} </option>
- </#list>
-</select><#t/>
-</#if>
\ No newline at end of file
Copied: trunk/wikitty-struts/src/main/java/template/xhtml/ws-form-close.ftl (from rev 1033, trunk/wikitty-struts/src/main/java/template/xhtml/wikitty-close.ftl)
===================================================================
--- trunk/wikitty-struts/src/main/java/template/xhtml/ws-form-close.ftl (rev 0)
+++ trunk/wikitty-struts/src/main/java/template/xhtml/ws-form-close.ftl 2011-07-04 10:16:24 UTC (rev 1037)
@@ -0,0 +1,6 @@
+<#include "/${parameters.templateDir}/xhtml/ws-form-commons.ftl" />
+<input type="submit" name="store" value="Store" />
+<#if parameters.allowDelete?? && parameters.allowDelete==true >
+<input type="submit" name="delete" value="Delete" />
+</#if>
+</form>
\ No newline at end of file
Copied: trunk/wikitty-struts/src/main/java/template/xhtml/ws-form-commons.ftl (from rev 1033, trunk/wikitty-struts/src/main/java/template/xhtml/wikitty-commons.ftl)
===================================================================
--- trunk/wikitty-struts/src/main/java/template/xhtml/ws-form-commons.ftl (rev 0)
+++ trunk/wikitty-struts/src/main/java/template/xhtml/ws-form-commons.ftl 2011-07-04 10:16:24 UTC (rev 1037)
@@ -0,0 +1,50 @@
+<#assign aKeys = parameters.wikittyfields><#t/>
+ <#list aKeys as aKey><#t/>
+<#--<#if aKey.type=="file">
+<input type="hidden" name="${aKey.name}" value="BINARY" />
+${aKey.label} : <input type="file" name="File" label ="File"/>
+</#if>-->
+<#if aKey.type=="hidden">
+<input
+<#include "/${parameters.templateDir}/xhtml/ws-commons.ftl" />
+ type="hidden" name="${aKey.name}" value="${aKey.value}" />
+</#if>
+<#if aKey.type=="textarea" >
+${aKey.label} : <textarea
+<#include "/${parameters.templateDir}/xhtml/ws-commons.ftl" />
+ cols="80" rows="20" name="${aKey.name}">${aKey.value}</textarea>
+</#if>
+<#if aKey.type=="textfield" >
+${aKey.label} : <input
+<#include "/${parameters.templateDir}/xhtml/ws-commons.ftl" />
+ type="text" name="${aKey.name}" value="${aKey.value}" >
+</#if>
+<#if aKey.type=="boolean" >
+${aKey.label} : <input
+<#include "/${parameters.templateDir}/xhtml/ws-commons.ftl" />
+ type="checkbox" name="${aKey.name}" value="true"
+ <#if aKey.value=="true" >
+ checked='true'
+ </#if>
+ />
+</#if>
+<#--
+
+-->
+<#if aKey.type=="select" >
+${aKey.label} :
+<select
+<#include "/${parameters.templateDir}/xhtml/ws-commons.ftl" />
+ name="${aKey.name}" size="1">
+<#assign optionKeys = aKey.listOption><#t/>
+ <#list optionKeys as optionKey><#t/>
+ <option value="${optionKey.valeur}"
+ <#if optionKey.valeur==aKey.value >
+ selected
+ </#if>
+ > ${optionKey.description} </option>
+ </#list><#t/>
+</select>
+</#if>
+</br>
+</#list><#t/>
Copied: trunk/wikitty-struts/src/main/java/template/xhtml/ws-form.ftl (from rev 1033, trunk/wikitty-struts/src/main/java/template/xhtml/wikitty.ftl)
===================================================================
--- trunk/wikitty-struts/src/main/java/template/xhtml/ws-form.ftl (rev 0)
+++ trunk/wikitty-struts/src/main/java/template/xhtml/ws-form.ftl 2011-07-04 10:16:24 UTC (rev 1037)
@@ -0,0 +1,10 @@
+<form
+<#include "/${parameters.templateDir}/xhtml/ws-commons.ftl" />
+class="edit" action="${parameters.action}" method="post" enctype="multipart/form-data" >
+<input type="hidden" name="id" value="${parameters.wikittyid}" />
+<#if parameters.redirect??>
+<input type="hidden" name="redirect" value="${parameters.redirect}" />
+</#if><#t/>
+<#if parameters.orderBefore?? && parameters.orderBefore==true >
+<#include "/${parameters.templateDir}/xhtml/ws-form-commons.ftl" />
+</#if><#t/>
\ No newline at end of file
Modified: trunk/wikitty-struts/src/main/java/template/xhtml/ws-hidden.ftl
===================================================================
--- trunk/wikitty-struts/src/main/java/template/xhtml/ws-hidden.ftl 2011-07-01 15:45:35 UTC (rev 1036)
+++ trunk/wikitty-struts/src/main/java/template/xhtml/ws-hidden.ftl 2011-07-04 10:16:24 UTC (rev 1037)
@@ -1,3 +1,5 @@
<#if parameters.included?? && parameters.included==true >
-<input type="hidden" name="${parameters.fqFieldName}" value="${parameters.value}" /><#t/>
+<input
+<#include "/${parameters.templateDir}/xhtml/ws-commons.ftl" />
+type="hidden" name="${parameters.fqFieldName}" value="${parameters.value}" /><#t/>
</#if>
\ No newline at end of file
Copied: trunk/wikitty-struts/src/main/java/template/xhtml/ws-selectcriteria.ftl (from rev 1033, trunk/wikitty-struts/src/main/java/template/xhtml/ws-wikittyselect.ftl)
===================================================================
--- trunk/wikitty-struts/src/main/java/template/xhtml/ws-selectcriteria.ftl (rev 0)
+++ trunk/wikitty-struts/src/main/java/template/xhtml/ws-selectcriteria.ftl 2011-07-04 10:16:24 UTC (rev 1037)
@@ -0,0 +1,14 @@
+<#if parameters.included?? && parameters.included==true >
+${parameters.label} :<select
+<#include "/${parameters.templateDir}/xhtml/ws-commons.ftl" />
+ name="${parameters.fqFieldName}" size="1">
+<#assign optionKeys = parameters.wikittiesvalues>
+ <#list optionKeys as optionKey>
+ <option value="${optionKey.valeur}"<#t/>
+ <#if optionKey.valeur==parameters.value >
+ selected <#t/>
+ </#if> <#t/>
+ > ${optionKey.description} </option>
+ </#list>
+</select><#t/>
+</#if>
\ No newline at end of file
Copied: trunk/wikitty-struts/src/main/java/template/xhtml/ws-selectfixed.ftl (from rev 1033, trunk/wikitty-struts/src/main/java/template/xhtml/ws-fixedselect.ftl)
===================================================================
--- trunk/wikitty-struts/src/main/java/template/xhtml/ws-selectfixed.ftl (rev 0)
+++ trunk/wikitty-struts/src/main/java/template/xhtml/ws-selectfixed.ftl 2011-07-04 10:16:24 UTC (rev 1037)
@@ -0,0 +1,14 @@
+<#if parameters.included?? && parameters.included==true >
+${parameters.label} :<select
+<#include "/${parameters.templateDir}/xhtml/ws-commons.ftl" />
+name="${parameters.fqFieldName}" size="1">
+<#assign optionKeys = parameters.fixvalues><#t/>
+ <#list optionKeys as optionKey><#t/>
+ <option value="${optionKey.valeur}" <#t/>
+ <#if optionKey.valeur==parameters.value >
+ selected <#t/>
+ </#if> <#t/>
+ > ${optionKey.description} </option>
+ </#list>
+</select><#t/>
+</#if>
\ No newline at end of file
Modified: trunk/wikitty-struts/src/main/java/template/xhtml/ws-textarea.ftl
===================================================================
--- trunk/wikitty-struts/src/main/java/template/xhtml/ws-textarea.ftl 2011-07-01 15:45:35 UTC (rev 1036)
+++ trunk/wikitty-struts/src/main/java/template/xhtml/ws-textarea.ftl 2011-07-04 10:16:24 UTC (rev 1037)
@@ -1,3 +1,5 @@
<#if parameters.included?? && parameters.included==true >
-${parameters.label} : <textarea id="${parameters.fqFieldName}" cols="80" rows="20" name="${parameters.fqFieldName}">${parameters.value}</textarea><#t/>
+${parameters.label} : <textarea
+<#include "/${parameters.templateDir}/xhtml/ws-commons.ftl" />
+ cols="80" rows="20" name="${parameters.fqFieldName}">${parameters.value}</textarea><#t/>
</#if><#t/>
\ No newline at end of file
Modified: trunk/wikitty-struts/src/main/java/template/xhtml/ws-textfield.ftl
===================================================================
--- trunk/wikitty-struts/src/main/java/template/xhtml/ws-textfield.ftl 2011-07-01 15:45:35 UTC (rev 1036)
+++ trunk/wikitty-struts/src/main/java/template/xhtml/ws-textfield.ftl 2011-07-04 10:16:24 UTC (rev 1037)
@@ -1,3 +1,5 @@
<#if parameters.included?? && parameters.included==true >
-${parameters.label} : <input type="text" name="${parameters.fqFieldName}" value="${parameters.value}" ><#t/>
+${parameters.label} : <input
+<#include "/${parameters.templateDir}/xhtml/ws-commons.ftl" />
+type="text" name="${parameters.fqFieldName}" value="${parameters.value}" ><#t/>
</#if><#t/>
\ No newline at end of file
Deleted: trunk/wikitty-struts/src/main/java/template/xhtml/ws-wikittyselect.ftl
===================================================================
--- trunk/wikitty-struts/src/main/java/template/xhtml/ws-wikittyselect.ftl 2011-07-01 15:45:35 UTC (rev 1036)
+++ trunk/wikitty-struts/src/main/java/template/xhtml/ws-wikittyselect.ftl 2011-07-04 10:16:24 UTC (rev 1037)
@@ -1,12 +0,0 @@
-<#if parameters.included?? && parameters.included==true >
-${parameters.label} :<select name="${parameters.fqFieldName}" size="1">
-<#assign optionKeys = parameters.wikittiesvalues>
- <#list optionKeys as optionKey>
- <option value="${optionKey.valeur}"<#t/>
- <#if optionKey.valeur==parameters.value >
- selected <#t/>
- </#if> <#t/>
- > ${optionKey.description} </option>
- </#list>
-</select><#t/>
-</#if>
\ No newline at end of file
Modified: trunk/wikitty-struts/src/main/tld/wikitty-struts.tld
===================================================================
--- trunk/wikitty-struts/src/main/tld/wikitty-struts.tld 2011-07-01 15:45:35 UTC (rev 1036)
+++ trunk/wikitty-struts/src/main/tld/wikitty-struts.tld 2011-07-04 10:16:24 UTC (rev 1037)
@@ -9,10 +9,15 @@
<uri>/wikitty-struts</uri>
<tag>
- <name>wikitty</name>
- <tagclass>org.nuiton.wikitty.struts.tag.WikittyTag</tagclass>
+ <name>form</name>
+ <tagclass>org.nuiton.wikitty.struts.tag.FormTag</tagclass>
<description><![CDATA[Tag use to make a form to edit wikitty]]></description>
<attribute>
+ <description><![CDATA[id for the field]]></description>
+ <name>id</name>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
<description><![CDATA[the wikitty to edit]]></description>
<name>wikitty</name>
<rtexprvalue>true</rtexprvalue>
@@ -74,10 +79,15 @@
<tag>
- <name>wikittySelect</name>
- <tagclass>org.nuiton.wikitty.struts.tag.WikittySelectTag</tagclass>
+ <name>selectCriteria</name>
+ <tagclass>org.nuiton.wikitty.struts.tag.SelectCriteriaTag</tagclass>
<bodycontent>empty</bodycontent>
<attribute>
+ <description><![CDATA[id for the field]]></description>
+ <name>id</name>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
<description><![CDATA[if subtype == wikitty, use the list of wikitty found by criteria as option for select]]></description>
<name>criteria</name>
<rtexprvalue>true</rtexprvalue>
@@ -104,10 +114,15 @@
<tag>
- <name>fixedSelect</name>
- <tagclass>org.nuiton.wikitty.struts.tag.FixedSelectTag</tagclass>
+ <name>selectFixed</name>
+ <tagclass>org.nuiton.wikitty.struts.tag.SelectFixedTag</tagclass>
<bodycontent>empty</bodycontent>
<attribute>
+ <description><![CDATA[id for the field]]></description>
+ <name>id</name>
+ <rtexprvalue>true</rtexprvalue>
+ </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>
@@ -132,6 +147,11 @@
<tagclass>org.nuiton.wikitty.struts.tag.HiddenTag</tagclass>
<bodycontent>empty</bodycontent>
<attribute>
+ <description><![CDATA[id for the field]]></description>
+ <name>id</name>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
<description><![CDATA[the name of the field that have to be specialize]]></description>
<name>fqFieldName</name>
<rtexprvalue>true</rtexprvalue>
@@ -145,6 +165,11 @@
<tagclass>org.nuiton.wikitty.struts.tag.TextFieldTag</tagclass>
<bodycontent>empty</bodycontent>
<attribute>
+ <description><![CDATA[id for the field]]></description>
+ <name>id</name>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
<description><![CDATA[the name of the field that have to be specialize]]></description>
<name>fqFieldName</name>
<rtexprvalue>true</rtexprvalue>
@@ -163,6 +188,11 @@
<tagclass>org.nuiton.wikitty.struts.tag.DateTag</tagclass>
<bodycontent>empty</bodycontent>
<attribute>
+ <description><![CDATA[id for the field]]></description>
+ <name>id</name>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
<description><![CDATA[the name of the field that have to be specialize]]></description>
<name>fqFieldName</name>
<rtexprvalue>true</rtexprvalue>
@@ -187,6 +217,11 @@
<tagclass>org.nuiton.wikitty.struts.tag.TextAreaTag</tagclass>
<bodycontent>empty</bodycontent>
<attribute>
+ <description><![CDATA[id for the field]]></description>
+ <name>id</name>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
<description><![CDATA[the name of the field that have to be specialize]]></description>
<name>fqFieldName</name>
<rtexprvalue>true</rtexprvalue>
@@ -205,6 +240,11 @@
<tagclass>org.nuiton.wikitty.struts.tag.BooleanTag</tagclass>
<bodycontent>empty</bodycontent>
<attribute>
+ <description><![CDATA[id for the field]]></description>
+ <name>id</name>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
<description><![CDATA[the name of the field that have to be specialize]]></description>
<name>fqFieldName</name>
<rtexprvalue>true</rtexprvalue>
1
0