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.27 by tdb, Tue Mar 13 02:19:46 2001 UTC vs.
Revision 1.34 by tdb, Fri Mar 22 16:42:54 2002 UTC

# Line 1 | Line 1
1   //---PACKAGE DECLARATION---
2 < package uk.ac.ukc.iscream.filter;
2 > package uk.org.iscream.cms.server.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.cms.server.core.*;
9 > import uk.org.iscream.cms.server.componentmanager.*;
10 > import uk.org.iscream.cms.server.filter.*;
11 > import uk.org.iscream.cms.server.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){
42 >    public FilterThread(Queue queue){
43          // set the Thread name
44          setName("filter.FilterThread");
45          
47 –        _parent = parent;
46          _queue = queue;
47          _logger.write(toString(), Logger.SYSINIT, "created");
48      }
# Line 62 | Line 60 | public class FilterThread extends Thread{
60          int n = _queue.getQueue();
61          // keep these out here, saves recreating the object
62          String xml = null;
63 +        String parentFilterName = "";
64 +        Filter parent = null;
65          while(true) {
66              // get a String of xml
67              try {
# Line 76 | Line 76 | public class FilterThread extends Thread{
76              if (xml.indexOf(0) != -1) {
77                  xml = xml.substring(0, xml.indexOf(0));
78              }
79 –            else {
80 –                xml = xml.substring(0, xml.length());
81 –            }
79              
80              // Bundle the XML all on one line (saves space and simplifies
81              // the protocol between clientinterface and client).
# Line 97 | Line 94 | public class FilterThread extends Thread{
94                  // skip the rest of this loop iteration
95                  continue;
96              }
97 <                              
98 <            // XMLPacket is ok, so run filters...
97 >            
98 >            // get parent
99 >            try {
100 >                String newParent = ConfigurationProxy.getInstance().getProperty("Filter." + FilterMain.NAME, "Filter.parentFilter");
101 >                if(!parentFilterName.equals(newParent)) {
102 >                    parentFilterName = newParent;
103 >                    parent = FilterHelper.narrow(_refman.getCORBARef("iscream.Filter." + parentFilterName));
104 >                    _logger.write(toString(), Logger.DEBUG, "Parent filter changed to: "+parentFilterName);
105 >                }
106 >            } catch (PropertyNotFoundException e) {
107 >                continue;
108 >            }
109 >                    
110 >            // XMLPacket is ok, run filters...
111              if(PluginFilterManager.getInstance().runFilters(packet)) {
112                  // and pass it on...
113 <                _parent.receiveXML(xml);
113 >                parent.receiveXML(xml);
114              }
115              else {
116                  // ... or filtered it
# Line 114 | Line 123 | public class FilterThread extends Thread{
123       * Overrides the {@link java.lang.Object#toString() Object.toString()}
124       * method to provide clean logging (every class should have this).
125       *
126 <     * This uses the uk.ac.ukc.iscream.util.NameFormat class
126 >     * This uses the uk.org.iscream.cms.server.util.NameFormat class
127       * to format the toString()
128       *
129       * @return the name of this class and its CVS revision
# Line 131 | Line 140 | public class FilterThread extends Thread{
140   //---ACCESSOR/MUTATOR METHODS---
141  
142   //---ATTRIBUTES---
134 –
135 –    /**
136 –     * Our parent filter
137 –     */
138 –    Filter _parent;
143      
144      /**
145       * The Queue object
# Line 158 | Line 162 | public class FilterThread extends Thread{
162       * system logger that is being used.
163       */
164      private Logger _logger = ReferenceManager.getInstance().getLogger();
165 +
166 +    /**
167 +     * A reference to the reference manager in use
168 +     */
169 +    private ReferenceManager _refman = ReferenceManager.getInstance();
170  
171   //---STATIC ATTRIBUTES---
172  

Diff Legend

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