svn commit: r939100 - /incubator/river/jtsk/trunk/src/net/jini/lookup/ServiceResultStreamFilter.java

[pe...@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++){

Re: svn commit: r939100 - /incubator/river/jtsk/trunk/src/net/jini/lookup/ServiceResultStreamFilter.java

[Peter Firmstone <ji...@zeus.net.au>]

Here's the latest qa test results, as I make these changes, I'm running 
the qa and jtreg tests, a separate binary build of the qa tests would be 
nice to check binary compatibility too, any volunteers?
     [java]
     [java] # of tests started   = 397
     [java] # of tests completed = 397
     [java] # of tests skipped   = 18
     [java] # of tests passed    = 397
     [java] # of tests failed    = 0
     [java]
     [java] -----------------------------------------
     [java]
     [java]    Date finished:
     [java]       Thu Apr 29 10:46:46 EST 2010
     [java]    Time elapsed:
     [java]       11363 seconds
     [java]

BUILD SUCCESSFUL
Total time: 189 minutes 30 seconds


peter_firmstone@apache.org wrote:
> 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++){
>
>
>
>