You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by ma...@apache.org on 2007/12/07 09:51:53 UTC
svn commit: r602026 - in
/myfaces/trinidad-maven/trunk/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces:
./ generator/taglib/ parse/
Author: matzew
Date: Fri Dec 7 00:51:51 2007
New Revision: 602026
URL: http://svn.apache.org/viewvc?rev=602026&view=rev
Log:
Merged the plugin related changes for TRINIDAD-61 already into a private branch;
Modified:
myfaces/trinidad-maven/trunk/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/GenerateJspTaglibsMojo.java
myfaces/trinidad-maven/trunk/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/generator/taglib/AbstractTagGenerator.java
myfaces/trinidad-maven/trunk/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/generator/taglib/TrinidadComponentTagGenerator.java
myfaces/trinidad-maven/trunk/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/generator/taglib/TrinidadValidatorTagGenerator.java
myfaces/trinidad-maven/trunk/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/parse/FacesConfigParser.java
myfaces/trinidad-maven/trunk/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/parse/PropertyBean.java
Modified: myfaces/trinidad-maven/trunk/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/GenerateJspTaglibsMojo.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad-maven/trunk/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/GenerateJspTaglibsMojo.java?rev=602026&r1=602025&r2=602026&view=diff
==============================================================================
--- myfaces/trinidad-maven/trunk/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/GenerateJspTaglibsMojo.java (original)
+++ myfaces/trinidad-maven/trunk/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/GenerateJspTaglibsMojo.java Fri Dec 7 00:51:51 2007
@@ -759,10 +759,13 @@
ComponentTagHandlerGenerator componentGen = new ComponentTagHandlerGenerator();
AbstractConverterTagGenerator converterGen = null;
AbstractValidatorTagGenerator validatorGen = null;
- if (type == null || "trinidad".equals(type)) {
+ if (type == null || "trinidad".equals(type))
+ {
converterGen = new TrinidadConverterTagGenerator(is12(), getLicenseHeader(), getLog());
validatorGen = new TrinidadValidatorTagGenerator(is12(), getLicenseHeader(), getLog());
- } else {
+ }
+ else
+ {
converterGen = new MyFacesConverterTagGenerator(is12(), getLicenseHeader(), getLog());
validatorGen = new MyFacesValidatorTagGenerator(is12(), getLicenseHeader(), getLog());
}
Modified: myfaces/trinidad-maven/trunk/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/generator/taglib/AbstractTagGenerator.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad-maven/trunk/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/generator/taglib/AbstractTagGenerator.java?rev=602026&r1=602025&r2=602026&view=diff
==============================================================================
--- myfaces/trinidad-maven/trunk/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/generator/taglib/AbstractTagGenerator.java (original)
+++ myfaces/trinidad-maven/trunk/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/generator/taglib/AbstractTagGenerator.java Fri Dec 7 00:51:51 2007
@@ -228,6 +228,12 @@
}
}
+ protected String resolveDateType(String className, boolean useMaxTime)
+ {
+ String type = (String)_RESOLVABLE_TYPES.get(className);
+ return useMaxTime ? type + "WithMaxTime" : type;
+ }
+
protected String resolveType(String className)
{
return (String)_RESOLVABLE_TYPES.get(className);
Modified: myfaces/trinidad-maven/trunk/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/generator/taglib/TrinidadComponentTagGenerator.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad-maven/trunk/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/generator/taglib/TrinidadComponentTagGenerator.java?rev=602026&r1=602025&r2=602026&view=diff
==============================================================================
--- myfaces/trinidad-maven/trunk/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/generator/taglib/TrinidadComponentTagGenerator.java (original)
+++ myfaces/trinidad-maven/trunk/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/generator/taglib/TrinidadComponentTagGenerator.java Fri Dec 7 00:51:51 2007
@@ -235,7 +235,7 @@
String propName = property.getPropertyName();
String propClass = property.getPropertyClass();
String propVar = "_" + propName;
-
+
if (property.isVirtual())
{
_writeVirtualSetMethod(out, componentClass, propName);
@@ -276,6 +276,10 @@
{
_writeSetLiteral(out, componentClass, propName, propClass, propVar);
}
+ else if ("java.util.Date".equals(propClass))
+ {
+ _writeSetDate(out, componentClass, propName, propClass, propVar, property.getUseMaxTime());
+ }
else //if (_hasPropertySetter(property))
{
_writeSetProperty(out, componentClass, propName, propClass, propVar);
@@ -309,6 +313,33 @@
componentClass + "." + propKey + ", " +
propVar + ");");
}
+ }
+
+ private void _writeSetDate(
+ PrettyWriter out,
+ String componentClass,
+ String propName,
+ String propFullClass,
+ String propVar,
+ boolean useMaxTime)
+ {
+ String propKey = Util.getConstantNameFromProperty(propName, "_KEY");
+ String propClass = Util.getClassFromFullClass(propFullClass);
+ String boxedClass = Util.getBoxedClass(propClass);
+ String setProperty = "setProperty";
+ String propType = boxedClass.replaceAll("\\[\\]", "Array");
+ if (useMaxTime)
+ {
+ setProperty = Util.getPrefixedPropertyName("setMax", propType + "Property");
+ }
+ else
+ {
+ setProperty = Util.getPrefixedPropertyName("set", propType + "Property");
+ }
+
+ out.println(setProperty + "(bean, " +
+ componentClass + "." + propKey + ", " +
+ propVar + ");");
}
private void _writeSetProperty(
Modified: myfaces/trinidad-maven/trunk/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/generator/taglib/TrinidadValidatorTagGenerator.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad-maven/trunk/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/generator/taglib/TrinidadValidatorTagGenerator.java?rev=602026&r1=602025&r2=602026&view=diff
==============================================================================
--- myfaces/trinidad-maven/trunk/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/generator/taglib/TrinidadValidatorTagGenerator.java (original)
+++ myfaces/trinidad-maven/trunk/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/generator/taglib/TrinidadValidatorTagGenerator.java Fri Dec 7 00:51:51 2007
@@ -86,7 +86,15 @@
propVar + ");");
out.unindent();
out.println("}");
- String propType = resolveType(propFullClass);
+ String propType = null;
+ if ("Date".equals (propClass))
+ {
+ propType = resolveDateType(propFullClass, property.getUseMaxTime());
+ }
+ else
+ {
+ propType = resolveType(propFullClass);
+ }
if (propType != null)
{
out.println("else");
@@ -125,7 +133,15 @@
out.println("validator.setValueBinding(\"" + propName + "\", vb);");
out.unindent();
out.println("}");
- String propType = resolveType(propFullClass);
+ String propType = null;
+ if ("Date".equals (propClass))
+ {
+ propType = resolveDateType(propFullClass, property.getUseMaxTime());
+ }
+ else
+ {
+ propType = resolveType(propFullClass);
+ }
if (propType != null)
{
out.println("else");
Modified: myfaces/trinidad-maven/trunk/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/parse/FacesConfigParser.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad-maven/trunk/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/parse/FacesConfigParser.java?rev=602026&r1=602025&r2=602026&view=diff
==============================================================================
--- myfaces/trinidad-maven/trunk/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/parse/FacesConfigParser.java (original)
+++ myfaces/trinidad-maven/trunk/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/parse/FacesConfigParser.java Fri Dec 7 00:51:51 2007
@@ -118,6 +118,7 @@
"defaultValue");
digester.addSetNext("faces-config/component/property", "addProperty",
PropertyBean.class.getName());
+
// faces-config/component/facet
digester.addObjectCreate("faces-config/component/facet", FacetBean.class);
@@ -186,7 +187,6 @@
"stateHolder");
digester.addBeanPropertySetter("faces-config/component/property/property-extension/jsp-property-name",
"jspPropertyName");
- // faces-config/component/property/property-extension
digester.addBeanPropertySetter("faces-config/component/property/property-extension/list",
"list");
digester.addBeanPropertySetter("faces-config/component/property/property-extension/required");
@@ -222,6 +222,9 @@
digester.addSetNext("faces-config/component/property/property-extension/method-binding-signature",
"setMethodBindingSignature",
MethodSignatureBean.class.getName());
+ // faces-config/component/property/property-extension/property-metada
+ digester.addBeanPropertySetter("faces-config/component/property/property-extension/property-metadata/use-max-time",
+ "useMaxTime");
// XInclude rules
@@ -354,6 +357,9 @@
// faces-config/validator/property/property-extension
digester.addBeanPropertySetter("faces-config/validator/property/property-extension/tag-attribute-excluded",
"tagAttributeExcluded");
+ // faces-config/validator/property/property-extension/property-metada
+ digester.addBeanPropertySetter("faces-config/validator/property/property-extension/property-metadata/use-max-time",
+ "useMaxTime");
// faces-config/render-kit/renderer/renderer-extension
digester.addBeanPropertySetter("faces-config/render-kit/renderer/renderer-extension/component-type",
Modified: myfaces/trinidad-maven/trunk/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/parse/PropertyBean.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad-maven/trunk/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/parse/PropertyBean.java?rev=602026&r1=602025&r2=602026&view=diff
==============================================================================
--- myfaces/trinidad-maven/trunk/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/parse/PropertyBean.java (original)
+++ myfaces/trinidad-maven/trunk/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/parse/PropertyBean.java Fri Dec 7 00:51:51 2007
@@ -24,6 +24,16 @@
*/
public class PropertyBean extends AttributeBean
{
+ public void setUseMaxTime(boolean _useMaxTime)
+ {
+ this._useMaxTime = _useMaxTime;
+ }
+
+ public boolean getUseMaxTime()
+ {
+ return _useMaxTime;
+ }
+
/**
* Sets the name of this property.
*
@@ -429,9 +439,11 @@
private boolean _list;
private boolean _tagAttributeExcluded;
private boolean _enum;
+ private boolean _useMaxTime;
private String[] _propertyValues;
private String[] _unsupportedAgents = _EMPTY_ARRAY;
private String[] _unsupportedRenderKits = _EMPTY_ARRAY;
static private String[] _EMPTY_ARRAY = new String[0];
+
}