--- projects/cms/source/util/uk/org/iscream/cms/util/XMLStringParser.java 2001/03/10 00:49:39 1.8 +++ projects/cms/source/util/uk/org/iscream/cms/util/XMLStringParser.java 2004/08/01 10:41:08 1.18 @@ -1,21 +1,39 @@ +/* + * i-scream central monitoring system + * http://www.i-scream.org + * Copyright (C) 2000-2002 i-scream + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + */ + //---PACKAGE DECLARATION--- -package uk.ac.ukc.iscream.util; +package uk.org.iscream.cms.util; //---IMPORTS--- import java.io.*; -import java.util.ArrayList; - +import java.util.LinkedList; +import java.util.Iterator; import org.xml.sax.*; import org.xml.sax.helpers.*; -import javax.xml.parsers.SAXParserFactory; -import javax.xml.parsers.ParserConfigurationException; -import javax.xml.parsers.SAXParser; +import javax.xml.parsers.*; /** * XMLStringParser - Used to assist in creating XMLPacket objects. * * @author $Author: tdb $ - * @version $Id: XMLStringParser.java,v 1.8 2001/03/10 00:49:39 tdb Exp $ + * @version $Id: XMLStringParser.java,v 1.18 2004/08/01 10:41:08 tdb Exp $ */ public class XMLStringParser extends DefaultHandler { @@ -24,7 +42,7 @@ public class XMLStringParser extends DefaultHandler { /** * The current CVS revision of this class */ - public final String REVISION = "$Revision: 1.8 $"; + public final String REVISION = "$Revision: 1.18 $"; //---STATIC METHODS--- @@ -34,38 +52,24 @@ public class XMLStringParser extends DefaultHandler { * No-args constructor. Generally not used. */ public XMLStringParser () { - this.packet = new XMLPacket(); + _packet = new XMLPacket(); } /** * Constructor for accepting a reference to an XMLPacket */ public XMLStringParser (XMLPacket packet) { - this.packet = packet; + _packet = packet; } //---PUBLIC METHODS--- - /** - * Accessor to the XMLPacket. - */ - public XMLPacket getXMLPacket() { - return packet; - } - //=========================================================== // SAX DocumentHandler methods //=========================================================== - public void startDocument () throws SAXException { - //System.out.println("XMLPacketParser - Starting parse process..."); - } - - public void endDocument () throws SAXException { - //System.out.println("XMLPacketParser - I just finished parsing an XML String."); - } - - /** Add each tag's attribute to the XMLPacket. + /** + * Add each tag's attribute to the XMLPacket. * Note that all attributes within an opening tag are * stored as "someroot.sometag.attributes.attribute_name" * E.g. If is the root node, then: @@ -74,26 +78,24 @@ public class XMLStringParser extends DefaultHandler { * "packet.attributes.machine_name" * within the XMLPacket. */ - public void startElement (String name, Attributes attrs) throws SAXException { - indentLevel++; - tagList.add(name); - if (attrs != null) { - for (int i = 0; i < attrs.getLength (); i++) { - packet.addParam(getPath()+".attributes."+attrs.getLocalName(i), attrs.getValue(i)); + public void startElement (String uri, String name, String qName, Attributes atts) { + _tagList.addLast(qName); + if (atts != null) { + for (int i = 0; i < atts.getLength (); i++) { + _packet.addParam(getPath()+".attributes."+atts.getQName(i), atts.getValue(i)); } } } - + /** * When an XML element is finished with, we must remove * the tag name from the tagList and decrement the indent * level. */ - public void endElement (String name) throws SAXException { - tagList.remove(tagList.size()-1); - indentLevel--; + public void endElement (String uri, String name, String qName) { + _tagList.removeLast(); } - + /** * Any text falling within a pair of terminal tags must * be added to the XMLPacket. Trim leading and trailing @@ -102,14 +104,14 @@ public class XMLStringParser extends DefaultHandler { */ public void characters (char[] buf, int offset, int len) throws SAXException { String s = new String(buf, offset, len); - packet.addParam(getPath(), s); + _packet.addParam(getPath(), s); } /** * Overrides the {@link java.lang.Object#toString() Object.toString()} * method to provide clean logging (every class should have this). * - * This uses the uk.ac.ukc.iscream.util.NameFormat class + * This uses the uk.org.iscream.cms.server.util.NameFormat class * to format the toString() * * @return the name of this class and its CVS revision @@ -132,10 +134,12 @@ public class XMLStringParser extends DefaultHandler { * in the XMLPacket. */ private String getPath () { - String path = (String)tagList.get(0); - if (tagList.size() > 0) { - for (int i = 1 ; i < tagList.size() ; i++) { - path = path + "." + (String)tagList.get(i); + String path = ""; + if (_tagList.size() > 0) { + Iterator i = _tagList.iterator(); + path = (String) i.next(); + while(i.hasNext()) { + path = path + "." + (String) i.next(); } } return path; @@ -143,22 +147,24 @@ public class XMLStringParser extends DefaultHandler { //---ACCESSOR/MUTATOR METHODS--- -//---ATTRIBUTES--- - /** - * To keep track of our identation level - */ - private int indentLevel = 0; + * Accessor to the XMLPacket. + */ + public XMLPacket getXMLPacket() { + return _packet; + } + +//---ATTRIBUTES--- /** - * An ArrayList of tags + * A LinkedList of tags */ - private ArrayList tagList = new ArrayList(); + private LinkedList _tagList = new LinkedList(); /** * A reference to the XMLPacket we are making */ - private XMLPacket packet; + private XMLPacket _packet; /** * This is the friendly identifier of the