--- projects/cms/source/util/uk/org/iscream/cms/util/ReferenceManager.java	2000/12/12 17:13:22	1.6
+++ projects/cms/source/util/uk/org/iscream/cms/util/ReferenceManager.java	2000/12/12 18:24:53	1.7
@@ -19,7 +19,7 @@ import uk.ac.ukc.iscream.core.*;
  * a component.
  *
  * @author  $Author: ajm $
- * @version $Id: ReferenceManager.java,v 1.6 2000/12/12 17:13:22 ajm Exp $
+ * @version $Id: ReferenceManager.java,v 1.7 2000/12/12 18:24:53 ajm Exp $
  */
 public class ReferenceManager {
 
@@ -28,13 +28,13 @@ public class ReferenceManager {
     /**
      * The current CVS revision of this class
      */
-    public final String REVISION = "$Revision: 1.6 $";
+    public final String REVISION = "$Revision: 1.7 $";
     
 //---STATIC METHODS---
 
     /**
      * TO BE REMOVED ONCE CODE TIDY HAS COMPLETED!
-     * @deprecated should know longer use this method to construct a refman
+     * @deprecated should no longer use this method to construct a refman
      */
     public static ReferenceManager init(String[] args, String name) throws AlreadyInitialisedException {
         System.out.println("LEGACY CALL - SORT THIS OUT! name=" + name);
@@ -73,7 +73,7 @@ public class ReferenceManager {
     
     /**
      * TO BE REMOVED ONCE CODE TIDY HAS COMPLETED!
-     * @deprecated should know longer use this method to construct a refman
+     * @deprecated should no longer use this method to construct a refman
      */
     private ReferenceManager(String[] args, String name) {
         System.out.println("LEGACY CALL - SORT THIS OUT! name=" + name);
@@ -86,7 +86,7 @@ public class ReferenceManager {
     /**
      * Obtains a CORBA reference through the naming service
      * for the named object.
-     * This will throw a Error if there is an error
+     * Calls the dieWithError() if any exceptions happen!
      *
      * @param name the name of the CORBA object to resolve
      *
@@ -112,7 +112,7 @@ public class ReferenceManager {
     /** 
      * Binds a given servant with the given name
      * to the naming service.
-     * Calls the dieWithError()!
+     * Calls the dieWithError() if any exceptions happen!
      *
      * @param objRef a reverence to the servant object
      * @param name the name to bind to the naming service with
@@ -143,7 +143,7 @@ public class ReferenceManager {
     
     /**
      * Activates the POA
-     * This will throw a Error if there is an error
+     * Calls the dieWithError() if any exceptions happen!
      */
     public void activatePOA() {
         try {
@@ -165,8 +165,8 @@ public class ReferenceManager {
      */
     public String toString() {
         return FormatName.getName(
-            null,
-            this.getClass().getName(),
+            _name,
+            getClass().getName(),
             REVISION);
     }
 
@@ -206,7 +206,7 @@ public class ReferenceManager {
 
     /**
      * Returns a reference to the Root POA
-     * This will throw a Error if there is an error
+     * Calls the dieWithError() if any exceptions happen!
      *
      * @return the reference this class holds
      */
@@ -226,7 +226,7 @@ public class ReferenceManager {
     
     /**
      * Returns a reference to the Naming Service
-     * This will throw a Error if there is an error
+     * Calls the dieWithError() if any exceptions happen!
      *
      * @return the reference this class holds
      */
@@ -251,7 +251,7 @@ public class ReferenceManager {
     
     /**
      * Returns a reference to the configuration manager
-     * This will throw a Error if there is an error
+     * Calls the dieWithError() if any exceptions happen!
      *
      * @return the reference this class holds
      */
@@ -330,11 +330,15 @@ public class ReferenceManager {
     private Logger _logger;
     
     /**
-     * The name
-     * TO BE REMOVED ONCE CODE TIDY HAS COMPLETED!
-     * @deprecated not stored in the refman any more - see Template.class
+     * 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;
+    private String _name = null;
 
 //---STATIC ATTRIBUTES---