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.14 by tdb, Wed Mar 14 23:25:30 2001 UTC

# Line 1 | Line 1
1   //---PACKAGE DECLARATION---
2 < package uk.ac.ukc.iscream.util;
2 > package uk.org.iscream.util;
3  
4   //---IMPORTS---
5   import java.io.*;
6 import java.util.ArrayList;
7
6   import org.xml.sax.*;
7 < import javax.xml.parsers.SAXParserFactory;
10 < import javax.xml.parsers.ParserConfigurationException;
11 < import javax.xml.parsers.SAXParser;
7 > import javax.xml.parsers.*;
8  
9   /**
10   * XMLPacketMaker - Creates an XMLPacket object.
# Line 16 | Line 12 | import javax.xml.parsers.SAXParser;
12   * @author  $Author$
13   * @version $Id$
14   */
15 < public class XMLPacketMaker extends HandlerBase {
15 > public class XMLPacketMaker {
16  
17   //---FINAL ATTRIBUTES---
18  
# Line 24 | Line 20 | public class XMLPacketMaker extends HandlerBase {
20       * The current CVS revision of this class
21       */
22      public final String REVISION = "$Revision$";
23 <    
23 >    
24   //---STATIC METHODS---
25  
26   //---CONSTRUCTORS---
27  
32    /**
33     * Constructor for accepting XML input.
34     *
35     * @param xml A String of XML to process.
36     */
37    public XMLPacketMaker (String xml) {
38        _xml = xml;
39    }
40
28   //---PUBLIC METHODS---
29  
30      /**
31       * Method to create an XML packet from the data this
32       * class was constructed with.
33       *
34 +     * @param xml the XML String to parse
35       * @return an XMLPacket representing the XML String given
36 +     * @throws InvalidXMLException if the XML cannot be parsed
37       */
38 <    public XMLPacket createXMLPacket() {
38 >    public XMLPacket createXMLPacket(String xml) throws InvalidXMLException {
39  
40          // Create the XMLPacket to store values in.
41          XMLPacket packet = new XMLPacket();
42 <
54 <        // Use the default (non-validating) parser
55 <        SAXParserFactory factory = SAXParserFactory.newInstance();
42 >        
43          try {
57
44              // Parse the input
45 <            InputSource inputSource = new InputSource(new StringReader(_xml));
46 <            SAXParser saxParser = factory.newSAXParser();
61 <            saxParser.parse(inputSource, new XMLStringParser(packet));
62 <
45 >            InputSource inputSource = new InputSource(new StringReader(xml));
46 >            _factory.newSAXParser().parse(inputSource, new XMLStringParser(packet));
47          }
48          catch (Exception e) {
49 <            return null;
49 >            // couldn't parse the XML for some reason
50 >            throw new InvalidXMLException("Could not parse the XML: "+xml);
51          }
52          
53 +        // parsed successfully, return the packet
54          return packet;
55      }
56  
# Line 72 | Line 58 | public class XMLPacketMaker extends HandlerBase {
58       * Overrides the {@link java.lang.Object#toString() Object.toString()}
59       * method to provide clean logging (every class should have this).
60       *
61 <     * This uses the uk.ac.ukc.iscream.util.NameFormat class
61 >     * This uses the uk.org.iscream.util.NameFormat class
62       * to format the toString()
63       *
64       * @return the name of this class and its CVS revision
# Line 89 | Line 75 | public class XMLPacketMaker extends HandlerBase {
75   //---ACCESSOR/MUTATOR METHODS---
76  
77   //---ATTRIBUTES---
92
93    /**
94     * Holds the xml
95     */
96    String _xml;
78      
79      /**
80       * This is the friendly identifier of the
# Line 107 | Line 88 | public class XMLPacketMaker extends HandlerBase {
88      private String _name = null;
89  
90   //---STATIC ATTRIBUTES---
91 +
92 +    /**
93 +     * A static reference to the system saxParser factory
94 +     */
95 +    private static SAXParserFactory _factory = SAXParserFactory.newInstance();
96  
97   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines