You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by de...@apache.org on 2017/09/17 18:05:24 UTC
[myfaces-trinidad-maven] branch 1.2.12.1-branch created (now
7d51e28)
This is an automated email from the ASF dual-hosted git repository.
deki pushed a change to branch 1.2.12.1-branch
in repository https://gitbox.apache.org/repos/asf/myfaces-trinidad-maven.git.
at 7d51e28 Oops. restoring the branches. It was not supposed to be deleted.
This branch includes the following new commits:
new 56d8059 Create a branch off of the 1.2.12 release
new 7f8dfcb Merge revision 1026414
new 6f9dbe2 TRINIDAD-1946 Merge revision 1026463
new 7d51e28 Oops. restoring the branches. It was not supposed to be deleted.
The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
--
To stop receiving notification emails like this one, please contact
['"commits@myfaces.apache.org" <co...@myfaces.apache.org>'].
[myfaces-trinidad-maven] 03/04: TRINIDAD-1946 Merge revision 1026463
Posted by de...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
deki pushed a commit to branch 1.2.12.1-branch
in repository https://gitbox.apache.org/repos/asf/myfaces-trinidad-maven.git
commit 6f9dbe2f7d055e9cf2320750fc7690f1c89ddfe1
Author: Andrew Robinson <ar...@apache.org>
AuthorDate: Thu Nov 4 23:15:26 2010 +0000
TRINIDAD-1946 Merge revision 1026463
---
.../plugin/faces/parse/FacesConfigParser.java | 1 +
.../trinidadbuild/plugin/tagdoc/TagdocReport.java | 81 +++++++++++-----------
2 files changed, 40 insertions(+), 42 deletions(-)
diff --git a/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/parse/FacesConfigParser.java b/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/parse/FacesConfigParser.java
index 720f5f2..5f2546e 100644
--- a/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/parse/FacesConfigParser.java
+++ b/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/parse/FacesConfigParser.java
@@ -324,6 +324,7 @@ public class FacesConfigParser
"parsePropertyValues", 1);
digester.addCallParam("faces-config/component/property/property-extension/property-metadata/property-values", 0);
digester.addBeanPropertySetter("faces-config/component/property/property-extension/property-metadata/deprecated");
+ digester.addBeanPropertySetter("faces-config/component/property/property-extension/property-metadata/hidden");
digester.setRuleNamespaceURI(oldNamespace);
}
diff --git a/maven-tagdoc-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/tagdoc/TagdocReport.java b/maven-tagdoc-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/tagdoc/TagdocReport.java
index 421349b..39c4770 100644
--- a/maven-tagdoc-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/tagdoc/TagdocReport.java
+++ b/maven-tagdoc-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/tagdoc/TagdocReport.java
@@ -128,13 +128,13 @@ public class TagdocReport extends AbstractMavenMultiPageReport
compIter = new FilteredIterator(compIter, new SkipFilter());
compIter = new FilteredIterator(compIter, new ComponentTagFilter());
compIter = new FilteredIterator(compIter, new ComponentNamespaceFilter());
-
+
// compTypeMap holds a map of compononent types to tag names that implement that component type
- // The map is built using getComponentType method on the component bean to determine the
+ // The map is built using getComponentType method on the component bean to determine the
// component type of a given tag name
Map<String, List<QName>> compTypeMap = new HashMap<String, List<QName>> ();
// contractMap holds a map of contract name to tag names that satisify that contract.
- // The map is built using the getSatisfiedContracts method API on the component bean to determine
+ // The map is built using the getSatisfiedContracts method API on the component bean to determine
// which contracts are satisfied for a given tagname
Map<String, List<QName>> contractMap = new HashMap<String, List<QName>>();
while (compIter.hasNext())
@@ -143,21 +143,21 @@ public class TagdocReport extends AbstractMavenMultiPageReport
List<QName> tagNames;
String compType = compBean.getComponentType();
if (compType != null &&
- compTypeMap.containsKey (compType) &&
- compBean.getTagName() != null)
+ compTypeMap.containsKey (compType) &&
+ compBean.getTagName() != null)
{
// the component type map already contains an entry for this component type
tagNames = compTypeMap.get(compType);
- }
- else
+ }
+ else
{
// the component type map does not contain an entry for this component type
- // so create a new ArrayList that will be used to store the tag names of
+ // so create a new ArrayList that will be used to store the tag names of
// component that have this component type
tagNames = new ArrayList<QName>();
}
tagNames.add(compBean.getTagName());
- compTypeMap.put (compType, tagNames);
+ compTypeMap.put (compType, tagNames);
if (compBean.hasSatisfiedContracts())
{
@@ -167,12 +167,12 @@ public class TagdocReport extends AbstractMavenMultiPageReport
String satContract = satContractsIter.next();
if (contractMap.containsKey (satContract))
{
- // the contract map already contains an entry for this contract
+ // the contract map already contains an entry for this contract
tagNames = contractMap.get(satContract);
}
else
{
- // the contract map does not contain an entry for this contract, so
+ // the contract map does not contain an entry for this contract, so
// create a new ArrayList which will be used to store the tag names of
// components that satisfy this contract
tagNames = new ArrayList<QName>();
@@ -314,7 +314,7 @@ public class TagdocReport extends AbstractMavenMultiPageReport
String header)
{
String formatted = null;
-
+
// Don't know how long this will be, but 300 should be plenty.
StringBuffer sb = new StringBuffer(300);
sb.append("\n");
@@ -322,7 +322,7 @@ public class TagdocReport extends AbstractMavenMultiPageReport
sb.append(header);
sb.append(":</b> ");
- boolean gotOne = false;
+ boolean gotOne = false;
while (strIter.hasNext())
{
List<QName> tagNameList = pMap.get(strIter.next());
@@ -425,13 +425,13 @@ public class TagdocReport extends AbstractMavenMultiPageReport
sink.text("Tag Name");
sink.tableHeaderCell_();
sink.tableRow_();
-
+
Iterator iter = pages.iterator();
while (iter.hasNext())
{
sink.tableRow();
sink.tableCell();
-
+
String name = (String) iter.next();
String tagName = "<" + name.replace('_', ':') + ">";
@@ -676,7 +676,7 @@ public class TagdocReport extends AbstractMavenMultiPageReport
if (bean.hasRequiredAncestorContracts())
{
- String formattedAncestors = _formatTagList ( bean.requiredAncestorContracts(),
+ String formattedAncestors = _formatTagList ( bean.requiredAncestorContracts(),
contractMap,
"Required Ancestor Tag");
out.write (formattedAncestors);
@@ -722,7 +722,7 @@ public class TagdocReport extends AbstractMavenMultiPageReport
out.write(" <b>Tag name:</b> <" +
_getQualifiedName(bean.getTagName()) + ">\n");
out.write(" <br/>\n");
-
+
out.write(" <br/>\n");
out.write(" <b> type:</b> " + bean.getValidatorId() + "\n");
out.write(" <br/>\n");
@@ -813,8 +813,10 @@ public class TagdocReport extends AbstractMavenMultiPageReport
private void _writeComponentAttributes(Writer out, ComponentBean bean) throws IOException
{
// Sort the names
- TreeSet attributes = new TreeSet();
+ TreeSet<String> attributes = new TreeSet<String>();
Iterator attrs = bean.properties(true);
+ attrs = new FilteredIterator(attrs, new NonHiddenFilter());
+
while (attrs.hasNext())
{
PropertyBean property = (PropertyBean) attrs.next();
@@ -823,7 +825,7 @@ public class TagdocReport extends AbstractMavenMultiPageReport
}
// Now get a list of PropertyBeans
- List list = new ArrayList();
+ List<PropertyBean> list = new ArrayList<PropertyBean>();
Iterator iter = attributes.iterator();
while (iter.hasNext())
{
@@ -832,7 +834,7 @@ public class TagdocReport extends AbstractMavenMultiPageReport
}
- TreeSet groups = new TreeSet(new GroupComparator());
+ TreeSet<String> groups = new TreeSet<String>(new GroupComparator());
/* No current support for grouping
// Make sure "null" is the representative for unknown groups
Iterator iter = attributes.iterator();
@@ -857,10 +859,8 @@ public class TagdocReport extends AbstractMavenMultiPageReport
bean.getComponentClass(),
(String) groupIter.next());
}
-
}
-
private void _writeConverterAttributes(Writer out, ConverterBean bean) throws IOException
{
// Sort the names
@@ -929,11 +929,6 @@ public class TagdocReport extends AbstractMavenMultiPageReport
while (attributes.hasNext())
{
PropertyBean attr = (PropertyBean) attributes.next();
-
- if (attr.isHidden())
- {
- continue;
- }
/*
if ((group == null) || "Ungrouped".equals(group))
@@ -1040,15 +1035,15 @@ public class TagdocReport extends AbstractMavenMultiPageReport
{
out.write(valStr);
}
-
+
if (defaultValueStr != null)
{
out.write(defaultValueStr);
}
-
- // if we print out a list of possible values and/or a default value for the attribute,
+
+ // if we print out a list of possible values and/or a default value for the attribute,
// then enter a line break before printing out other information about the attribute.
- if (valStr != null || defaultValueStr != null)
+ if (valStr != null || defaultValueStr != null)
{
out.write("<br/>");
}
@@ -1319,7 +1314,7 @@ public class TagdocReport extends AbstractMavenMultiPageReport
// guidelines
private void _writeAccessibilityGuidelines(Writer out, ComponentBean bean) throws IOException
{
- // accAttributes and accFacets are sorted lists of attributes and facets, respectively,
+ // accAttributes and accFacets are sorted lists of attributes and facets, respectively,
// that have an associated accessibility guideline
TreeSet<PropertyBean> accAttributes = new TreeSet<PropertyBean>();
TreeSet<String> accFacets = new TreeSet<String>();
@@ -1336,7 +1331,7 @@ public class TagdocReport extends AbstractMavenMultiPageReport
}
// see if any of the component's facets has an associated accessibility guideline
- if (bean.hasFacets())
+ if (bean.hasFacets())
{
Iterator<FacetBean> facets = bean.facets(true);
while (facets.hasNext())
@@ -1427,11 +1422,11 @@ public class TagdocReport extends AbstractMavenMultiPageReport
out.write(" <div class=\'accGuideline\'>\n");
out.write("<li>");
- if (!"".equals(referenceName))
+ if (!"".equals(referenceName))
{
out.write("<b>");
out.write(referenceName);
- out.write("</b>: ");
+ out.write("</b>: ");
}
if (desc != null)
@@ -1440,7 +1435,7 @@ public class TagdocReport extends AbstractMavenMultiPageReport
{
out.write(desc + "\n");
}
- }
+ }
out.write("</li>");
out.write(" </div>\n");
@@ -1654,8 +1649,6 @@ public class TagdocReport extends AbstractMavenMultiPageReport
}
}
-
-
private class ComponentNamespaceFilter extends ComponentFilter
{
public ComponentNamespaceFilter()
@@ -1704,8 +1697,6 @@ public class TagdocReport extends AbstractMavenMultiPageReport
}
}
-
-
static final protected class TagAttributeFilter extends PropertyFilter
{
protected boolean accept(
@@ -1742,11 +1733,17 @@ public class TagdocReport extends AbstractMavenMultiPageReport
}
}
+ final protected static class NonHiddenFilter extends PropertyFilter
+ {
+ protected boolean accept(
+ PropertyBean property)
+ {
+ return (!property.isHidden());
+ }
+ }
private FacesConfigBean _facesConfig;
-
-
// todo: make this configurable?
private boolean _attrDocSpansColumns = false;
--
To stop receiving notification emails like this one, please contact
"commits@myfaces.apache.org" <co...@myfaces.apache.org>.
[myfaces-trinidad-maven] 02/04: Merge revision 1026414
Posted by de...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
deki pushed a commit to branch 1.2.12.1-branch
in repository https://gitbox.apache.org/repos/asf/myfaces-trinidad-maven.git
commit 7f8dfcb796301ad911360869094ad083f8f03c72
Author: Andrew Robinson <ar...@apache.org>
AuthorDate: Thu Nov 4 23:08:56 2010 +0000
Merge revision 1026414
---
maven-faces-plugin/pom.xml | 2 +-
.../plugin/faces/AbstractFacesMojo.java | 28 +++++++----
.../component/AbstractComponentGenerator.java | 15 ++++++
.../component/TrinidadComponentGenerator.java | 2 +
.../taglib/AbstractComponentTagGenerator.java | 47 ++++++++++++++----
.../taglib/TrinidadComponentTagGenerator.java | 57 +++++++++++++---------
.../plugin/faces/parse/ComponentBean.java | 44 ++++++++---------
.../plugin/faces/parse/FacesConfigBean.java | 51 ++++++++++++++++---
.../plugin/faces/parse/PropertyBean.java | 19 ++++++++
maven-i18n-plugin/pom.xml | 2 +-
maven-javacc-plugin/pom.xml | 2 +-
maven-javascript-plugin/pom.xml | 2 +-
maven-jdev-plugin/pom.xml | 2 +-
maven-tagdoc-plugin/pom.xml | 2 +-
maven-xrts-plugin/pom.xml | 2 +-
pom.xml | 2 +-
16 files changed, 198 insertions(+), 81 deletions(-)
diff --git a/maven-faces-plugin/pom.xml b/maven-faces-plugin/pom.xml
index b40adca..5102bc7 100644
--- a/maven-faces-plugin/pom.xml
+++ b/maven-faces-plugin/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.myfaces.trinidadbuild</groupId>
<artifactId>maven-plugin-parent</artifactId>
- <version>1.2.12</version>
+ <version>1.2.12.1-SNAPSHOT</version>
</parent>
<groupId>org.apache.myfaces.trinidadbuild</groupId>
diff --git a/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/AbstractFacesMojo.java b/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/AbstractFacesMojo.java
index f40fd26..6aabc6f 100644
--- a/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/AbstractFacesMojo.java
+++ b/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/AbstractFacesMojo.java
@@ -19,10 +19,12 @@ import java.io.BufferedReader;
import java.io.File;
import java.io.FileReader;
import java.io.IOException;
+
import java.net.MalformedURLException;
import java.net.URL;
import java.net.URLClassLoader;
import java.net.URLConnection;
+
import java.util.ArrayList;
import java.util.Collections;
import java.util.Enumeration;
@@ -56,10 +58,13 @@ import org.apache.myfaces.trinidadbuild.plugin.faces.util.ConverterFilter;
import org.apache.myfaces.trinidadbuild.plugin.faces.util.Util;
import org.apache.myfaces.trinidadbuild.plugin.faces.util.ValidatorFilter;
import org.apache.myfaces.trinidadbuild.plugin.faces.util.XIncludeFilter;
+
import org.codehaus.plexus.util.FileUtils;
+
import org.xml.sax.Attributes;
import org.xml.sax.SAXException;
+
abstract public class AbstractFacesMojo extends AbstractMojo
{
protected List getCompileDependencyResources(
@@ -117,7 +122,7 @@ abstract public class AbstractFacesMojo extends AbstractMojo
} catch (MalformedURLException e) {
getLog().error("", e);
}
- return urls;
+ return urls;
}
else
{
@@ -218,7 +223,7 @@ abstract public class AbstractFacesMojo extends AbstractMojo
{
return _DEFAULT_LICENSE_HEADER;
}
-
+
if (!licenseHeaderFile.exists())
{
throw new MojoExecutionException("License header file not found: "
@@ -232,12 +237,12 @@ abstract public class AbstractFacesMojo extends AbstractMojo
}
StringBuffer sb = new StringBuffer();
-
+
try
{
BufferedReader reader = new BufferedReader(new FileReader(licenseHeaderFile));
String line;
-
+
while ((line = reader.readLine()) != null)
{
sb.append(line+"\n");
@@ -247,17 +252,17 @@ abstract public class AbstractFacesMojo extends AbstractMojo
{
throw new MojoExecutionException("Exception reading license header file", e);
}
-
+
return sb.toString();
}
-
+
protected String getLicenseHeader() throws MojoExecutionException
{
if (_licenseHeader == null)
{
_licenseHeader = readLicenseHeader();
}
-
+
return _licenseHeader;
}
@@ -286,6 +291,9 @@ abstract public class AbstractFacesMojo extends AbstractMojo
{
processIndexEntry(index[i]);
}
+
+ // Perform any post-processing
+ _facesConfig.performPostProcessing();
}
protected void processIndexEntry(
@@ -408,7 +416,7 @@ abstract public class AbstractFacesMojo extends AbstractMojo
protected boolean accept(
ComponentBean component)
{
- String componentType = component.getComponentType();
+ String componentType = component.getComponentType();
return (componentType.startsWith(_typePrefix));
}
private final String _typePrefix;
@@ -498,7 +506,7 @@ abstract public class AbstractFacesMojo extends AbstractMojo
private final String _packageContains;
}
-
+
static final protected class ComponentTagFilter extends ComponentFilter
{
@@ -680,4 +688,4 @@ abstract public class AbstractFacesMojo extends AbstractMojo
" * under the License.\n" +
"*/\n";
}
-
+
diff --git a/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/generator/component/AbstractComponentGenerator.java b/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/generator/component/AbstractComponentGenerator.java
index 58de9be..a06aa85 100644
--- a/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/generator/component/AbstractComponentGenerator.java
+++ b/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/generator/component/AbstractComponentGenerator.java
@@ -583,6 +583,11 @@ public abstract class AbstractComponentGenerator implements ComponentGenerator
{
Iterator properties = component.properties();
properties = new FilteredIterator(properties, new NonVirtualFilter());
+ if (isAccessorMethodFinal())
+ {
+ // Do not generate property methods if they are final and the properties are overrides
+ properties = new FilteredIterator(properties, new NonOverriddenFilter());
+ }
while (properties.hasNext())
{
PropertyBean property = (PropertyBean) properties.next();
@@ -1046,6 +1051,16 @@ public abstract class AbstractComponentGenerator implements ComponentGenerator
}
}
+ protected static class NonOverriddenFilter
+ extends PropertyFilter
+ {
+ protected boolean accept(
+ PropertyBean property)
+ {
+ return (!property.isOverride());
+ }
+ }
+
static protected String resolveType(
String className)
{
diff --git a/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/generator/component/TrinidadComponentGenerator.java b/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/generator/component/TrinidadComponentGenerator.java
index a1b9970..58b3274 100644
--- a/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/generator/component/TrinidadComponentGenerator.java
+++ b/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/generator/component/TrinidadComponentGenerator.java
@@ -94,6 +94,8 @@ public class TrinidadComponentGenerator extends AbstractComponentGenerator
// component property keys
Iterator properties = component.properties();
properties = new FilteredIterator(properties, new NonVirtualFilter());
+ properties = new FilteredIterator(properties, new NonOverriddenFilter());
+
while (properties.hasNext())
{
PropertyBean property = (PropertyBean) properties.next();
diff --git a/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/generator/taglib/AbstractComponentTagGenerator.java b/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/generator/taglib/AbstractComponentTagGenerator.java
index 433ae8c..6ce9669 100644
--- a/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/generator/taglib/AbstractComponentTagGenerator.java
+++ b/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/generator/taglib/AbstractComponentTagGenerator.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -18,21 +18,25 @@
*/
package org.apache.myfaces.trinidadbuild.plugin.faces.generator.taglib;
+import java.io.IOException;
+
+import java.lang.reflect.Modifier;
+
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Set;
+import java.util.TreeSet;
+
import org.apache.myfaces.trinidadbuild.plugin.faces.generator.GeneratorHelper;
import org.apache.myfaces.trinidadbuild.plugin.faces.io.PrettyWriter;
import org.apache.myfaces.trinidadbuild.plugin.faces.parse.ComponentBean;
import org.apache.myfaces.trinidadbuild.plugin.faces.parse.PropertyBean;
import org.apache.myfaces.trinidadbuild.plugin.faces.util.FilteredIterator;
+import org.apache.myfaces.trinidadbuild.plugin.faces.util.PropertyFilter;
import org.apache.myfaces.trinidadbuild.plugin.faces.util.SourceTemplate;
import org.apache.myfaces.trinidadbuild.plugin.faces.util.Util;
-import java.io.IOException;
-import java.lang.reflect.Modifier;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Set;
-import java.util.TreeSet;
/**
* TODO: comment this!
@@ -197,6 +201,11 @@ public abstract class AbstractComponentTagGenerator implements ComponentTagGener
{
Iterator properties = component.properties();
properties = new FilteredIterator(properties, new TagAttributeFilter());
+ if (isSetterMethodFinal())
+ {
+ // Do not generate property methods if they are final and the properties are overrides
+ properties = new FilteredIterator(properties, new NonOverriddenFilter());
+ }
while (properties.hasNext())
{
@@ -206,6 +215,15 @@ public abstract class AbstractComponentTagGenerator implements ComponentTagGener
}
}
+ /**
+ * Whether the tag setter methods have the final modifier
+ *
+ * @return true if the setter methods are final
+ */
+ protected boolean isSetterMethodFinal()
+ {
+ return false;
+ }
public void writePropertyMembers(PrettyWriter out, Collection components) throws IOException
{
@@ -243,6 +261,8 @@ public abstract class AbstractComponentTagGenerator implements ComponentTagGener
Iterator properties = all.iterator();
properties = new FilteredIterator(properties, new TagAttributeFilter());
+ properties = new FilteredIterator(properties, new NonOverriddenFilter());
+
if (properties.hasNext() || special)
{
out.println();
@@ -292,4 +312,13 @@ public abstract class AbstractComponentTagGenerator implements ComponentTagGener
String componentClass,
Iterator properties) throws IOException;
+ protected static class NonOverriddenFilter
+ extends PropertyFilter
+ {
+ protected boolean accept(
+ PropertyBean property)
+ {
+ return (!property.isOverride());
+ }
+ }
}
diff --git a/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/generator/taglib/TrinidadComponentTagGenerator.java b/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/generator/taglib/TrinidadComponentTagGenerator.java
index ae3f791..468d6cd 100644
--- a/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/generator/taglib/TrinidadComponentTagGenerator.java
+++ b/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/generator/taglib/TrinidadComponentTagGenerator.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -18,6 +18,13 @@
*/
package org.apache.myfaces.trinidadbuild.plugin.faces.generator.taglib;
+import java.io.IOException;
+
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Set;
+
import org.apache.myfaces.trinidadbuild.plugin.faces.generator.GeneratorHelper;
import org.apache.myfaces.trinidadbuild.plugin.faces.io.PrettyWriter;
import org.apache.myfaces.trinidadbuild.plugin.faces.parse.ComponentBean;
@@ -26,11 +33,6 @@ import org.apache.myfaces.trinidadbuild.plugin.faces.parse.PropertyBean;
import org.apache.myfaces.trinidadbuild.plugin.faces.util.FilteredIterator;
import org.apache.myfaces.trinidadbuild.plugin.faces.util.Util;
-import java.io.IOException;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Set;
/**
* TODO: comment this!
@@ -135,11 +137,11 @@ public class TrinidadComponentTagGenerator extends AbstractComponentTagGenerator
{
imports.add(propertyClass);
}
-
+
if (property.isNoOp())
{
imports.add("org.apache.myfaces.trinidad.logging.TrinidadLogger");
- }
+ }
}
}
@@ -179,10 +181,10 @@ public class TrinidadComponentTagGenerator extends AbstractComponentTagGenerator
out.indent();
if (property.isNoOp())
{
- out.println("TrinidadLogger log = TrinidadLogger.createTrinidadLogger(this.getClass());");
+ out.println("TrinidadLogger log = TrinidadLogger.createTrinidadLogger(this.getClass());");
out.print("log.warning(\"property \\\"" + propName + "\\\" setter is ");
out.print("using a no-op implementation. Used in extreme cases when the property value, beyond the default value, results in unwanted behavior.");
- out.println("\");");
+ out.println("\");");
}
else
{
@@ -218,6 +220,7 @@ public class TrinidadComponentTagGenerator extends AbstractComponentTagGenerator
Iterator properties = all.iterator();
properties = new FilteredIterator(properties, new TagAttributeFilter());
+ properties = new FilteredIterator(properties, new NonOverriddenFilter());
if (properties.hasNext())
{
@@ -250,6 +253,12 @@ public class TrinidadComponentTagGenerator extends AbstractComponentTagGenerator
}
}
+ @Override
+ protected boolean isSetterMethodFinal()
+ {
+ return true;
+ }
+
private void _writeSetPropertiesCase(
PrettyWriter out,
String componentClass,
@@ -258,7 +267,7 @@ public class TrinidadComponentTagGenerator extends AbstractComponentTagGenerator
String propName = property.getPropertyName();
String propClass = property.getPropertyClass();
String propVar = "_" + propName;
-
+
if (property.isVirtual())
{
_writeVirtualSetMethod(out, componentClass, propName);
@@ -291,16 +300,16 @@ public class TrinidadComponentTagGenerator extends AbstractComponentTagGenerator
{
_writeSetColor(out, componentClass, propName, false);
}
- else if (GeneratorHelper.isKnownTypeList(propClass,
+ else if (GeneratorHelper.isKnownTypeList(propClass,
property.getPropertyClassParameters()))
{
- _writeSetKnownTypeList (out, componentClass, propName,
+ _writeSetKnownTypeList (out, componentClass, propName,
property.getPropertyClassParameters()[0]);
}
- else if (GeneratorHelper.isKnownTypeSet(propClass,
+ else if (GeneratorHelper.isKnownTypeSet(propClass,
property.getPropertyClassParameters()))
{
- _writeSetKnownTypeSet (out, componentClass, propName,
+ _writeSetKnownTypeSet (out, componentClass, propName,
property.getPropertyClassParameters()[0]);
}
else if (GeneratorHelper.isConverter(propClass))
@@ -869,17 +878,17 @@ public class TrinidadComponentTagGenerator extends AbstractComponentTagGenerator
{
String propKey = Util.getConstantNameFromProperty(propName, "_KEY");
String propVar = "_" + propName;
-
+
String propClass = Util.getClassFromFullClass(propFullClass);
String boxedClass = Util.getBoxedClass(propClass);
System.out.println ("_writeSetList: propFullClass = " + propFullClass +
- " propClass= " + propClass +
+ " propClass= " + propClass +
" boxedClass=" + boxedClass);
if (_is12)
{
- out.println("set" + boxedClass + "ListProperty" +
- "(bean, " + componentClass + "." + propKey +
+ out.println("set" + boxedClass + "ListProperty" +
+ "(bean, " + componentClass + "." + propKey +
", " + propVar + ");");
}
else
@@ -926,17 +935,17 @@ public class TrinidadComponentTagGenerator extends AbstractComponentTagGenerator
{
String propKey = Util.getConstantNameFromProperty(propName, "_KEY");
String propVar = "_" + propName;
-
+
String propClass = Util.getClassFromFullClass(propFullClass);
String boxedClass = Util.getBoxedClass(propClass);
System.out.println ("_writeSetSet: propFullClass = " + propFullClass +
- " propClass= " + propClass +
+ " propClass= " + propClass +
" boxedClass=" + boxedClass);
if (_is12)
{
- out.println("set" + boxedClass + "SetProperty" +
- "(bean, " + componentClass + "." + propKey +
+ out.println("set" + boxedClass + "SetProperty" +
+ "(bean, " + componentClass + "." + propKey +
", " + propVar + ");");
}
else
diff --git a/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/parse/ComponentBean.java b/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/parse/ComponentBean.java
index c67a6ed..31a72c4 100644
--- a/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/parse/ComponentBean.java
+++ b/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/parse/ComponentBean.java
@@ -722,9 +722,9 @@ public class ComponentBean extends AbstractTagBean
* Parses the string of satisfied contracts into a String array
* using space as the separator between values.
* In the component metadata file, the satisfied contracts are noted
- * with satisfied-contracts markup. As an example, af:popup
+ * with satisfied-contracts markup. As an example, af:popup
* (oracle.adf.view.rich.component.rich.RichPopup) supports
- * oracle-adf-richmenu-holder, oracle-adf-richdialog-holder,
+ * oracle-adf-richmenu-holder, oracle-adf-richdialog-holder,
* oracle-adf-richnotewindow-holder, and oracle-adf-richpanelwindow-holder
* contracts. The satisfied contracts of a given component are matched
* with the required ancestor contracts of other components to determine
@@ -741,14 +741,14 @@ public class ComponentBean extends AbstractTagBean
/**
* Sets the possible values for this property.
* In the component metadata file, the satisfied contracts are noted
- * with satisfied-contracts markup. As an example, af:popup
+ * with satisfied-contracts markup. As an example, af:popup
* (oracle.adf.view.rich.component.rich.RichPopup) supports
- * oracle-adf-richmenu-holder, oracle-adf-richdialog-holder,
+ * oracle-adf-richmenu-holder, oracle-adf-richdialog-holder,
* oracle-adf-richnotewindow-holder, and oracle-adf-richpanelwindow-holder
* contracts. The satisfied contracts of a given component are matched
* with the required ancestor contracts of other components to determine
* if a component hierarchy is legally assembled.
- *
+ *
* @param satisfiedContracts a string array of the satisfied contracts
*/
public void setSatisfiedContracts(
@@ -760,22 +760,22 @@ public class ComponentBean extends AbstractTagBean
/**
* Returns an iterator of the satisfied contracts for this component.
* In the component metadata file, the satisfied contracts are noted
- * with satisfied-contracts markup. As an example, af:popup
+ * with satisfied-contracts markup. As an example, af:popup
* (oracle.adf.view.rich.component.rich.RichPopup) supports
- * oracle-adf-richmenu-holder, oracle-adf-richdialog-holder,
+ * oracle-adf-richmenu-holder, oracle-adf-richdialog-holder,
* oracle-adf-richnotewindow-holder, and oracle-adf-richpanelwindow-holder
* contracts. The satisfied contracts of a given component are matched
* with the required ancestor contracts of other components to determine
* if a component hierarchy is legally assembled.
- *
- * @return a java.util.Iterator of Strings, where each string is the name of a
+ *
+ * @return a java.util.Iterator of Strings, where each string is the name of a
* satisfied contract
*/
public Iterator<String> satisfiedContracts()
{
return _satisfiedContracts.iterator();
- }
-
+ }
+
/**
* Returns true if this component has any satisfied contracts.
*
@@ -786,17 +786,17 @@ public class ComponentBean extends AbstractTagBean
{
return (!_satisfiedContracts.isEmpty());
}
-
+
/**
* Parses the string of required ancestor contracts into a String array
* using space as the separator between values.
* In the component metadata file, the required ancestors are noted
* with required-ancestor-contracts markup. This indicates that an
- * ancestor (e.g. parent or grandparent) tag must be have satisfied-contracts
+ * ancestor (e.g. parent or grandparent) tag must be have satisfied-contracts
* metadata matching the required-ancestor-contracts metadata of this tag.
* As an example, af:dialog
* (oracle.adf.view.rich.component.rich.RichDialog) lists
- * oracle-adf-richdialog-holder as a required ancestor contract, and
+ * oracle-adf-richdialog-holder as a required ancestor contract, and
* af:popup (oracle.adf.view.rich.component.rich.RichPopup) lists
* oracle-adf-richdialog-holder as a satisified contract.
*
@@ -812,14 +812,14 @@ public class ComponentBean extends AbstractTagBean
* Sets the possible values for this property.
* In the component metadata file, the required ancestors are noted
* with required-ancestor-contracts markup. This indicates that an
- * ancestor (e.g. parent or grandparent) tag must be have satisfied-contracts
+ * ancestor (e.g. parent or grandparent) tag must be have satisfied-contracts
* metadata matching the required-ancestor-contracts metadata of this tag.
* As an example, af:dialog
* (oracle.adf.view.rich.component.rich.RichDialog) lists
- * oracle-adf-richdialog-holder as a required ancestor contract, and
+ * oracle-adf-richdialog-holder as a required ancestor contract, and
* af:popup (oracle.adf.view.rich.component.rich.RichPopup) lists
* oracle-adf-richdialog-holder as a satisified contract.
- *
+ *
* @param requiredAncestorContracts a string array of the required ancestor contracts
*/
public void setRequiredAncestorContracts(
@@ -832,21 +832,21 @@ public class ComponentBean extends AbstractTagBean
* Returns the required ancestor contracts for this component.
* In the component metadata file, the required ancestors are noted
* with required-ancestor-contracts markup. This indicates that an
- * ancestor (e.g. parent or grandparent) tag must be have satisfied-contracts
+ * ancestor (e.g. parent or grandparent) tag must be have satisfied-contracts
* metadata matching the required-ancestor-contracts metadata of this tag.
* As an example, af:dialog
* (oracle.adf.view.rich.component.rich.RichDialog) lists
- * oracle-adf-richdialog-holder as a required ancestor contract, and
+ * oracle-adf-richdialog-holder as a required ancestor contract, and
* af:popup (oracle.adf.view.rich.component.rich.RichPopup) lists
* oracle-adf-richdialog-holder as a satisified contract.
- *
+ *
* @return a java.util.Iterator of strings, where each string is the name
* of a required ancestor contract
*/
public Iterator<String> requiredAncestorContracts()
{
return _requiredAncestorContracts.iterator();
- }
+ }
/**
* Returns true if this component has any required ancestor contracts.
@@ -858,7 +858,7 @@ public class ComponentBean extends AbstractTagBean
{
return (!_requiredAncestorContracts.isEmpty());
}
-
+
/**
* Adds a Java Language class modifier to the tag class.
*
diff --git a/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/parse/FacesConfigBean.java b/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/parse/FacesConfigBean.java
index 5e75106..38f8bed 100644
--- a/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/parse/FacesConfigBean.java
+++ b/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/parse/FacesConfigBean.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -19,11 +19,13 @@
package org.apache.myfaces.trinidadbuild.plugin.faces.parse;
import java.net.URL;
+
import java.util.Iterator;
import java.util.Map;
import java.util.TreeMap;
import java.util.logging.Logger;
+
/**
* FacesConfigBean is a Java representation of the faces-config XML element.
*/
@@ -296,7 +298,7 @@ public class FacesConfigBean extends ObjectBean
{
return _currentResource;
}
-
+
public URL setCurrentResource(URL resource)
{
URL _cur = _currentResource;
@@ -304,11 +306,44 @@ public class FacesConfigBean extends ObjectBean
return _cur;
}
- private Map _converters = new TreeMap();
- private Map _validators = new TreeMap();
- private Map _components = new TreeMap();
- private Map _events = new TreeMap();
- private Map _renderKits = new TreeMap();
+ /**
+ * Performs any processing of the meta-data that must be performed after all of the
+ * meta-data has been collected. This includes processing on super-class data and other
+ * inter-related computations that cannot be done as the data is being parsed.
+ */
+ public void performPostProcessing()
+ {
+ _identifyOverriddenProperies();
+ }
+
+ private void _identifyOverriddenProperies()
+ {
+ for (ComponentBean component : _components.values())
+ {
+ ComponentBean parentComponent = component.resolveSupertype();
+ if (parentComponent == null)
+ {
+ continue;
+ }
+
+ for (Iterator<PropertyBean> iter = component.properties(); iter.hasNext();)
+ {
+ PropertyBean property = iter.next();
+ PropertyBean parentProperty = parentComponent.findProperty(property.getPropertyName(),
+ true);
+ if (parentProperty != null)
+ {
+ property.setOverride(true);
+ }
+ }
+ }
+ }
+
+ private Map<String, ConverterBean> _converters = new TreeMap<String, ConverterBean>();
+ private Map<String, ValidatorBean> _validators = new TreeMap<String, ValidatorBean>();
+ private Map<String, ComponentBean> _components = new TreeMap<String, ComponentBean>();
+ private Map<String, EventBean> _events = new TreeMap<String, EventBean>();
+ private Map<String, RenderKitBean> _renderKits = new TreeMap<String, RenderKitBean>();
private URL _currentResource = null;
static private final Logger _LOG = Logger.getLogger(FacesConfigBean.class.getName());
diff --git a/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/parse/PropertyBean.java b/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/parse/PropertyBean.java
index 2f7c6f0..1372f71 100644
--- a/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/parse/PropertyBean.java
+++ b/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/parse/PropertyBean.java
@@ -524,6 +524,24 @@ public class PropertyBean extends AttributeBean
return _valueExpression;
}
+ /**
+ * Set if this property is overridding a property in an ancestor class.
+ * @param override if overridding a property
+ */
+ public void setOverride(boolean override)
+ {
+ this._override = override;
+ }
+
+ /**
+ * Get if this property is overridding a property in an ancestor class.
+ * @return If the property is an overide
+ */
+ public boolean isOverride()
+ {
+ return _override;
+ }
+
private String _aliasOf;
private String _jspPropertyName;
private String _fieldPropertyName;
@@ -537,6 +555,7 @@ public class PropertyBean extends AttributeBean
private boolean _enum;
private boolean _useMaxTime;
private boolean _hidden;
+ private boolean _override;
private String[] _propertyValues;
private String[] _unsupportedAgents = _EMPTY_ARRAY;
private String[] _unsupportedRenderKits = _EMPTY_ARRAY;
diff --git a/maven-i18n-plugin/pom.xml b/maven-i18n-plugin/pom.xml
index d0ea7e0..cfb7aef 100644
--- a/maven-i18n-plugin/pom.xml
+++ b/maven-i18n-plugin/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.myfaces.trinidadbuild</groupId>
<artifactId>maven-plugin-parent</artifactId>
- <version>1.2.12</version>
+ <version>1.2.12.1-SNAPSHOT</version>
</parent>
<groupId>org.apache.myfaces.trinidadbuild</groupId>
diff --git a/maven-javacc-plugin/pom.xml b/maven-javacc-plugin/pom.xml
index 90c6b93..641f2fd 100644
--- a/maven-javacc-plugin/pom.xml
+++ b/maven-javacc-plugin/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.myfaces.trinidadbuild</groupId>
<artifactId>maven-plugin-parent</artifactId>
- <version>1.2.12</version>
+ <version>1.2.12.1-SNAPSHOT</version>
</parent>
<groupId>org.apache.myfaces.trinidadbuild</groupId>
diff --git a/maven-javascript-plugin/pom.xml b/maven-javascript-plugin/pom.xml
index 3036373..e1da814 100644
--- a/maven-javascript-plugin/pom.xml
+++ b/maven-javascript-plugin/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.myfaces.trinidadbuild</groupId>
<artifactId>maven-plugin-parent</artifactId>
- <version>1.2.12</version>
+ <version>1.2.12.1-SNAPSHOT</version>
</parent>
<groupId>org.apache.myfaces.trinidadbuild</groupId>
diff --git a/maven-jdev-plugin/pom.xml b/maven-jdev-plugin/pom.xml
index bb9227b..de91396 100644
--- a/maven-jdev-plugin/pom.xml
+++ b/maven-jdev-plugin/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.myfaces.trinidadbuild</groupId>
<artifactId>maven-plugin-parent</artifactId>
- <version>1.2.12</version>
+ <version>1.2.12.1-SNAPSHOT</version>
</parent>
<groupId>org.apache.myfaces.trinidadbuild</groupId>
diff --git a/maven-tagdoc-plugin/pom.xml b/maven-tagdoc-plugin/pom.xml
index b935bfd..90f8228 100644
--- a/maven-tagdoc-plugin/pom.xml
+++ b/maven-tagdoc-plugin/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.myfaces.trinidadbuild</groupId>
<artifactId>maven-plugin-parent</artifactId>
- <version>1.2.12</version>
+ <version>1.2.12.1-SNAPSHOT</version>
</parent>
<groupId>org.apache.myfaces.trinidadbuild</groupId>
diff --git a/maven-xrts-plugin/pom.xml b/maven-xrts-plugin/pom.xml
index e72967f..baefdda 100644
--- a/maven-xrts-plugin/pom.xml
+++ b/maven-xrts-plugin/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.myfaces.trinidadbuild</groupId>
<artifactId>maven-plugin-parent</artifactId>
- <version>1.2.12</version>
+ <version>1.2.12.1-SNAPSHOT</version>
</parent>
<groupId>org.apache.myfaces.trinidadbuild</groupId>
diff --git a/pom.xml b/pom.xml
index e01fa93..583d73e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,7 +25,7 @@
<groupId>org.apache.myfaces.trinidadbuild</groupId>
<artifactId>maven-plugin-parent</artifactId>
- <version>1.2.12</version>
+ <version>1.2.12.1-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Apache Trinidad Maven Plugin Parent</name>
--
To stop receiving notification emails like this one, please contact
"commits@myfaces.apache.org" <co...@myfaces.apache.org>.
[myfaces-trinidad-maven] 04/04: Oops. restoring the branches. It
was not supposed to be deleted.
Posted by de...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
deki pushed a commit to branch 1.2.12.1-branch
in repository https://gitbox.apache.org/repos/asf/myfaces-trinidad-maven.git
commit 7d51e287bb72d1f8e824a166d6d9e5c7f08c9b65
Author: Scott Bryan <so...@apache.org>
AuthorDate: Thu Dec 22 17:43:30 2011 +0000
Oops. restoring the branches. It was not supposed to be deleted.
--
To stop receiving notification emails like this one, please contact
"commits@myfaces.apache.org" <co...@myfaces.apache.org>.
[myfaces-trinidad-maven] 01/04: Create a branch off of the 1.2.12
release
Posted by de...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
deki pushed a commit to branch 1.2.12.1-branch
in repository https://gitbox.apache.org/repos/asf/myfaces-trinidad-maven.git
commit 56d80591d3c3938212e85233f503fd88886561a1
Author: Andrew Robinson <ar...@apache.org>
AuthorDate: Thu Nov 4 22:49:45 2010 +0000
Create a branch off of the 1.2.12 release
--
To stop receiving notification emails like this one, please contact
"commits@myfaces.apache.org" <co...@myfaces.apache.org>.