Return-Path: 
 <river-commits-return-1635-apmail-incubator-river-commits-archive=incubator.apache.org@incubator.apache.org>
Delivered-To: apmail-incubator-river-commits-archive@minotaur.apache.org
Received: (qmail 30374 invoked from network); 28 Apr 2010 21:27:21 -0000
Received: from unknown (HELO mail.apache.org) (140.211.11.3)
  by 140.211.11.9 with SMTP; 28 Apr 2010 21:27:21 -0000
Received: (qmail 87930 invoked by uid 500); 28 Apr 2010 21:27:21 -0000
Delivered-To: apmail-incubator-river-commits-archive@incubator.apache.org
Received: (qmail 87908 invoked by uid 500); 28 Apr 2010 21:27:21 -0000
Mailing-List: contact river-commits-help@incubator.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:river-commits-help@incubator.apache.org>
List-Unsubscribe: <mailto:river-commits-unsubscribe@incubator.apache.org>
List-Post: <mailto:river-commits@incubator.apache.org>
List-Id: <river-commits.incubator.apache.org>
Reply-To: river-dev@incubator.apache.org
Delivered-To: mailing list river-commits@incubator.apache.org
Received: (qmail 87901 invoked by uid 99); 28 Apr 2010 21:27:21 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 28 Apr 2010 21:27:21 +0000
X-ASF-Spam-Status: No, hits=-1823.8 required=10.0
	tests=ALL_TRUSTED,AWL
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 28 Apr 2010 21:27:20 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 1F8B12388980; Wed, 28 Apr 2010 21:26:30 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r939100 -
 /incubator/river/jtsk/trunk/src/net/jini/lookup/ServiceResultStreamFilter.java
Date: Wed, 28 Apr 2010 21:26:30 -0000
To: river-commits@incubator.apache.org
From: peter_firmstone@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20100428212630.1F8B12388980@eris.apache.org>

Author: peter_firmstone
Date: Wed Apr 28 21:26:29 2010
New Revision: 939100

URL: http://svn.apache.org/viewvc?rev=939100&view=rev
Log:
This is very experimental please comment, suggest improvements etc, where new classes should go etc.

Note changes to follow for methods signatures as per Chris Dolan's suggestions.

Also please check for backward compatibility issues.

Modified:
    incubator/river/jtsk/trunk/src/net/jini/lookup/ServiceResultStreamFilter.java

Modified: incubator/river/jtsk/trunk/src/net/jini/lookup/ServiceResultStreamFilter.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/src/net/jini/lookup/ServiceResultStreamFilter.java?rev=939100&r1=939099&r2=939100&view=diff
==============================================================================
--- incubator/river/jtsk/trunk/src/net/jini/lookup/ServiceResultStreamFilter.java (original)
+++ incubator/river/jtsk/trunk/src/net/jini/lookup/ServiceResultStreamFilter.java Wed Apr 28 21:26:29 2010
@@ -9,7 +9,7 @@ import net.jini.core.lookup.ResultStream
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
-import net.jini.core.lookup.MarshalledServiceItem;
+import net.jini.core.lookup.ServiceItem;
 
 /**
  * A Filter utility class designed to filter out unwanted results.  Filters can
@@ -24,19 +24,19 @@ import net.jini.core.lookup.MarshalledSe
  * 
  * @author Peter Firmstone.
  */
-public class ServiceResultStreamFilter implements ResultStream<MarshalledServiceItem> {
+public class ServiceResultStreamFilter implements ResultStream<ServiceItem> {
     private final List<ServiceItemFilter> filters;
-    private final ResultStream<MarshalledServiceItem> inputResultStream;
+    private final ResultStream<ServiceItem> inputResultStream;
     
-    public ServiceResultStreamFilter(ResultStream<MarshalledServiceItem> rs,
+    public ServiceResultStreamFilter(ResultStream<ServiceItem> rs,
             ServiceItemFilter[] sf){
         inputResultStream = rs;
         filters = new ArrayList<ServiceItemFilter>(sf.length);
         filters.addAll(Arrays.asList(sf));
     }
 
-    public MarshalledServiceItem get() {
-        for(MarshalledServiceItem item = inputResultStream.get(); item != null; 
+    public ServiceItem get() {
+        for(ServiceItem item = inputResultStream.get(); item != null; 
                 item = inputResultStream.get()) {
             int l = filters.size();
             for ( int i = 0; i < l; i++){