--- projects/cms/source/util/uk/org/iscream/cms/util/XMLStringParser.java	2001/01/28 05:47:05	1.6
+++ projects/cms/source/util/uk/org/iscream/cms/util/XMLStringParser.java	2001/03/14 23:25:30	1.11
@@ -1,29 +1,27 @@
 //---PACKAGE DECLARATION---
-package uk.ac.ukc.iscream.util;
+package uk.org.iscream.util;
 
 //---IMPORTS---
 import java.io.*;
 import java.util.ArrayList;
-
 import org.xml.sax.*;
-import javax.xml.parsers.SAXParserFactory;
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.parsers.SAXParser;
+import org.xml.sax.helpers.*;
+import javax.xml.parsers.*;
 
 /**
  * XMLStringParser - Used to assist in creating XMLPacket objects.
  *
  * @author  $Author: tdb $
- * @version $Id: XMLStringParser.java,v 1.6 2001/01/28 05:47:05 tdb Exp $
+ * @version $Id: XMLStringParser.java,v 1.11 2001/03/14 23:25:30 tdb Exp $
  */
-public class XMLStringParser extends HandlerBase {
+public class XMLStringParser extends DefaultHandler {
 
 //---FINAL ATTRIBUTES---
 
     /**
      * The current CVS revision of this class
      */
-    public final String REVISION = "$Revision: 1.6 $";
+    public final String REVISION = "$Revision: 1.11 $";
     
 //---STATIC METHODS---
 
@@ -33,38 +31,24 @@ public class XMLStringParser extends HandlerBase {
      * 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 <packet> is the root node, then:
@@ -73,26 +57,26 @@ public class XMLStringParser extends HandlerBase {
      *     "packet.attributes.machine_name"
      * within the XMLPacket.
      */
-    public void startElement (String name, AttributeList attrs) throws SAXException {
-        indentLevel++;
-        tagList.add(name);
-        if (attrs != null) {
-            for (int i = 0; i < attrs.getLength (); i++) {
-                packet.addParam(getPath()+".attributes."+attrs.getName(i), attrs.getValue(i));
+    public void startElement (String uri, String name, String qName, Attributes atts) {
+	    _indentLevel++;
+        _tagList.add(name);
+        if (atts != null) {
+            for (int i = 0; i < atts.getLength (); i++) {
+                _packet.addParam(getPath()+".attributes."+atts.getLocalName(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.remove(_tagList.size() - 1);    
+        _indentLevel--;
     }
-
+    
     /**
      * Any text falling within a pair of terminal tags must
      * be added to the XMLPacket.  Trim leading and trailing
@@ -101,16 +85,14 @@ public class XMLStringParser extends HandlerBase {
      */
     public void characters (char[] buf, int offset, int len) throws SAXException {
         String s = new String(buf, offset, len);
-        if (!s.trim().equals("")) {
-            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.util.NameFormat class
      * to format the toString()
      *
      * @return the name of this class and its CVS revision
@@ -133,10 +115,10 @@ public class XMLStringParser extends HandlerBase {
      * 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 = (String) _tagList.get(0);
+        if (_tagList.size() > 0) {
+            for (int i = 1 ; i < _tagList.size() ; i++) {
+                path = path + "." + (String) _tagList.get(i);
             }
         }
         return path;
@@ -144,22 +126,29 @@ public class XMLStringParser extends HandlerBase {
 
 //---ACCESSOR/MUTATOR METHODS---
 
+    /**
+     * Accessor to the XMLPacket.
+     */ 
+    public XMLPacket getXMLPacket() {
+        return _packet;
+    }
+
 //---ATTRIBUTES---
 
     /**
      * To keep track of our identation level
      */
-    private int indentLevel = 0;
+    private int _indentLevel = 0;
     
     /**
      * An ArrayList of tags
      */
-    private ArrayList tagList = new ArrayList();
+    private ArrayList _tagList = new ArrayList();
     
     /**
      * A reference to the XMLPacket we are making
      */
-    private XMLPacket packet;
+    private XMLPacket _packet;
     
     /**
      * This is the friendly identifier of the