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

Comparing projects/cms/source/server/uk/org/iscream/cms/server/client/alerters/IRC__Alerter.java (file contents):
Revision 1.18 by tdb, Thu Mar 8 13:43:54 2001 UTC vs.
Revision 1.23 by tdb, Fri Mar 16 17:13:49 2001 UTC

#	Line 1 | Line 1
1		//---PACKAGE DECLARATION---
2	<	package uk.ac.ukc.iscream.client.alerters;
2	>	package uk.org.iscream.client.alerters;
3
4		//---IMPORTS---
5	<	import uk.ac.ukc.iscream.client.*;
6	<	import uk.ac.ukc.iscream.core.*;
7	<	import uk.ac.ukc.iscream.util.*;
8	<	import uk.ac.ukc.iscream.componentmanager.*;
5	>	import uk.org.iscream.client.*;
6	>	import uk.org.iscream.core.*;
7	>	import uk.org.iscream.util.*;
8	>	import uk.org.iscream.componentmanager.*;
9
10		import java.io.*;
11		import java.net.*;
#	Line 52 | Line 52 | public class IRC__Alerter implements PluginAlerter {
52
53		// connect to the IRC server
54		_ircbot = new IRCBot();
55	+	// set it's name and start it
56	+	_ircbot.setName("client.IRC__Alerter$IRCBot");
57		_ircbot.start();
58		_startTime = System.currentTimeMillis();
59
#	Line 77 | 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 94 | 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 115 | Line 117 | public class IRC__Alerter implements PluginAlerter {
117		* Overrides the {@link java.lang.Object#toString() Object.toString()}
118		* method to provide clean logging (every class should have this).
119		*
120	<	* This uses the uk.ac.ukc.iscream.util.NameFormat class
120	>	* This uses the uk.org.iscream.util.NameFormat class
121		* to format the toString()
122		*
123		* @return the name of this class and its CVS revision
#	Line 136 | Line 138 | public class IRC__Alerter implements PluginAlerter {
138
139		//---PRIVATE METHODS---
140
139	–	private String getTimeString(long time) {
140	–	String timeString = null;
141	–	if (time >= 60) {
142	–	timeString = (time / 60) + " minute(s)";
143	–	} else if (time >= 3600) {
144	–	timeString = ((time/60) / 60) + " hour(s)";
145	–	} else {
146	–	timeString = time + " second(s)";
147	–	}
148	–	return timeString;
149	–	}
150	–
141		//---ACCESSOR/MUTATOR METHODS---
142
143		//---ATTRIBUTES---
#	Line 442 | Line 432 | public class IRC__Alerter implements PluginAlerter {
432		* Overrides the {@link java.lang.Object#toString() Object.toString()}
433		* method to provide clean logging (every class should have this).
434		*
435	<	* This uses the uk.ac.ukc.iscream.util.NameFormat class
435	>	* This uses the uk.org.iscream.util.NameFormat class
436		* to format the toString()
437		*
438		* @return the name of this class and its CVS revision
#	Line 529 | Line 519 | public class IRC__Alerter implements PluginAlerter {
519		endOfChan = newChan.length();
520		}
521		newChan = newChan.substring(0, endOfChan);
522	<	sendMsg(getMsgSender(line)+", okay, I'm off to "+newChan);
523	<	_socketOut.println("PART "+_channel);
524	<	_socketOut.println("JOIN "+newChan);
525	<	_channel = newChan;
522	>	if(newChan.equals(_channel)) {
523	>	sendMsg(getMsgSender(line)+", I'm already on "+newChan+"!");
524	>	} else {
525	>	sendMsg(getMsgSender(line)+", okay, I'm off to "+newChan);
526	>	_socketOut.println("PART "+_channel);
527	>	_socketOut.println("JOIN "+newChan);
528	>	_channel = newChan;
529	>	}
530		}
531		else if(message.indexOf(nickChangeCommand)!=-1) {
532		String nickChangeCmd = nickChangeCommand;

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines
>	Changed lines