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 2008/05/05 21:56:51 UTC
svn commit: r653574 - in /myfaces/trinidad-maven/branches/1.2.6.1-branch:
maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/parse/
maven-tagdoc-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/tagdoc/
Author: arobinson74
Date: Mon May 5 12:56:51 2008
New Revision: 653574
URL: http://svn.apache.org/viewvc?rev=653574&view=rev
Log:
TRINIDAD-1065 - use the mfp:hidden in facets and properties to be able
to prevent these from being included in the tag documentation
Modified:
myfaces/trinidad-maven/branches/1.2.6.1-branch/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/parse/FacesConfigParser.java
myfaces/trinidad-maven/branches/1.2.6.1-branch/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/parse/FacetBean.java
myfaces/trinidad-maven/branches/1.2.6.1-branch/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/parse/PropertyBean.java
myfaces/trinidad-maven/branches/1.2.6.1-branch/maven-tagdoc-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/tagdoc/TagdocReport.java
Modified: myfaces/trinidad-maven/branches/1.2.6.1-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/1.2.6.1-branch/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/parse/FacesConfigParser.java?rev=653574&r1=653573&r2=653574&view=diff
==============================================================================
--- myfaces/trinidad-maven/branches/1.2.6.1-branch/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/parse/FacesConfigParser.java (original)
+++ myfaces/trinidad-maven/branches/1.2.6.1-branch/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/parse/FacesConfigParser.java Mon May 5 12:56:51 2008
@@ -130,6 +130,9 @@
// Maven Faces Plugin
digester.setRuleNamespaceURI("http://myfaces.apache.org/maven-faces-plugin");
+
+ // faces-config/component/facet/facet-extension
+ digester.addBeanPropertySetter("faces-config/component/facet/facet-extension/hidden");
// faces-config/component/component-extension
digester.addBeanPropertySetter("faces-config/component/component-extension/long-description",
@@ -202,6 +205,7 @@
"alternateClass");
digester.addBeanPropertySetter("faces-config/component/property/property-extension/tag-attribute-excluded",
"tagAttributeExcluded");
+ digester.addBeanPropertySetter("faces-config/component/property/property-extension/hidden");
digester.addCallMethod("faces-config/component/property/property-extension/property-values",
"parsePropertyValues", 1);
digester.addCallParam("faces-config/component/property/property-extension/property-values", 0);
Modified: myfaces/trinidad-maven/branches/1.2.6.1-branch/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/parse/FacetBean.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad-maven/branches/1.2.6.1-branch/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/parse/FacetBean.java?rev=653574&r1=653573&r2=653574&view=diff
==============================================================================
--- myfaces/trinidad-maven/branches/1.2.6.1-branch/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/parse/FacetBean.java (original)
+++ myfaces/trinidad-maven/branches/1.2.6.1-branch/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/parse/FacetBean.java Mon May 5 12:56:51 2008
@@ -87,7 +87,26 @@
return _required;
}
+ /**
+ * If the facet should be hidden from documentation
+ * @return If the facet should be hidden
+ */
+ public boolean isHidden()
+ {
+ return _hidden;
+ }
+
+ /**
+ * Set if this facet should be hidden from documentation
+ * @param hidden If the facet should be hidden
+ */
+ public void setHidden(boolean hidden)
+ {
+ this._hidden = hidden;
+ }
+
private String _description;
private String _facetName;
private boolean _required;
+ private boolean _hidden;
}
Modified: myfaces/trinidad-maven/branches/1.2.6.1-branch/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/parse/PropertyBean.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad-maven/branches/1.2.6.1-branch/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/parse/PropertyBean.java?rev=653574&r1=653573&r2=653574&view=diff
==============================================================================
--- myfaces/trinidad-maven/branches/1.2.6.1-branch/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/parse/PropertyBean.java (original)
+++ myfaces/trinidad-maven/branches/1.2.6.1-branch/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/parse/PropertyBean.java Mon May 5 12:56:51 2008
@@ -428,6 +428,24 @@
return _fieldPropertyName;
}
+
+ /**
+ * If the property should be hidden from documentation
+ * @return If the facet should be hidden
+ */
+ public boolean isHidden()
+ {
+ return _hidden;
+ }
+
+ /**
+ * Set if this facet should be hidden from documentation
+ * @param hidden If the facet should be hidden
+ */
+ public void setHidden(boolean hidden)
+ {
+ this._hidden = hidden;
+ }
private String _aliasOf;
private String _jspPropertyName;
@@ -440,6 +458,7 @@
private boolean _tagAttributeExcluded;
private boolean _enum;
private boolean _useMaxTime;
+ private boolean _hidden;
private String[] _propertyValues;
private String[] _unsupportedAgents = _EMPTY_ARRAY;
private String[] _unsupportedRenderKits = _EMPTY_ARRAY;
Modified: myfaces/trinidad-maven/branches/1.2.6.1-branch/maven-tagdoc-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/tagdoc/TagdocReport.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad-maven/branches/1.2.6.1-branch/maven-tagdoc-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/tagdoc/TagdocReport.java?rev=653574&r1=653573&r2=653574&view=diff
==============================================================================
--- myfaces/trinidad-maven/branches/1.2.6.1-branch/maven-tagdoc-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/tagdoc/TagdocReport.java (original)
+++ myfaces/trinidad-maven/branches/1.2.6.1-branch/maven-tagdoc-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/tagdoc/TagdocReport.java Mon May 5 12:56:51 2008
@@ -795,6 +795,11 @@
while (attributes.hasNext())
{
PropertyBean attr = (PropertyBean) attributes.next();
+
+ if (attr.isHidden())
+ {
+ continue;
+ }
/*
if ((group == null) || "Ungrouped".equals(group))
@@ -990,7 +995,11 @@
Iterator iter = bean.facets(true);
while (iter.hasNext())
{
- facetNames.add(((FacetBean) iter.next()).getFacetName());
+ FacetBean facetBean = (FacetBean)iter.next();
+ if (!facetBean.isHidden())
+ {
+ facetNames.add(facetBean.getFacetName());
+ }
}
out.write("<table>\n");