You are viewing a plain text version of this content. The canonical link for it is here.
Posted to taglibs-dev@jakarta.apache.org by mo...@apache.org on 2001/09/20 00:25:32 UTC

cvs commit: jakarta-taglibs-sandbox/latka-taglib/src/org/apache/taglibs/latka FindVariablesTag.java

morgand     01/09/19 15:25:32

  Modified:    latka-taglib/src/org/apache/taglibs/latka
                        FindVariablesTag.java
  Log:
  updated to new XML preprocessing format
  
  Revision  Changes    Path
  1.3       +7 -3      jakarta-taglibs-sandbox/latka-taglib/src/org/apache/taglibs/latka/FindVariablesTag.java
  
  Index: FindVariablesTag.java
  ===================================================================
  RCS file: /home/cvs/jakarta-taglibs-sandbox/latka-taglib/src/org/apache/taglibs/latka/FindVariablesTag.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- FindVariablesTag.java	2001/09/06 15:19:50	1.2
  +++ FindVariablesTag.java	2001/09/19 22:25:32	1.3
  @@ -10,6 +10,7 @@
   import javax.servlet.jsp.JspTagException;
   import javax.servlet.jsp.tagext.BodyTagSupport;
   
  +import org.apache.commons.latka.Suite;
   import org.apache.commons.latka.xml.XMLPreprocessor;
   
   /**
  @@ -53,15 +54,18 @@
   
     public int doEndTag() throws JspTagException {
   
  -    XMLPreprocessor processor = new XMLPreprocessor();
       Set set = null;
   
       try {
  +      Suite suite = null;
         if (_url != null) {
  -        set = processor.findVariables(new URL(_url));
  +        suite = new Suite(new URL(_url));
         } else {
  -        set = processor.findVariables(_bodyContent);
  +        suite = new Suite(_bodyContent);
         }
  +      
  +      XMLPreprocessor processor = XMLPreprocessor.instance();
  +      set = processor.findVariables(suite);
       } catch (IOException e) {
         e.printStackTrace();
         throw new JspTagException(e.toString());