[Archive-access-cvs] SF.net SVN: archive-access: [1883] trunk/archive-access/projects/wayback/ wayback-core/src/main/java/org/archive/wayback/resourceindex

[<bra...@us...>]

Revision: 1883
          http://archive-access.svn.sourceforge.net/archive-access/?rev=1883&view=rev
Author:   bradtofel
Date:     2007-07-24 17:47:07 -0700 (Tue, 24 Jul 2007)

Log Message:
-----------
REFACTOR: now using ObjectFilter with strong typing, instead of inheriting from SearchResultFilter

Modified Paths:
--------------
    trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourceindex/CompositeExclusionFilterFactory.java
    trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourceindex/ExclusionFilterFactory.java

Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourceindex/CompositeExclusionFilterFactory.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourceindex/CompositeExclusionFilterFactory.java	2007-07-25 00:45:21 UTC (rev 1882)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourceindex/CompositeExclusionFilterFactory.java	2007-07-25 00:47:07 UTC (rev 1883)
@@ -26,10 +26,10 @@
 
 import java.util.ArrayList;
 import java.util.Iterator;
-import java.util.Properties;
 
-import org.archive.wayback.exception.ConfigurationException;
+import org.archive.wayback.core.SearchResult;
 import org.archive.wayback.resourceindex.filters.CompositeExclusionFilter;
+import org.archive.wayback.util.ObjectFilter;
 
 /**
  * Class that provides SearchResult Filtering based on multiple
@@ -43,14 +43,6 @@
 
 	private ArrayList<ExclusionFilterFactory> factories = 
 		new ArrayList<ExclusionFilterFactory>();
-
-	/* (non-Javadoc)
-	 * @see org.archive.wayback.PropertyConfigurable#init(java.util.Properties)
-	 */
-	public void init(Properties p) throws ConfigurationException {
-		// no-op...
-	}
-
 	
 	/**
 	 * @param factory to be added to the composite
@@ -62,7 +54,7 @@
 	/* (non-Javadoc)
 	 * @see org.archive.wayback.resourceindex.ExclusionFilterFactory#get()
 	 */
-	public SearchResultFilter get() {
+	public ObjectFilter<SearchResult> get() {
 		Iterator<ExclusionFilterFactory> itr = factories.iterator();
 		CompositeExclusionFilter filter = new CompositeExclusionFilter();
 		while(itr.hasNext()) {
@@ -70,4 +62,20 @@
 		}
 		return filter;
 	}
+
+
+	/**
+	 * @return the factories
+	 */
+	public ArrayList<ExclusionFilterFactory> getFactories() {
+		return factories;
+	}
+
+
+	/**
+	 * @param factories the factories to set
+	 */
+	public void setFactories(ArrayList<ExclusionFilterFactory> factories) {
+		this.factories = factories;
+	}
 }

Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourceindex/ExclusionFilterFactory.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourceindex/ExclusionFilterFactory.java	2007-07-25 00:45:21 UTC (rev 1882)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourceindex/ExclusionFilterFactory.java	2007-07-25 00:47:07 UTC (rev 1883)
@@ -24,18 +24,18 @@
  */
 package org.archive.wayback.resourceindex;
 
-import org.archive.wayback.PropertyConfigurable;
-
+import org.archive.wayback.core.SearchResult;
+import org.archive.wayback.util.ObjectFilter;
 /**
  *
  *
  * @author brad
  * @version $Date$, $Revision$
  */
-public interface ExclusionFilterFactory extends PropertyConfigurable {
+public interface ExclusionFilterFactory {
 	/**
-	 * @return a SearchResultFilter object that filters records based on
+	 * @return an ObjectFilter object that filters records based on
 	 * some set of exclusion rules.
 	 */
-	public SearchResultFilter get();
+	public ObjectFilter<SearchResult> get();
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.