svn commit: r412283 - in /myfaces/core/branches/jsf12: api/src/main/java/javax/faces/context/ExternalContext.java impl/src/main/java/org/apache/myfaces/el/unified/resolver/ScopedAttributeResolver.java

[ma...@apache.org]

Author: matzew
Date: Tue Jun  6 21:14:44 2006
New Revision: 412283

URL: http://svn.apache.org/viewvc?rev=412283&view=rev
Log:
java5

Modified:
    myfaces/core/branches/jsf12/api/src/main/java/javax/faces/context/ExternalContext.java
    myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/el/unified/resolver/ScopedAttributeResolver.java

Modified: myfaces/core/branches/jsf12/api/src/main/java/javax/faces/context/ExternalContext.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/jsf12/api/src/main/java/javax/faces/context/ExternalContext.java?rev=412283&r1=412282&r2=412283&view=diff
==============================================================================
--- myfaces/core/branches/jsf12/api/src/main/java/javax/faces/context/ExternalContext.java (original)
+++ myfaces/core/branches/jsf12/api/src/main/java/javax/faces/context/ExternalContext.java Tue Jun  6 21:14:44 2006
@@ -42,7 +42,7 @@
 
     public abstract String encodeResourceURL(String url);
 
-    public abstract Map getApplicationMap();
+    public abstract Map<String, Object> getApplicationMap();
 
     public abstract String getAuthType();
 
@@ -56,27 +56,35 @@
 
     public abstract Object getRequest();
     
-    public abstract String getRequestContentType();
-
+    public String getRequestCharacterEncoding()
+    {
+    	throw new UnsupportedOperationException();
+    }
+    
+    public String getRequestContentType()
+    {
+    	throw new UnsupportedOperationException();
+    }
+    
     public abstract String getRequestContextPath();
 
-    public abstract Map getRequestCookieMap();
+    public abstract Map<String, Object> getRequestCookieMap();
 
-    public abstract Map getRequestHeaderMap();
+    public abstract Map<String, Object> getRequestHeaderMap();
 
-    public abstract Map getRequestHeaderValuesMap();
+    public abstract Map<String, String[]> getRequestHeaderValuesMap();
 
     public abstract Locale getRequestLocale();
 
-    public abstract Iterator getRequestLocales();
+    public abstract Iterator<Locale> getRequestLocales();
 
-    public abstract Map getRequestMap();
+    public abstract Map<String, Object> getRequestMap();
 
-    public abstract Map getRequestParameterMap();
+    public abstract Map<String, String> getRequestParameterMap();
 
-    public abstract Iterator getRequestParameterNames();
+    public abstract Iterator<String> getRequestParameterNames();
 
-    public abstract Map getRequestParameterValuesMap();
+    public abstract Map<String, String[]> getRequestParameterValuesMap();
 
     public abstract String getRequestPathInfo();
 
@@ -87,7 +95,7 @@
 
     public abstract java.io.InputStream getResourceAsStream(String path);
 
-    public abstract Set getResourcePaths(String path);
+    public abstract Set<String> getResourcePaths(String path);
 
     public abstract Object getResponse();
     
@@ -95,7 +103,7 @@
 
     public abstract Object getSession(boolean create);
 
-    public abstract Map getSessionMap();
+    public abstract Map<String, Object> getSessionMap();
 
     public abstract java.security.Principal getUserPrincipal();
 

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?rev=412283&r1=412282&r2=412283&view=diff
==============================================================================
--- 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 Tue Jun  6 21:14:44 2006
@@ -21,6 +21,7 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
+
 import javax.el.ELContext;
 import javax.el.ELException;
 import javax.el.ELResolver;
@@ -48,11 +49,11 @@
         if (base != null) return;
         if (property == null) throw new PropertyNotFoundException();
         
-        Map scopedMap = findScopedMap(externalContext(context), property);
+        Map<String, Object> scopedMap = findScopedMap(externalContext(context), property);
         if (scopedMap != null) {
-            scopedMap.put(property, value);
+            scopedMap.put((String)property, value);
         } else {
-            externalContext(context).getRequestMap().put(property, value);
+            externalContext(context).getRequestMap().put((String)property, value);
         }
         
         context.setPropertyResolved(true);
@@ -134,9 +135,9 @@
     }
     
     // returns null if not found
-    private Map findScopedMap(ExternalContext extContext, Object property) {
+    private Map<String, Object> findScopedMap(ExternalContext extContext, Object property) {
 
-        Map scopedMap = extContext.getRequestMap();
+        Map<String, Object> scopedMap = extContext.getRequestMap();
         if (scopedMap.containsKey(property)) return scopedMap;
         
         scopedMap = extContext.getSessionMap();