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 22:56:43 UTC
svn commit: r511124 - in
/myfaces/core/branches/jsf12/api/src/main/java/javax/faces: ./ component/
context/ convert/ event/ model/ webapp/
Author: mbr
Date: Fri Feb 23 13:56:42 2007
New Revision: 511124
URL: http://svn.apache.org/viewvc?view=rev&rev=511124
Log:
inject generic types
see MYFACES-1262
Removed:
myfaces/core/branches/jsf12/api/src/main/java/javax/faces/convert/EnumConverter.java
Modified:
myfaces/core/branches/jsf12/api/src/main/java/javax/faces/FactoryFinder.java
myfaces/core/branches/jsf12/api/src/main/java/javax/faces/component/UIColumn.java
myfaces/core/branches/jsf12/api/src/main/java/javax/faces/component/UIComponent.java
myfaces/core/branches/jsf12/api/src/main/java/javax/faces/component/UIComponentBase.java
myfaces/core/branches/jsf12/api/src/main/java/javax/faces/component/_AttachedListStateWrapper.java
myfaces/core/branches/jsf12/api/src/main/java/javax/faces/component/_ComponentAttributesMap.java
myfaces/core/branches/jsf12/api/src/main/java/javax/faces/component/_ComponentChildrenList.java
myfaces/core/branches/jsf12/api/src/main/java/javax/faces/component/_ComponentFacetMap.java
myfaces/core/branches/jsf12/api/src/main/java/javax/faces/component/_SelectItemsIterator.java
myfaces/core/branches/jsf12/api/src/main/java/javax/faces/component/_SelectItemsUtil.java
myfaces/core/branches/jsf12/api/src/main/java/javax/faces/component/_SharedRendererUtils.java
myfaces/core/branches/jsf12/api/src/main/java/javax/faces/context/FacesContext.java
myfaces/core/branches/jsf12/api/src/main/java/javax/faces/event/PhaseId.java
myfaces/core/branches/jsf12/api/src/main/java/javax/faces/model/DataModel.java
myfaces/core/branches/jsf12/api/src/main/java/javax/faces/model/ResultSetDataModel.java
myfaces/core/branches/jsf12/api/src/main/java/javax/faces/webapp/UIComponentClassicTagBase.java
Modified: myfaces/core/branches/jsf12/api/src/main/java/javax/faces/FactoryFinder.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/jsf12/api/src/main/java/javax/faces/FactoryFinder.java?view=diff&rev=511124&r1=511123&r2=511124
==============================================================================
--- myfaces/core/branches/jsf12/api/src/main/java/javax/faces/FactoryFinder.java (original)
+++ myfaces/core/branches/jsf12/api/src/main/java/javax/faces/FactoryFinder.java Fri Feb 23 13:56:42 2007
@@ -74,7 +74,7 @@
throw new NullPointerException("factoryName may not be null");
ClassLoader classLoader = getClassLoader();
- Map factoryClassNames = (Map) _registeredFactoryNames.get(classLoader);
+ Map factoryClassNames = _registeredFactoryNames.get(classLoader);
if (factoryClassNames == null)
{
@@ -94,17 +94,17 @@
throw new IllegalArgumentException("no factory " + factoryName + " configured for this application.");
}
- Map factoryMap = (Map) _factories.get(classLoader);
+ Map<String, Object> factoryMap = _factories.get(classLoader);
if (factoryMap == null) {
- factoryMap = new HashMap();
+ factoryMap = new HashMap<String, Object>();
_factories.put(classLoader, factoryMap);
}
Object factory = factoryMap.get(factoryName);
if (factory == null) {
List classNames = (List) factoryClassNames.get(factoryName);
- factory = newFactoryInstance((Class)ABSTRACT_FACTORY_CLASSES.get(factoryName), classNames.iterator(), classLoader);
+ factory = newFactoryInstance(ABSTRACT_FACTORY_CLASSES.get(factoryName), classNames.iterator(), classLoader);
factoryMap.put(factoryName, factory);
return factory;
}
@@ -187,7 +187,7 @@
ClassLoader classLoader = getClassLoader();
synchronized(_registeredFactoryNames)
{
- Map factories = (Map) _factories.get(classLoader);
+ Map factories = _factories.get(classLoader);
if (factories != null && factories.containsKey(factoryName)) {
// Javadoc says ... This method has no effect if getFactory() has already been
@@ -195,18 +195,18 @@
return;
}
- Map factoryClassNames = (Map) _registeredFactoryNames.get(classLoader);
+ Map<String, List> factoryClassNames = _registeredFactoryNames.get(classLoader);
if (factoryClassNames == null)
{
- factoryClassNames = new HashMap();
+ factoryClassNames = new HashMap<String, List>();
_registeredFactoryNames.put(classLoader, factoryClassNames);
}
- List classNameList = (List) factoryClassNames.get(factoryName);
+ List<String> classNameList = factoryClassNames.get(factoryName);
if (classNameList == null) {
- classNameList = new ArrayList();
+ classNameList = new ArrayList<String>();
factoryClassNames.put(factoryName, classNameList);
}
classNameList.add(implName);
Modified: myfaces/core/branches/jsf12/api/src/main/java/javax/faces/component/UIColumn.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/jsf12/api/src/main/java/javax/faces/component/UIColumn.java?view=diff&rev=511124&r1=511123&r2=511124
==============================================================================
--- myfaces/core/branches/jsf12/api/src/main/java/javax/faces/component/UIColumn.java (original)
+++ myfaces/core/branches/jsf12/api/src/main/java/javax/faces/component/UIColumn.java Fri Feb 23 13:56:42 2007
@@ -36,7 +36,7 @@
public UIComponent getFooter()
{
- return (UIComponent)getFacets().get(FOOTER_FACET_NAME);
+ return getFacets().get(FOOTER_FACET_NAME);
}
public void setHeader(UIComponent header)
@@ -46,7 +46,7 @@
public UIComponent getHeader()
{
- return (UIComponent)getFacets().get(HEADER_FACET_NAME);
+ return getFacets().get(HEADER_FACET_NAME);
}
Modified: myfaces/core/branches/jsf12/api/src/main/java/javax/faces/component/UIComponent.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/jsf12/api/src/main/java/javax/faces/component/UIComponent.java?view=diff&rev=511124&r1=511123&r2=511124
==============================================================================
--- myfaces/core/branches/jsf12/api/src/main/java/javax/faces/component/UIComponent.java (original)
+++ myfaces/core/branches/jsf12/api/src/main/java/javax/faces/component/UIComponent.java Fri Feb 23 13:56:42 2007
@@ -39,7 +39,7 @@
{
}
- public abstract java.util.Map getAttributes();
+ public abstract java.util.Map<String, Object> getAttributes();
/**
* @deprecated Replaced by getValueExpression
@@ -134,7 +134,7 @@
public abstract javax.faces.component.UIComponent findComponent(java.lang.String expr);
- public abstract java.util.Map getFacets();
+ public abstract java.util.Map<String, UIComponent> getFacets();
public abstract javax.faces.component.UIComponent getFacet(java.lang.String name);
@@ -217,7 +217,7 @@
{
// not sure why the RI has this method in both
// UIComponent and UIComponentBase
- Map facets = getFacets();
+ Map<String, UIComponent> facets = getFacets();
return facets == null ? 0 : facets.size();
}
Modified: myfaces/core/branches/jsf12/api/src/main/java/javax/faces/component/UIComponentBase.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/jsf12/api/src/main/java/javax/faces/component/UIComponentBase.java?view=diff&rev=511124&r1=511123&r2=511124
==============================================================================
--- myfaces/core/branches/jsf12/api/src/main/java/javax/faces/component/UIComponentBase.java (original)
+++ myfaces/core/branches/jsf12/api/src/main/java/javax/faces/component/UIComponentBase.java Fri Feb 23 13:56:42 2007
@@ -62,7 +62,7 @@
private Map<String, ValueExpression> _valueExpressionMap = null;
private List<UIComponent> _childrenList = null;
private Map<String,UIComponent> _facetMap = null;
- private List _facesListeners = null;
+ private List<FacesListener> _facesListeners = null;
private String _clientId = null;
private String _id = null;
private UIComponent _parent = null;
@@ -119,7 +119,7 @@
* are automatically serialized along with the component when the view
* is serialized.
*/
- public Map getAttributes()
+ public Map<String, Object> getAttributes()
{
if (_attributesMap == null)
{
@@ -474,7 +474,7 @@
}
- public Map getFacets()
+ public Map<String, UIComponent> getFacets()
{
if (_facetMap == null)
{
@@ -485,7 +485,7 @@
public UIComponent getFacet(String name)
{
- return _facetMap == null ? null : (UIComponent)_facetMap.get(name);
+ return _facetMap == null ? null : _facetMap.get(name);
}
public Iterator<UIComponent> getFacetsAndChildren()
@@ -521,9 +521,9 @@
{
if (event == null) throw new NullPointerException("event");
if (_facesListeners == null) return;
- for (Iterator it = _facesListeners.iterator(); it.hasNext(); )
+ for (Iterator<FacesListener> it = _facesListeners.iterator(); it.hasNext(); )
{
- FacesListener facesListener = (FacesListener)it.next();
+ FacesListener facesListener = it.next();
if (event.isAppropriateListener(facesListener))
{
event.processListener(facesListener);
@@ -587,7 +587,7 @@
if (listener == null) throw new NullPointerException("listener");
if (_facesListeners == null)
{
- _facesListeners = new ArrayList();
+ _facesListeners = new ArrayList<FacesListener>();
}
_facesListeners.add(listener);
}
@@ -598,13 +598,13 @@
{
return (FacesListener[])Array.newInstance(clazz, 0);
}
- List lst = null;
- for (Iterator it = _facesListeners.iterator(); it.hasNext(); )
+ List<FacesListener> lst = null;
+ for (Iterator<FacesListener> it = _facesListeners.iterator(); it.hasNext(); )
{
- FacesListener facesListener = (FacesListener)it.next();
+ FacesListener facesListener = it.next();
if (clazz.isAssignableFrom(facesListener.getClass()))
{
- if (lst == null) lst = new ArrayList();
+ if (lst == null) lst = new ArrayList<FacesListener>();
lst.add(facesListener);
}
}
@@ -614,7 +614,7 @@
}
else
{
- return (FacesListener[])lst.toArray((FacesListener[])Array.newInstance(clazz, lst.size()));
+ return lst.toArray((FacesListener[])Array.newInstance(clazz, lst.size()));
}
}
@@ -706,14 +706,14 @@
facetMap.put(entry.getKey(), component.processSaveState(context));
}
}
- List childrenList = null;
+ List<Object> childrenList = null;
if (getChildCount() > 0)
{
for (Iterator it = getChildren().iterator(); it.hasNext(); )
{
UIComponent child = (UIComponent)it.next();
if (childrenList == null) {
- childrenList = new ArrayList(getChildCount());
+ childrenList = new ArrayList<Object>(getChildCount());
}
Object childState = child.processSaveState(context);
if (childState != null) {
@@ -881,7 +881,7 @@
if (attachedObject == null) return null;
if (attachedObject instanceof List)
{
- List lst = new ArrayList(((List)attachedObject).size());
+ List<Object> lst = new ArrayList<Object>(((List)attachedObject).size());
for (Iterator it = ((List)attachedObject).iterator(); it.hasNext(); )
{
lst.add(saveAttachedState(context, it.next()));
@@ -918,9 +918,9 @@
if (stateObj == null) return null;
if (stateObj instanceof _AttachedListStateWrapper)
{
- List lst = ((_AttachedListStateWrapper)stateObj).getWrappedStateList();
- List restoredList = new ArrayList(lst.size());
- for (Iterator it = lst.iterator(); it.hasNext(); )
+ List<Object> lst = ((_AttachedListStateWrapper)stateObj).getWrappedStateList();
+ List<Object> restoredList = new ArrayList<Object>(lst.size());
+ for (Iterator<Object> it = lst.iterator(); it.hasNext(); )
{
restoredList.add(restoreAttachedState(context, it.next()));
}
@@ -992,7 +992,7 @@
_rendererType = (String)values[2];
_clientId = (String)values[3];
restoreAttributesMap(values[4]);
- _facesListeners = (List)restoreAttachedState(context, values[5]);
+ _facesListeners = (List<FacesListener>)restoreAttachedState(context, values[5]);
restoreValueExpressionMap(context, values[6]);
}
@@ -1013,7 +1013,7 @@
{
if (stateObj != null)
{
- _attributesMap = new _ComponentAttributesMap(this, (Map)stateObj);
+ _attributesMap = new _ComponentAttributesMap(this, (Map<Object, Object>)stateObj);
}
else
{
@@ -1144,7 +1144,7 @@
{
// not sure why the RI has this method in both
// UIComponent and UIComponentBase
- Map facets = getFacets();
+ Map<String, UIComponent> facets = getFacets();
return facets == null ? 0 : facets.size();
}
}
Modified: myfaces/core/branches/jsf12/api/src/main/java/javax/faces/component/_AttachedListStateWrapper.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/jsf12/api/src/main/java/javax/faces/component/_AttachedListStateWrapper.java?view=diff&rev=511124&r1=511123&r2=511124
==============================================================================
--- myfaces/core/branches/jsf12/api/src/main/java/javax/faces/component/_AttachedListStateWrapper.java (original)
+++ myfaces/core/branches/jsf12/api/src/main/java/javax/faces/component/_AttachedListStateWrapper.java Fri Feb 23 13:56:42 2007
@@ -26,14 +26,14 @@
implements Serializable
{
private static final long serialVersionUID = -3958718149793179776L;
- private List _wrappedStateList;
+ private List<Object> _wrappedStateList;
- public _AttachedListStateWrapper(List wrappedStateList)
+ public _AttachedListStateWrapper(List<Object> wrappedStateList)
{
_wrappedStateList = wrappedStateList;
}
- public List getWrappedStateList()
+ public List<Object> getWrappedStateList()
{
return _wrappedStateList;
}
Modified: myfaces/core/branches/jsf12/api/src/main/java/javax/faces/component/_ComponentAttributesMap.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/jsf12/api/src/main/java/javax/faces/component/_ComponentAttributesMap.java?view=diff&rev=511124&r1=511123&r2=511124
==============================================================================
--- myfaces/core/branches/jsf12/api/src/main/java/javax/faces/component/_ComponentAttributesMap.java (original)
+++ myfaces/core/branches/jsf12/api/src/main/java/javax/faces/component/_ComponentAttributesMap.java Fri Feb 23 13:56:42 2007
@@ -62,13 +62,13 @@
// We delegate instead of derive from HashMap, so that we can later
// optimize Serialization
- private Map _attributes = null;
+ private Map<Object, Object> _attributes = null;
// A cached hashmap of propertyName => PropertyDescriptor object for all
// the javabean properties of the associated component. This is built by
// introspection on the associated UIComponent. Don't serialize this as
// it can always be recreated when needed.
- private transient Map _propertyDescriptorMap = null;
+ private transient Map<String, PropertyDescriptor> _propertyDescriptorMap = null;
/**
* Create a map backed by the specified component.
@@ -78,7 +78,7 @@
_ComponentAttributesMap(UIComponent component)
{
_component = component;
- _attributes = new HashMap();
+ _attributes = new HashMap<Object, Object>();
}
/**
@@ -89,7 +89,7 @@
* <p>
* This method is expected to be called during the "restore view" phase.
*/
- _ComponentAttributesMap(UIComponent component, Map attributes)
+ _ComponentAttributesMap(UIComponent component, Map<Object, Object> attributes)
{
_component = component;
_attributes = attributes;
@@ -178,7 +178,7 @@
* Return a collection of the values of all <i>attributes</i>. Property
* values are not included, nor value-bindings.
*/
- public Collection values()
+ public Collection<Object> values()
{
return _attributes.values();
}
@@ -208,7 +208,7 @@
* Return a set of the keys for all <i>attributes</i>. Properties of the
* underlying UIComponent are not included, nor value-bindings.
*/
- public Set keySet()
+ public Set<Object> keySet()
{
return _attributes.keySet();
}
@@ -347,7 +347,7 @@
throw new FacesException(e);
}
PropertyDescriptor[] propertyDescriptors = beanInfo.getPropertyDescriptors();
- _propertyDescriptorMap = new HashMap();
+ _propertyDescriptorMap = new HashMap<String, PropertyDescriptor>();
for (int i = 0; i < propertyDescriptors.length; i++)
{
PropertyDescriptor propertyDescriptor = propertyDescriptors[i];
@@ -358,7 +358,7 @@
}
}
}
- return (PropertyDescriptor)_propertyDescriptorMap.get(key);
+ return _propertyDescriptorMap.get(key);
}
@@ -441,7 +441,7 @@
* This method is package-scope so that the UIComponentBase class can access it
* directly when serializing the component.
*/
- Map getUnderlyingMap()
+ Map<Object, Object> getUnderlyingMap()
{
return _attributes;
}
Modified: myfaces/core/branches/jsf12/api/src/main/java/javax/faces/component/_ComponentChildrenList.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/jsf12/api/src/main/java/javax/faces/component/_ComponentChildrenList.java?view=diff&rev=511124&r1=511123&r2=511124
==============================================================================
--- myfaces/core/branches/jsf12/api/src/main/java/javax/faces/component/_ComponentChildrenList.java (original)
+++ myfaces/core/branches/jsf12/api/src/main/java/javax/faces/component/_ComponentChildrenList.java Fri Feb 23 13:56:42 2007
@@ -30,7 +30,7 @@
{
private static final long serialVersionUID = -6775078929331154224L;
private UIComponent _component;
- private List _list = new ArrayList();
+ private List<Object> _list = new ArrayList<Object>();
_ComponentChildrenList(UIComponent component)
{
Modified: myfaces/core/branches/jsf12/api/src/main/java/javax/faces/component/_ComponentFacetMap.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/jsf12/api/src/main/java/javax/faces/component/_ComponentFacetMap.java?view=diff&rev=511124&r1=511123&r2=511124
==============================================================================
--- myfaces/core/branches/jsf12/api/src/main/java/javax/faces/component/_ComponentFacetMap.java (original)
+++ myfaces/core/branches/jsf12/api/src/main/java/javax/faces/component/_ComponentFacetMap.java Fri Feb 23 13:56:42 2007
@@ -27,7 +27,7 @@
{
private static final long serialVersionUID = -3456937594422167629L;
private UIComponent _component;
- private Map _map = new HashMap();
+ private Map<Object, Object> _map = new HashMap<Object, Object>();
_ComponentFacetMap(UIComponent component)
{
@@ -61,7 +61,7 @@
return _map.containsValue(value);
}
- public Collection values()
+ public Collection<Object> values()
{
return _map.values();
}
@@ -80,7 +80,7 @@
return _map.entrySet();
}
- public Set keySet()
+ public Set<Object> keySet()
{
return _map.keySet();
}
Modified: myfaces/core/branches/jsf12/api/src/main/java/javax/faces/component/_SelectItemsIterator.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/jsf12/api/src/main/java/javax/faces/component/_SelectItemsIterator.java?view=diff&rev=511124&r1=511123&r2=511124
==============================================================================
--- myfaces/core/branches/jsf12/api/src/main/java/javax/faces/component/_SelectItemsIterator.java (original)
+++ myfaces/core/branches/jsf12/api/src/main/java/javax/faces/component/_SelectItemsIterator.java Fri Feb 23 13:56:42 2007
@@ -27,7 +27,7 @@
class _SelectItemsIterator implements Iterator
{
private final Iterator _childs;
- private Iterator _nestedItems;
+ private Iterator<SelectItem> _nestedItems;
private Object _nextItem;
private String _collectionLabel;
private UISelectItems _currentUISelectItems;
@@ -105,14 +105,14 @@
}
else if (value instanceof Collection)
{
- _nestedItems = ((Collection)value).iterator();
+ _nestedItems = ((Collection<SelectItem>)value).iterator();
_collectionLabel = "Collection";
return hasNext();
}
else if (value instanceof Map)
{
Map map = ((Map) value);
- Collection items = new ArrayList(map.size());
+ Collection<SelectItem> items = new ArrayList<SelectItem>(map.size());
for (Iterator it = map.entrySet().iterator(); it
.hasNext();)
{
Modified: myfaces/core/branches/jsf12/api/src/main/java/javax/faces/component/_SelectItemsUtil.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/jsf12/api/src/main/java/javax/faces/component/_SelectItemsUtil.java?view=diff&rev=511124&r1=511123&r2=511124
==============================================================================
--- myfaces/core/branches/jsf12/api/src/main/java/javax/faces/component/_SelectItemsUtil.java (original)
+++ myfaces/core/branches/jsf12/api/src/main/java/javax/faces/component/_SelectItemsUtil.java Fri Feb 23 13:56:42 2007
@@ -41,11 +41,11 @@
* @return if the value of a selectitem is equal to the given value
*/
public static boolean matchValue(FacesContext context, Object value,
- Iterator selectItemsIter, _ValueConverter converter)
+ Iterator<SelectItem> selectItemsIter, _ValueConverter converter)
{
while (selectItemsIter.hasNext())
{
- SelectItem item = (SelectItem) selectItemsIter.next();
+ SelectItem item = selectItemsIter.next();
if (item instanceof SelectItemGroup)
{
SelectItemGroup itemgroup = (SelectItemGroup) item;
Modified: myfaces/core/branches/jsf12/api/src/main/java/javax/faces/component/_SharedRendererUtils.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/jsf12/api/src/main/java/javax/faces/component/_SharedRendererUtils.java?view=diff&rev=511124&r1=511123&r2=511124
==============================================================================
--- myfaces/core/branches/jsf12/api/src/main/java/javax/faces/component/_SharedRendererUtils.java (original)
+++ myfaces/core/branches/jsf12/api/src/main/java/javax/faces/component/_SharedRendererUtils.java Fri Feb 23 13:56:42 2007
@@ -102,7 +102,7 @@
// --> according to javadoc of UISelectMany we assume that the element type
// is java.lang.String, and copy the String array to a new List
int len = submittedValue.length;
- List lst = new ArrayList(len);
+ List<String> lst = new ArrayList<String>(len);
for (int i = 0; i < len; i++)
{
lst.add(submittedValue[i]);
@@ -163,7 +163,7 @@
// of this List is java.lang.String. But there is a Converter set for this
// component. Because the user must know what he is doing, we will convert the values.
int len = submittedValue.length;
- List lst = new ArrayList(len);
+ List<Object> lst = new ArrayList<Object>(len);
for (int i = 0; i < len; i++)
{
lst.add(converter.getAsObject(facesContext, component, submittedValue[i]));
@@ -192,7 +192,7 @@
{
//Object array
int len = submittedValue.length;
- ArrayList convertedValues = new ArrayList(len);
+ ArrayList<Object> convertedValues = new ArrayList<Object>(len);
for (int i = 0; i < len; i++)
{
convertedValues.add(i, converter.getAsObject(facesContext, component, submittedValue[i]));
Modified: myfaces/core/branches/jsf12/api/src/main/java/javax/faces/context/FacesContext.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/jsf12/api/src/main/java/javax/faces/context/FacesContext.java?view=diff&rev=511124&r1=511123&r2=511124
==============================================================================
--- myfaces/core/branches/jsf12/api/src/main/java/javax/faces/context/FacesContext.java (original)
+++ myfaces/core/branches/jsf12/api/src/main/java/javax/faces/context/FacesContext.java Fri Feb 23 13:56:42 2007
@@ -85,7 +85,7 @@
public abstract void responseComplete();
- private static ThreadLocal _currentInstance = new ThreadLocal()
+ private static ThreadLocal<FacesContext> _currentInstance = new ThreadLocal()
{
protected Object initialValue()
{
@@ -95,7 +95,7 @@
public static FacesContext getCurrentInstance()
{
- return (FacesContext)_currentInstance.get();
+ return _currentInstance.get();
}
protected static void setCurrentInstance(javax.faces.context.FacesContext context)
Modified: myfaces/core/branches/jsf12/api/src/main/java/javax/faces/event/PhaseId.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/jsf12/api/src/main/java/javax/faces/event/PhaseId.java?view=diff&rev=511124&r1=511123&r2=511124
==============================================================================
--- myfaces/core/branches/jsf12/api/src/main/java/javax/faces/event/PhaseId.java (original)
+++ myfaces/core/branches/jsf12/api/src/main/java/javax/faces/event/PhaseId.java Fri Feb 23 13:56:42 2007
@@ -34,12 +34,12 @@
public static final javax.faces.event.PhaseId RENDER_RESPONSE;
public static final javax.faces.event.PhaseId RESTORE_VIEW;
public static final javax.faces.event.PhaseId UPDATE_MODEL_VALUES;
- public static final java.util.List VALUES;
+ public static final java.util.List<PhaseId> VALUES;
static
{
int i = 0;
- ArrayList list = new ArrayList(6);
+ ArrayList<PhaseId> list = new ArrayList<PhaseId>(6);
ANY_PHASE = new PhaseId("ANY_PHASE",i++);
list.add(ANY_PHASE);
Modified: myfaces/core/branches/jsf12/api/src/main/java/javax/faces/model/DataModel.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/jsf12/api/src/main/java/javax/faces/model/DataModel.java?view=diff&rev=511124&r1=511123&r2=511124
==============================================================================
--- myfaces/core/branches/jsf12/api/src/main/java/javax/faces/model/DataModel.java (original)
+++ myfaces/core/branches/jsf12/api/src/main/java/javax/faces/model/DataModel.java Fri Feb 23 13:56:42 2007
@@ -47,7 +47,7 @@
public abstract class DataModel
{
// FIELDS
- private List _listeners;
+ private List<DataModelListener> _listeners;
// METHODS
public void addDataModelListener(DataModelListener listener)
@@ -55,7 +55,7 @@
if (listener == null) throw new NullPointerException("listener");
if (_listeners == null)
{
- _listeners = new ArrayList();
+ _listeners = new ArrayList<DataModelListener>();
}
_listeners.add(listener);
}
@@ -66,7 +66,7 @@
{
return new DataModelListener[0];
}
- return (DataModelListener[])_listeners.toArray(new DataModelListener[_listeners.size()]);
+ return _listeners.toArray(new DataModelListener[_listeners.size()]);
}
/**
Modified: myfaces/core/branches/jsf12/api/src/main/java/javax/faces/model/ResultSetDataModel.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/jsf12/api/src/main/java/javax/faces/model/ResultSetDataModel.java?view=diff&rev=511124&r1=511123&r2=511124
==============================================================================
--- myfaces/core/branches/jsf12/api/src/main/java/javax/faces/model/ResultSetDataModel.java (original)
+++ myfaces/core/branches/jsf12/api/src/main/java/javax/faces/model/ResultSetDataModel.java Fri Feb 23 13:56:42 2007
@@ -262,8 +262,8 @@
public boolean containsValue(Object value)
{
- Set keys = keySet();
- for (Iterator iterator = keys.iterator(); iterator.hasNext();) {
+ Set<Object> keys = keySet();
+ for (Iterator<Object> iterator = keys.iterator(); iterator.hasNext();) {
Object object = get(iterator.next());
if (object == null) {
return value == null;
@@ -306,7 +306,7 @@
}
- public Set keySet()
+ public Set<Object> keySet()
{
return new WrapResultSetKeys(this);
}
@@ -357,7 +357,7 @@
"It is not allowed to remove entries from this set.");
}
- public Collection values()
+ public Collection<Object> values()
{
return new WrapResultSetValues(this);
}
@@ -460,7 +460,7 @@
{
private WrapResultSetMap _wrapMap = null;
- private Iterator _keyIterator = null;
+ private Iterator<Object> _keyIterator = null;
public WrapResultSetEntriesIterator(WrapResultSetMap wrapMap)
{
@@ -708,7 +708,7 @@
{
private WrapResultSetMap _wrapMap;
- private Iterator _keyIterator;
+ private Iterator<Object> _keyIterator;
public WrapResultSetValuesIterator(WrapResultSetMap wrapMap)
{
Modified: myfaces/core/branches/jsf12/api/src/main/java/javax/faces/webapp/UIComponentClassicTagBase.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/jsf12/api/src/main/java/javax/faces/webapp/UIComponentClassicTagBase.java?view=diff&rev=511124&r1=511123&r2=511124
==============================================================================
--- myfaces/core/branches/jsf12/api/src/main/java/javax/faces/webapp/UIComponentClassicTagBase.java (original)
+++ myfaces/core/branches/jsf12/api/src/main/java/javax/faces/webapp/UIComponentClassicTagBase.java Fri Feb 23 13:56:42 2007
@@ -148,11 +148,11 @@
public static UIComponentClassicTagBase getParentUIComponentClassicTagBase(
PageContext pageContext)
{
- Stack stack = getStack(pageContext);
+ Stack<UIComponentClassicTagBase> stack = getStack(pageContext);
int size = stack.size();
- return size > 0 ? (UIComponentClassicTagBase) stack.get(size - 1) : null;
+ return size > 0 ? stack.get(size - 1) : null;
}
/**
@@ -695,7 +695,7 @@
{
return;
}
- List children = parent.getChildren();
+ List<UIComponent> children = parent.getChildren();
indexOfComponentInParent = children.indexOf(component);
if (children.size() - 1 == indexOfComponentInParent)
{
@@ -782,8 +782,8 @@
/** Map of <ID,Tag> in the view */
private Map<String,Object> getViewComponentIds()
{
- Map requestMap = _facesContext.getExternalContext().getRequestMap();
- Map<String,Object> viewComponentIds;
+ Map<String, Object> requestMap = _facesContext.getExternalContext().getRequestMap();
+ Map<String, Object> viewComponentIds;
if (_parent == null)
{
@@ -793,21 +793,21 @@
}
else
{
- viewComponentIds = (Map) requestMap.get(VIEW_IDS);
+ viewComponentIds = (Map<String, Object>) requestMap.get(VIEW_IDS);
}
return viewComponentIds;
}
- private static final Stack getStack(PageContext pageContext)
+ private static final Stack<UIComponentClassicTagBase> getStack(PageContext pageContext)
{
- Stack stack = (Stack) pageContext.getAttribute(COMPONENT_STACK_ATTR,
+ Stack<UIComponentClassicTagBase> stack = (Stack<UIComponentClassicTagBase>) pageContext.getAttribute(COMPONENT_STACK_ATTR,
PageContext.REQUEST_SCOPE);
if (stack == null)
{
- stack = new Stack();
+ stack = new Stack<UIComponentClassicTagBase>();
pageContext.setAttribute(COMPONENT_STACK_ATTR,
stack, PageContext.REQUEST_SCOPE);
}
@@ -824,7 +824,7 @@
*/
private void popTag()
{
- Stack stack = getStack(pageContext);
+ Stack<UIComponentClassicTagBase> stack = getStack(pageContext);
int size = stack.size();
stack.remove(size -1);
@@ -1088,7 +1088,7 @@
_componentInstance = createComponent(context, id);
setProperties(_componentInstance);
int index = getAddedChildrenCount(parentTag);
- List children = parent.getChildren();
+ List<UIComponent> children = parent.getChildren();
if (index <= children.size())
{
children.add(index, _componentInstance);
@@ -1207,7 +1207,7 @@
private Set<String> getPreviousJspIdsSet()
{
- Set<String> previousJspIdsSet = (Set) getFacesContext().getExternalContext()
+ Set<String> previousJspIdsSet = (Set<String>) getFacesContext().getExternalContext()
.getRequestMap().get(PREVIOUS_JSP_IDS_SET);
if (previousJspIdsSet == null)