[Archive-access-cvs] SF.net SVN: archive-access: [1781] trunk/archive-access/projects/wayback/ wayback-core/src/main/java/org/archive/wayback/util/flatfile/FlatFile.java

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

Revision: 1781
          http://archive-access.svn.sourceforge.net/archive-access/?rev=1781&view=rev
Author:   bradtofel
Date:     2007-07-16 15:57:38 -0700 (Mon, 16 Jul 2007)

Log Message:
-----------
REFACTOR: now HASA File instead of ISA File, to allow for empty constructor, and getters and setters for Spring.

Modified Paths:
--------------
    trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/util/flatfile/FlatFile.java

Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/util/flatfile/FlatFile.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/util/flatfile/FlatFile.java	2007-07-16 22:55:57 UTC (rev 1780)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/util/flatfile/FlatFile.java	2007-07-16 22:57:38 UTC (rev 1781)
@@ -39,23 +39,46 @@
  * @author brad
  * @version $Date$, $Revision$
  */
-public class FlatFile extends File {
+public class FlatFile {
 
 	private static final long serialVersionUID = 6174187801001601557L;
 	private long lastMatchOffset;
+	private File file = null;
 	/**
+	 * 
+	 */
+	public FlatFile() {
+		
+	}
+	/**
 	 * @param parent
 	 * @param child
 	 */
 	public FlatFile(File parent, String child) {
-		super(parent, child);
+		file = new File(parent,child);
 	}
 	/**
 	 * @param path
 	 */
 	public FlatFile(String path) {
-		super(path);
+		file = new File(path);
 	}
+	
+	/**
+	 * @param path to set
+	 */
+	public void setPath(String path) {
+		file = new File(path);
+	}
+	/**
+	 * @return current String path, or null if none has been set
+	 */
+	public String getPath() {
+		if(file == null) {
+			return null;
+		}
+		return file.getAbsolutePath();
+	}
 
 	/**
 	 * Binary search thru RandomAccessFile argument to locate the first line
@@ -110,7 +133,7 @@
 	 * @throws IOException
 	 */
 	public Iterator getSequentialIterator() throws IOException {
-		BufferedReader br = new BufferedReader(new FileReader(this));
+		BufferedReader br = new BufferedReader(new FileReader(file));
 		return new RecordIterator(br);
 	}
 	
@@ -121,7 +144,7 @@
 	 */
 	public Iterator getRecordIterator(final String prefix) throws IOException {
 		RecordIterator itr = null;
-		RandomAccessFile raf = new RandomAccessFile(this,"r");
+		RandomAccessFile raf = new RandomAccessFile(file,"r");
 		long offset = findKeyOffset(raf,prefix);
 		lastMatchOffset = offset;
 		BufferedReader br = new BufferedReader(new FileReader(raf.getFD()));
@@ -140,7 +163,7 @@
 		throws IOException {
 
 		ReverseRecordIterator itr = null;
-		RandomAccessFile raf = new RandomAccessFile(this,"r");
+		RandomAccessFile raf = new RandomAccessFile(file,"r");
 		long offset = findKeyOffset(raf,prefix);
 		if(offset < 1) {
 			return new ReverseRecordIterator(null);


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