You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by jw...@apache.org on 2010/03/10 19:46:17 UTC
svn commit: r921508 - in /myfaces/trinidad-maven/trunk:
maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/
maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/generator/
maven-faces-plugin/src/mai...
Author: jwaldman
Date: Wed Mar 10 18:46:16 2010
New Revision: 921508
URL: http://svn.apache.org/viewvc?rev=921508&view=rev
Log:
TRINIDAD-1732 Code Cleanup: Move to using generics in the trinidad-maven project
Thanks to Maria Kaval for the patch.
Modified:
myfaces/trinidad-maven/trunk/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/AbstractFacesMojo.java
myfaces/trinidad-maven/trunk/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/GenerateComponentsMojo.java
myfaces/trinidad-maven/trunk/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/GenerateJspTaglibsMojo.java
myfaces/trinidad-maven/trunk/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/GenerateRendererMapMojo.java
myfaces/trinidad-maven/trunk/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/generator/GeneratorHelper.java
myfaces/trinidad-maven/trunk/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/generator/component/AbstractComponentGenerator.java
myfaces/trinidad-maven/trunk/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/generator/component/MyFacesComponentGenerator.java
myfaces/trinidad-maven/trunk/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/generator/component/TrinidadComponentGenerator.java
myfaces/trinidad-maven/trunk/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/generator/taglib/AbstractComponentTagGenerator.java
myfaces/trinidad-maven/trunk/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/generator/taglib/AbstractConverterTagGenerator.java
myfaces/trinidad-maven/trunk/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/generator/taglib/AbstractTagGenerator.java
myfaces/trinidad-maven/trunk/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/generator/taglib/AbstractValidatorTagGenerator.java
myfaces/trinidad-maven/trunk/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/generator/taglib/MyFacesComponentTagGenerator.java
myfaces/trinidad-maven/trunk/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/generator/taglib/TrinidadComponentTagGenerator.java
myfaces/trinidad-maven/trunk/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/parse/AbstractTagBean.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/FacesConfigBean.java
myfaces/trinidad-maven/trunk/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/parse/RenderKitBean.java
myfaces/trinidad-maven/trunk/maven-javacc-plugin/src/main/java/org/apache/myfaces/trinidadinternal/view/faces/maven/plugin/javacc/JavaCCMojo.java
myfaces/trinidad-maven/trunk/maven-tagdoc-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/tagdoc/TagdocReport.java
Modified: myfaces/trinidad-maven/trunk/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/AbstractFacesMojo.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad-maven/trunk/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/AbstractFacesMojo.java?rev=921508&r1=921507&r2=921508&view=diff
==============================================================================
--- myfaces/trinidad-maven/trunk/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/AbstractFacesMojo.java (original)
+++ myfaces/trinidad-maven/trunk/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/AbstractFacesMojo.java Wed Mar 10 18:46:16 2010
@@ -147,9 +147,9 @@ abstract public class AbstractFacesMojo
// requires JAXP 1.3, in JavaSE 5.0
// spf.setXIncludeAware(false);
- for (Iterator i=masters.iterator(); i.hasNext();)
+ for (Iterator<URL> i=masters.iterator(); i.hasNext();)
{
- URL url = (URL)i.next();
+ URL url = i.next();
Digester digester = new Digester(spf.newSAXParser());
digester.setNamespaceAware(true);
Modified: myfaces/trinidad-maven/trunk/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/GenerateComponentsMojo.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad-maven/trunk/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/GenerateComponentsMojo.java?rev=921508&r1=921507&r2=921508&view=diff
==============================================================================
--- myfaces/trinidad-maven/trunk/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/GenerateComponentsMojo.java (original)
+++ myfaces/trinidad-maven/trunk/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/GenerateComponentsMojo.java Wed Mar 10 18:46:16 2010
@@ -81,7 +81,7 @@ public class GenerateComponentsMojo exte
if (suppressListenerMethods)
getLog().warn("Event listener methods will not be generated");
- Iterator components = facesConfig.components();
+ Iterator<ComponentBean> components = facesConfig.components();
components = new FilteredIterator(components, new SkipFilter());
components = new FilteredIterator(components,
new ComponentTypeFilter(typePrefix));
@@ -99,7 +99,7 @@ public class GenerateComponentsMojo exte
int count = 0;
while (components.hasNext())
{
- _generateComponent((ComponentBean)components.next());
+ _generateComponent(components.next());
count++;
}
getLog().info("Generated " + count + " component(s)");
Modified: myfaces/trinidad-maven/trunk/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/GenerateJspTaglibsMojo.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad-maven/trunk/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/GenerateJspTaglibsMojo.java?rev=921508&r1=921507&r2=921508&view=diff
==============================================================================
--- myfaces/trinidad-maven/trunk/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/GenerateJspTaglibsMojo.java (original)
+++ myfaces/trinidad-maven/trunk/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/GenerateJspTaglibsMojo.java Wed Mar 10 18:46:16 2010
@@ -144,9 +144,9 @@ public class GenerateJspTaglibsMojo exte
// taglibs map syntax requires distinct shortNames,
// which is a Good Thing!
- for (Iterator i = taglibs.entrySet().iterator(); i.hasNext(); )
+ for (Iterator<Map.Entry> i = taglibs.entrySet().iterator(); i.hasNext(); )
{
- Map.Entry entry = (Map.Entry)i.next();
+ Map.Entry entry = i.next();
String shortName = (String)entry.getKey();
String namespaceURI = (String)entry.getValue();
@@ -492,11 +492,11 @@ public class GenerateJspTaglibsMojo exte
// converters need an id attribute
writeTagAttribute(stream, "id", "the identifier for the converter", null, null);
- Iterator properties = converter.properties();
+ Iterator<PropertyBean> properties = converter.properties();
properties = new FilteredIterator(properties, new TagAttributeFilter());
while (properties.hasNext())
{
- PropertyBean property = (PropertyBean)properties.next();
+ PropertyBean property = properties.next();
writeTagAttribute(stream,
property.getPropertyName(),
property.getDescription(),
@@ -704,11 +704,11 @@ public class GenerateJspTaglibsMojo exte
// validators need an id attribute
writeTagAttribute(stream, "id", "the identifier for the validator", null, null);
- Iterator properties = validator.properties();
+ Iterator<PropertyBean> properties = validator.properties();
properties = new FilteredIterator(properties, new TagAttributeFilter());
while (properties.hasNext())
{
- PropertyBean property = (PropertyBean)properties.next();
+ PropertyBean property = properties.next();
writeTagAttribute(stream,
property.getPropertyName(),
property.getDescription(),
Modified: myfaces/trinidad-maven/trunk/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/GenerateRendererMapMojo.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad-maven/trunk/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/GenerateRendererMapMojo.java?rev=921508&r1=921507&r2=921508&view=diff
==============================================================================
--- myfaces/trinidad-maven/trunk/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/GenerateRendererMapMojo.java (original)
+++ myfaces/trinidad-maven/trunk/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/GenerateRendererMapMojo.java Wed Mar 10 18:46:16 2010
@@ -71,10 +71,10 @@ public class GenerateRendererMapMojo ext
}
else
{
- Iterator renderkits = facesConfig.renderKits();
+ Iterator<RenderKitBean> renderkits = facesConfig.renderKits();
while (renderkits.hasNext())
{
- RenderKitBean renderkit = (RenderKitBean) renderkits.next();
+ RenderKitBean renderkit = renderkits.next();
String id = renderkit.getRenderKitId();
if (!id.startsWith(renderKitPrefix))
continue;
@@ -92,10 +92,10 @@ public class GenerateRendererMapMojo ext
PrintWriter pw = new PrintWriter(fw);
try
{
- Iterator renderers = rk.renderers();
+ Iterator<RendererBean> renderers = rk.renderers();
while (renderers.hasNext())
{
- RendererBean r = (RendererBean) renderers.next();
+ RendererBean r = renderers.next();
pw.print(r.getComponentFamily());
pw.print('|');
pw.print(r.getRendererType());
Modified: myfaces/trinidad-maven/trunk/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/generator/GeneratorHelper.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad-maven/trunk/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/generator/GeneratorHelper.java?rev=921508&r1=921507&r2=921508&view=diff
==============================================================================
--- myfaces/trinidad-maven/trunk/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/generator/GeneratorHelper.java (original)
+++ myfaces/trinidad-maven/trunk/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/generator/GeneratorHelper.java Wed Mar 10 18:46:16 2010
@@ -129,12 +129,12 @@ public class GeneratorHelper
String packageName,
Set imports)
{
- Iterator iterator = imports.iterator();
+ Iterator<String> iterator = imports.iterator();
iterator = new FilteredIterator(iterator,
new PackageImportsFilter(packageName));
while (iterator.hasNext())
{
- String className = (String) iterator.next();
+ String className = iterator.next();
out.println("import " + className + ";");
}
Modified: myfaces/trinidad-maven/trunk/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/trunk/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/generator/component/AbstractComponentGenerator.java?rev=921508&r1=921507&r2=921508&view=diff
==============================================================================
--- myfaces/trinidad-maven/trunk/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/generator/component/AbstractComponentGenerator.java (original)
+++ myfaces/trinidad-maven/trunk/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/generator/component/AbstractComponentGenerator.java Wed Mar 10 18:46:16 2010
@@ -85,10 +85,10 @@ public abstract class AbstractComponentG
out.println(" * <th align=\"left\">Phases</th>");
out.println(" * <th align=\"left\">Description</th>");
out.println(" * </tr>");
- Iterator events = component.events(true);
+ Iterator<EventRefBean> events = component.events(true);
while (events.hasNext())
{
- EventRefBean eventRef = (EventRefBean) events.next();
+ EventRefBean eventRef = events.next();
EventBean event = eventRef.resolveEventType();
if (event != null)
{
@@ -138,10 +138,10 @@ public abstract class AbstractComponentG
if (component.isNamingContainer())
interfaces.add("javax.faces.component.NamingContainer");
- Iterator events = component.events();
+ Iterator<EventRefBean> events = component.events();
while (events.hasNext())
{
- EventRefBean eventRef = (EventRefBean) events.next();
+ EventRefBean eventRef = events.next();
EventBean event = eventRef.resolveEventType();
if (event != null)
{
@@ -219,14 +219,14 @@ public abstract class AbstractComponentG
if (component.isNamingContainer())
imports.add("javax.faces.component.NamingContainer");
- Iterator properties = component.properties();
+ Iterator<PropertyBean> properties = component.properties();
properties = new FilteredIterator(properties, new NonVirtualFilter());
// PropertyKey only needed if there are properties
if (properties.hasNext())
{
while (properties.hasNext())
{
- PropertyBean property = (PropertyBean) properties.next();
+ PropertyBean property = properties.next();
String propertyClass = property.getPropertyClass();
if (propertyClass != null)
{
@@ -249,10 +249,10 @@ public abstract class AbstractComponentG
if (facets.hasNext())
imports.add("javax.faces.component.UIComponent");
- Iterator events = component.events();
+ Iterator<EventRefBean> events = component.events();
while (events.hasNext())
{
- EventRefBean eventRef = (EventRefBean) events.next();
+ EventRefBean eventRef = events.next();
EventBean event = eventRef.resolveEventType();
if (event == null)
@@ -346,11 +346,11 @@ public abstract class AbstractComponentG
ComponentBean component) throws IOException
{
// component property keys
- Iterator properties = component.properties();
+ Iterator<PropertyBean> properties = component.properties();
properties = new FilteredIterator(properties, new NonVirtualFilter());
while (properties.hasNext())
{
- PropertyBean property = (PropertyBean) properties.next();
+ PropertyBean property = properties.next();
String[] propertyValues = property.getPropertyValues();
if (propertyValues != null)
@@ -376,10 +376,10 @@ public abstract class AbstractComponentG
PrettyWriter out,
ComponentBean component) throws IOException
{
- Iterator facets = component.facets();
+ Iterator<FacetBean> facets = component.facets();
while (facets.hasNext())
{
- FacetBean facet = (FacetBean) facets.next();
+ FacetBean facet = facets.next();
String facetName = facet.getFacetName();
String facetKey = Util.getConstantNameFromProperty(facetName, "_FACET");
out.println("static public final " +
@@ -581,11 +581,11 @@ public abstract class AbstractComponentG
public void writePropertyMethods(PrettyWriter out, ComponentBean component, Collection ignoreList)
throws IOException
{
- Iterator properties = component.properties();
+ Iterator<PropertyBean> properties = component.properties();
properties = new FilteredIterator(properties, new NonVirtualFilter());
while (properties.hasNext())
{
- PropertyBean property = (PropertyBean) properties.next();
+ PropertyBean property = properties.next();
if (property.isList())
writePropertyListMethods(out, property, ignoreList);
else
@@ -793,10 +793,10 @@ public abstract class AbstractComponentG
PrettyWriter out,
ComponentBean component) throws IOException
{
- Iterator facets = component.facets();
+ Iterator<FacetBean> facets = component.facets();
while (facets.hasNext())
{
- FacetBean facet = (FacetBean) facets.next();
+ FacetBean facet = facets.next();
writeFacetGet(out, facet);
writeFacetSet(out, facet);
}
@@ -879,10 +879,10 @@ public abstract class AbstractComponentG
PrettyWriter out,
ComponentBean component) throws IOException
{
- Iterator events = component.events();
+ Iterator<EventRefBean> events = component.events();
while (events.hasNext())
{
- EventRefBean eventRef = (EventRefBean) events.next();
+ EventRefBean eventRef = events.next();
EventBean event = eventRef.resolveEventType();
if (event != null)
{
Modified: myfaces/trinidad-maven/trunk/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/generator/component/MyFacesComponentGenerator.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad-maven/trunk/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/generator/component/MyFacesComponentGenerator.java?rev=921508&r1=921507&r2=921508&view=diff
==============================================================================
--- myfaces/trinidad-maven/trunk/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/generator/component/MyFacesComponentGenerator.java (original)
+++ myfaces/trinidad-maven/trunk/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/generator/component/MyFacesComponentGenerator.java Wed Mar 10 18:46:16 2010
@@ -49,9 +49,9 @@ public class MyFacesComponentGenerator e
{
imports.add("javax.faces.context.FacesContext");
imports.add("javax.el.ValueExpression");
- for (Iterator lIterator = component.properties(); lIterator.hasNext();)
+ for (Iterator<PropertyBean> lIterator = component.properties(); lIterator.hasNext();)
{
- PropertyBean lPropertyBean = (PropertyBean) lIterator.next();
+ PropertyBean lPropertyBean = lIterator.next();
if (GeneratorHelper.isValidator(lPropertyBean, _is12))
{
imports.add("javax.faces.validator.Validator");
@@ -297,9 +297,9 @@ public class MyFacesComponentGenerator e
// first we count the primitive properties, because for each primitive property
// we save a new property that says if the property has been set or not
int primitivePropertiesCount = 0;
- for (Iterator iterator = component.properties(); iterator.hasNext();)
+ for (Iterator<PropertyBean> iterator = component.properties(); iterator.hasNext();)
{
- PropertyBean property = (PropertyBean) iterator.next();
+ PropertyBean property = iterator.next();
if (Util.isPrimitiveClass(property.getPropertyClass()))
{
primitivePropertiesCount++;
@@ -321,9 +321,9 @@ public class MyFacesComponentGenerator e
int propIndex = 1;
- for (Iterator iterator = component.properties(); iterator.hasNext();)
+ for (Iterator<PropertyBean> iterator = component.properties(); iterator.hasNext();)
{
- PropertyBean property = (PropertyBean) iterator.next();
+ PropertyBean property = iterator.next();
String varName = property.getFieldPropertyName();
if (property.isStateHolder())
@@ -381,9 +381,9 @@ public class MyFacesComponentGenerator e
int propIndex = 1;
- for (Iterator iterator = component.properties(); iterator.hasNext();)
+ for (Iterator<PropertyBean> iterator = component.properties(); iterator.hasNext();)
{
- PropertyBean property = (PropertyBean) iterator.next();
+ PropertyBean property = iterator.next();
String varName = property.getFieldPropertyName();
String propFullClass = property.getPropertyClass();
Modified: myfaces/trinidad-maven/trunk/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/generator/component/TrinidadComponentGenerator.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad-maven/trunk/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/generator/component/TrinidadComponentGenerator.java?rev=921508&r1=921507&r2=921508&view=diff
==============================================================================
--- myfaces/trinidad-maven/trunk/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/generator/component/TrinidadComponentGenerator.java (original)
+++ myfaces/trinidad-maven/trunk/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/generator/component/TrinidadComponentGenerator.java Wed Mar 10 18:46:16 2010
@@ -43,7 +43,7 @@ public class TrinidadComponentGenerator
imports.add("org.apache.myfaces.trinidad.bean.FacesBean");
- Iterator properties = component.properties();
+ Iterator<PropertyBean> properties = component.properties();
properties = new FilteredIterator(properties, new NonVirtualFilter());
// PropertyKey only needed if there are properties
if (properties.hasNext())
@@ -53,7 +53,7 @@ public class TrinidadComponentGenerator
PropertyFilter resolvable = new ResolvableTypeFilter();
while (properties.hasNext())
{
- PropertyBean property = (PropertyBean) properties.next();
+ PropertyBean property = properties.next();
// ComponentUtils only needed for resolvable properties
if (resolvable.accept(property))
@@ -92,11 +92,11 @@ public class TrinidadComponentGenerator
out.unindent();
// component property keys
- Iterator properties = component.properties();
+ Iterator<PropertyBean> properties = component.properties();
properties = new FilteredIterator(properties, new NonVirtualFilter());
while (properties.hasNext())
{
- PropertyBean property = (PropertyBean) properties.next();
+ PropertyBean property = properties.next();
String propName = property.getPropertyName();
String propKey = Util.getConstantNameFromProperty(propName, "_KEY");
String propAlias = property.getAliasOf();
Modified: myfaces/trinidad-maven/trunk/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/generator/taglib/AbstractComponentTagGenerator.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad-maven/trunk/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/generator/taglib/AbstractComponentTagGenerator.java?rev=921508&r1=921507&r2=921508&view=diff
==============================================================================
--- myfaces/trinidad-maven/trunk/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/generator/taglib/AbstractComponentTagGenerator.java (original)
+++ myfaces/trinidad-maven/trunk/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/generator/taglib/AbstractComponentTagGenerator.java Wed Mar 10 18:46:16 2010
@@ -61,10 +61,10 @@ public abstract class AbstractComponentT
{
Set imports = new TreeSet();
- for (Iterator lIterator = components.iterator(); lIterator.hasNext();)
+ for (Iterator<ComponentBean> lIterator = components.iterator(); lIterator.hasNext();)
{
- ComponentBean component = (ComponentBean) lIterator.next();
- Iterator properties = component.properties();
+ ComponentBean component = lIterator.next();
+ Iterator<PropertyBean> properties = component.properties();
properties = new FilteredIterator(properties, new TagAttributeFilter());
// TODO: remove these imports
@@ -81,7 +81,7 @@ public abstract class AbstractComponentT
while (properties.hasNext())
{
- PropertyBean property = (PropertyBean) properties.next();
+ PropertyBean property = properties.next();
String propertyClass = property.getPropertyClass();
String[] propertyClassParams = property.getPropertyClassParameters();
@@ -195,12 +195,12 @@ public abstract class AbstractComponentT
public void writePropertyMembers(PrettyWriter out,
ComponentBean component) throws IOException
{
- Iterator properties = component.properties();
+ Iterator<PropertyBean> properties = component.properties();
properties = new FilteredIterator(properties, new TagAttributeFilter());
while (properties.hasNext())
{
- PropertyBean property = (PropertyBean) properties.next();
+ PropertyBean property = properties.next();
writePropertyDeclaration(out, property);
writePropertySetter(out, property);
}
@@ -209,9 +209,9 @@ public abstract class AbstractComponentT
public void writePropertyMembers(PrettyWriter out, Collection components) throws IOException
{
- for (Iterator lIterator = components.iterator(); lIterator.hasNext();)
+ for (Iterator<ComponentBean> lIterator = components.iterator(); lIterator.hasNext();)
{
- writePropertyMembers(out, (ComponentBean) lIterator.next());
+ writePropertyMembers(out, lIterator.next());
}
}
Modified: myfaces/trinidad-maven/trunk/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/generator/taglib/AbstractConverterTagGenerator.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad-maven/trunk/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/generator/taglib/AbstractConverterTagGenerator.java?rev=921508&r1=921507&r2=921508&view=diff
==============================================================================
--- myfaces/trinidad-maven/trunk/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/generator/taglib/AbstractConverterTagGenerator.java (original)
+++ myfaces/trinidad-maven/trunk/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/generator/taglib/AbstractConverterTagGenerator.java Wed Mar 10 18:46:16 2010
@@ -87,7 +87,7 @@ public abstract class AbstractConverterT
PrettyWriter out,
ConverterBean converter) throws IOException
{
- Iterator properties = converter.properties();
+ Iterator<PropertyBean> properties = converter.properties();
properties = new FilteredIterator(properties, new TagAttributeFilter());
if (properties.hasNext())
{
@@ -102,7 +102,7 @@ public abstract class AbstractConverterT
out.indent();
while (properties.hasNext())
{
- PropertyBean property = (PropertyBean)properties.next();
+ PropertyBean property = properties.next();
writeSetProperty(out, property);
}
out.unindent();
Modified: myfaces/trinidad-maven/trunk/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/generator/taglib/AbstractTagGenerator.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad-maven/trunk/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/generator/taglib/AbstractTagGenerator.java?rev=921508&r1=921507&r2=921508&view=diff
==============================================================================
--- myfaces/trinidad-maven/trunk/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/generator/taglib/AbstractTagGenerator.java (original)
+++ myfaces/trinidad-maven/trunk/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/generator/taglib/AbstractTagGenerator.java Wed Mar 10 18:46:16 2010
@@ -93,11 +93,11 @@ public abstract class AbstractTagGenerat
PrettyWriter out,
AbstractTagBean abstractTag) throws IOException
{
- Iterator properties = abstractTag.properties();
+ Iterator<PropertyBean> properties = abstractTag.properties();
properties = new FilteredIterator(properties, new TagAttributeFilter());
while (properties.hasNext())
{
- PropertyBean property = (PropertyBean)properties.next();
+ PropertyBean property = properties.next();
out.println();
writePropertyMember(out, property);
writePropertySet(out, property);
@@ -136,7 +136,7 @@ public abstract class AbstractTagGenerat
PrettyWriter out,
AbstractTagBean abstractTag) throws IOException
{
- Iterator properties = abstractTag.properties();
+ Iterator<PropertyBean> properties = abstractTag.properties();
properties = new FilteredIterator(properties, new TagAttributeFilter());
if (properties.hasNext())
{
@@ -150,7 +150,7 @@ public abstract class AbstractTagGenerat
out.println("super.release();");
while (properties.hasNext())
{
- PropertyBean property = (PropertyBean)properties.next();
+ PropertyBean property = properties.next();
String propName = property.getPropertyName();
String propVar = "_" + Util.getVariableFromName(propName);
out.println(propVar + " = null;");
@@ -210,12 +210,12 @@ public abstract class AbstractTagGenerat
}
protected void addImportsFromPropertes(AbstractTagBean abstractTagBean, Set imports) {
- Iterator properties = abstractTagBean.properties();
+ Iterator<PropertyBean> properties = abstractTagBean.properties();
properties = new FilteredIterator(properties, new TagAttributeFilter());
while (properties.hasNext())
{
- PropertyBean property = (PropertyBean)properties.next();
+ PropertyBean property = properties.next();
String propertyClass = property.getPropertyClass();
if (propertyClass != null)
Modified: myfaces/trinidad-maven/trunk/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/generator/taglib/AbstractValidatorTagGenerator.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad-maven/trunk/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/generator/taglib/AbstractValidatorTagGenerator.java?rev=921508&r1=921507&r2=921508&view=diff
==============================================================================
--- myfaces/trinidad-maven/trunk/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/generator/taglib/AbstractValidatorTagGenerator.java (original)
+++ myfaces/trinidad-maven/trunk/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/generator/taglib/AbstractValidatorTagGenerator.java Wed Mar 10 18:46:16 2010
@@ -165,7 +165,7 @@ public abstract class AbstractValidatorT
PrettyWriter out,
ValidatorBean validator) throws IOException
{
- Iterator properties = validator.properties();
+ Iterator<PropertyBean> properties = validator.properties();
properties = new FilteredIterator(properties, new TagAttributeFilter());
if (properties.hasNext())
{
@@ -180,7 +180,7 @@ public abstract class AbstractValidatorT
out.indent();
while (properties.hasNext())
{
- PropertyBean property = (PropertyBean)properties.next();
+ PropertyBean property = properties.next();
writeSetProperty(out, property);
}
out.unindent();
Modified: myfaces/trinidad-maven/trunk/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/generator/taglib/MyFacesComponentTagGenerator.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad-maven/trunk/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/generator/taglib/MyFacesComponentTagGenerator.java?rev=921508&r1=921507&r2=921508&view=diff
==============================================================================
--- myfaces/trinidad-maven/trunk/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/generator/taglib/MyFacesComponentTagGenerator.java (original)
+++ myfaces/trinidad-maven/trunk/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/generator/taglib/MyFacesComponentTagGenerator.java Wed Mar 10 18:46:16 2010
@@ -185,9 +185,9 @@ public class MyFacesComponentTagGenerato
{
Collection all = new HashSet();
- for (Iterator lIterator = components.iterator(); lIterator.hasNext();)
+ for (Iterator<ComponentBean> lIterator = components.iterator(); lIterator.hasNext();)
{
- ComponentBean component = (ComponentBean) lIterator.next();
+ ComponentBean component = lIterator.next();
Iterator prop = component.properties();
while (prop.hasNext())
{
Modified: myfaces/trinidad-maven/trunk/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/generator/taglib/TrinidadComponentTagGenerator.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad-maven/trunk/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/generator/taglib/TrinidadComponentTagGenerator.java?rev=921508&r1=921507&r2=921508&view=diff
==============================================================================
--- myfaces/trinidad-maven/trunk/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/generator/taglib/TrinidadComponentTagGenerator.java (original)
+++ myfaces/trinidad-maven/trunk/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/generator/taglib/TrinidadComponentTagGenerator.java Wed Mar 10 18:46:16 2010
@@ -62,12 +62,12 @@ public class TrinidadComponentTagGenerat
imports.add("javax.el.ValueExpression");
}
- Iterator properties = component.properties();
+ Iterator<PropertyBean> properties = component.properties();
properties = new FilteredIterator(properties, new TagAttributeFilter());
while (properties.hasNext())
{
- PropertyBean property = (PropertyBean) properties.next();
+ PropertyBean property = properties.next();
String propertyClass = property.getPropertyClass();
String[] propertyClassParams = property.getPropertyClassParameters();
@@ -206,9 +206,9 @@ public class TrinidadComponentTagGenerat
throws IOException
{
Collection all = new HashSet();
- for (Iterator lIterator = components.iterator(); lIterator.hasNext();)
+ for (Iterator<ComponentBean> lIterator = components.iterator(); lIterator.hasNext();)
{
- ComponentBean component = (ComponentBean) lIterator.next();
+ ComponentBean component = lIterator.next();
Iterator prop = component.properties();
while (prop.hasNext())
{
Modified: myfaces/trinidad-maven/trunk/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/parse/AbstractTagBean.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad-maven/trunk/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/parse/AbstractTagBean.java?rev=921508&r1=921507&r2=921508&view=diff
==============================================================================
--- myfaces/trinidad-maven/trunk/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/parse/AbstractTagBean.java (original)
+++ myfaces/trinidad-maven/trunk/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/parse/AbstractTagBean.java Wed Mar 10 18:46:16 2010
@@ -32,11 +32,11 @@ public class AbstractTagBean extends Obj
private String _longDescription;
private QName _tagName;
private String _tagClass;
- protected Map _properties;
+ protected Map<String, PropertyBean> _properties;
private int _tagClassModifiers;
- private Map _examples;
+ private Map<String, ExampleBean> _examples;
private int _exampleIdx = 0;
- private Map _screenshots;
+ private Map<String, ScreenshotBean> _screenshots;
private int _screenshotIdx = 0;
public AbstractTagBean()
@@ -52,10 +52,10 @@ public class AbstractTagBean extends Obj
// use the same properties.
if (!isComponentBean)
{
- _properties = new LinkedHashMap();
+ _properties = new LinkedHashMap<String, PropertyBean>();
}
- _examples = new LinkedHashMap();
- _screenshots = new LinkedHashMap();
+ _examples = new LinkedHashMap<String, ExampleBean>();
+ _screenshots = new LinkedHashMap<String, ScreenshotBean>();
}
/**
@@ -162,7 +162,7 @@ public class AbstractTagBean extends Obj
public PropertyBean findProperty(
String propertyName)
{
- return (PropertyBean)_properties.get(propertyName);
+ return _properties.get(propertyName);
}
/**
@@ -181,7 +181,7 @@ public class AbstractTagBean extends Obj
*
* @return the property iterator
*/
- public Iterator properties()
+ public Iterator<PropertyBean> properties()
{
return _properties.values().iterator();
}
@@ -218,7 +218,7 @@ public class AbstractTagBean extends Obj
public ExampleBean findExample(
String key)
{
- return (ExampleBean)_examples.get(key);
+ return _examples.get(key);
}
/**
@@ -226,7 +226,7 @@ public class AbstractTagBean extends Obj
*
* @return the example iterator
*/
- public Iterator examples()
+ public Iterator<ExampleBean> examples()
{
return _examples.values().iterator();
}
@@ -263,7 +263,7 @@ public class AbstractTagBean extends Obj
public ScreenshotBean findScreenshot(
String key)
{
- return (ScreenshotBean)_screenshots.get(key);
+ return _screenshots.get(key);
}
/**
@@ -271,7 +271,7 @@ public class AbstractTagBean extends Obj
*
* @return the screenshot iterator
*/
- public Iterator screenshots()
+ public Iterator<ScreenshotBean> screenshots()
{
return _screenshots.values().iterator();
}
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=921508&r1=921507&r2=921508&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 Mar 10 18:46:16 2010
@@ -44,9 +44,9 @@ public class ComponentBean extends Abstr
public ComponentBean()
{
super(true);
- _properties = new LinkedHashMap();
- _facets = new LinkedHashMap();
- _events = new LinkedHashMap();
+ _properties = new LinkedHashMap<String, PropertyBean>();
+ _facets = new LinkedHashMap<String, FacetBean>();
+ _events = new LinkedHashMap<String, EventRefBean>();
}
/**
@@ -422,7 +422,7 @@ public class ComponentBean extends Abstr
public PropertyBean findProperty(
String propertyName)
{
- return (PropertyBean)_properties.get(propertyName);
+ return _properties.get(propertyName);
}
/**
@@ -484,7 +484,7 @@ public class ComponentBean extends Abstr
*
* @return the property iterator
*/
- public Iterator properties()
+ public Iterator<PropertyBean> properties()
{
return _properties.values().iterator();
}
@@ -498,7 +498,7 @@ public class ComponentBean extends Abstr
*
* @return the property iterator
*/
- public Iterator properties(
+ public Iterator<PropertyBean> properties(
boolean flatten)
{
if (flatten)
@@ -518,9 +518,9 @@ public class ComponentBean extends Abstr
if (parent != null)
{
Map superProps = parent.getFlattenedProperties();
- for (Iterator iter = superProps.entrySet().iterator(); iter.hasNext(); )
+ for (Iterator<Map.Entry> iter = superProps.entrySet().iterator(); iter.hasNext(); )
{
- Map.Entry entry = (Map.Entry)iter.next();
+ Map.Entry entry = iter.next();
if (!props.containsKey(entry.getKey()))
{
props.put(entry.getKey(), entry.getValue());
@@ -558,7 +558,7 @@ public class ComponentBean extends Abstr
public FacetBean findFacet(
String facetName)
{
- return (FacetBean)_facets.get(facetName);
+ return _facets.get(facetName);
}
@@ -615,7 +615,7 @@ public class ComponentBean extends Abstr
*
* @return the facet iterator
*/
- public Iterator facets()
+ public Iterator<FacetBean> facets()
{
return _facets.values().iterator();
}
@@ -629,7 +629,7 @@ public class ComponentBean extends Abstr
*
* @return the facet iterator
*/
- public Iterator facets(
+ public Iterator<FacetBean> facets(
boolean flatten)
{
if (flatten)
@@ -649,9 +649,9 @@ public class ComponentBean extends Abstr
if (parent != null)
{
Map superFacets = parent.getFlattenedFacets();
- for (Iterator iter = superFacets.entrySet().iterator(); iter.hasNext(); )
+ for (Iterator<Map.Entry> iter = superFacets.entrySet().iterator(); iter.hasNext(); )
{
- Map.Entry entry = (Map.Entry)iter.next();
+ Map.Entry entry = iter.next();
if (!facets.containsKey(entry.getKey()))
{
facets.put(entry.getKey(), entry.getValue());
@@ -968,17 +968,17 @@ public class ComponentBean extends Abstr
*
* @param eventName the event name to find
*/
- public EventBean findEvent(
+ public EventRefBean findEvent(
String eventName)
{
- return (EventBean)_events.get(eventName);
+ return _events.get(eventName);
}
- public EventBean findEvent(
+ public EventRefBean findEvent(
String eventName,
boolean flatten)
{
- EventBean event = findEvent(eventName);
+ EventRefBean event = findEvent(eventName);
if (event == null && flatten)
{
ComponentBean parent = resolveSupertype();
@@ -995,7 +995,7 @@ public class ComponentBean extends Abstr
*
* @return the event iterator
*/
- public Iterator events()
+ public Iterator<EventRefBean> events()
{
return _events.values().iterator();
}
@@ -1009,10 +1009,10 @@ public class ComponentBean extends Abstr
*
* @return the event iterator
*/
- public Iterator events(
+ public Iterator<EventRefBean> events(
boolean flatten)
{
- Iterator events = events();
+ Iterator<EventRefBean> events = events();
if (flatten)
{
ComponentBean parent = resolveSupertype();
@@ -1179,10 +1179,10 @@ public class ComponentBean extends Abstr
FacesConfigBean owner)
{
super.attach(owner);
- Iterator events = events(false);
+ Iterator<EventRefBean> events = events(false);
while (events.hasNext())
{
- EventRefBean eventRef = (EventRefBean)events.next();
+ EventRefBean eventRef = events.next();
eventRef.attach(owner);
}
}
@@ -1203,9 +1203,9 @@ public class ComponentBean extends Abstr
private String _nodeClass;
private boolean _namingContainer;
private boolean _children = true;
- private Map _properties;
- private Map _facets;
- private Map _events;
+ private Map<String, PropertyBean> _properties;
+ private Map<String, FacetBean> _facets;
+ private Map<String, EventRefBean> _events;
private int _componentClassModifiers;
private int _tagClassModifiers;
private String[] _unsupportedAgents = new String[0];
Modified: myfaces/trinidad-maven/trunk/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/parse/FacesConfigBean.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad-maven/trunk/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/parse/FacesConfigBean.java?rev=921508&r1=921507&r2=921508&view=diff
==============================================================================
--- myfaces/trinidad-maven/trunk/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/parse/FacesConfigBean.java (original)
+++ myfaces/trinidad-maven/trunk/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/parse/FacesConfigBean.java Wed Mar 10 18:46:16 2010
@@ -50,7 +50,7 @@ public class FacesConfigBean extends Obj
public ConverterBean findConverter(
String converterId)
{
- return (ConverterBean)_converters.get(converterId);
+ return _converters.get(converterId);
}
/**
@@ -70,7 +70,7 @@ public class FacesConfigBean extends Obj
*
* @return the converter iterator
*/
- public Iterator converters()
+ public Iterator<ConverterBean> converters()
{
return _converters.values().iterator();
}
@@ -96,7 +96,7 @@ public class FacesConfigBean extends Obj
public ValidatorBean findValidator(
String validatorId)
{
- return (ValidatorBean)_validators.get(validatorId);
+ return _validators.get(validatorId);
}
/**
@@ -116,7 +116,7 @@ public class FacesConfigBean extends Obj
*
* @return the validator iterator
*/
- public Iterator validators()
+ public Iterator<ValidatorBean> validators()
{
return _validators.values().iterator();
}
@@ -145,7 +145,7 @@ public class FacesConfigBean extends Obj
public ComponentBean findComponent(
String componentType)
{
- return (ComponentBean)_components.get(componentType);
+ return _components.get(componentType);
}
/**
@@ -165,7 +165,7 @@ public class FacesConfigBean extends Obj
*
* @return the component iterator
*/
- public Iterator components()
+ public Iterator<ComponentBean> components()
{
return _components.values().iterator();
}
@@ -232,7 +232,7 @@ public class FacesConfigBean extends Obj
*
* @return the event iterator
*/
- public Iterator events()
+ public Iterator<EventBean> events()
{
return _events.values().iterator();
}
@@ -304,11 +304,11 @@ public class FacesConfigBean extends Obj
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();
+ 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());
Modified: myfaces/trinidad-maven/trunk/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/parse/RenderKitBean.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad-maven/trunk/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/parse/RenderKitBean.java?rev=921508&r1=921507&r2=921508&view=diff
==============================================================================
--- myfaces/trinidad-maven/trunk/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/parse/RenderKitBean.java (original)
+++ myfaces/trinidad-maven/trunk/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/parse/RenderKitBean.java Wed Mar 10 18:46:16 2010
@@ -87,7 +87,7 @@ public class RenderKitBean extends Objec
String rendererType)
{
String compositeKey = componentFamily + "|" + rendererType;
- return (RendererBean) _renderers.get(compositeKey);
+ return _renderers.get(compositeKey);
}
/**
@@ -106,7 +106,7 @@ public class RenderKitBean extends Objec
*
* @return the renderer iterator
*/
- public Iterator renderers()
+ public Iterator<RendererBean> renderers()
{
return _renderers.values().iterator();
}
@@ -120,10 +120,10 @@ public class RenderKitBean extends Objec
FacesConfigBean owner)
{
super.attach(owner);
- Iterator renderers = renderers();
+ Iterator<RendererBean> renderers = renderers();
while (renderers.hasNext())
{
- RendererBean renderer = (RendererBean)renderers.next();
+ RendererBean renderer = renderers.next();
renderer.attach(owner);
}
}
@@ -131,13 +131,13 @@ public class RenderKitBean extends Objec
void addAllRenderers(
RenderKitBean renderKit)
{
- for (Iterator i = renderKit._renderers.values().iterator(); i.hasNext();)
+ for (Iterator<RendererBean> i = renderKit._renderers.values().iterator(); i.hasNext();)
{
// use addRenderer to establish owner
- addRenderer((RendererBean)i.next());
+ addRenderer(i.next());
}
}
private String _renderKitId = "";
- private Map _renderers;
+ private Map<String,RendererBean> _renderers;
}
Modified: myfaces/trinidad-maven/trunk/maven-javacc-plugin/src/main/java/org/apache/myfaces/trinidadinternal/view/faces/maven/plugin/javacc/JavaCCMojo.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad-maven/trunk/maven-javacc-plugin/src/main/java/org/apache/myfaces/trinidadinternal/view/faces/maven/plugin/javacc/JavaCCMojo.java?rev=921508&r1=921507&r2=921508&view=diff
==============================================================================
--- myfaces/trinidad-maven/trunk/maven-javacc-plugin/src/main/java/org/apache/myfaces/trinidadinternal/view/faces/maven/plugin/javacc/JavaCCMojo.java (original)
+++ myfaces/trinidad-maven/trunk/maven-javacc-plugin/src/main/java/org/apache/myfaces/trinidadinternal/view/faces/maven/plugin/javacc/JavaCCMojo.java Wed Mar 10 18:46:16 2010
@@ -249,9 +249,9 @@ public class JavaCCMojo
return;
}
- for (Iterator i = staleGrammars.iterator(); i.hasNext(); )
+ for (Iterator<File> i = staleGrammars.iterator(); i.hasNext(); )
{
- File javaccFile = (File) i.next();
+ File javaccFile = i.next();
try
{
org.javacc.parser.Main.mainProgram(generateJavaCCArgumentList(javaccFile.getAbsolutePath()));
Modified: myfaces/trinidad-maven/trunk/maven-tagdoc-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/tagdoc/TagdocReport.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad-maven/trunk/maven-tagdoc-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/tagdoc/TagdocReport.java?rev=921508&r1=921507&r2=921508&view=diff
==============================================================================
--- myfaces/trinidad-maven/trunk/maven-tagdoc-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/tagdoc/TagdocReport.java (original)
+++ myfaces/trinidad-maven/trunk/maven-tagdoc-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/tagdoc/TagdocReport.java Wed Mar 10 18:46:16 2010
@@ -137,6 +137,7 @@ public class TagdocReport extends Abstra
// 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())
{
ComponentBean compBean = compIter.next();
@@ -183,11 +184,11 @@ public class TagdocReport extends Abstra
}
}
- Iterator validators = facesConfig.validators();
+ Iterator<ValidatorBean> validators = facesConfig.validators();
validators = new FilteredIterator(validators, new ValidatorTagFilter());
validators = new FilteredIterator(validators, new ValidatorNamespaceFilter());
- Iterator converters = facesConfig.converters();
+ Iterator<ConverterBean> converters = facesConfig.converters();
converters = new FilteredIterator(converters, new ConverterTagFilter());
converters = new FilteredIterator(converters, new ConverterNamespaceFilter());
@@ -209,7 +210,7 @@ public class TagdocReport extends Abstra
int count = 0;
while (components.hasNext())
{
- String pageName = _generateComponentDoc((ComponentBean)components.next(), compTypeMap, contractMap);
+ String pageName = _generateComponentDoc(components.next(), compTypeMap, contractMap);
if (pageName != null)
{
componentPages.add(pageName);
@@ -218,7 +219,7 @@ public class TagdocReport extends Abstra
}
while (converters.hasNext())
{
- String pageName = _generateConverterDoc((ConverterBean)converters.next());
+ String pageName = _generateConverterDoc(converters.next());
if (pageName != null)
{
converterPages.add(pageName);
@@ -227,7 +228,7 @@ public class TagdocReport extends Abstra
}
while (validators.hasNext())
{
- String pageName = _generateValidatorDoc((ValidatorBean)validators.next());
+ String pageName = _generateValidatorDoc(validators.next());
if (pageName != null)
{
validatorPages.add(pageName);
@@ -253,9 +254,9 @@ public class TagdocReport extends Abstra
sink.sectionTitle1_();
sink.section1();
- for (Iterator i = taglibs.entrySet().iterator(); i.hasNext(); )
+ for (Iterator<Map.Entry> i = taglibs.entrySet().iterator(); i.hasNext(); )
{
- Map.Entry entry = (Map.Entry)i.next();
+ Map.Entry entry = i.next();
sink.paragraph();
sink.bold();
@@ -426,13 +427,13 @@ public class TagdocReport extends Abstra
sink.tableHeaderCell_();
sink.tableRow_();
- Iterator iter = pages.iterator();
+ Iterator<String> iter = pages.iterator();
while (iter.hasNext())
{
sink.tableRow();
sink.tableCell();
- String name = (String) iter.next();
+ String name = iter.next();
String tagName = "<" + name.replace('_', ':') + ">";
sink.link(_DOC_SUBDIRECTORY + "/" + name + ".html");
@@ -471,9 +472,9 @@ public class TagdocReport extends Abstra
if (namespace == null)
return null;
- for (Iterator i = taglibs.entrySet().iterator(); i.hasNext(); )
+ for (Iterator<Map.Entry> i = taglibs.entrySet().iterator(); i.hasNext(); )
{
- Map.Entry entry = (Map.Entry)i.next();
+ Map.Entry entry = i.next();
if (namespace.equals(entry.getValue()))
return (String) entry.getKey();
}
@@ -828,20 +829,20 @@ public class TagdocReport extends Abstra
{
// Sort the names
TreeSet attributes = new TreeSet();
- Iterator attrs = bean.properties(true);
+ Iterator<PropertyBean> attrs = bean.properties(true);
while (attrs.hasNext())
{
- PropertyBean property = (PropertyBean) attrs.next();
+ PropertyBean property = attrs.next();
if (!property.isTagAttributeExcluded())
attributes.add(property.getPropertyName());
}
// Now get a list of PropertyBeans
List list = new ArrayList();
- Iterator iter = attributes.iterator();
+ Iterator<String> iter = attributes.iterator();
while (iter.hasNext())
{
- String attrName = (String) iter.next();
+ String attrName = iter.next();
list.add(bean.findProperty(attrName, true));
}
@@ -863,13 +864,13 @@ public class TagdocReport extends Abstra
bean.getComponentClass(),
groups.isEmpty() ? null : "Ungrouped");
- Iterator groupIter = groups.iterator();
+ Iterator<String> groupIter = groups.iterator();
while (groupIter.hasNext())
{
_writeComponentAttributes(out,
list.iterator(),
bean.getComponentClass(),
- (String) groupIter.next());
+ groupIter.next());
}
}
@@ -879,20 +880,20 @@ public class TagdocReport extends Abstra
{
// Sort the names
TreeSet attributes = new TreeSet();
- Iterator attrs = bean.properties();
+ Iterator<PropertyBean> attrs = bean.properties();
while (attrs.hasNext())
{
- PropertyBean property = (PropertyBean) attrs.next();
+ PropertyBean property = attrs.next();
if (!property.isTagAttributeExcluded())
attributes.add(property.getPropertyName());
}
// Now get a list of PropertyBeans
List list = new ArrayList();
- Iterator iter = attributes.iterator();
+ Iterator<String> iter = attributes.iterator();
while (iter.hasNext())
{
- String attrName = (String) iter.next();
+ String attrName = iter.next();
list.add(bean.findProperty(attrName));
}
@@ -908,20 +909,20 @@ public class TagdocReport extends Abstra
{
// Sort the names
TreeSet attributes = new TreeSet();
- Iterator attrs = bean.properties();
+ Iterator<PropertyBean> attrs = bean.properties();
while (attrs.hasNext())
{
- PropertyBean property = (PropertyBean) attrs.next();
+ PropertyBean property = attrs.next();
if (!property.isTagAttributeExcluded())
attributes.add(property.getPropertyName());
}
// Now get a list of PropertyBeans
List list = new ArrayList();
- Iterator iter = attributes.iterator();
+ Iterator<String> iter = attributes.iterator();
while (iter.hasNext())
{
- String attrName = (String) iter.next();
+ String attrName = iter.next();
list.add(bean.findProperty(attrName));
}
@@ -934,7 +935,7 @@ public class TagdocReport extends Abstra
private void _writeComponentAttributes(Writer out,
- Iterator attributes,
+ Iterator<PropertyBean> attributes,
String className,
String group) throws IOException
{
@@ -942,7 +943,7 @@ public class TagdocReport extends Abstra
while (attributes.hasNext())
{
- PropertyBean attr = (PropertyBean) attributes.next();
+ PropertyBean attr = attributes.next();
if (attr.isHidden())
{
@@ -1146,10 +1147,10 @@ public class TagdocReport extends Abstra
out.write("<th>Description</th>\n");
out.write("</tr>\n");
- Iterator iter = bean.events(true);
+ Iterator<EventRefBean> iter = bean.events(true);
while (iter.hasNext())
{
- EventRefBean eventRef = (EventRefBean) iter.next();
+ EventRefBean eventRef = iter.next();
EventBean event = eventRef.resolveEventType();
out.write("<tr>\n");
@@ -1232,10 +1233,10 @@ public class TagdocReport extends Abstra
// Go through each example, write its description
// followed by the example source code.
- Iterator iter = bean.examples();
+ Iterator<ExampleBean> iter = bean.examples();
while (iter.hasNext())
{
- exBean = (ExampleBean) iter.next();
+ exBean = iter.next();
String desc = exBean.getSourceDescription();
String source = exBean.getSourceCode();
@@ -1279,10 +1280,10 @@ public class TagdocReport extends Abstra
// Go through each screenshot, write its image
// followed by the image's caption.
- Iterator iter = bean.screenshots();
+ Iterator<ScreenshotBean> iter = bean.screenshots();
while (iter.hasNext())
{
- ssBean = (ScreenshotBean) iter.next();
+ ssBean = iter.next();
String desc = ssBean.getDescription();
String img = ssBean.getImage();
@@ -1381,10 +1382,10 @@ public class TagdocReport extends Abstra
// specific attribute
if (bean.hasAccessibilityGuidelines())
{
- Iterator iter = bean.accessibilityGuidelines();
+ Iterator<String> iter = bean.accessibilityGuidelines();
while (iter.hasNext())
{
- accGuideline = (String) iter.next();
+ accGuideline = iter.next();
_writeAccessibilityGuideline(out, "", accGuideline);
}
}
@@ -1574,9 +1575,9 @@ public class TagdocReport extends Abstra
// requires JAXP 1.3, in JavaSE 5.0
// spf.setXIncludeAware(false);
- for (Iterator i=masters.iterator(); i.hasNext();)
+ for (Iterator<URL> i=masters.iterator(); i.hasNext();)
{
- URL url = (URL)i.next();
+ URL url = i.next();
Digester digester = new Digester(spf.newSAXParser());
digester.setNamespaceAware(true);