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.11 by tdb, Sat Mar 10 00:49:39 2001 UTC vs.
Revision 1.18 by tdb, Tue May 21 16:47:20 2002 UTC

# Line 1 | Line 1
1 + /*
2 + * i-scream central monitoring system
3 + * http://www.i-scream.org.uk
4 + * Copyright (C) 2000-2002 i-scream
5 + *
6 + * This program is free software; you can redistribute it and/or
7 + * modify it under the terms of the GNU General Public License
8 + * as published by the Free Software Foundation; either version 2
9 + * of the License, or (at your option) any later version.
10 + *
11 + * This program is distributed in the hope that it will be useful,
12 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
13 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
14 + * GNU General Public License for more details.
15 + *
16 + * You should have received a copy of the GNU General Public License
17 + * along with this program; if not, write to the Free Software
18 + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
19 + */
20 +
21   //---PACKAGE DECLARATION---
22 < package uk.ac.ukc.iscream.util;
22 > package uk.org.iscream.cms.server.util;
23  
24   //---IMPORTS---
25   import java.io.*;
6 import java.util.ArrayList;
7
26   import org.xml.sax.*;
27 < import org.xml.sax.helpers.*;
10 < import javax.xml.parsers.SAXParserFactory;
11 < import javax.xml.parsers.ParserConfigurationException;
12 < import javax.xml.parsers.SAXParser;
27 > import javax.xml.parsers.*;
28  
29   /**
30   * XMLPacketMaker - Creates an XMLPacket object.
# Line 25 | Line 40 | public class XMLPacketMaker {
40       * The current CVS revision of this class
41       */
42      public final String REVISION = "$Revision$";
43 <    
44 <    /**
45 <     * A static reference to the system saxParser
46 <     * Use the default (non-validating) parser
47 <     */
33 <    private static SAXParser saxParser = null;
34 <    private static SAXParserFactory factory = SAXParserFactory.newInstance();
43 >
44 >    /**
45 >     * A reference to the system saxParser factory
46 >     */
47 >    private final SAXParserFactory _factory = SAXParserFactory.newInstance();
48      
49   //---STATIC METHODS---
50  
51   //---CONSTRUCTORS---
52  
40    /**
41     * Constructor for accepting XML input.
42     *
43     * @param xml A String of XML to process.
44     */
45    public XMLPacketMaker (String xml) {
46        _xml = xml;
47    }
48
53   //---PUBLIC METHODS---
54  
55      /**
56       * Method to create an XML packet from the data this
57       * class was constructed with.
58       *
59 +     * @param xml the XML String to parse
60       * @return an XMLPacket representing the XML String given
61       * @throws InvalidXMLException if the XML cannot be parsed
62       */
63 <    public XMLPacket createXMLPacket() throws InvalidXMLException {
63 >    public XMLPacket createXMLPacket(String xml) throws InvalidXMLException {
64  
65          // Create the XMLPacket to store values in.
66          XMLPacket packet = new XMLPacket();
67          
68          try {
69              // Parse the input
70 <            InputSource inputSource = new InputSource(new StringReader(_xml));
71 <            
67 <            if (saxParser == null) {
68 <                saxParser = factory.newSAXParser();
69 <            }
70 <            
71 <            saxParser.parse(inputSource, new XMLStringParser(packet));
70 >            InputSource inputSource = new InputSource(new StringReader(xml));
71 >            _factory.newSAXParser().parse(inputSource, new XMLStringParser(packet));
72          }
73          catch (Exception e) {
74              // couldn't parse the XML for some reason
75 <            throw new InvalidXMLException("Could not parse the XML: "+_xml);
75 >            throw new InvalidXMLException("Could not parse the XML: "+xml);
76          }
77 +        
78          // parsed successfully, return the packet
79          return packet;
80      }
# Line 82 | Line 83 | public class XMLPacketMaker {
83       * Overrides the {@link java.lang.Object#toString() Object.toString()}
84       * method to provide clean logging (every class should have this).
85       *
86 <     * This uses the uk.ac.ukc.iscream.util.NameFormat class
86 >     * This uses the uk.org.iscream.cms.server.util.NameFormat class
87       * to format the toString()
88       *
89       * @return the name of this class and its CVS revision
# Line 99 | Line 100 | public class XMLPacketMaker {
100   //---ACCESSOR/MUTATOR METHODS---
101  
102   //---ATTRIBUTES---
102
103    /**
104     * Holds the xml
105     */
106    String _xml;
103      
104      /**
105       * This is the friendly identifier of the

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines