Wikitty-commits
Threads by month
- ----- 2026 -----
- 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
July 2011
- 4 participants
- 85 discussions
r1050 - trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator
by echatellier@users.nuiton.org 05 Jul '11
by echatellier@users.nuiton.org 05 Jul '11
05 Jul '11
Author: echatellier
Date: 2011-07-05 16:12:19 +0200 (Tue, 05 Jul 2011)
New Revision: 1050
Url: http://nuiton.org/repositories/revision/wikitty/1050
Log:
Fix void generation
Modified:
trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyContractGenerator.java
Modified: trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyContractGenerator.java
===================================================================
--- trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyContractGenerator.java 2011-07-05 14:05:19 UTC (rev 1049)
+++ trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyContractGenerator.java 2011-07-05 14:12:19 UTC (rev 1050)
@@ -5,7 +5,7 @@
* $Id$
* $HeadURL$
* %%
- * Copyright (C) 2009 - 2010 CodeLutin, Benjamin Poussin
+ * Copyright (C) 2009 - 2011 CodeLutin, Benjamin Poussin, Chatellier Eric
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as
@@ -175,7 +175,12 @@
// add all method describe in model in contract interfaces
// this method must be writed by developer in Impl
for (ObjectModelOperation operation : businessEntity.getOperations()) {
- addOperation(contract, operation);
+ //FIXME echatellier 20110705 mayb fix it to eugene
+ if (operation.getReturnType() == null || operation.getReturnType().isEmpty()) {
+ addOperation(contract, operation.getName(), "void");
+ } else {
+ addOperation(contract, operation);
+ }
}
for(ObjectModelAttribute attribute : businessEntity.getAttributes()) {
@@ -204,7 +209,7 @@
for (ObjectModelAttribute attribute : businessEntity.getAttributes()) {
if (attribute.isNavigable()) {
// needed below, in templates
- String fieldVariableName = WikittyTransformerUtil.attributeToFielVariableName(attribute, true);
+ //String fieldVariableName = WikittyTransformerUtil.attributeToFielVariableName(attribute, true);
String attributeType = WikittyTransformerUtil.generateResultType(attribute, false);
String attributeName = attribute.getName();
@@ -266,7 +271,7 @@
addInterface(contract, superClass.getQualifiedName());
if (WikittyTransformerUtil.isBusinessEntity(superClass)) {
// superclass must have been processed first to have its operations set
- if ( ! processedEntities.contains(superClass)) {
+ if ( !processedEntities.contains(superClass)) {
log.debug(businessEntity.getName() + " require to process " +
superClass.getName() + " first");
processEntity(superClass);
1
0
r1049 - trunk/wikitty-struts/src/main/resources/template/wikitty
by mfortun@users.nuiton.org 05 Jul '11
by mfortun@users.nuiton.org 05 Jul '11
05 Jul '11
Author: mfortun
Date: 2011-07-05 16:05:19 +0200 (Tue, 05 Jul 2011)
New Revision: 1049
Url: http://nuiton.org/repositories/revision/wikitty/1049
Log:
* correct commons template for name element
Modified:
trunk/wikitty-struts/src/main/resources/template/wikitty/ws-commons.ftl
Modified: trunk/wikitty-struts/src/main/resources/template/wikitty/ws-commons.ftl
===================================================================
--- trunk/wikitty-struts/src/main/resources/template/wikitty/ws-commons.ftl 2011-07-05 14:04:04 UTC (rev 1048)
+++ trunk/wikitty-struts/src/main/resources/template/wikitty/ws-commons.ftl 2011-07-05 14:05:19 UTC (rev 1049)
@@ -1,4 +1,4 @@
-name=${parameters.name}
+name="${parameters.name}"
<#if parameters.id?? ><#t/>
id="${parameters.id}"<#t/>
</#if><#t/>
\ No newline at end of file
1
0
r1048 - in trunk/wikitty-struts/src/main: java/org/nuiton/wikitty/struts/component java/org/nuiton/wikitty/struts/tag resources/template/wikitty tld
by mfortun@users.nuiton.org 05 Jul '11
by mfortun@users.nuiton.org 05 Jul '11
05 Jul '11
Author: mfortun
Date: 2011-07-05 16:04:04 +0200 (Tue, 05 Jul 2011)
New Revision: 1048
Url: http://nuiton.org/repositories/revision/wikitty/1048
Log:
* correct template location with theme for form tag
* add label element in template
* add new tag for wikitty collection
Added:
trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/SelectAssociationBean.java
trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/SelectAssociationTag.java
trunk/wikitty-struts/src/main/resources/template/wikitty/ws-label-commons.ftl
trunk/wikitty-struts/src/main/resources/template/wikitty/ws-selectAssociation-close.ftl
trunk/wikitty-struts/src/main/resources/template/wikitty/ws-selectAssociation.ftl
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/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/tag/SelectCriteriaTag.java
trunk/wikitty-struts/src/main/resources/template/wikitty/ws-boolean.ftl
trunk/wikitty-struts/src/main/resources/template/wikitty/ws-date.ftl
trunk/wikitty-struts/src/main/resources/template/wikitty/ws-selectcriteria.ftl
trunk/wikitty-struts/src/main/resources/template/wikitty/ws-selectfixed.ftl
trunk/wikitty-struts/src/main/resources/template/wikitty/ws-textarea.ftl
trunk/wikitty-struts/src/main/resources/template/wikitty/ws-textfield.ftl
trunk/wikitty-struts/src/main/tld/wikitty-struts.tld
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-05 13:42:02 UTC (rev 1047)
+++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/DateBean.java 2011-07-05 14:04:04 UTC (rev 1048)
@@ -4,11 +4,14 @@
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 com.opensymphony.xwork2.util.ValueStack;
+@StrutsTag(name = "boolean", tldTagClass = "org.nuiton.wikitty.struts.tag.DateTag",
+ description = "", allowDynamicAttributes = false)
public class DateBean extends AbstractWikittyComponent {
/** to use log facility, just put in your code: log.info(\"...\"); */
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-05 13:42:02 UTC (rev 1047)
+++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/FormTagBean.java 2011-07-05 14:04:04 UTC (rev 1048)
@@ -128,6 +128,12 @@
}
+
+
+ @Override
+ public String getTheme() {
+ return "wikitty";
+ }
public String getDefaultOpenTemplate() {
return OPEN_TEMPLATE;
Added: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/SelectAssociationBean.java
===================================================================
--- trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/SelectAssociationBean.java (rev 0)
+++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/SelectAssociationBean.java 2011-07-05 14:04:04 UTC (rev 1048)
@@ -0,0 +1,108 @@
+package org.nuiton.wikitty.struts.component;
+
+import java.util.Collection;
+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.nuiton.util.StringUtil;
+import org.nuiton.wikitty.WikittyUtil;
+import org.nuiton.wikitty.entities.Wikitty;
+import org.nuiton.wikitty.struts.Option;
+import org.nuiton.wikitty.struts.WikittyFieldHandler;
+
+import com.opensymphony.xwork2.util.ValueStack;
+
+public class SelectAssociationBean extends AbstractWikittyComponent {
+
+ /** to use log facility, just put in your code: log.info(\"...\"); */
+ final static private Log log = LogFactory
+ .getLog(SelectAssociationBean.class);
+
+ public static final String OPEN_TEMPLATE = "ws-selectassociation";
+ public static final String TEMPLATE = "ws-selectassociation-close";
+
+ protected String descField;
+ protected int size;
+
+ public SelectAssociationBean(ValueStack stack, HttpServletRequest request,
+ HttpServletResponse response) {
+ super(stack, request, response);
+ }
+
+
+ @Override
+ protected void evaluateExtraParams() {
+ super.evaluateExtraParams();
+
+ // the select constructed must be positive
+ if (size <= 0 ){
+ size = 1;
+ }
+
+ // add parametter
+ addParameter("size", size);
+
+ List<Option> listOption = new LinkedList<Option>();
+
+ String ext = WikittyUtil.getExtensionNameFromFQFieldName(fqFieldName);
+ String fieldName = WikittyUtil.getFieldNameFromFQFieldName(fqFieldName);
+
+ String[] descriptor = StringUtil.split(descField,
+ WikittyFieldHandler.FIELD_SEPARATOR);
+
+ // iterate wikitty for result construction
+ for (Wikitty wiki : wikitty.getFieldAsList(ext, fieldName, Wikitty.class)){
+ Option temp = new Option();
+ temp.setValeur(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, WikittyUtil.FQ_FIELD_NAME_SEPARATOR);
+
+ desc += wiki.getFieldAsWikitty(descTable[0],
+ descTable[1]);
+ }
+ }
+ temp.setDescription(desc);
+ listOption.add(temp);
+
+ }
+
+ addParameter("value", listOption);
+ }
+
+
+ public String getDescField() {
+ return descField;
+ }
+
+ public void setDescField(String descField) {
+ this.descField = descField;
+ }
+
+ public int getSize() {
+ return size;
+ }
+
+ public void setSize(int size) {
+ this.size = size;
+ }
+
+ public String getDefaultOpenTemplate() {
+ return OPEN_TEMPLATE;
+ }
+
+ protected String getDefaultTemplate() {
+ return TEMPLATE;
+ }
+
+}
Property changes on: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/SelectAssociationBean.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
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-05 13:42:02 UTC (rev 1047)
+++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/SelectCriteriaBean.java 2011-07-05 14:04:04 UTC (rev 1048)
@@ -29,7 +29,7 @@
public static final String TEMPLATE = "ws-selectcriteria-close";
protected Criteria criteria;
- protected String descfield;
+ protected String descField;
public SelectCriteriaBean(ValueStack stack, HttpServletRequest request,
HttpServletResponse response) {
@@ -62,7 +62,7 @@
// search for the wikitty with the criteria
PagedResult<Wikitty> wikitties = proxy.findAllByCriteria(criteria);
- String[] descriptor = StringUtil.split(descfield,
+ String[] descriptor = StringUtil.split(descField,
WikittyFieldHandler.FIELD_SEPARATOR);
// if wikitties not null contruct option result
@@ -81,7 +81,7 @@
desc = "";
for (String descriptorIt : descriptor) {
String[] descTable = StringUtil
- .split(descriptorIt, ".");
+ .split(descriptorIt, WikittyUtil.FQ_FIELD_NAME_SEPARATOR);
desc += wiki.getFieldAsWikitty(descTable[0],
descTable[1]);
@@ -110,12 +110,12 @@
this.criteria = criteria;
}
- public String getDescfield() {
- return descfield;
+ public String getDescField() {
+ return descField;
}
- public void setDescfield(String descfield) {
- this.descfield = descfield;
+ public void setDescField(String descfield) {
+ this.descField = descfield;
}
}
Added: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/SelectAssociationTag.java
===================================================================
--- trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/SelectAssociationTag.java (rev 0)
+++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/SelectAssociationTag.java 2011-07-05 14:04:04 UTC (rev 1048)
@@ -0,0 +1,57 @@
+package org.nuiton.wikitty.struts.tag;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.struts2.components.Component;
+import org.nuiton.wikitty.struts.component.SelectAssociationBean;
+
+import com.opensymphony.xwork2.util.ValueStack;
+
+public class SelectAssociationTag extends AbstractWikittyTag{
+
+ /**
+ *
+ */
+ private static final long serialVersionUID = 1341902299150448705L;
+
+
+ protected String descField;
+ protected int size;
+
+ @Override
+ public Component getBean(ValueStack stack, HttpServletRequest req,
+ HttpServletResponse res) {
+ return new SelectAssociationBean(stack, req, res);
+
+ }
+
+
+ @Override
+ protected void populateParams() {
+ super.populateParams();
+
+ SelectAssociationBean select= (SelectAssociationBean) component;
+ select.setDescField(descField);
+ select.setSize(size);
+ }
+
+ public String getDescField() {
+ return descField;
+ }
+
+ public void setDescField(String descField) {
+ this.descField = descField;
+ }
+
+ public int getSize() {
+ return size;
+ }
+
+ public void setSize(int size) {
+ this.size = size;
+ }
+
+
+
+}
Property changes on: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/SelectAssociationTag.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
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-05 13:42:02 UTC (rev 1047)
+++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/SelectCriteriaTag.java 2011-07-05 14:04:04 UTC (rev 1048)
@@ -14,7 +14,7 @@
*/
private static final long serialVersionUID = 2807198744532780915L;
protected Criteria criteria;
- protected String descfield;
+ protected String descField;
@Override
public Component getBean(ValueStack stack, HttpServletRequest req,
@@ -31,7 +31,7 @@
SelectCriteriaBean fieldtag = ((SelectCriteriaBean) component);
fieldtag.setCriteria(criteria);
- fieldtag.setDescfield(descfield);
+ fieldtag.setDescField(descField);
}
@@ -43,12 +43,12 @@
this.criteria = criteria;
}
- public String getDescfield() {
- return descfield;
+ public String getDescField() {
+ return descField;
}
- public void setDescfield(String descfield) {
- this.descfield = descfield;
+ public void setDescField(String descField) {
+ this.descField = descField;
}
}
Modified: trunk/wikitty-struts/src/main/resources/template/wikitty/ws-boolean.ftl
===================================================================
--- trunk/wikitty-struts/src/main/resources/template/wikitty/ws-boolean.ftl 2011-07-05 13:42:02 UTC (rev 1047)
+++ trunk/wikitty-struts/src/main/resources/template/wikitty/ws-boolean.ftl 2011-07-05 14:04:04 UTC (rev 1048)
@@ -1,5 +1,6 @@
<#if parameters.included?? && parameters.included==true >
-${parameters.label} : <input
+<#include "/${parameters.templateDir}/${parameters.theme}/ws-label-commons.ftl" />
+<input
<#include "/${parameters.templateDir}/${parameters.theme}/ws-commons.ftl" />
type="checkbox" value="true" <#t/>
<#if aKey.value=="true" > <#t/>
Modified: trunk/wikitty-struts/src/main/resources/template/wikitty/ws-date.ftl
===================================================================
--- trunk/wikitty-struts/src/main/resources/template/wikitty/ws-date.ftl 2011-07-05 13:42:02 UTC (rev 1047)
+++ trunk/wikitty-struts/src/main/resources/template/wikitty/ws-date.ftl 2011-07-05 14:04:04 UTC (rev 1048)
@@ -1,5 +1,6 @@
<#if parameters.included?? && parameters.included==true >
-${parameters.label} : <input
+<#include "/${parameters.templateDir}/${parameters.theme}/ws-label-commons.ftl" />
+<input
<#include "/${parameters.templateDir}/${parameters.theme}/ws-commons.ftl" />
type="text" value="${parameters.value}"> </p>
</#if><#t/>
Added: trunk/wikitty-struts/src/main/resources/template/wikitty/ws-label-commons.ftl
===================================================================
--- trunk/wikitty-struts/src/main/resources/template/wikitty/ws-label-commons.ftl (rev 0)
+++ trunk/wikitty-struts/src/main/resources/template/wikitty/ws-label-commons.ftl 2011-07-05 14:04:04 UTC (rev 1048)
@@ -0,0 +1 @@
+<label for="${parameters.id}">${parameters.label}</label>
\ No newline at end of file
Added: trunk/wikitty-struts/src/main/resources/template/wikitty/ws-selectAssociation.ftl
===================================================================
--- trunk/wikitty-struts/src/main/resources/template/wikitty/ws-selectAssociation.ftl (rev 0)
+++ trunk/wikitty-struts/src/main/resources/template/wikitty/ws-selectAssociation.ftl 2011-07-05 14:04:04 UTC (rev 1048)
@@ -0,0 +1,12 @@
+<#if parameters.included?? && parameters.included==true >
+<#include "/${parameters.templateDir}/${parameters.theme}/ws-label-commons.ftl" />
+<select
+<#include "/${parameters.templateDir}/${parameters.theme}/ws-commons.ftl" />
+ size="${parameters.size}">
+<#assign optionKeys = parameters.value><#t/>
+ <#list optionKeys as optionKey>
+ <option value="${optionKey.valeur}">
+ ${optionKey.description} </option>
+ </#list>
+</select><#t/>
+</#if>
\ No newline at end of file
Modified: trunk/wikitty-struts/src/main/resources/template/wikitty/ws-selectcriteria.ftl
===================================================================
--- trunk/wikitty-struts/src/main/resources/template/wikitty/ws-selectcriteria.ftl 2011-07-05 13:42:02 UTC (rev 1047)
+++ trunk/wikitty-struts/src/main/resources/template/wikitty/ws-selectcriteria.ftl 2011-07-05 14:04:04 UTC (rev 1048)
@@ -1,5 +1,6 @@
<#if parameters.included?? && parameters.included==true >
-${parameters.label} :<select
+<#include "/${parameters.templateDir}/${parameters.theme}/ws-label-commons.ftl" />
+<select
<#include "/${parameters.templateDir}/${parameters.theme}/ws-commons.ftl" />
size="1">
<#assign optionKeys = parameters.wikittiesvalues>
Modified: trunk/wikitty-struts/src/main/resources/template/wikitty/ws-selectfixed.ftl
===================================================================
--- trunk/wikitty-struts/src/main/resources/template/wikitty/ws-selectfixed.ftl 2011-07-05 13:42:02 UTC (rev 1047)
+++ trunk/wikitty-struts/src/main/resources/template/wikitty/ws-selectfixed.ftl 2011-07-05 14:04:04 UTC (rev 1048)
@@ -1,5 +1,6 @@
<#if parameters.included?? && parameters.included==true >
-${parameters.label} :<select
+<#include "/${parameters.templateDir}/${parameters.theme}/ws-label-commons.ftl" />
+<select
<#include "/${parameters.templateDir}/${parameters.theme}/ws-commons.ftl" />
size="1">
<#assign optionKeys = parameters.fixvalues><#t/>
Modified: trunk/wikitty-struts/src/main/resources/template/wikitty/ws-textarea.ftl
===================================================================
--- trunk/wikitty-struts/src/main/resources/template/wikitty/ws-textarea.ftl 2011-07-05 13:42:02 UTC (rev 1047)
+++ trunk/wikitty-struts/src/main/resources/template/wikitty/ws-textarea.ftl 2011-07-05 14:04:04 UTC (rev 1048)
@@ -1,5 +1,6 @@
<#if parameters.included?? && parameters.included==true >
-${parameters.label} : <textarea
+<#include "/${parameters.templateDir}/${parameters.theme}/ws-label-commons.ftl" />
+<textarea
<#include "/${parameters.templateDir}/${parameters.theme}/ws-commons.ftl" />
cols="80" rows="20" >${parameters.value}</textarea><#t/>
</#if><#t/>
\ No newline at end of file
Modified: trunk/wikitty-struts/src/main/resources/template/wikitty/ws-textfield.ftl
===================================================================
--- trunk/wikitty-struts/src/main/resources/template/wikitty/ws-textfield.ftl 2011-07-05 13:42:02 UTC (rev 1047)
+++ trunk/wikitty-struts/src/main/resources/template/wikitty/ws-textfield.ftl 2011-07-05 14:04:04 UTC (rev 1048)
@@ -1,5 +1,6 @@
<#if parameters.included?? && parameters.included==true >
-${parameters.label} : <input
+<#include "/${parameters.templateDir}/${parameters.theme}/ws-label-commons.ftl" />
+<input
<#include "/${parameters.templateDir}/${parameters.theme}/ws-commons.ftl" />
<#if parameters.password?? && parameters.password==true ><#t/>
Modified: trunk/wikitty-struts/src/main/tld/wikitty-struts.tld
===================================================================
--- trunk/wikitty-struts/src/main/tld/wikitty-struts.tld 2011-07-05 13:42:02 UTC (rev 1047)
+++ trunk/wikitty-struts/src/main/tld/wikitty-struts.tld 2011-07-05 14:04:04 UTC (rev 1048)
@@ -82,6 +82,58 @@
</attribute>
</tag>
+
+ <tag>
+ <name>selectAssociation</name>
+ <tagclass>org.nuiton.wikitty.struts.tag.SelectAssociationTag</tagclass>
+ <bodycontent>empty</bodycontent>
+ <attribute>
+ <description><![CDATA[id for the field]]></description>
+ <name>id</name>
+ <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>
+ <required>true</required>
+ </attribute>
+ <attribute>
+ <description><![CDATA[the proxy from whom search for wikitty required if tag not used inside form tag]]></description>
+ <name>proxy</name>
+ <rtexprvalue>true</rtexprvalue>
+ <required>true</required>
+ </attribute>
+ <attribute>
+ <description><![CDATA[if subtype == wikitty, use the name of the descfield of the wikitties as a description value for select's option]]></description>
+ <name>descField</name>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
+ <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>
+ </attribute>
+ <attribute>
+ <description><![CDATA[the label of the field]]></description>
+ <name>label</name>
+ <rtexprvalue>true</rtexprvalue>
+ <required>true</required>
+ </attribute>
+ <attribute>
+ <description><![CDATA[the label of the field]]></description>
+ <name>size</name>
+ <rtexprvalue>true</rtexprvalue>
+ <required>true</required>
+ </attribute>
+ </tag>
+
<tag>
@@ -118,7 +170,7 @@
</attribute>
<attribute>
<description><![CDATA[if subtype == wikitty, use the name of the descfield of the wikitties as a description value for select's option]]></description>
- <name>descfield</name>
+ <name>descField</name>
<rtexprvalue>true</rtexprvalue>
</attribute>
<attribute>
1
0
r1047 - in trunk/wikitty-struts/src/main: java/org/nuiton/wikitty/struts/component resources/template resources/template/wikitty
by sletellier@users.nuiton.org 05 Jul '11
by sletellier@users.nuiton.org 05 Jul '11
05 Jul '11
Author: sletellier
Date: 2011-07-05 15:42:02 +0200 (Tue, 05 Jul 2011)
New Revision: 1047
Url: http://nuiton.org/repositories/revision/wikitty/1047
Log:
- Set as parent theme css_xhtml
- Move templates to wikitty directory
- Set wikitty theme name in abstract component
Added:
trunk/wikitty-struts/src/main/resources/template/wikitty/
trunk/wikitty-struts/src/main/resources/template/wikitty/theme.properties
trunk/wikitty-struts/src/main/resources/template/wikitty/ws-boolean-close.ftl
trunk/wikitty-struts/src/main/resources/template/wikitty/ws-boolean.ftl
trunk/wikitty-struts/src/main/resources/template/wikitty/ws-commons.ftl
trunk/wikitty-struts/src/main/resources/template/wikitty/ws-date-close.ftl
trunk/wikitty-struts/src/main/resources/template/wikitty/ws-date.ftl
trunk/wikitty-struts/src/main/resources/template/wikitty/ws-form-close.ftl
trunk/wikitty-struts/src/main/resources/template/wikitty/ws-form-commons.ftl
trunk/wikitty-struts/src/main/resources/template/wikitty/ws-form.ftl
trunk/wikitty-struts/src/main/resources/template/wikitty/ws-hidden-close.ftl
trunk/wikitty-struts/src/main/resources/template/wikitty/ws-hidden.ftl
trunk/wikitty-struts/src/main/resources/template/wikitty/ws-selectcriteria-close.ftl
trunk/wikitty-struts/src/main/resources/template/wikitty/ws-selectcriteria.ftl
trunk/wikitty-struts/src/main/resources/template/wikitty/ws-selectfixed-close.ftl
trunk/wikitty-struts/src/main/resources/template/wikitty/ws-selectfixed.ftl
trunk/wikitty-struts/src/main/resources/template/wikitty/ws-textarea-close.ftl
trunk/wikitty-struts/src/main/resources/template/wikitty/ws-textarea.ftl
trunk/wikitty-struts/src/main/resources/template/wikitty/ws-textfield-close.ftl
trunk/wikitty-struts/src/main/resources/template/wikitty/ws-textfield.ftl
Removed:
trunk/wikitty-struts/src/main/resources/template/xhtml/
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-05 11:54:44 UTC (rev 1046)
+++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/AbstractWikittyComponent.java 2011-07-05 13:42:02 UTC (rev 1047)
@@ -79,6 +79,7 @@
} else {
addParameter("name", fqFieldName);
}
+ addParameter("theme", getTheme());
// check if field included
// if so add the parametter included
@@ -93,8 +94,12 @@
}
}
}
-
+ @Override
+ public String getTheme() {
+ return "wikitty";
+ }
+
public WikittyFieldHandler getHandler() {
return handler;
}
Added: trunk/wikitty-struts/src/main/resources/template/wikitty/theme.properties
===================================================================
--- trunk/wikitty-struts/src/main/resources/template/wikitty/theme.properties (rev 0)
+++ trunk/wikitty-struts/src/main/resources/template/wikitty/theme.properties 2011-07-05 13:42:02 UTC (rev 1047)
@@ -0,0 +1 @@
+parent = css_xhtml
Copied: trunk/wikitty-struts/src/main/resources/template/wikitty/ws-boolean.ftl (from rev 1046, trunk/wikitty-struts/src/main/resources/template/xhtml/ws-boolean.ftl)
===================================================================
--- trunk/wikitty-struts/src/main/resources/template/wikitty/ws-boolean.ftl (rev 0)
+++ trunk/wikitty-struts/src/main/resources/template/wikitty/ws-boolean.ftl 2011-07-05 13:42:02 UTC (rev 1047)
@@ -0,0 +1,9 @@
+<#if parameters.included?? && parameters.included==true >
+${parameters.label} : <input
+<#include "/${parameters.templateDir}/${parameters.theme}/ws-commons.ftl" />
+ type="checkbox" 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/wikitty/ws-commons.ftl (from rev 1046, trunk/wikitty-struts/src/main/resources/template/xhtml/ws-commons.ftl)
===================================================================
--- trunk/wikitty-struts/src/main/resources/template/wikitty/ws-commons.ftl (rev 0)
+++ trunk/wikitty-struts/src/main/resources/template/wikitty/ws-commons.ftl 2011-07-05 13:42:02 UTC (rev 1047)
@@ -0,0 +1,4 @@
+name=${parameters.name}
+<#if parameters.id?? ><#t/>
+id="${parameters.id}"<#t/>
+</#if><#t/>
\ No newline at end of file
Copied: trunk/wikitty-struts/src/main/resources/template/wikitty/ws-date.ftl (from rev 1046, trunk/wikitty-struts/src/main/resources/template/xhtml/ws-date.ftl)
===================================================================
--- trunk/wikitty-struts/src/main/resources/template/wikitty/ws-date.ftl (rev 0)
+++ trunk/wikitty-struts/src/main/resources/template/wikitty/ws-date.ftl 2011-07-05 13:42:02 UTC (rev 1047)
@@ -0,0 +1,7 @@
+<#if parameters.included?? && parameters.included==true >
+${parameters.label} : <input
+<#include "/${parameters.templateDir}/${parameters.theme}/ws-commons.ftl" />
+ type="text" value="${parameters.value}"> </p>
+</#if><#t/>
+
+
Copied: trunk/wikitty-struts/src/main/resources/template/wikitty/ws-form-close.ftl (from rev 1046, trunk/wikitty-struts/src/main/resources/template/xhtml/ws-form-close.ftl)
===================================================================
--- trunk/wikitty-struts/src/main/resources/template/wikitty/ws-form-close.ftl (rev 0)
+++ trunk/wikitty-struts/src/main/resources/template/wikitty/ws-form-close.ftl 2011-07-05 13:42:02 UTC (rev 1047)
@@ -0,0 +1,6 @@
+<#include "/${parameters.templateDir}/${parameters.theme}/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/wikitty/ws-form-commons.ftl (from rev 1046, trunk/wikitty-struts/src/main/resources/template/xhtml/ws-form-commons.ftl)
===================================================================
--- trunk/wikitty-struts/src/main/resources/template/wikitty/ws-form-commons.ftl (rev 0)
+++ trunk/wikitty-struts/src/main/resources/template/wikitty/ws-form-commons.ftl 2011-07-05 13:42:02 UTC (rev 1047)
@@ -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}/${parameters.theme}/ws-commons.ftl" />
+ type="hidden" name="${aKey.name}" value="${aKey.value}" />
+</#if>
+<#if aKey.type=="textarea" >
+${aKey.label} : <textarea
+<#include "/${parameters.templateDir}/${parameters.theme}/ws-commons.ftl" />
+ cols="80" rows="20" name="${aKey.name}">${aKey.value}</textarea>
+</#if>
+<#if aKey.type=="textfield" >
+${aKey.label} : <input
+<#include "/${parameters.templateDir}/${parameters.theme}/ws-commons.ftl" />
+ type="text" name="${aKey.name}" value="${aKey.value}" >
+</#if>
+<#if aKey.type=="boolean" >
+${aKey.label} : <input
+<#include "/${parameters.templateDir}/${parameters.theme}/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}/${parameters.theme}/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/wikitty/ws-form.ftl (from rev 1046, trunk/wikitty-struts/src/main/resources/template/xhtml/ws-form.ftl)
===================================================================
--- trunk/wikitty-struts/src/main/resources/template/wikitty/ws-form.ftl (rev 0)
+++ trunk/wikitty-struts/src/main/resources/template/wikitty/ws-form.ftl 2011-07-05 13:42:02 UTC (rev 1047)
@@ -0,0 +1,10 @@
+<form
+<#include "/${parameters.templateDir}/${parameters.theme}/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}/${parameters.theme}/ws-form-commons.ftl" />
+</#if><#t/>
\ No newline at end of file
Copied: trunk/wikitty-struts/src/main/resources/template/wikitty/ws-hidden.ftl (from rev 1046, trunk/wikitty-struts/src/main/resources/template/xhtml/ws-hidden.ftl)
===================================================================
--- trunk/wikitty-struts/src/main/resources/template/wikitty/ws-hidden.ftl (rev 0)
+++ trunk/wikitty-struts/src/main/resources/template/wikitty/ws-hidden.ftl 2011-07-05 13:42:02 UTC (rev 1047)
@@ -0,0 +1,5 @@
+<#if parameters.included?? && parameters.included==true >
+<input
+<#include "/${parameters.templateDir}/${parameters.theme}/ws-commons.ftl" />
+type="hidden" value="${parameters.value}" /><#t/>
+</#if>
\ No newline at end of file
Copied: trunk/wikitty-struts/src/main/resources/template/wikitty/ws-selectcriteria.ftl (from rev 1046, trunk/wikitty-struts/src/main/resources/template/xhtml/ws-selectcriteria.ftl)
===================================================================
--- trunk/wikitty-struts/src/main/resources/template/wikitty/ws-selectcriteria.ftl (rev 0)
+++ trunk/wikitty-struts/src/main/resources/template/wikitty/ws-selectcriteria.ftl 2011-07-05 13:42:02 UTC (rev 1047)
@@ -0,0 +1,14 @@
+<#if parameters.included?? && parameters.included==true >
+${parameters.label} :<select
+<#include "/${parameters.templateDir}/${parameters.theme}/ws-commons.ftl" />
+ 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/wikitty/ws-selectfixed.ftl (from rev 1046, trunk/wikitty-struts/src/main/resources/template/xhtml/ws-selectfixed.ftl)
===================================================================
--- trunk/wikitty-struts/src/main/resources/template/wikitty/ws-selectfixed.ftl (rev 0)
+++ trunk/wikitty-struts/src/main/resources/template/wikitty/ws-selectfixed.ftl 2011-07-05 13:42:02 UTC (rev 1047)
@@ -0,0 +1,14 @@
+<#if parameters.included?? && parameters.included==true >
+${parameters.label} :<select
+<#include "/${parameters.templateDir}/${parameters.theme}/ws-commons.ftl" />
+ 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/wikitty/ws-textarea.ftl (from rev 1046, trunk/wikitty-struts/src/main/resources/template/xhtml/ws-textarea.ftl)
===================================================================
--- trunk/wikitty-struts/src/main/resources/template/wikitty/ws-textarea.ftl (rev 0)
+++ trunk/wikitty-struts/src/main/resources/template/wikitty/ws-textarea.ftl 2011-07-05 13:42:02 UTC (rev 1047)
@@ -0,0 +1,5 @@
+<#if parameters.included?? && parameters.included==true >
+${parameters.label} : <textarea
+<#include "/${parameters.templateDir}/${parameters.theme}/ws-commons.ftl" />
+ cols="80" rows="20" >${parameters.value}</textarea><#t/>
+</#if><#t/>
\ No newline at end of file
Copied: trunk/wikitty-struts/src/main/resources/template/wikitty/ws-textfield.ftl (from rev 1046, trunk/wikitty-struts/src/main/resources/template/xhtml/ws-textfield.ftl)
===================================================================
--- trunk/wikitty-struts/src/main/resources/template/wikitty/ws-textfield.ftl (rev 0)
+++ trunk/wikitty-struts/src/main/resources/template/wikitty/ws-textfield.ftl 2011-07-05 13:42:02 UTC (rev 1047)
@@ -0,0 +1,11 @@
+<#if parameters.included?? && parameters.included==true >
+${parameters.label} : <input
+<#include "/${parameters.templateDir}/${parameters.theme}/ws-commons.ftl" />
+
+<#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
1
0
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 05 Jul '11
by mfortun@users.nuiton.org 05 Jul '11
05 Jul '11
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 04 Jul '11
by echatellier@users.nuiton.org 04 Jul '11
04 Jul '11
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
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 04 Jul '11
by mfortun@users.nuiton.org 04 Jul '11
04 Jul '11
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 04 Jul '11
by mfortun@users.nuiton.org 04 Jul '11
04 Jul '11
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 04 Jul '11
by mfortun@users.nuiton.org 04 Jul '11
04 Jul '11
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