[seam-commits] Seam SVN: r9683 - trunk/src/main/org/jboss/seam/core.

[seam-commits at lists.jboss.org]

Author: dan.j.allen
Date: 2008-12-01 16:40:20 -0500 (Mon, 01 Dec 2008)
New Revision: 9683

Modified:
   trunk/src/main/org/jboss/seam/core/Expressions.java
Log:
names of variables were backwards

Modified: trunk/src/main/org/jboss/seam/core/Expressions.java
===================================================================
--- trunk/src/main/org/jboss/seam/core/Expressions.java	2008-12-01 21:39:44 UTC (rev 9682)
+++ trunk/src/main/org/jboss/seam/core/Expressions.java	2008-12-01 21:40:20 UTC (rev 9683)
@@ -86,19 +86,19 @@
          {
             if ( isFacesContextActive() )
             {
-               if (seamValueExpression==null)
+               if (facesValueExpression==null)
                {
-                  seamValueExpression = createExpression();
+                  facesValueExpression = createExpression();
                }
-               return seamValueExpression;
+               return facesValueExpression;
             }
             else
             {
-               if (facesValueExpression==null)
+               if (seamValueExpression==null)
                {
-                  facesValueExpression = createExpression();
+                  seamValueExpression = createExpression();
                }
-               return facesValueExpression;
+               return seamValueExpression;
             }
          }
          
@@ -124,6 +124,7 @@
          
          public Class<T> getType()
          {
+            // QUESTION shouldn't we use the type provided in the constructor?
             return (Class<T>) toUnifiedValueExpression().getType( getELContext() );
          }
          
@@ -148,19 +149,19 @@
          {
             if ( isFacesContextActive() )
             {
-               if (seamMethodExpression==null)
+               if (facesMethodExpression==null)
                {
-                  seamMethodExpression = createExpression();
+                  facesMethodExpression = createExpression();
                }
-               return seamMethodExpression;
+               return facesMethodExpression;
             }
             else
             {
-               if (facesMethodExpression==null)
+               if (seamMethodExpression==null)
                {
-                  facesMethodExpression = createExpression();
+                  seamMethodExpression = createExpression();
                }
-               return facesMethodExpression;
+               return seamMethodExpression;
             }
          }