svn commit: r651761 - in /commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml: Context.java env/faces/SessionContext.java

[ra...@apache.org]

Author: rahul
Date: Fri Apr 25 17:59:08 2008
New Revision: 651761

URL: http://svn.apache.org/viewvc?rev=651761&view=rev
Log:
Eliminate raw type warnings.

Modified:
    commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/Context.java
    commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/env/faces/SessionContext.java

Modified: commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/Context.java
URL: http://svn.apache.org/viewvc/commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/Context.java?rev=651761&r1=651760&r2=651761&view=diff
==============================================================================
--- commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/Context.java (original)
+++ commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/Context.java Fri Apr 25 17:59:08 2008
@@ -66,7 +66,7 @@
      * To get variables in parent Context, call getParent().getVars().
      * @see #getParent()
      */
-    Map getVars();
+    Map<String, Object> getVars();
 
     /**
      * Clear this Context.

Modified: commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/env/faces/SessionContext.java
URL: http://svn.apache.org/viewvc/commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/env/faces/SessionContext.java?rev=651761&r1=651760&r2=651761&view=diff
==============================================================================
--- commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/env/faces/SessionContext.java (original)
+++ commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/env/faces/SessionContext.java Fri Apr 25 17:59:08 2008
@@ -37,7 +37,7 @@
     /** Serial version UID. */
     private static final long serialVersionUID = 1L;
     /** The map of session scoped variables. */
-    private Map sessionMap;
+    private Map<String, Object> sessionMap;
     /** Bark if FacesContext is null. */
     private static final String ERR_HOST_FACES_CTX_NULL =
         "Host FacesContext cannot be null";
@@ -57,13 +57,15 @@
      * @param fc The current FacesContext
      * @param parent A parent Context, can be null
      */
+    @SuppressWarnings("unchecked")
     public SessionContext(final FacesContext fc, final Context parent) {
         super(parent);
         if (fc == null) {
             throw new IllegalArgumentException(ERR_HOST_FACES_CTX_NULL);
         } else {
-          // only retain the session map
-          this.sessionMap = fc.getExternalContext().getSessionMap();
+            // only retain the session map
+            // legacy code, suppress warning
+            this.sessionMap = fc.getExternalContext().getSessionMap();
         }
 
     }