CVS: Tapestry/framework/src/net/sf/tapestry/util/xml AbstractDocumentParser.java,1.11.2.4,1.11.2.5

Update of /cvsroot/tapestry/Tapestry/framework/src/net/sf/tapestry/util/xml
In directory sc8-pr-cvs1:/tmp/cvs-serv2336/framework/src/net/sf/tapestry/util/xml

Modified Files:
      Tag: hship-2-3
	AbstractDocumentParser.java 
Log Message:
Add support for <listener-binding>.
Use a ResourceBundle for "factory default" configuration properties.

Index: AbstractDocumentParser.java
===================================================================
RCS file: /cvsroot/tapestry/Tapestry/framework/src/net/sf/tapestry/util/xml/AbstractDocumentParser.java,v
retrieving revision 1.11.2.4
retrieving revision 1.11.2.5
diff -C2 -d -r1.11.2.4 -r1.11.2.5
*** AbstractDocumentParser.java	2 Jan 2003 03:03:24 -0000	1.11.2.4
--- AbstractDocumentParser.java	4 Jan 2003 02:46:46 -0000	1.11.2.5
***************
*** 1,5 ****
  package net.sf.tapestry.util.xml;
  
- import java.io.BufferedInputStream;
  import java.io.IOException;
  import java.io.InputStream;
--- 1,4 ----
***************
*** 21,25 ****
  import org.apache.oro.text.regex.Perl5Matcher;
  import org.w3c.dom.Document;
- import org.w3c.dom.DocumentType;
  import org.w3c.dom.Element;
  import org.w3c.dom.NamedNodeMap;
--- 20,23 ----
***************
*** 139,143 ****
  
      /** 
!      * Invoked by subclasses to parse a document.  Obtains (or re-uses) a
       *  {@link DocumentBuilder} and parses the document from the {@link InputSource}.
       *
--- 137,141 ----
  
      /** 
!      *  Invoked by subclasses to parse a document.  Obtains (or re-uses) a
       *  {@link DocumentBuilder} and parses the document from the {@link InputSource}.
       *
***************
*** 167,188 ****
                  resourceLocation);
  
-         InputStream inputStream = null;
- 
          try
          {
  
!             inputStream = url.openStream();
! 
!             if (inputStream == null)
!                 throw new DocumentParseException(
!                     Tapestry.getString("AbstractDocumentParser.unable-to-open-resource", url, resourceLocation),
!                     resourceLocation);
! 
!             // Wrapping in a buffered input stream seems to provide a slight
!             // speed improvement.
! 
!             inputStream = new BufferedInputStream(inputStream);
! 
!             InputSource source = new InputSource(inputStream);
  
              if (_builder == null)
--- 165,172 ----
                  resourceLocation);
  
          try
          {
  
!             InputSource source = new InputSource(url.toExternalForm());
  
              if (_builder == null)
***************
*** 210,216 ****
              validateRootElement(document, rootElementName);
  
-             inputStream.close();
-             inputStream = null;
- 
              return document;
          }
--- 194,197 ----
***************
*** 246,251 ****
          finally
          {
-             Tapestry.close(inputStream);
- 
              // If there was an error, discard the builder --- it may be in
              // an unknown and unusable state.
--- 227,230 ----



-------------------------------------------------------
This sf.net email is sponsored by:ThinkGeek
Welcome to geek heaven.
http://thinkgeek.com/sf