--- projects/cms/source/server/uk/org/iscream/cms/server/core/ConfigurationServant.java	2000/11/21 15:08:42	1.11
+++ projects/cms/source/server/uk/org/iscream/cms/server/core/ConfigurationServant.java	2000/11/21 21:58:52	1.12
@@ -12,15 +12,15 @@ import java.text.DateFormat;
  * set their configuration from a central location.
  *
  * When classes want their configuration, they contact
- * the Configurator, which will locate their config,
+ * the ConfigurationManager, which will locate their config,
  * open it and pass it to a Configuration object which is
  * then passed back to the calling class.
  *
  * Essentially this class behaves in a similar fashion
  * to the java.util.Properties class.
  *
- * @author  $Author: tdb $
- * @version $Id: ConfigurationServant.java,v 1.11 2000/11/21 15:08:42 tdb Exp $
+ * @author  $Author: ajm $
+ * @version $Id: ConfigurationServant.java,v 1.12 2000/11/21 21:58:52 ajm Exp $
  */
 class ConfigurationServant extends ConfigurationPOA {
 
@@ -29,7 +29,7 @@ class ConfigurationServant extends ConfigurationPOA {
     /**
      * The current CVS revision of this class
      */
-    public final String REVISION = "$Revision: 1.11 $";
+    public final String REVISION = "$Revision: 1.12 $";
     
 //---STATIC METHODS---
 
@@ -37,11 +37,15 @@ class ConfigurationServant extends ConfigurationPOA {
 
     /**
      * Creates a new ConfigurationServant taking a hook
-     * to a file containing the configuration.
+     * to a Properties object containing the configuration.
      *
-     * @param propertiesStream an InputStream connected to the configuration
+     * @param properties a Properties object that contains the full properties for this configuration
+     * @param fileList the list of config files used to build this configuration
+     * @param lastModified the most recent last modified value for the file list
+     * @param logRef a reference to the logger system
      */
     ConfigurationServant(Properties properties, String fileList, long lastModified, Logger logRef) {
+        // assign local variables
         _properties = properties;
         _lastModified = lastModified;
         _fileList = fileList;
@@ -77,6 +81,11 @@ class ConfigurationServant extends ConfigurationPOA {
 
 //---PRIVATE METHODS---
 
+    /**
+     * Overridden for debugging purposes
+     * to see when an instance of this class
+     * is destroyed
+     */
     protected void finalize() throws Throwable {
         _logRef.write(this.toString(), Logger.DEBUG, "finalized (ick, us english!)");
     }
@@ -93,6 +102,12 @@ class ConfigurationServant extends ConfigurationPOA {
         return _lastModified;
     }
 
+    /**
+     * Returns the list of files used to build the Properties
+     * this object is using.
+     *
+     * @return the list of files
+     */
     public String getFileList() {
         return _fileList;
     }
@@ -115,6 +130,10 @@ class ConfigurationServant extends ConfigurationPOA {
      */
     private long _lastModified;
     
+    
+    /**
+     * The list of files that were used to build this configuration
+     */
     private String _fileList;
     
 //---STATIC ATTRIBUTES---