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.26 by tdb, Sat Mar 10 04:03:07 2001 UTC vs.
Revision 1.29 by tdb, Wed Mar 14 23:25:29 2001 UTC

# Line 1 | Line 1
1   //---PACKAGE DECLARATION---
2 < package uk.ac.ukc.iscream.filter;
2 > package uk.org.iscream.filter;
3  
4   //---IMPORTS---
5   import java.io.*;
6   import java.net.*;
7   import java.util.*;
8 < import uk.ac.ukc.iscream.core.*;
9 < import uk.ac.ukc.iscream.componentmanager.*;
10 < import uk.ac.ukc.iscream.filter.*;
11 < import uk.ac.ukc.iscream.util.*;
8 > import uk.org.iscream.core.*;
9 > import uk.org.iscream.componentmanager.*;
10 > import uk.org.iscream.filter.*;
11 > import uk.org.iscream.util.*;
12  
13   /**
14   * Handle an incoming packet as a separate thread.
# Line 38 | Line 38 | public class FilterThread extends Thread{
38       * Constructs an instance of a FilterThread
39       *
40       * @param queue the Queue this filter is using
41 –     * @param parent a CORBA reference to our parent filter
41       */
42 <    public FilterThread(Queue queue, Filter parent){
43 <        _parent = parent;
42 >    public FilterThread(Queue queue){
43 >        // set the Thread name
44 >        setName("filter.FilterThread");
45 >        
46          _queue = queue;
47          _logger.write(toString(), Logger.SYSINIT, "created");
48      }
# Line 94 | Line 95 | public class FilterThread extends Thread{
95                  // skip the rest of this loop iteration
96                  continue;
97              }
98 <                              
99 <            // XMLPacket is ok, so run filters...
98 >            
99 >            // get parent
100 >            Filter parent;
101 >            try {
102 >                String parentFilterName = ConfigurationProxy.getInstance().getProperty(FilterMain.NAME, "Filter.parentFilter");
103 >                parent = FilterHelper.narrow(_refman.getCORBARef("iscream.Filter." + parentFilterName));
104 >            } catch (PropertyNotFoundException e) {
105 >                continue;
106 >            }
107 >                    
108 >            // XMLPacket is ok, run filters...
109              if(PluginFilterManager.getInstance().runFilters(packet)) {
110                  // and pass it on...
111 <                _parent.receiveXML(xml);
111 >                parent.receiveXML(xml);
112              }
113              else {
114                  // ... or filtered it
# Line 111 | Line 121 | public class FilterThread extends Thread{
121       * Overrides the {@link java.lang.Object#toString() Object.toString()}
122       * method to provide clean logging (every class should have this).
123       *
124 <     * This uses the uk.ac.ukc.iscream.util.NameFormat class
124 >     * This uses the uk.org.iscream.util.NameFormat class
125       * to format the toString()
126       *
127       * @return the name of this class and its CVS revision
# Line 128 | Line 138 | public class FilterThread extends Thread{
138   //---ACCESSOR/MUTATOR METHODS---
139  
140   //---ATTRIBUTES---
131 –
132 –    /**
133 –     * Our parent filter
134 –     */
135 –    Filter _parent;
141      
142      /**
143       * The Queue object
# Line 155 | Line 160 | public class FilterThread extends Thread{
160       * system logger that is being used.
161       */
162      private Logger _logger = ReferenceManager.getInstance().getLogger();
163 +
164 +    /**
165 +     * A reference to the reference manager in use
166 +     */
167 +    private ReferenceManager _refman = ReferenceManager.getInstance();
168  
169   //---STATIC ATTRIBUTES---
170  

Diff Legend

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