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

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

Revision: 2020
          http://archive-access.svn.sourceforge.net/archive-access/?rev=2020&view=rev
Author:   bradtofel
Date:     2007-09-28 15:42:11 -0700 (Fri, 28 Sep 2007)

Log Message:
-----------
REFACTOR: moved references to store and index to WaybackCollection.

Modified Paths:
--------------
    trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/webapp/AccessPoint.java

Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/webapp/AccessPoint.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/webapp/AccessPoint.java	2007-09-28 22:41:20 UTC (rev 2019)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/webapp/AccessPoint.java	2007-09-28 22:42:11 UTC (rev 2020)
@@ -35,8 +35,6 @@
 import org.archive.wayback.QueryRenderer;
 import org.archive.wayback.ReplayDispatcher;
 import org.archive.wayback.RequestParser;
-import org.archive.wayback.ResourceIndex;
-import org.archive.wayback.ResourceStore;
 import org.archive.wayback.ResultURIConverter;
 import org.archive.wayback.WaybackConstants;
 import org.archive.wayback.accesscontrol.ExclusionFilterFactory;
@@ -71,8 +69,7 @@
 	private boolean useServerName = false;
 	private int contextPort = 0;
 	private String contextName = null;
-	private ResourceIndex index = null;
-	private ResourceStore store = null;
+	private WaybackCollection collection = null;
 	private ReplayDispatcher replay = null;
 	private QueryRenderer query = null;
 	private RequestParser parser = null;
@@ -295,7 +292,7 @@
 	throws IOException, ServletException {
 		Resource resource = null;
 		try {
-			SearchResults results = index.query(wbRequest);
+			SearchResults results = collection.getResourceIndex().query(wbRequest);
 			if(!(results instanceof CaptureSearchResults)) {
 				throw new ResourceNotAvailableException("Bad results...");
 			}
@@ -303,7 +300,7 @@
 	
 			// TODO: check which versions are actually accessible right now?
 			SearchResult closest = captureResults.getClosest(wbRequest);
-			resource = store.retrieveResource(closest);
+			resource = collection.getResourceStore().retrieveResource(closest);
 	
 			replay.renderResource(httpRequest, httpResponse, wbRequest,
 					closest, resource, uriConverter, captureResults);
@@ -321,7 +318,7 @@
 	throws ServletException, IOException {
 
 		try {
-			SearchResults results = index.query(wbRequest);
+			SearchResults results = collection.getResourceIndex().query(wbRequest);
 			if(results.getResultsType().equals(
 					WaybackConstants.RESULTS_TYPE_CAPTURE)) {
 
@@ -352,20 +349,6 @@
 	}
 
 	/**
-	 * @param index the index to set
-	 */
-	public void setIndex(ResourceIndex index) {
-		this.index = index;
-	}
-
-	/**
-	 * @param store the store to set
-	 */
-	public void setStore(ResourceStore store) {
-		this.store = store;
-	}
-
-	/**
 	 * @param replay the replay to set
 	 */
 	public void setReplay(ReplayDispatcher replay) {
@@ -444,4 +427,12 @@
 	public void setAuthentication(BooleanOperator<WaybackRequest> authentication) {
 		this.authentication = authentication;
 	}
+
+	public WaybackCollection getCollection() {
+		return collection;
+	}
+
+	public void setCollection(WaybackCollection collection) {
+		this.collection = collection;
+	}
 }


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