ViewVC Help
View File | Revision Log | Show Annotations | Revision Graph | Root Listing
root/i-scream/projects/cms/source/server/uk/org/iscream/cms/server/client/alerters/IRC__Alerter.java
(Generate patch)

Comparing projects/cms/source/server/uk/org/iscream/cms/server/client/alerters/IRC__Alerter.java (file contents):
Revision 1.21 by tdb, Thu Mar 15 04:06:57 2001 UTC vs.
Revision 1.23 by tdb, Fri Mar 16 17:13:49 2001 UTC

# Line 79 | Line 79 | public class IRC__Alerter implements PluginAlerter {
79              if(((alert.getLevel() == 0) && (alert.getLastLevel() >= level)) || (alert.getLevel() >= level)) {
80                  String alertType = Alert.alertLevels[alert.getLevel()];
81                  String thresholdType = Alert.thresholdLevels[alert.getThreshold()];
82 <                String timeFirstSince = DateUtils.formatTime(System.currentTimeMillis() - alert.getInitialAlertTime(), "%DAYS% days, %HOURS% hours, %MINS% mins, and %SECS% secs");
82 >                String timeFirstSince = DateUtils.formatTime((System.currentTimeMillis() - alert.getInitialAlertTime())/1000, "%DAYS% days, %HOURS% hours, %MINS% mins, and %SECS% secs");
83                  String timeFirstOccured = DateFormat.getDateTimeInstance(DateFormat.SHORT, DateFormat.SHORT, Locale.UK).format(new Date(alert.getInitialAlertTime()));
84                  // sort out the message              
85                  String message;
# Line 96 | Line 96 | public class IRC__Alerter implements PluginAlerter {
96                  message = StringUtils.replaceText(message, "%value%", alert.getValue());
97                  message = StringUtils.replaceText(message, "%thresholdValue%", alert.getThresholdValue());
98                  message = StringUtils.replaceText(message, "%attributeName%", alert.getAttributeName());
99 <                message = StringUtils.replaceText(message, "%timeTillNextAlert%",  getTimeString(Long.parseLong(alert.getTimeTillNextAlert())));
99 >                message = StringUtils.replaceText(message, "%timeTillNextAlert%",  DateUtils.getTimeString(Long.parseLong(alert.getTimeTillNextAlert())));
100                  message = StringUtils.replaceText(message, "%timeSinceFirstAlert%", timeFirstSince);
101                  message = StringUtils.replaceText(message, "%timeOfFirstAlert%", timeFirstOccured);
102                  
# Line 137 | Line 137 | public class IRC__Alerter implements PluginAlerter {
137      }
138  
139   //---PRIVATE METHODS---
140
141    private String getTimeString(long time) {
142        String timeString = null;
143        if (time >= 60) {
144            timeString = (time / 60) + " minute(s)";
145        } else if (time >= 3600) {
146            timeString = ((time/60) / 60) + " hour(s)";
147        } else {
148            timeString = time + " second(s)";
149        }
150        return timeString;
151    }
140  
141   //---ACCESSOR/MUTATOR METHODS---
142  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines