--- projects/cms/source/util/uk/org/iscream/cms/util/XMLPacketMaker.java 2000/11/29 19:11:53 1.3 +++ projects/cms/source/util/uk/org/iscream/cms/util/XMLPacketMaker.java 2000/12/07 23:26:16 1.6 @@ -1,5 +1,5 @@ //---PACKAGE DECLARATION--- -package uk.ac.ukc.iscream.xml; +package uk.ac.ukc.iscream.util; //---IMPORTS--- import java.io.*; @@ -16,7 +16,7 @@ import uk.ac.ukc.iscream.core.*; * XMLPacketMaker - Creates an XMLPacket object. * * @author $Author: tdb $ - * @version $Id: XMLPacketMaker.java,v 1.3 2000/11/29 19:11:53 tdb Exp $ + * @version $Id: XMLPacketMaker.java,v 1.6 2000/12/07 23:26:16 tdb Exp $ */ public class XMLPacketMaker extends HandlerBase { @@ -25,16 +25,15 @@ public class XMLPacketMaker extends HandlerBase { /** * The current CVS revision of this class */ - public final String REVISION = "$Revision: 1.3 $"; + public final String REVISION = "$Revision: 1.6 $"; //---STATIC METHODS--- //---CONSTRUCTORS--- // Constructor for accepting XML input. - public XMLPacketMaker (String xml, Logger logger) { - this.xml = xml; - this.logger = logger; + public XMLPacketMaker (String xml) { + _xml = xml; } //---PUBLIC METHODS--- @@ -49,14 +48,14 @@ public class XMLPacketMaker extends HandlerBase { try { // Parse the input - InputSource inputSource = new InputSource(new StringReader(xml)); + InputSource inputSource = new InputSource(new StringReader(_xml)); SAXParser saxParser = factory.newSAXParser(); saxParser.parse(inputSource, new XMLStringParser(packet)); } catch (Exception e) { - logger.write(this.toString(), Logger.WARNING, "An invalid XML UDP packet has been detected: "+packet.printAll()); - //t.printStackTrace(); + _logger.write(this.toString(), Logger.WARNING, e.toString()); + _logger.write(this.toString(), Logger.WARNING, "An invalid XML UDP packet has been detected: "+packet.printAll()); return null; } @@ -79,8 +78,8 @@ public class XMLPacketMaker extends HandlerBase { //---ATTRIBUTES--- - String xml; - Logger logger; + String _xml; + Logger _logger = ReferenceManager.getInstance().getLogger(); //---STATIC ATTRIBUTES---