ViewVC Help
View File | Revision Log | Show Annotations | Revision Graph | Root Listing
root/i-scream/projects/cms/source/util/uk/org/iscream/cms/util/XMLPacketMaker.java
(Generate patch)

Comparing projects/cms/source/util/uk/org/iscream/cms/util/XMLPacketMaker.java (file contents):
Revision 1.9 by tdb, Sun Jan 28 05:47:05 2001 UTC vs.
Revision 1.11 by tdb, Sat Mar 10 00:49:39 2001 UTC

# Line 6 | Line 6 | import java.io.*;
6   import java.util.ArrayList;
7  
8   import org.xml.sax.*;
9 + import org.xml.sax.helpers.*;
10   import javax.xml.parsers.SAXParserFactory;
11   import javax.xml.parsers.ParserConfigurationException;
12   import javax.xml.parsers.SAXParser;
# Line 16 | Line 17 | import javax.xml.parsers.SAXParser;
17   * @author  $Author$
18   * @version $Id$
19   */
20 < public class XMLPacketMaker extends HandlerBase {
20 > public class XMLPacketMaker {
21  
22   //---FINAL ATTRIBUTES---
23  
# Line 25 | Line 26 | public class XMLPacketMaker extends HandlerBase {
26       */
27      public final String REVISION = "$Revision$";
28      
29 +    /**
30 +     * A static reference to the system saxParser
31 +     * Use the default (non-validating) parser
32 +     */
33 +    private static SAXParser saxParser = null;
34 +    private static SAXParserFactory factory = SAXParserFactory.newInstance();
35 +    
36   //---STATIC METHODS---
37  
38   //---CONSTRUCTORS---
# Line 45 | Line 53 | public class XMLPacketMaker extends HandlerBase {
53       * class was constructed with.
54       *
55       * @return an XMLPacket representing the XML String given
56 +     * @throws InvalidXMLException if the XML cannot be parsed
57       */
58 <    public XMLPacket createXMLPacket() {
58 >    public XMLPacket createXMLPacket() throws InvalidXMLException {
59  
60          // Create the XMLPacket to store values in.
61          XMLPacket packet = new XMLPacket();
62 <
54 <        // Use the default (non-validating) parser
55 <        SAXParserFactory factory = SAXParserFactory.newInstance();
62 >        
63          try {
57
64              // Parse the input
65              InputSource inputSource = new InputSource(new StringReader(_xml));
66 <            SAXParser saxParser = factory.newSAXParser();
66 >            
67 >            if (saxParser == null) {
68 >                saxParser = factory.newSAXParser();
69 >            }
70 >            
71              saxParser.parse(inputSource, new XMLStringParser(packet));
62
72          }
73          catch (Exception e) {
74 <            return null;
74 >            // couldn't parse the XML for some reason
75 >            throw new InvalidXMLException("Could not parse the XML: "+_xml);
76          }
77 <        
77 >        // parsed successfully, return the packet
78          return packet;
79      }
80  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines