You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lu...@apache.org on 2009/05/19 03:06:36 UTC
svn commit: r776147 - in /myfaces/myfaces-build-tools/trunk/maven2-plugins:
myfaces-builder-annotations/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/annotation/
myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/mav...
Author: lu4242
Date: Tue May 19 01:06:36 2009
New Revision: 776147
URL: http://svn.apache.org/viewvc?rev=776147&view=rev
Log:
MYFACES-2236 Allow define deferredValueType for component/converter/validator for tag @JSFProperty when generate tld using myfaces-builder-plugin
Modified:
myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-builder-annotations/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/annotation/JSFProperty.java
myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/model/PropertyMeta.java
myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/qdox/QdoxModelBuilder.java
Modified: myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-builder-annotations/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/annotation/JSFProperty.java
URL: http://svn.apache.org/viewvc/myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-builder-annotations/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/annotation/JSFProperty.java?rev=776147&r1=776146&r2=776147&view=diff
==============================================================================
--- myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-builder-annotations/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/annotation/JSFProperty.java (original)
+++ myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-builder-annotations/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/annotation/JSFProperty.java Tue May 19 01:06:36 2009
@@ -136,4 +136,14 @@
*/
String defaultValue() default "";
+ /**
+ * Indicate the type that values should be cast on tld.
+ * This param only applies on jsf 1.2 (it is supposed that
+ * the className is javax.el.ValueExpression to apply it),
+ * because in jsf 1.1, values on tag class are considered
+ * to be String.
+ *
+ * @since 1.0.3
+ */
+ String deferredValueType() default "";
}
Modified: myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/model/PropertyMeta.java
URL: http://svn.apache.org/viewvc/myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/model/PropertyMeta.java?rev=776147&r1=776146&r2=776147&view=diff
==============================================================================
--- myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/model/PropertyMeta.java (original)
+++ myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/model/PropertyMeta.java Tue May 19 01:06:36 2009
@@ -54,6 +54,8 @@
private Boolean _setMethod; //Generate method to define if is set a value or not
private Boolean _rtexprvalue;
+
+ private String _deferredValueType;
public PropertyMeta()
{
@@ -85,7 +87,7 @@
_setMethodScope = pm._setMethodScope;
_setMethod = pm._setMethod;
_rtexprvalue = pm._rtexprvalue;
-
+ _deferredValueType = pm._deferredValueType;
}
/**
@@ -124,6 +126,7 @@
out.writeElement("setMethodScope", pm._setMethodScope);
out.writeElement("setMethod", pm._setMethod);
out.writeElement("rtexprvalue", pm._rtexprvalue);
+ out.writeElement("deferredValueType", pm._deferredValueType);
out.endElement("property");
}
@@ -158,6 +161,7 @@
digester.addBeanPropertySetter(newPrefix + "/setMethodScope", "setMethodScope");
digester.addBeanPropertySetter(newPrefix + "/setMethod", "setMethod");
digester.addBeanPropertySetter(newPrefix + "/rtexprvalue", "rtexprvalue");
+ digester.addBeanPropertySetter(newPrefix + "/deferredValueType", "deferredValueType");
MethodSignatureMeta.addXmlRules(digester, newPrefix);
}
@@ -190,6 +194,7 @@
_setMethod = ModelUtils.merge(this._setMethod, other._setMethod);
_tagExcluded = ModelUtils.merge(this._tagExcluded, other._tagExcluded);
_rtexprvalue = ModelUtils.merge(this._rtexprvalue, other._rtexprvalue);
+ _deferredValueType = ModelUtils.merge(this._deferredValueType, other._deferredValueType);
}
/**
@@ -522,4 +527,24 @@
{
return ("javax.el.MethodExpression".equals(getClassName()));
}
+
+ /**
+ * @since 1.0.3
+ */
+ public void setDeferredValueType(String deferredValueType)
+ {
+ _deferredValueType = deferredValueType;
+ }
+
+ /**
+ * Indicate the type that values should be
+ * cast on tld. It is supposed that the className is
+ * javax.el.ValueExpression to apply it.
+ *
+ * @since 1.0.3
+ */
+ public String getDeferredValueType()
+ {
+ return _deferredValueType;
+ }
}
Modified: myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/qdox/QdoxModelBuilder.java
URL: http://svn.apache.org/viewvc/myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/qdox/QdoxModelBuilder.java?rev=776147&r1=776146&r2=776147&view=diff
==============================================================================
--- myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/qdox/QdoxModelBuilder.java (original)
+++ myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/qdox/QdoxModelBuilder.java Tue May 19 01:06:36 2009
@@ -1545,6 +1545,7 @@
String defaultValue = getString(clazz,"defaultValue",props,null);
String jspName = getString(clazz,"jspName",props,null);
Boolean rtexprvalue = getBoolean(clazz, "rtexprvalue",props,null);
+ String deferredValueType = getString(clazz, "deferredValueType", props, null);
Type returnType = null;
@@ -1586,6 +1587,7 @@
p.setSetMethodScope(setMethodScope);
p.setJspName(jspName);
p.setRtexprvalue(rtexprvalue);
+ p.setDeferredValueType(deferredValueType);
p.setInheritedTag(inheritedTag);
if (returnSignature != null)