myfaces-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From m..@apache.org
Subject svn commit: r511308 - in /myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/el/unified/resolver: ResourceBundleResolver.java ScopedAttributeResolver.java
Date Sat, 24 Feb 2007 17:14:46 GMT
Author: mbr
Date: Sat Feb 24 09:14:46 2007
New Revision: 511308

URL: http://svn.apache.org/viewvc?view=rev&rev=511308
Log:
generics

Modified:
    myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/el/unified/resolver/ResourceBundleResolver.java
    myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/el/unified/resolver/ScopedAttributeResolver.java

Modified: myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/el/unified/resolver/ResourceBundleResolver.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/el/unified/resolver/ResourceBundleResolver.java?view=diff&rev=511308&r1=511307&r2=511308
==============================================================================
--- myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/el/unified/resolver/ResourceBundleResolver.java
(original)
+++ myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/el/unified/resolver/ResourceBundleResolver.java
Sat Feb 24 09:14:46 2007
@@ -16,6 +16,7 @@
 
 package org.apache.myfaces.el.unified.resolver;
 
+import java.beans.FeatureDescriptor;
 import java.util.Iterator;
 import java.util.ResourceBundle;
 import javax.el.ELContext;
@@ -102,7 +103,7 @@
         return null;
     }
 
-    public Iterator getFeatureDescriptors(ELContext context, Object base) {
+    public Iterator<FeatureDescriptor> getFeatureDescriptors(ELContext context, Object
base) {
        
         if (base != null) return null;
         

Modified: myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/el/unified/resolver/ScopedAttributeResolver.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/el/unified/resolver/ScopedAttributeResolver.java?view=diff&rev=511308&r1=511307&r2=511308
==============================================================================
--- myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/el/unified/resolver/ScopedAttributeResolver.java
(original)
+++ myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/el/unified/resolver/ScopedAttributeResolver.java
Sat Feb 24 09:14:46 2007
@@ -92,11 +92,11 @@
         return Object.class;
     }
 
-    public Iterator getFeatureDescriptors(ELContext context, Object base) {
+    public Iterator<FeatureDescriptor> getFeatureDescriptors(ELContext context, Object
base) {
         
         if (base != null) return null;
         
-        List descriptorList = new ArrayList();
+        List<FeatureDescriptor> descriptorList = new ArrayList<FeatureDescriptor>();
         ExternalContext extContext = externalContext(context);
         addDescriptorsToList(descriptorList, extContext.getRequestMap());
         addDescriptorsToList(descriptorList, extContext.getSessionMap());
@@ -113,7 +113,7 @@
     }
     
     // side effect: modifies the list
-    private void addDescriptorsToList(List descriptorList, Map scopeMap) {
+    private void addDescriptorsToList(List<FeatureDescriptor> descriptorList, Map scopeMap)
{
         for (Object name: scopeMap.keySet()) {
             String strName = (String)name;
             Class runtimeType = scopeMap.get(strName).getClass();



Mime
View raw message