[WebMacro-cvs] webmacro/src/org/webmacro/directive SetpropsDirective.java, 1.5, 1.6

[Tim P <ti...@us...>]

Update of /cvsroot/webmacro/webmacro/src/org/webmacro/directive
In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv7614/src/org/webmacro/directive

Modified Files:
	SetpropsDirective.java 
Log Message:
Refactor variable name

Index: SetpropsDirective.java
===================================================================
RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/directive/SetpropsDirective.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** SetpropsDirective.java	20 Mar 2008 22:30:55 -0000	1.5
--- SetpropsDirective.java	20 Feb 2010 17:31:57 -0000	1.6
***************
*** 143,147 ****
          String prop;
          String val;
!         StringTemplate stmpl;
  
          if (s.length() > 0 && !s.startsWith("#")) {
--- 143,147 ----
          String prop;
          String val;
!         StringTemplate stringTemplate;
  
          if (s.length() > 0 && !s.startsWith("#")) {
***************
*** 157,168 ****
                      s = prefix + prop + "=\"" + val + "\"";
                      try {
!                         stmpl = new StringTemplate(context.getBroker(), s);
!                         stmpl.evaluateAsString(context);
                      } catch (WebMacroException wme) {
                          // try again without quotes.
                          s = prefix + prop + "=" + val;
                          try {
!                             stmpl = new StringTemplate(context.getBroker(), s);
!                             stmpl.evaluateAsString(context);
                          } catch (WebMacroException wme2) {
                              PropertyException pex = new PropertyException(
--- 157,168 ----
                      s = prefix + prop + "=\"" + val + "\"";
                      try {
!                         stringTemplate = new StringTemplate(context.getBroker(), s);
!                         stringTemplate.evaluateAsString(context);
                      } catch (WebMacroException wme) {
                          // try again without quotes.
                          s = prefix + prop + "=" + val;
                          try {
!                             stringTemplate = new StringTemplate(context.getBroker(), s);
!                             stringTemplate.evaluateAsString(context);
                          } catch (WebMacroException wme2) {
                              PropertyException pex = new PropertyException(