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 2007/09/19 20:16:21 UTC
svn commit: r577410 - in
/myfaces/trinidad-maven/trunk/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces:
GenerateFaceletsTaglibsMojo.java parse/ComponentBean.java
parse/FacesConfigParser.java
Author: arobinson74
Date: Wed Sep 19 11:16:14 2007
New Revision: 577410
URL: http://svn.apache.org/viewvc?rev=577410&view=rev
Log:
Code for TRINIDAD-725 -- add support for a component-specific facelets tag-handler
Modified:
myfaces/trinidad-maven/trunk/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/GenerateFaceletsTaglibsMojo.java
myfaces/trinidad-maven/trunk/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/parse/ComponentBean.java
myfaces/trinidad-maven/trunk/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/parse/FacesConfigParser.java
Modified: myfaces/trinidad-maven/trunk/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/GenerateFaceletsTaglibsMojo.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad-maven/trunk/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/GenerateFaceletsTaglibsMojo.java?rev=577410&r1=577409&r2=577410&view=diff
==============================================================================
--- myfaces/trinidad-maven/trunk/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/GenerateFaceletsTaglibsMojo.java (original)
+++ myfaces/trinidad-maven/trunk/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/GenerateFaceletsTaglibsMojo.java Wed Sep 19 11:16:14 2007
@@ -287,11 +287,16 @@
stream.writeEndElement();
}
- if (faceletHandlerClass != null)
+ String tagHandler = component.getTagHandler();
+ if (tagHandler == null)
+ {
+ tagHandler = faceletHandlerClass;
+ }
+ if (tagHandler != null)
{
stream.writeCharacters("\n ");
stream.writeStartElement("handler-class");
- stream.writeCharacters(faceletHandlerClass);
+ stream.writeCharacters(tagHandler);
stream.writeEndElement();
}
Modified: myfaces/trinidad-maven/trunk/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/parse/ComponentBean.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad-maven/trunk/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/parse/ComponentBean.java?rev=577410&r1=577409&r2=577410&view=diff
==============================================================================
--- myfaces/trinidad-maven/trunk/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/parse/ComponentBean.java (original)
+++ myfaces/trinidad-maven/trunk/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/parse/ComponentBean.java Wed Sep 19 11:16:14 2007
@@ -273,6 +273,27 @@
}
/**
+ * Sets the Facelets tag handler (component handler) this component.
+ *
+ * @param tagHandler the Facelets tag handler class
+ */
+ public void setTagHandler(
+ String tagHandler)
+ {
+ _tagHandler = tagHandler;
+ }
+
+ /**
+ * Returns the Facelets tag handler for this component
+ *
+ * @return the Facelets tag handler
+ */
+ public String getTagHandler()
+ {
+ return _tagHandler;
+ }
+
+ /**
* Returns the JSP tag name for this component.
*
* @return the JSP tag name
@@ -1032,6 +1053,7 @@
private String _implementationType;
private QName _tagName;
private String _tagClass;
+ private String _tagHandler;
private String _tagSuperclass;
private String _localName;
private String _nodeClass;
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=577410&r1=577409&r2=577410&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 Wed Sep 19 11:16:14 2007
@@ -149,6 +149,8 @@
"tagClass");
digester.addBeanPropertySetter("faces-config/component/component-extension/tag-superclass",
"tagSuperclass");
+ digester.addBeanPropertySetter("faces-config/component/component-extension/tag-handler",
+ "tagHandler");
digester.addBeanPropertySetter("faces-config/component/component-extension/implementation-type",
"implementationType");
digester.addCallMethod("faces-config/component/component-extension/tag-class-modifier",