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.30.2.6 by tdb, Wed Feb 6 22:59:06 2002 UTC vs.
Revision 1.36 by tdb, Sun Aug 1 10:40:43 2004 UTC

# Line 1 | Line 1
1 + /*
2 + * i-scream central monitoring system
3 + * http://www.i-scream.org
4 + * Copyright (C) 2000-2002 i-scream
5 + *
6 + * This program is free software; you can redistribute it and/or
7 + * modify it under the terms of the GNU General Public License
8 + * as published by the Free Software Foundation; either version 2
9 + * of the License, or (at your option) any later version.
10 + *
11 + * This program is distributed in the hope that it will be useful,
12 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
13 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
14 + * GNU General Public License for more details.
15 + *
16 + * You should have received a copy of the GNU General Public License
17 + * along with this program; if not, write to the Free Software
18 + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
19 + */
20 +
21   //---PACKAGE DECLARATION---
22   package uk.org.iscream.cms.server.client.alerters;
23  
24   //---IMPORTS---
25   import uk.org.iscream.cms.server.client.*;
26   import uk.org.iscream.cms.server.core.*;
27 < import uk.org.iscream.cms.server.util.*;
27 > import uk.org.iscream.cms.util.*;
28   import uk.org.iscream.cms.server.componentmanager.*;
29   import java.io.*;
30   import java.net.*;
# Line 94 | Line 114 | public class IRC__Alerter extends AlerterSkeleton {
114       * Overrides the {@link java.lang.Object#toString() Object.toString()}
115       * method to provide clean logging (every class should have this).
116       *
117 <     * This uses the uk.org.iscream.cms.server.util.NameFormat class
117 >     * This uses the uk.org.iscream.cms.util.NameFormat class
118       * to format the toString()
119       *
120       * @return the name of this class and its CVS revision
# Line 289 | Line 309 | public class IRC__Alerter extends AlerterSkeleton {
309                      _logger.write(this.toString(), Logger.ERROR, "IO error when connecting to server: "+e);
310                      throw new IOException("IO error when connecting to server");
311                  }
292                catch(IrcException e) {
293                    _logger.write(this.toString(), Logger.ERROR, "IRC error when connecting to server: "+e);
294                    throw new IOException("IRC error when connecting to server");
295                }
312                  catch(NickAlreadyInUseException e) {
313                      _logger.write(this.toString(), Logger.ERROR, "Nickname "+nick+" is already in use: "+e);
314                      // don't do anything, instead just loop round
315                      // and try the next nickname in the list
316                  }
317 +                catch(IrcException e) {
318 +                    _logger.write(this.toString(), Logger.ERROR, "IRC error when connecting to server: "+e);
319 +                    throw new IOException("IRC error when connecting to server");
320 +                }
321              }
322              if(!ok) {
323                  // must have tried all the nicknames, best bail out
# Line 639 | Line 659 | public class IRC__Alerter extends AlerterSkeleton {
659           * Overrides the {@link java.lang.Object#toString() Object.toString()}
660           * method to provide clean logging (every class should have this).
661           *
662 <         * This uses the uk.org.iscream.cms.server.util.NameFormat class
662 >         * This uses the uk.org.iscream.cms.util.NameFormat class
663           * to format the toString()
664           *
665           * @return the name of this class and its CVS revision

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines