--- 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/12 20:44:30	1.7
@@ -1,5 +1,5 @@
 //---PACKAGE DECLARATION---
-package uk.ac.ukc.iscream.xml;
+package uk.ac.ukc.iscream.util;
 
 //---IMPORTS---
 import java.io.*;
@@ -15,8 +15,8 @@ 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 $
+ * @author  $Author: ajm $
+ * @version $Id: XMLPacketMaker.java,v 1.7 2000/12/12 20:44:30 ajm 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.7 $";
     
 //---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;
         }
         
@@ -67,10 +66,16 @@ public class XMLPacketMaker extends HandlerBase {
      * 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
+     * to format the toString()
+     *
      * @return the name of this class and its CVS revision
      */
     public String toString() {
-        return this.getClass().getName() + "(" + REVISION.substring(11, REVISION.length() - 2) + ")";
+        return FormatName.getName(
+            _name,
+            getClass().getName(),
+            REVISION);
     }
 
 //---PRIVATE METHODS---
@@ -79,8 +84,27 @@ public class XMLPacketMaker extends HandlerBase {
 
 //---ATTRIBUTES---
 
-    String xml;
-    Logger logger;
+    /**
+     * Holds the xml
+     */
+    String _xml;
+    
+    /**
+     * This holds a reference to the
+     * system logger that is being used.
+     */
+    private Logger _logger = ReferenceManager.getInstance().getLogger();
+    
+    /**
+     * This is the friendly identifier of the
+     * component this class is running in.
+     * eg, a Filter may be called "filter1",
+     * If this class does not have an owning
+     * component,  a name from the configuration
+     * can be placed here.  This name could also
+     * be changed to null for utility classes.
+     */
+    private String _name = null;
 
 //---STATIC ATTRIBUTES---