[WebMacro-cvs] webmacro/src/org/webmacro/servlet TemplateTool.java, 1.11, 1.12

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

Update of /cvsroot/webmacro/webmacro/src/org/webmacro/servlet
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv23590/src/org/webmacro/servlet

Modified Files:
	TemplateTool.java 
Log Message:
Field hiding

Index: TemplateTool.java
===================================================================
RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/servlet/TemplateTool.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** TemplateTool.java	18 Mar 2008 12:09:57 -0000	1.11
--- TemplateTool.java	12 Nov 2008 20:26:52 -0000	1.12
***************
*** 60,64 ****
      {
  
!         private Context _context;
          private ArrayList _macros = new ArrayList(10);
  
--- 60,64 ----
      {
  
!         private Context _contextLocal;
          private ArrayList _macros = new ArrayList(10);
  
***************
*** 68,72 ****
          public MacroTemplateFactory (Context ctx)
          {
!             _context = ctx;
          }
  
--- 68,72 ----
          public MacroTemplateFactory (Context ctx)
          {
!             _contextLocal = ctx;
          }
  
***************
*** 77,81 ****
          public MacroTemplate fromString (String s)
          {
!             MacroTemplate mt = new MacroTemplate(_context, s);
              _macros.add(mt);
              return mt;
--- 77,81 ----
          public MacroTemplate fromString (String s)
          {
!             MacroTemplate mt = new MacroTemplate(_contextLocal, s);
              _macros.add(mt);
              return mt;
***************
*** 91,97 ****
                  throws org.webmacro.ResourceException
          {
!             Template t = (Template) _context.getBroker()
                      .getProvider("template").get(fileRef);
!             MacroTemplate mt = new MacroTemplate(_context, t);
              _macros.add(mt);
              return mt;
--- 91,97 ----
                  throws org.webmacro.ResourceException
          {
!             Template t = (Template) _contextLocal.getBroker()
                      .getProvider("template").get(fileRef);
!             MacroTemplate mt = new MacroTemplate(_contextLocal, t);
              _macros.add(mt);
              return mt;
***************
*** 108,112 ****
  
          private Template _template;
!         private Context _context, _origContext;
  
          /** 
--- 108,112 ----
  
          private Template _template;
!         private Context _contextLocal, _origContext;
  
          /** 
***************
*** 120,124 ****
              _origContext = c;
              // @@@ Just get a new one?
!             _context = c.cloneContext();
          }
  
--- 120,124 ----
              _origContext = c;
              // @@@ Just get a new one?
!             _contextLocal = c.cloneContext();
          }
  
***************
*** 141,145 ****
          public Context getArgs ()
          {
!             return _context;
          }
  
--- 141,145 ----
          public Context getArgs ()
          {
!             return _contextLocal;
          }
  
***************
*** 152,158 ****
          public Object eval () throws PropertyException
          {
!             synchronized (_context)
              {
!                 return _template.evaluateAsString(_context);
              }
          }
--- 152,158 ----
          public Object eval () throws PropertyException
          {
!             synchronized (_contextLocal)
              {
!                 return _template.evaluateAsString(_contextLocal);
              }
          }
***************
*** 164,170 ****
                  for (int i = 0; i < args.length; i++)
                  {
!                     _context.put("arg" + (i + 1), args[i]);
                  }
!                 _context.put("args", args);
              }
              return eval();
--- 164,170 ----
                  for (int i = 0; i < args.length; i++)
                  {
!                     _contextLocal.put("arg" + (i + 1), args[i]);
                  }
!                 _contextLocal.put("args", args);
              }
              return eval();
***************
*** 178,184 ****
              for (int i = 0; i < args.length; i++)
              {
!                 _context.put(names[i], args[i]);
              }
!             _context.put("args", args);
              return eval();
          }
--- 178,184 ----
              for (int i = 0; i < args.length; i++)
              {
!                 _contextLocal.put(names[i], args[i]);
              }
!             _contextLocal.put("args", args);
              return eval();
          }
***************
*** 186,190 ****
          public Object eval (java.util.Map map) throws PropertyException
          {
!             _context.putAll(map);
              return eval();
          }
--- 186,190 ----
          public Object eval (java.util.Map map) throws PropertyException
          {
!             _contextLocal.putAll(map);
              return eval();
          }
***************
*** 196,202 ****
          public void copyCurrentContext ()
          {
!             synchronized (_context)
              {
!                 _context.putAll(_origContext);
              }
          }
--- 196,202 ----
          public void copyCurrentContext ()
          {
!             synchronized (_contextLocal)
              {
!                 _contextLocal.putAll(_origContext);
              }
          }