You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by mb...@apache.org on 2007/02/23 18:41:53 UTC
svn commit: r511033 - in
/myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements:
Attribute.java ListEntries.java ManagedBean.java MapEntries.java
NavigationRule.java Property.java
Author: mbr
Date: Fri Feb 23 09:41:52 2007
New Revision: 511033
URL: http://svn.apache.org/viewvc?view=rev&rev=511033
Log:
inject generic types
Modified:
myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/Attribute.java
myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/ListEntries.java
myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/ManagedBean.java
myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/MapEntries.java
myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/NavigationRule.java
myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/Property.java
Modified: myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/Attribute.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/Attribute.java?view=diff&rev=511033&r1=511032&r2=511033
==============================================================================
--- myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/Attribute.java (original)
+++ myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/Attribute.java Fri Feb 23 09:41:52 2007
@@ -36,25 +36,25 @@
*/
public class Attribute
{
- private List _description;
- private List _displayName;
- private List _icon;
+ private List<String> _description;
+ private List<String> _displayName;
+ private List<String> _icon;
private String _attributeName;
private String _attributeClass;
private String _defaultValue;
private String _suggestedValue;
- private List _attributeExtension;
+ private List<String> _attributeExtension;
public void addDescription(String value)
{
if(_description == null)
- _description = new ArrayList();
+ _description = new ArrayList<String>();
_description.add(value);
}
- public Iterator getDescriptions()
+ public Iterator<String> getDescriptions()
{
if(_description==null)
return Collections.EMPTY_LIST.iterator();
@@ -65,12 +65,12 @@
public void addDisplayName(String value)
{
if(_displayName == null)
- _displayName = new ArrayList();
+ _displayName = new ArrayList<String>();
_displayName.add(value);
}
- public Iterator getDisplayNames()
+ public Iterator<String> getDisplayNames()
{
if(_displayName==null)
return Collections.EMPTY_LIST.iterator();
@@ -81,12 +81,12 @@
public void addIcon(String value)
{
if(_icon == null)
- _icon = new ArrayList();
+ _icon = new ArrayList<String>();
_icon.add(value);
}
- public Iterator getIcons()
+ public Iterator<String> getIcons()
{
if(_icon==null)
return Collections.EMPTY_LIST.iterator();
@@ -137,12 +137,12 @@
public void addAttributeExtension(String attributeExtension)
{
if(_attributeExtension == null)
- _attributeExtension = new ArrayList();
+ _attributeExtension = new ArrayList<String>();
_attributeExtension.add(attributeExtension);
}
- public Iterator getAttributeExtensions()
+ public Iterator<String> getAttributeExtensions()
{
if(_attributeExtension==null)
return Collections.EMPTY_LIST.iterator();
Modified: myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/ListEntries.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/ListEntries.java?view=diff&rev=511033&r1=511032&r2=511033
==============================================================================
--- myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/ListEntries.java (original)
+++ myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/ListEntries.java Fri Feb 23 09:41:52 2007
@@ -27,7 +27,7 @@
{
private String valueClass;
- private List entries = new ArrayList();
+ private List<Entry> entries = new ArrayList<Entry>();
public String getValueClass()
@@ -49,7 +49,7 @@
}
- public Iterator getListEntries()
+ public Iterator<Entry> getListEntries()
{
return entries.iterator();
}
Modified: myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/ManagedBean.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/ManagedBean.java?view=diff&rev=511033&r1=511032&r2=511033
==============================================================================
--- myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/ManagedBean.java (original)
+++ myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/ManagedBean.java Fri Feb 23 09:41:52 2007
@@ -33,7 +33,7 @@
private String beanClassName;
private Class beanClass;
private String scope;
- private List property = new ArrayList();
+ private List<ManagedProperty> property = new ArrayList<ManagedProperty>();
private MapEntries mapEntries;
private ListEntries listEntries;
@@ -142,7 +142,7 @@
}
- public Iterator getManagedProperties()
+ public Iterator<ManagedProperty> getManagedProperties()
{
return property.iterator();
}
Modified: myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/MapEntries.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/MapEntries.java?view=diff&rev=511033&r1=511032&r2=511033
==============================================================================
--- myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/MapEntries.java (original)
+++ myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/MapEntries.java Fri Feb 23 09:41:52 2007
@@ -28,7 +28,7 @@
private String keyClass;
private String valueClass;
- private List entries = new ArrayList();
+ private List<Entry> entries = new ArrayList<Entry>();
public String getKeyClass()
@@ -59,7 +59,7 @@
}
- public Iterator getMapEntries()
+ public Iterator<Entry> getMapEntries()
{
return entries.iterator();
}
Modified: myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/NavigationRule.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/NavigationRule.java?view=diff&rev=511033&r1=511032&r2=511033
==============================================================================
--- myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/NavigationRule.java (original)
+++ myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/NavigationRule.java Fri Feb 23 09:41:52 2007
@@ -29,7 +29,7 @@
{
private String fromViewId;
- private List navigationCases = new ArrayList();
+ private List<NavigationCase> navigationCases = new ArrayList<NavigationCase>();
public String getFromViewId()
@@ -50,7 +50,7 @@
}
- public Collection getNavigationCases()
+ public Collection<NavigationCase> getNavigationCases()
{
return navigationCases;
}
Modified: myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/Property.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/Property.java?view=diff&rev=511033&r1=511032&r2=511033
==============================================================================
--- myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/Property.java (original)
+++ myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/Property.java Fri Feb 23 09:41:52 2007
@@ -38,25 +38,25 @@
*/
public class Property
{
- private List _description;
- private List _displayName;
- private List _icon;
+ private List<String> _description;
+ private List<String> _displayName;
+ private List<String> _icon;
private String _propertyName;
private String _propertyClass;
private String _defaultValue;
private String _suggestedValue;
- private List _propertyExtension;
+ private List<String> _propertyExtension;
public void addDescription(String value)
{
if(_description == null)
- _description = new ArrayList();
+ _description = new ArrayList<String>();
_description.add(value);
}
- public Iterator getDescriptions()
+ public Iterator<String> getDescriptions()
{
if(_description==null)
return Collections.EMPTY_LIST.iterator();
@@ -67,12 +67,12 @@
public void addDisplayName(String value)
{
if(_displayName == null)
- _displayName = new ArrayList();
+ _displayName = new ArrayList<String>();
_displayName.add(value);
}
- public Iterator getDisplayNames()
+ public Iterator<String> getDisplayNames()
{
if(_displayName==null)
return Collections.EMPTY_LIST.iterator();
@@ -83,12 +83,12 @@
public void addIcon(String value)
{
if(_icon == null)
- _icon = new ArrayList();
+ _icon = new ArrayList<String>();
_icon.add(value);
}
- public Iterator getIcons()
+ public Iterator<String> getIcons()
{
if(_icon==null)
return Collections.EMPTY_LIST.iterator();
@@ -139,12 +139,12 @@
public void addPropertyExtension(String propertyExtension)
{
if(_propertyExtension == null)
- _propertyExtension = new ArrayList();
+ _propertyExtension = new ArrayList<String>();
_propertyExtension.add(propertyExtension);
}
- public Iterator getPropertyExtensions()
+ public Iterator<String> getPropertyExtensions()
{
if(_propertyExtension==null)
return Collections.EMPTY_LIST.iterator();