--- projects/cms/source/TemplateClass.java	2000/12/07 21:16:10	1.7
+++ projects/cms/source/TemplateClass.java	2002/05/21 16:47:10	1.14
@@ -1,15 +1,35 @@
+/* 
+ * i-scream central monitoring system
+ * http://www.i-scream.org.uk
+ * 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---
 
 //---IMPORTS---
-import uk.ac.ukc.iscream.util.IscreamNamer;
-import uk.ac.ukc.iscream.util.ReferenceManager;
+import uk.org.iscream.cms.server.util.*;
+import uk.org.iscream.cms.server.componentmanager.*;
 
 /**
  * <ONE LINE DESCRIPTION>
  * <DETAILED DESCRIPTION>
  *
  * @author  $Author: tdb $
- * @version $Id: TemplateClass.java,v 1.7 2000/12/07 21:16:10 tdb Exp $
+ * @version $Id: TemplateClass.java,v 1.14 2002/05/21 16:47:10 tdb Exp $
  */
 class TemplateClass {
 
@@ -18,7 +38,7 @@ class TemplateClass {
     /**
      * The current CVS revision of this class
      */
-    public static final String REVISION = "$Revision: 1.7 $";
+    public static final String REVISION = "$Revision: 1.14 $";
     
 //---STATIC METHODS---
 
@@ -30,12 +50,15 @@ class TemplateClass {
      * 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.cms.server.util.FormatName class
+     * to format the toString()
+     *
      * @return the name of this class and its CVS revision
      */
     public String toString() {
-        return uk.ac.ukc.iscream.util.IscreamNamer.formatName(
-            uk.ac.ukc.iscream.util.ReferenceManager.getInstance().getName(),
-            this.getClass().getName(),
+        return FormatName.getName(
+            _name,
+            getClass().getName(),
             REVISION);
     }
 
@@ -44,6 +67,23 @@ class TemplateClass {
 //---ACCESSOR/MUTATOR METHODS---
 
 //---ATTRIBUTES---
+
+    /**
+     * 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 = <!THIS SHOULD CALL A STATIC NAME IN THE COMPONENT CLASS FOR THIS OBJECT!>;
+
+    /**
+     * This holds a reference to the
+     * system logger that is being used.
+     */
+    private Logger _logger = ReferenceManager.getInstance().getLogger();
 
 //---STATIC ATTRIBUTES---