| 1 |
|
//---PACKAGE DECLARATION--- |
| 2 |
+ |
package uk.ac.ukc.iscream.core; |
| 3 |
|
|
| 4 |
|
//---IMPORTS--- |
| 5 |
< |
import uk.ac.ukc.iscream.core.*; |
| 6 |
< |
import java.util.*; |
| 7 |
< |
import java.io.*; |
| 5 |
> |
import uk.ac.ukc.iscream.util.*; |
| 6 |
> |
import uk.ac.ukc.iscream.componentmanager.*; |
| 7 |
> |
import java.util.Properties; |
| 8 |
> |
import java.util.Date; |
| 9 |
|
import java.text.DateFormat; |
| 10 |
|
|
| 11 |
|
/** |
| 46 |
|
* @param lastModified the most recent last modified value for the file list |
| 47 |
|
* @param logRef a reference to the logger system |
| 48 |
|
*/ |
| 49 |
< |
ConfigurationServant(Properties properties, String fileList, long lastModified, Logger logRef) { |
| 49 |
> |
ConfigurationServant(Properties properties, String fileList, long lastModified) { |
| 50 |
|
// assign local variables |
| 51 |
|
_properties = properties; |
| 52 |
|
_lastModified = lastModified; |
| 53 |
|
_fileList = fileList; |
| 54 |
< |
_logRef = logRef; |
| 53 |
< |
_logRef.write(this.toString(), Logger.SYSINIT, "created"); |
| 54 |
> |
_logger.write(toString(), Logger.SYSINIT, "created"); |
| 55 |
|
String date = DateFormat.getDateTimeInstance(DateFormat.SHORT, DateFormat.MEDIUM).format(new Date(getLastModified())); |
| 56 |
< |
_logRef.write(this.toString(), Logger.SYSMSG, "last modified - " + date); |
| 57 |
< |
_logRef.write(this.toString(), Logger.DEBUG, "file list - " + _fileList); |
| 56 |
> |
_logger.write(toString(), Logger.SYSMSG, "last modified - " + date); |
| 57 |
> |
_logger.write(toString(), Logger.DEBUG, "file list - " + _fileList); |
| 58 |
|
} |
| 59 |
|
|
| 60 |
|
//---PUBLIC METHODS--- |
| 74 |
|
* Overrides the {@link java.lang.Object#toString() Object.toString()} |
| 75 |
|
* method to provide clean logging (every class should have this). |
| 76 |
|
* |
| 77 |
+ |
* This uses the uk.ac.ukc.iscream.util.FormatName class |
| 78 |
+ |
* to format the toString() |
| 79 |
+ |
* |
| 80 |
|
* @return the name of this class and its CVS revision |
| 81 |
|
*/ |
| 82 |
|
public String toString() { |
| 83 |
< |
return this.getClass().getName() + "(" + REVISION.substring(11, REVISION.length() - 2) + ")"; |
| 83 |
> |
return FormatName.getName( |
| 84 |
> |
_name, |
| 85 |
> |
getClass().getName(), |
| 86 |
> |
REVISION); |
| 87 |
|
} |
| 88 |
|
|
| 89 |
|
//---PRIVATE METHODS--- |
| 94 |
|
* is destroyed |
| 95 |
|
*/ |
| 96 |
|
protected void finalize() throws Throwable { |
| 97 |
< |
_logRef.write(this.toString(), Logger.DEBUG, "finalized (ick, us english!)"); |
| 97 |
> |
_logger.write(this.toString(), Logger.DEBUG, "finalized"); |
| 98 |
|
} |
| 99 |
|
|
| 100 |
|
//---ACCESSOR/MUTATOR METHODS--- |
| 127 |
|
private Properties _properties = new Properties(); |
| 128 |
|
|
| 129 |
|
/** |
| 130 |
< |
* Reference to a Logger |
| 130 |
> |
* This holds a reference to the |
| 131 |
> |
* system logger that is being used. |
| 132 |
|
*/ |
| 133 |
< |
private Logger _logRef; |
| 133 |
> |
private Logger _logger = ReferenceManager.getInstance().getLogger(); |
| 134 |
> |
|
| 135 |
> |
/** |
| 136 |
> |
* This is the friendly identifier of the |
| 137 |
> |
* component this class is running in. |
| 138 |
> |
* eg, a Filter may be called "filter1", |
| 139 |
> |
* If this class does not have an owning |
| 140 |
> |
* component, a name from the configuration |
| 141 |
> |
* can be placed here. This name could also |
| 142 |
> |
* be changed to null for utility classes. |
| 143 |
> |
*/ |
| 144 |
> |
private String _name = Core.NAME; |
| 145 |
|
|
| 146 |
|
/** |
| 147 |
|
* The date stamp of the configuration file |
| 148 |
|
* this object is using |
| 149 |
|
*/ |
| 150 |
|
private long _lastModified; |
| 132 |
– |
|
| 151 |
|
|
| 152 |
|
/** |
| 153 |
|
* The list of files that were used to build this configuration |
