[Archive-access-cvs] SF.net SVN: archive-access: [1856] trunk/archive-access/projects/wayback/ wayback-core/src

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

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

Log Message:
-----------
TWEAK: type safety

Modified Paths:
--------------
    trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourcestore/http/FileLocationDB.java
    trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourcestore/http/FileLocationDBLog.java
    trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourcestore/http/FileLocationDBServlet.java
    trunk/archive-access/projects/wayback/wayback-core/src/test/java/org/archive/wayback/resourcestore/http/FileLocationDBLogTest.java
    trunk/archive-access/projects/wayback/wayback-core/src/test/java/org/archive/wayback/resourcestore/http/FileLocationDBTest.java

Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourcestore/http/FileLocationDB.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourcestore/http/FileLocationDB.java	2007-07-25 00:15:38 UTC (rev 1855)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourcestore/http/FileLocationDB.java	2007-07-25 00:17:15 UTC (rev 1856)
@@ -184,7 +184,8 @@
 	 * @return Iterator for traversing arcs between start and end.
 	 * @throws IOException
 	 */
-	public CloseableIterator getArcsBetweenMarks(long start, long end) throws IOException {
+	public CloseableIterator<String> getArcsBetweenMarks(long start, long end) 
+	throws IOException {
 		return log.getArcsBetweenMarks(start, end);
 	}
 

Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourcestore/http/FileLocationDBLog.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourcestore/http/FileLocationDBLog.java	2007-07-25 00:15:38 UTC (rev 1855)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourcestore/http/FileLocationDBLog.java	2007-07-25 00:17:15 UTC (rev 1856)
@@ -87,7 +87,7 @@
 	 * @return CleanableIterator that returns all arcs between start and end
 	 * @throws IOException
 	 */
-	public CloseableIterator getArcsBetweenMarks(long start, long end)
+	public CloseableIterator<String> getArcsBetweenMarks(long start, long end)
 			throws IOException {
 
 		RandomAccessFile raf = new RandomAccessFile(this, "r");
@@ -107,7 +107,7 @@
 		writer.close();
 	}
 
-	private class BufferedRangeIterator implements CloseableIterator {
+	private class BufferedRangeIterator implements CloseableIterator<String> {
 		private RecordIterator itr;
 		private long bytesToSend;
 		private long bytesSent;
@@ -156,7 +156,7 @@
 		/* (non-Javadoc)
 		 * @see java.util.Iterator#next()
 		 */
-		public Object next() {
+		public String next() {
 			String returnString = next;
 			next = null;
 			bytesSent += returnString.length() + 1; // TODO: not X-platform!

Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourcestore/http/FileLocationDBServlet.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourcestore/http/FileLocationDBServlet.java	2007-07-25 00:15:38 UTC (rev 1855)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourcestore/http/FileLocationDBServlet.java	2007-07-25 00:17:15 UTC (rev 1856)
@@ -112,7 +112,7 @@
 
 				long start = Long.parseLong(getRequiredMapParam(queryMap, START_ARGUMENT));
 				long end = Long.parseLong(getRequiredMapParam(queryMap, END_ARGUMENT));
-				Iterator itr = locationDB.getArcsBetweenMarks(start,end);
+				Iterator<String> itr = locationDB.getArcsBetweenMarks(start,end);
 				StringBuilder str = new StringBuilder();
 				str.append("OK ");
 				while(itr.hasNext()) {

Modified: trunk/archive-access/projects/wayback/wayback-core/src/test/java/org/archive/wayback/resourcestore/http/FileLocationDBLogTest.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/test/java/org/archive/wayback/resourcestore/http/FileLocationDBLogTest.java	2007-07-25 00:15:38 UTC (rev 1855)
+++ trunk/archive-access/projects/wayback/wayback-core/src/test/java/org/archive/wayback/resourcestore/http/FileLocationDBLogTest.java	2007-07-25 00:17:15 UTC (rev 1856)
@@ -61,7 +61,7 @@
 		String newArc2 = "bar.arc.gz";
 		long mark1 = log.getCurrentMark();
 		assertEquals(mark1,0);
-		Iterator itr = log.getArcsBetweenMarks(0,0);
+		Iterator<String> itr = log.getArcsBetweenMarks(0,0);
 		assertFalse(itr.hasNext());
 		log.addArc(newArc1);
 		long mark2 = log.getCurrentMark();

Modified: trunk/archive-access/projects/wayback/wayback-core/src/test/java/org/archive/wayback/resourcestore/http/FileLocationDBTest.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/test/java/org/archive/wayback/resourcestore/http/FileLocationDBTest.java	2007-07-25 00:15:38 UTC (rev 1855)
+++ trunk/archive-access/projects/wayback/wayback-core/src/test/java/org/archive/wayback/resourcestore/http/FileLocationDBTest.java	2007-07-25 00:17:15 UTC (rev 1856)
@@ -84,7 +84,7 @@
 	}
 
 	private void testMarkLength(long start, long end, int count) throws IOException {
-		Iterator itr = db.getArcsBetweenMarks(start,end);
+		Iterator<String> itr = db.getArcsBetweenMarks(start,end);
 		int found = 0;
 		while(itr.hasNext()) {
 			itr.next();


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