[WebMacro-cvs] webmacro/src/org/webmacro/servlet CGITool.java,1.11,1.12 CookieTool.java,1.10,1.11 FormListTool.java,1.10,1.11 FormTool.java,1.10,1.11 ListTool.java,1.6,1.7 LocaleTool.java,1.9,1.10 MathTool.java,1.8,1.9 RequestTool.java,1.9,1.10 ResponseTool.java,1.9,1.10 SessionTool.java,1.11,1.12 TemplateTool.java,1.8,1.9 TextTool.java,1.12,1.13 TypeTool.java,1.5,1.6 URLTool.java,1.5,1.6 VariableTool.java,1.11,1.12

[<bri...@us...>]

Update of /cvsroot/webmacro/webmacro/src/org/webmacro/servlet
In directory sc8-pr-cvs1:/tmp/cvs-serv23890/src/org/webmacro/servlet

Modified Files:
	CGITool.java CookieTool.java FormListTool.java FormTool.java 
	ListTool.java LocaleTool.java MathTool.java RequestTool.java 
	ResponseTool.java SessionTool.java TemplateTool.java 
	TextTool.java TypeTool.java URLTool.java VariableTool.java 
Log Message:
Refactor ContextTool to be a special case of ContextAutoLoader

Index: CGITool.java
===================================================================
RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/servlet/CGITool.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** CGITool.java	16 Jul 2003 06:45:00 -0000	1.11
--- CGITool.java	30 Jul 2003 04:51:17 -0000	1.12
***************
*** 32,38 ****
   * script variable names.
   */
