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

Comparing projects/cms/source/server/uk/org/iscream/cms/server/filter/FilterThread.java (file contents):
Revision 1.31 by tdb, Fri Mar 16 00:17:04 2001 UTC vs.
Revision 1.35 by tdb, Sat May 18 18:16:02 2002 UTC

# Line 1 | Line 1
1 + /*
2 + * i-scream central monitoring system
3 + * Copyright (C) 2000-2002 i-scream
4 + *
5 + * This program is free software; you can redistribute it and/or
6 + * modify it under the terms of the GNU General Public License
7 + * as published by the Free Software Foundation; either version 2
8 + * of the License, or (at your option) any later version.
9 + *
10 + * This program is distributed in the hope that it will be useful,
11 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
12 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
13 + * GNU General Public License for more details.
14 + *
15 + * You should have received a copy of the GNU General Public License
16 + * along with this program; if not, write to the Free Software
17 + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
18 + */
19 +
20   //---PACKAGE DECLARATION---
21 < package uk.org.iscream.filter;
21 > package uk.org.iscream.cms.server.filter;
22  
23   //---IMPORTS---
24   import java.io.*;
25   import java.net.*;
26   import java.util.*;
27 < import uk.org.iscream.core.*;
28 < import uk.org.iscream.componentmanager.*;
29 < import uk.org.iscream.filter.*;
30 < import uk.org.iscream.util.*;
27 > import uk.org.iscream.cms.server.core.*;
28 > import uk.org.iscream.cms.server.componentmanager.*;
29 > import uk.org.iscream.cms.server.filter.*;
30 > import uk.org.iscream.cms.server.util.*;
31  
32   /**
33   * Handle an incoming packet as a separate thread.
# Line 76 | Line 95 | public class FilterThread extends Thread{
95              if (xml.indexOf(0) != -1) {
96                  xml = xml.substring(0, xml.indexOf(0));
97              }
79            else {
80                xml = xml.substring(0, xml.length());
81            }
98              
99              // Bundle the XML all on one line (saves space and simplifies
100              // the protocol between clientinterface and client).
# Line 100 | Line 116 | public class FilterThread extends Thread{
116              
117              // get parent
118              try {
119 <                String newParent = ConfigurationProxy.getInstance().getProperty(FilterMain.NAME, "Filter.parentFilter");
119 >                String newParent = ConfigurationProxy.getInstance().getProperty("Filter." + FilterMain.NAME, "Filter.parentFilter");
120                  if(!parentFilterName.equals(newParent)) {
121                      parentFilterName = newParent;
122                      parent = FilterHelper.narrow(_refman.getCORBARef("iscream.Filter." + parentFilterName));
# Line 126 | Line 142 | public class FilterThread extends Thread{
142       * Overrides the {@link java.lang.Object#toString() Object.toString()}
143       * method to provide clean logging (every class should have this).
144       *
145 <     * This uses the uk.org.iscream.util.NameFormat class
145 >     * This uses the uk.org.iscream.cms.server.util.NameFormat class
146       * to format the toString()
147       *
148       * @return the name of this class and its CVS revision

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines