svn commit: r727169 - /struts/sandbox/trunk/struts2-javatemplates-plugin/src/main/java/org/apache/struts2/views/java/simple/AbstractTagHandler.java

[musachy]

Author: musachy
Date: Tue Dec 16 13:44:57 2008
New Revision: 727169

URL: http://svn.apache.org/viewvc?rev=727169&view=rev
Log:
Use refactored altSyntax methods

Modified:
    
struts/sandbox/trunk/struts2-javatemplates-plugin/src/main/java/org/apache/struts2/views/java/simple/AbstractTagHandler.java

Modified: 
struts/sandbox/trunk/struts2-javatemplates-plugin/src/main/java/org/apache/struts2/views/java/simple/AbstractTagHandler.java
URL: 
http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-javatemplates-plugin/src/main/java/org/apache/struts2/views/java/simple/AbstractTagHandler.java?rev=727169&r1=727168&r2=727169&view=diff
==============================================================================
--- 
struts/sandbox/trunk/struts2-javatemplates-plugin/src/main/java/org/apache/struts2/views/java/simple/AbstractTagHandler.java
 (original)
+++ 
struts/sandbox/trunk/struts2-javatemplates-plugin/src/main/java/org/apache/struts2/views/java/simple/AbstractTagHandler.java
 Tue Dec 16 13:44:57 2008
@@ -23,6 +23,7 @@
 import com.opensymphony.xwork2.util.TextParseUtil;
 import com.opensymphony.xwork2.util.ValueStack;
 import org.apache.struts2.components.template.TemplateRenderingContext;
+import org.apache.struts2.components.Component;
 import org.apache.struts2.views.java.Attributes;
 import org.apache.struts2.views.java.TagHandler;
 import org.apache.struts2.views.util.ContextUtil;
@@ -82,14 +83,7 @@
         }
 
         ValueStack stack = context.getStack();
-        if (altSyntax) {
-            // does the expression start with %{ and end with }? if so, just 
cut it off!
-            if (expr.startsWith("%{") && expr.endsWith("}")) {
-                expr = expr.substring(2, expr.length() - 1);
-            }
-        }
-
-        return stack.findValue(expr);
+        return stack.findValue(Component.stripExpressionIfAltSyntax(stack, 
expr));
     }
 
     private Object findValue(String expr, Class toType) {
@@ -98,14 +92,7 @@
         if (altSyntax && toType == String.class) {
             return TextParseUtil.translateVariables('%', expr, stack);
         } else {
-            if (altSyntax) {
-                // does the expression start with %{ and end with }? if so, 
just cut it off!
-                if (expr.startsWith("%{") && expr.endsWith("}")) {
-                    expr = expr.substring(2, expr.length() - 1);
-                }
-            }
-
-            return stack.findValue(expr, toType);
+            return stack.findValue(Component.stripExpressionIfAltSyntax(stack, 
expr), toType);
         }
     }
 }