! public class CGITool implements ContextTool
  {
- 
      public Object init (Context context)
              throws PropertyException
--- 32,37 ----
   * script variable names.
   */
! public class CGITool extends ContextTool
  {
      public Object init (Context context)
              throws PropertyException

Index: CookieTool.java
===================================================================
RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/servlet/CookieTool.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** CookieTool.java	16 Jul 2003 06:45:00 -0000	1.10
--- CookieTool.java	30 Jul 2003 04:51:17 -0000	1.11
***************
*** 31,35 ****
   * Provide Template with access to form data.
   */
! public class CookieTool implements ContextTool
  {
  
--- 31,35 ----
   * Provide Template with access to form data.
   */
! public class CookieTool extends ContextTool
  {
  

Index: FormListTool.java
===================================================================
RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/servlet/FormListTool.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** FormListTool.java	16 Jul 2003 06:45:00 -0000	1.10
--- FormListTool.java	30 Jul 2003 04:51:17 -0000	1.11
***************
*** 31,35 ****
   * Provide Template with access to form data.
   */
! public class FormListTool implements ContextTool
  {
  
--- 31,35 ----
   * Provide Template with access to form data.
   */
! public class FormListTool extends ContextTool
  {
  

Index: FormTool.java
===================================================================
RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/servlet/FormTool.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** FormTool.java	16 Jul 2003 06:45:00 -0000	1.10
--- FormTool.java	30 Jul 2003 04:51:17 -0000	1.11
***************
*** 31,35 ****
   * Provide Template with access to form data.
   */
! public class FormTool implements ContextTool
  {
  
--- 31,35 ----
   * Provide Template with access to form data.
   */
! public class FormTool extends ContextTool
  {
  

Index: ListTool.java
===================================================================
RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/servlet/ListTool.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** ListTool.java	16 Jul 2003 06:45:00 -0000	1.6
--- ListTool.java	30 Jul 2003 04:51:17 -0000	1.7
***************
*** 34,38 ****
   * @see ListUtil
   */
! public class ListTool implements ContextTool
  {
  
--- 34,38 ----
   * @see ListUtil
   */
! public class ListTool extends ContextTool
  {
  

Index: LocaleTool.java
===================================================================
RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/servlet/LocaleTool.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** LocaleTool.java	16 Jul 2003 06:45:00 -0000	1.9
--- LocaleTool.java	30 Jul 2003 04:51:17 -0000	1.10
***************
*** 40,44 ****
   * fields e.g., Locale.US
   */
! public class LocaleTool implements ContextTool, Bag
  {
  
--- 40,44 ----
   * fields e.g., Locale.US
   */
! public class LocaleTool extends ContextTool implements Bag
  {
  

Index: MathTool.java
===================================================================
RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/servlet/MathTool.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** MathTool.java	16 Jul 2003 06:45:00 -0000	1.8
--- MathTool.java	30 Jul 2003 04:51:17 -0000	1.9
***************
*** 34,38 ****
   */
  
! public class MathTool implements ContextTool
  {
  
--- 34,38 ----
   */
  
! public class MathTool extends ContextTool
  {
  

Index: RequestTool.java
===================================================================
RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/servlet/RequestTool.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** RequestTool.java	16 Jul 2003 06:45:00 -0000	1.9
--- RequestTool.java	30 Jul 2003 04:51:17 -0000	1.10
***************
*** 31,35 ****
   * Provide Template with access to form data.
   */
! public class RequestTool implements ContextTool
  {
  
--- 31,35 ----
   * Provide Template with access to form data.
   */
! public class RequestTool extends ContextTool
  {
  

Index: ResponseTool.java
===================================================================
RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/servlet/ResponseTool.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** ResponseTool.java	16 Jul 2003 06:45:00 -0000	1.9
--- ResponseTool.java	30 Jul 2003 04:51:17 -0000	1.10
***************
*** 31,35 ****
   * Provide Template with access to form data.
   */
! public class ResponseTool implements ContextTool
  {
  
--- 31,35 ----
   * Provide Template with access to form data.
   */
! public class ResponseTool extends ContextTool
  {
  

Index: SessionTool.java
===================================================================
RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/servlet/SessionTool.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** SessionTool.java	16 Jul 2003 06:45:00 -0000	1.11
--- SessionTool.java	30 Jul 2003 04:51:17 -0000	1.12
***************
*** 34,38 ****
   * with the current request.
   */
! public class SessionTool implements ContextTool
  {
  
--- 34,38 ----
   * with the current request.
   */
! public class SessionTool extends ContextTool
  {
  

Index: TemplateTool.java
===================================================================
RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/servlet/TemplateTool.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** TemplateTool.java	16 Jul 2003 06:45:00 -0000	1.8
--- TemplateTool.java	30 Jul 2003 04:51:17 -0000	1.9
***************
*** 10,13 ****
--- 10,14 ----
  import org.webmacro.PropertyException;
  import org.webmacro.Template;
+ import org.webmacro.ContextTool;
  import org.webmacro.engine.StringTemplate;
  
***************
*** 26,30 ****
   * @version 0.2
   */
! public class TemplateTool implements org.webmacro.ContextTool
  {
  
--- 27,31 ----
   * @version 0.2
   */
! public class TemplateTool extends ContextTool
  {
  

Index: TextTool.java
===================================================================
RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/servlet/TextTool.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** TextTool.java	16 Jul 2003 06:45:00 -0000	1.12
--- TextTool.java	30 Jul 2003 04:51:17 -0000	1.13
***************
*** 42,46 ****
   */
  
! public class TextTool implements ContextTool
  {
  
--- 42,46 ----
   */
  
! public class TextTool extends ContextTool
  {
  

Index: TypeTool.java
===================================================================
RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/servlet/TypeTool.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** TypeTool.java	16 Jul 2003 06:45:00 -0000	1.5
--- TypeTool.java	30 Jul 2003 04:51:17 -0000	1.6
***************
*** 34,38 ****
   * @see org.webmacro.util.CastUtil
   */
! public class TypeTool implements ContextTool
  {
  
--- 34,38 ----
   * @see org.webmacro.util.CastUtil
   */
! public class TypeTool extends ContextTool
  {
  

Index: URLTool.java
===================================================================
RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/servlet/URLTool.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** URLTool.java	16 Jul 2003 06:45:00 -0000	1.5
--- URLTool.java	30 Jul 2003 04:51:17 -0000	1.6
***************
*** 35,39 ****
   * @author Sebastian Kanthak (mailto:ska...@mu...)
   */
! public class URLTool implements ContextTool
  {
  
--- 35,39 ----
   * @author Sebastian Kanthak (mailto:ska...@mu...)
   */
! public class URLTool extends ContextTool
  {
  

Index: VariableTool.java
===================================================================
RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/servlet/VariableTool.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** VariableTool.java	28 Jul 2003 20:56:23 -0000	1.11
--- VariableTool.java	30 Jul 2003 04:51:17 -0000	1.12
***************
*** 35,39 ****
   */
  
! public class VariableTool implements ContextTool
  {
  
--- 35,39 ----
   */
  
! public class VariableTool extends ContextTool
  {