--- projects/cms/source/util/uk/org/iscream/cms/util/XMLStringParser.java 2001/03/16 01:33:46 1.12 +++ projects/cms/source/util/uk/org/iscream/cms/util/XMLStringParser.java 2002/05/18 18:16:04 1.15 @@ -1,5 +1,24 @@ +/* + * i-scream central monitoring system + * 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.org.iscream.util; +package uk.org.iscream.cms.server.util; //---IMPORTS--- import java.io.*; @@ -13,7 +32,7 @@ import javax.xml.parsers.*; * XMLStringParser - Used to assist in creating XMLPacket objects. * * @author $Author: tdb $ - * @version $Id: XMLStringParser.java,v 1.12 2001/03/16 01:33:46 tdb Exp $ + * @version $Id: XMLStringParser.java,v 1.15 2002/05/18 18:16:04 tdb Exp $ */ public class XMLStringParser extends DefaultHandler { @@ -22,7 +41,7 @@ public class XMLStringParser extends DefaultHandler { /** * The current CVS revision of this class */ - public final String REVISION = "$Revision: 1.12 $"; + public final String REVISION = "$Revision: 1.15 $"; //---STATIC METHODS--- @@ -59,10 +78,10 @@ public class XMLStringParser extends DefaultHandler { * within the XMLPacket. */ public void startElement (String uri, String name, String qName, Attributes atts) { - _tagList.addLast(name); + _tagList.addLast(qName); if (atts != null) { for (int i = 0; i < atts.getLength (); i++) { - _packet.addParam(getPath()+".attributes."+atts.getLocalName(i), atts.getValue(i)); + _packet.addParam(getPath()+".attributes."+atts.getQName(i), atts.getValue(i)); } } } @@ -91,7 +110,7 @@ public class XMLStringParser extends DefaultHandler { * Overrides the {@link java.lang.Object#toString() Object.toString()} * method to provide clean logging (every class should have this). * - * This uses the uk.org.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