[richfaces-svn-commits] JBoss Rich Faces SVN: r3507 - in trunk/cdk/generator/src/main: resources/META-INF/templates12 and 1 other directory.

Author: maksimkaszynski Date: 2007-10-24 11:44:48 -0400 (Wed, 24 Oct 2007) New Revision: 3507 Modified: trunk/cdk/generator/src/main/java/org/ajax4jsf/builder/config/BuilderConfig.java trunk/cdk/generator/src/main/java/org/ajax4jsf/builder/config/ListenerBean.java trunk/cdk/generator/src/main/resources/META-INF/templates12/taglib.vm Log: correct output of listener tags Modified: trunk/cdk/generator/src/main/java/org/ajax4jsf/builder/config/BuilderConfig.java =================================================================== --- trunk/cdk/generator/src/main/java/org/ajax4jsf/builder/config/BuilderConfig.java 2007-10-24 15:42:43 UTC (rev 3506) +++ trunk/cdk/generator/src/main/java/org/ajax4jsf/builder/config/BuilderConfig.java 2007-10-24 15:44:48 UTC (rev 3507) @@ -416,6 +416,7 @@ try { Class<?> listenerClass = Class.forName(listener .getComponentclass(), false, getLoader()); + for (ComponentBean bean : getComponents()) { if (bean.getSuperclass() != null) { Class<?> componentSClass = Class.forName(bean @@ -468,6 +469,8 @@ } catch (ClassNotFoundException e) { throw new BuildException(e); } + + listener.checkProperties(); } for (Iterator iter = this.getComponents().iterator(); iter.hasNext();) { Modified: trunk/cdk/generator/src/main/java/org/ajax4jsf/builder/config/ListenerBean.java =================================================================== --- trunk/cdk/generator/src/main/java/org/ajax4jsf/builder/config/ListenerBean.java 2007-10-24 15:42:43 UTC (rev 3506) +++ trunk/cdk/generator/src/main/java/org/ajax4jsf/builder/config/ListenerBean.java 2007-10-24 15:44:48 UTC (rev 3507) @@ -29,7 +29,7 @@ * created 03.12.2006 * */ -public class ListenerBean extends ComponentBean { +public class ListenerBean extends ComponentBaseBean { private String listenerclass; private String componentclass; private String eventclass; Modified: trunk/cdk/generator/src/main/resources/META-INF/templates12/taglib.vm =================================================================== --- trunk/cdk/generator/src/main/resources/META-INF/templates12/taglib.vm 2007-10-24 15:42:43 UTC (rev 3506) +++ trunk/cdk/generator/src/main/resources/META-INF/templates12/taglib.vm 2007-10-24 15:44:48 UTC (rev 3507) @@ -39,7 +39,7 @@ <tag> #if(${source.tag.description}) <description>${source.tag.xmlEncodedDescription}</description> - #else + #elseif(${source.description}) <description>${source.xmlEncodedDescription}</description> #end #if(${source.tag.displayname}) @@ -47,7 +47,11 @@ #elseif(${source.displayname}) <display-name>${source.xmlEncodedDisplayname}</display-name> #end - <name>${source.tag.name}</name> + #if(${source.tag.name}) + <name>${source.tag.name}</name> + #else + <name>${source.name}</name> + #end <tag-class>${source.tag.classname}</tag-class> <body-content>${source.tag.bodyContent}</body-content>