You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by ar...@apache.org on 2010/01/06 19:46:53 UTC
svn commit: r896615 - in
/myfaces/trinidad-maven/branches/2.0.x-branch/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces:
generator/component/AbstractComponentGenerator.java
parse/FacesConfigParser.java
Author: arobinson74
Date: Wed Jan 6 18:46:52 2010
New Revision: 896615
URL: http://svn.apache.org/viewvc?rev=896615&view=rev
Log:
Move the event-names and default-event-name under the fmd:component-metadata to be consistent with the JSR and fix the code for the default event name so that the generated code will compile if there is no default event name given
Modified:
myfaces/trinidad-maven/branches/2.0.x-branch/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/generator/component/AbstractComponentGenerator.java
myfaces/trinidad-maven/branches/2.0.x-branch/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/parse/FacesConfigParser.java
Modified: myfaces/trinidad-maven/branches/2.0.x-branch/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/generator/component/AbstractComponentGenerator.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad-maven/branches/2.0.x-branch/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/generator/component/AbstractComponentGenerator.java?rev=896615&r1=896614&r2=896615&view=diff
==============================================================================
--- myfaces/trinidad-maven/branches/2.0.x-branch/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/generator/component/AbstractComponentGenerator.java (original)
+++ myfaces/trinidad-maven/branches/2.0.x-branch/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/generator/component/AbstractComponentGenerator.java Wed Jan 6 18:46:52 2010
@@ -1024,19 +1024,23 @@
) throws IOException
{
String defaultEventName = component.getDefaultEventName();
+ out.println();
+ out.println("@Override");
+ out.println("public String getDefaultEventName()");
+ out.println("{");
+ out.indent();
if (defaultEventName != null)
{
- out.println();
- out.println("@Override");
- out.println("public String getDefaultEventName()");
- out.println("{");
- out.indent();
out.print("return \"");
out.print(defaultEventName);
out.println("\";");
- out.unindent();
- out.println("}");
}
+ else
+ {
+ out.println("return super.getDefaultEventName();");
+ }
+ out.unindent();
+ out.println("}");
out.println();
out.println("@Override"); // JDK 1.6 is a requirement for JSF2 so this is okay
Modified: myfaces/trinidad-maven/branches/2.0.x-branch/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/parse/FacesConfigParser.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad-maven/branches/2.0.x-branch/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/parse/FacesConfigParser.java?rev=896615&r1=896614&r2=896615&view=diff
==============================================================================
--- myfaces/trinidad-maven/branches/2.0.x-branch/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/parse/FacesConfigParser.java (original)
+++ myfaces/trinidad-maven/branches/2.0.x-branch/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/parse/FacesConfigParser.java Wed Jan 6 18:46:52 2010
@@ -217,11 +217,11 @@
digester.setRuleNamespaceURI("http://java.sun.com/xml/ns/javaee/faces/design-time-metadata");
digester.addBeanPropertySetter("faces-config/component/property/property-extension/property-metadata/required");
digester.addBeanPropertySetter("faces-config/component/property/property-extension/property-metadata/value-expression", "valueExpression");
- digester.addBeanPropertySetter("faces-config/component/component-extension/default-event-name",
+ digester.addBeanPropertySetter("faces-config/component/component-extension/component-metadata/default-event-name",
"defaultEventName");
- digester.addCallMethod("faces-config/component/component-extension/event-names",
+ digester.addCallMethod("faces-config/component/component-extension/component-metadata/event-names",
"parseEventNames", 1);
- digester.addCallParam("faces-config/component/component-extension/event-names", 0);
+ digester.addCallParam("faces-config/component/component-extension/component-metadata/event-names", 0);
// XInclude rules
digester.setRuleNamespaceURI(XIncludeFilter.XINCLUDE_NAMESPACE);