[CJ-dev] commonjava-projects/commonjava-util/src/java/org/commonjava/util OrLogicFilenameFilter.java,1.3,1.4 AndLogicFilenameFilter.java,1.3,1.4 CompoundFilenameFilter.java,1.2,1.3 RegexFilenameFilter.java,1.3,1.4

[<joh...@co...>]

Update of /cvsroot/commonjava/commonjava-projects/commonjava-util/src/java/org/commonjava/util
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19603/src/java/org/commonjava/util

Modified Files:
	OrLogicFilenameFilter.java AndLogicFilenameFilter.java 
	CompoundFilenameFilter.java RegexFilenameFilter.java 
Log Message:
made all FilenameFilter implementations Serializable.

Index: OrLogicFilenameFilter.java
===================================================================
RCS file: /cvsroot/commonjava/commonjava-projects/commonjava-util/src/java/org/commonjava/util/OrLogicFilenameFilter.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- OrLogicFilenameFilter.java	5 Jan 2004 14:50:17 -0000	1.3
+++ OrLogicFilenameFilter.java	2 Feb 2004 07:04:28 -0000	1.4
@@ -3,12 +3,13 @@
 
 import java.io.File;
 import java.io.FilenameFilter;
+import java.io.Serializable;
 import java.util.Iterator;
 
 /**
  * @author jdcasey
  */
-public class OrLogicFilenameFilter extends CompoundFilenameFilter
+public class OrLogicFilenameFilter extends CompoundFilenameFilter implements Serializable
 {
 
   /**

Index: AndLogicFilenameFilter.java
===================================================================
RCS file: /cvsroot/commonjava/commonjava-projects/commonjava-util/src/java/org/commonjava/util/AndLogicFilenameFilter.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- AndLogicFilenameFilter.java	5 Jan 2004 14:50:17 -0000	1.3
+++ AndLogicFilenameFilter.java	2 Feb 2004 07:04:28 -0000	1.4
@@ -3,12 +3,13 @@
 
 import java.io.File;
 import java.io.FilenameFilter;
+import java.io.Serializable;
 import java.util.Iterator;
 
 /**
  * @author jdcasey
  */
-public class AndLogicFilenameFilter extends CompoundFilenameFilter
+public class AndLogicFilenameFilter extends CompoundFilenameFilter implements Serializable
 {
 
   /**

Index: CompoundFilenameFilter.java
===================================================================
RCS file: /cvsroot/commonjava/commonjava-projects/commonjava-util/src/java/org/commonjava/util/CompoundFilenameFilter.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- CompoundFilenameFilter.java	5 Jan 2004 04:53:34 -0000	1.2
+++ CompoundFilenameFilter.java	2 Feb 2004 07:04:28 -0000	1.3
@@ -2,6 +2,10 @@
 package org.commonjava.util;
 
 import java.io.FilenameFilter;
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.io.Serializable;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.Set;
@@ -9,7 +13,7 @@
 /**
  * @author jdcasey
  */
-public abstract class CompoundFilenameFilter implements FilenameFilter
+public abstract class CompoundFilenameFilter implements FilenameFilter, Serializable
 {
   
   private Set filters = new HashSet();
@@ -32,5 +36,13 @@
   protected boolean hasSubFilters() {
     return filters.size() > 0;
   }
+  
+  protected void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException{
+    this.filters = (Set)in.readObject();
+  }
+  
+  protected void writeObject(ObjectOutputStream out) throws IOException{
+    out.writeObject(filters);
+  }
 
 }

Index: RegexFilenameFilter.java
===================================================================
RCS file: /cvsroot/commonjava/commonjava-projects/commonjava-util/src/java/org/commonjava/util/RegexFilenameFilter.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- RegexFilenameFilter.java	5 Jan 2004 04:53:34 -0000	1.3
+++ RegexFilenameFilter.java	2 Feb 2004 07:04:28 -0000	1.4
@@ -8,6 +8,10 @@
 
 import java.io.File;
 import java.io.FilenameFilter;
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.io.Serializable;
 
 /**
  * FilenameFilter that compares a file's name (and optionally dir + file name)
@@ -15,7 +19,7 @@
  *
  * @author  John Casey
  */
-public class RegexFilenameFilter implements FilenameFilter {
+public class RegexFilenameFilter implements FilenameFilter, Serializable {
   
   private String pattern;
   private boolean includeDirInCheck;
@@ -72,4 +76,16 @@
     return result;
   }
   
+  protected void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException{
+    this.pattern = (String)in.readObject();
+    this.includeDirInCheck = in.readBoolean();
+    this.negated = in.readBoolean();
+  }
+  
+  protected void writeObject(ObjectOutputStream out) throws IOException{
+    out.writeObject(pattern);
+    out.writeBoolean(includeDirInCheck);
+    out.writeBoolean(negated);
+  }
+
 }