svn commit: r381925 - in /struts/shale/trunk/clay-plugin/src/java/org/apache/shale/clay: component/LoadBundle.java utils/ClayAmalgam.java

[hrabago]

Author: hrabago
Date: Tue Feb 28 22:23:00 2006
New Revision: 381925

URL: http://svn.apache.org/viewcvs?rev=381925&view=rev
Log:
Updated to reflect recent refactoring.

Modified:
    
struts/shale/trunk/clay-plugin/src/java/org/apache/shale/clay/component/LoadBundle.java
    
struts/shale/trunk/clay-plugin/src/java/org/apache/shale/clay/utils/ClayAmalgam.java

Modified: 
struts/shale/trunk/clay-plugin/src/java/org/apache/shale/clay/component/LoadBundle.java
URL: 
http://svn.apache.org/viewcvs/struts/shale/trunk/clay-plugin/src/java/org/apache/shale/clay/component/LoadBundle.java?rev=381925&r1=381924&r2=381925&view=diff
==============================================================================
--- 
struts/shale/trunk/clay-plugin/src/java/org/apache/shale/clay/component/LoadBundle.java
 (original)
+++ 
struts/shale/trunk/clay-plugin/src/java/org/apache/shale/clay/component/LoadBundle.java
 Tue Feb 28 22:23:00 2006
@@ -94,7 +94,7 @@
                 .resolveVariable(context, ShaleConstants.TAG_UTILITY_BEAN);
 
         // evaluate any VB expression that we were passed
-        String resolvedBasename = tagUtils.eval(basename);
+        String resolvedBasename = tagUtils.evalString(basename);
 
         if (null == resolvedBasename || null == var) {
             throw new NullPointerException("null basename or var");

Modified: 
struts/shale/trunk/clay-plugin/src/java/org/apache/shale/clay/utils/ClayAmalgam.java
URL: 
http://svn.apache.org/viewcvs/struts/shale/trunk/clay-plugin/src/java/org/apache/shale/clay/utils/ClayAmalgam.java?rev=381925&r1=381924&r2=381925&view=diff
==============================================================================
--- 
struts/shale/trunk/clay-plugin/src/java/org/apache/shale/clay/utils/ClayAmalgam.java
 (original)
+++ 
struts/shale/trunk/clay-plugin/src/java/org/apache/shale/clay/utils/ClayAmalgam.java
 Tue Feb 28 22:23:00 2006
@@ -168,7 +168,7 @@
         ComponentBean text = (ComponentBean) displayElementRoot;
         Clay clay = (Clay) component;
         String value = (String) clay.getAttributes().get("value");
-        value = tagUtils.eval(value);
+        value = tagUtils.evalString(value);
         if (value == null) {
             throw new 
IllegalArgumentException(messages.getMessage("missing.attribute", new Object[] 
{"value", "clayOut"}));    
         }
@@ -236,7 +236,7 @@
         if (url == null) {
             throw new 
IllegalArgumentException(messages.getMessage("missing.attribute", new Object[] 
{"url", "clayImport"}));    
         }
-        url = tagUtils.eval(url);
+        url = tagUtils.evalString(url);
         
         boolean escapeXml = true;
         String escAttribute = (String) clay.getAttributes().get("escapeXml");
@@ -335,13 +335,13 @@
         }
 
         String bodyJsfid = (String) clay.getAttributes().get("bodyJsfid");
-        bodyJsfid = tagUtils.eval(bodyJsfid);
+        bodyJsfid = tagUtils.evalString(bodyJsfid);
         if (bodyJsfid == null) {
             throw new 
IllegalArgumentException(messages.getMessage("missing.attribute", new Object[] 
{"bodyJsfid", "clayForEach"}));    
         }
 
         String var = (String) clay.getAttributes().get("var");
-        var = tagUtils.eval(var);
+        var = tagUtils.evalString(var);
         if (var == null) {
             throw new 
IllegalArgumentException(messages.getMessage("missing.attribute", new Object[] 
{"var", "clayForEach"}));    
         }



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]