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.10 by tdb, Thu Mar 1 16:55:11 2001 UTC vs.
Revision 1.15 by tdb, Fri Mar 16 00:39:42 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 >    /**
25 >     * A reference to the system saxParser factory
26 >     */
27 >    private final SAXParserFactory _factory = SAXParserFactory.newInstance();
28 >    
29   //---STATIC METHODS---
30  
31   //---CONSTRUCTORS---
32  
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
33   //---PUBLIC METHODS---
34  
35      /**
36       * Method to create an XML packet from the data this
37       * class was constructed with.
38       *
39 +     * @param xml the XML String to parse
40       * @return an XMLPacket representing the XML String given
41       * @throws InvalidXMLException if the XML cannot be parsed
42       */
43 <    public XMLPacket createXMLPacket() throws InvalidXMLException {
43 >    public XMLPacket createXMLPacket(String xml) throws InvalidXMLException {
44  
45          // Create the XMLPacket to store values in.
46          XMLPacket packet = new XMLPacket();
47 <
55 <        // Use the default (non-validating) parser
56 <        SAXParserFactory factory = SAXParserFactory.newInstance();
47 >        
48          try {
49              // Parse the input
50 <            InputSource inputSource = new InputSource(new StringReader(_xml));
51 <            SAXParser saxParser = factory.newSAXParser();
61 <            saxParser.parse(inputSource, new XMLStringParser(packet));
50 >            InputSource inputSource = new InputSource(new StringReader(xml));
51 >            _factory.newSAXParser().parse(inputSource, new XMLStringParser(packet));
52          }
53          catch (Exception e) {
54              // couldn't parse the XML for some reason
55 <            throw new InvalidXMLException("Could not parse the XML: "+_xml);
55 >            throw new InvalidXMLException("Could not parse the XML: "+xml);
56          }
57 +        
58          // parsed successfully, return the packet
59          return packet;
60      }
# Line 72 | Line 63 | public class XMLPacketMaker extends HandlerBase {
63       * Overrides the {@link java.lang.Object#toString() Object.toString()}
64       * method to provide clean logging (every class should have this).
65       *
66 <     * This uses the uk.ac.ukc.iscream.util.NameFormat class
66 >     * This uses the uk.org.iscream.util.NameFormat class
67       * to format the toString()
68       *
69       * @return the name of this class and its CVS revision
# Line 89 | Line 80 | public class XMLPacketMaker extends HandlerBase {
80   //---ACCESSOR/MUTATOR METHODS---
81  
82   //---ATTRIBUTES---
92
93    /**
94     * Holds the xml
95     */
96    String _xml;
83      
84      /**
85       * This is the friendly identifier of the

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines