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 2008/04/18 03:18:24 UTC
svn commit: r649344 [3/3] - in
/myfaces/myfaces-build-tools/branches/builder_plugin:
bigtest/core_trunk_11/api/
bigtest/core_trunk_11/api/src/main/java/javax/faces/component/
bigtest/core_trunk_11/api/src/main/java/javax/faces/component/html/
bigtest/c...
Modified: myfaces/myfaces-build-tools/branches/builder_plugin/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/model/Model.java
URL: http://svn.apache.org/viewvc/myfaces/myfaces-build-tools/branches/builder_plugin/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/model/Model.java?rev=649344&r1=649343&r2=649344&view=diff
==============================================================================
--- myfaces/myfaces-build-tools/branches/builder_plugin/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/model/Model.java (original)
+++ myfaces/myfaces-build-tools/branches/builder_plugin/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/model/Model.java Thu Apr 17 18:18:20 2008
@@ -117,6 +117,27 @@
this.addComponent(component);
}
}
+
+ for (Iterator it = other.getConverters().iterator(); it.hasNext();)
+ {
+ ConverterMeta converter = (ConverterMeta) it.next();
+
+ if (this.findConverterByClassName(converter.getClassName())== null)
+ {
+ this.addConverter(converter);
+ }
+ }
+
+ for (Iterator it = other.getValidators().iterator(); it.hasNext();)
+ {
+ ValidatorMeta converter = (ValidatorMeta) it.next();
+
+ if (this.findConverterByClassName(converter.getClassName())== null)
+ {
+ this.addValidator(converter);
+ }
+ }
+
}
/**
Modified: myfaces/myfaces-build-tools/branches/builder_plugin/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/branches/builder_plugin/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/qdox/QdoxModelBuilder.java?rev=649344&r1=649343&r2=649344&view=diff
==============================================================================
--- myfaces/myfaces-build-tools/branches/builder_plugin/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/qdox/QdoxModelBuilder.java (original)
+++ myfaces/myfaces-build-tools/branches/builder_plugin/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/qdox/QdoxModelBuilder.java Thu Apr 17 18:18:20 2008
@@ -254,6 +254,7 @@
String src = srcObj.toString();
int start = 0;
int end = src.length();
+
while (start <= end)
{
char c = src.charAt(start);
@@ -365,12 +366,20 @@
}
String shortDescription = getString(clazz, "desc", props, descDflt);
- String converterId = getString(clazz, "id", props, null);
- String packageClass = getString(clazz, "class", props, clazz
- .getPackage());
+ String converterIdDflt = null;
+ JavaField fieldConverterId = clazz
+ .getFieldByName("CONVERTER_ID");
+ if (fieldConverterId != null)
+ {
+ String value = fieldConverterId.getInitializationExpression();
+ converterIdDflt = clean(value.substring(value.indexOf('"')));
+ }
+ String converterId = getString(clazz, "id", props, converterIdDflt);
+ String converterClass = getString(clazz, "class", props, clazz
+ .getFullyQualifiedName());
ConverterMeta converter = new ConverterMeta();
- converter.setClassName(clazz.getName());
+ converter.setClassName(converterClass);
converter.setConverterId(converterId);
converter.setDescription(shortDescription);
converter.setLongDescription(longDescription);
@@ -387,13 +396,21 @@
descDflt = "no description";
}
String shortDescription = getString(clazz, "desc", props, descDflt);
- String packageClass = getString(clazz, "class", props, clazz
- .getPackage());
- String validatorId = getString(clazz, "id", props, null);
+ String validatorIdDflt = null;
+ JavaField fieldConverterId = clazz
+ .getFieldByName("VALIDATOR_ID");
+ if (fieldConverterId != null)
+ {
+ String value = fieldConverterId.getInitializationExpression();
+ validatorIdDflt = clean(value.substring(value.indexOf('"')));
+ }
+ String validatorId = getString(clazz, "id", props, validatorIdDflt);
+ String validatorClass = getString(clazz, "class", props, clazz
+ .getFullyQualifiedName());
ValidatorMeta validator = new ValidatorMeta();
- validator.setClassName(clazz.getName());
+ validator.setClassName(validatorClass);
validator.setValidatorId(validatorId);
validator.setDescription(shortDescription);
validator.setLongDescription(longDescription);
Modified: myfaces/myfaces-build-tools/branches/builder_plugin/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/utils/MyfacesUtils.java
URL: http://svn.apache.org/viewvc/myfaces/myfaces-build-tools/branches/builder_plugin/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/utils/MyfacesUtils.java?rev=649344&r1=649343&r2=649344&view=diff
==============================================================================
--- myfaces/myfaces-build-tools/branches/builder_plugin/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/utils/MyfacesUtils.java (original)
+++ myfaces/myfaces-build-tools/branches/builder_plugin/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/utils/MyfacesUtils.java Thu Apr 17 18:18:20 2008
@@ -47,10 +47,10 @@
public static String getJspPropertyType11(PropertyMeta property)
{
if (property.isMethodExpression())
- return "MethodExpression";
+ return "MethodBinding";
if (property.isMethodBinding())
- return "MethodExpression";
+ return "MethodBinding";
return "String";
}
@@ -61,7 +61,7 @@
return "MethodExpression";
if (property.isMethodBinding())
- return "MethodExpression";
+ return "MethodBinding";
if (!property.isLiteralOnly().booleanValue())
return "ValueExpression";