--- projects/cms/source/server/uk/org/iscream/cms/server/client/monitors/Disk__Monitor.java 2001/11/15 11:47:30 1.13 +++ projects/cms/source/server/uk/org/iscream/cms/server/client/monitors/Disk__Monitor.java 2001/11/26 11:59:19 1.14 @@ -16,7 +16,7 @@ import uk.org.iscream.cms.server.componentmanager.*; * This Monitor watches the Disks for all machines * * @author $Author: tdb $ - * @version $Id: Disk__Monitor.java,v 1.13 2001/11/15 11:47:30 tdb Exp $ + * @version $Id: Disk__Monitor.java,v 1.14 2001/11/26 11:59:19 tdb Exp $ */ public class Disk__Monitor extends MonitorSkeleton { @@ -25,7 +25,7 @@ public class Disk__Monitor extends MonitorSkeleton { /** * The current CVS revision of this class */ - public final String REVISION = "$Revision: 1.13 $"; + public final String REVISION = "$Revision: 1.14 $"; /** * A description of this monitor @@ -216,18 +216,18 @@ public class Disk__Monitor extends MonitorSkeleton { * @param negateCheck whether to negate the check * @return the threshold level breached, if any */ - private int checkAttributeThreshold(double diskInUse, Register reg, boolean negateCheck) { + private int checkAttributeThreshold(double value, Register reg, boolean negateCheck) { for(int thresholdLevel = Alert.thresholdLevels.length - 1; thresholdLevel >= 0; thresholdLevel--) { if (reg.getThreshold(thresholdLevel) != -1.0) { if(!negateCheck) { // normal check - has the value gone *over* the threshold - if(((double) reg.getThreshold(thresholdLevel)) < diskInUse) { + if(((double) reg.getThreshold(thresholdLevel)) < value) { return thresholdLevel; } } else { // negated check - has the value gone *under* the threshold - if(((double) reg.getThreshold(thresholdLevel)) > diskInUse) { + if(((double) reg.getThreshold(thresholdLevel)) > value) { return thresholdLevel; } }