--- dao/DaoAdresseVedligehold/src/main/java/dk/daoas/adressevedligehold/AddressSourceDAO.java	2016/01/28 10:30:01	2857
+++ dao/DaoAdresseVedligehold/src/main/java/dk/daoas/adressevedligehold/fileupload/AddressSourceDAO.java	2016/02/16 13:15:25	2954
@@ -1,74 +1,27 @@
-package dk.daoas.adressevedligehold;
+package dk.daoas.adressevedligehold.fileupload;
 
-import java.io.BufferedReader;
 import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.nio.charset.Charset;
 
 import org.apache.commons.fileupload.FileItem;
 
-import dk.daoas.adressevedligehold.AddressSourceEntry.EntryType;
-import dk.daoas.adressevedligehold.util.DeduplicateHelper;
+import dk.daoas.adressevedligehold.fileupload.AddressSourceEntry.EntryType;
 
-public class AddressSourceDAO implements AddressSource {
+public class AddressSourceDAO extends AbstractAddressSource {
 	
 	final static String DAO = "DAO";
 	
-	DeduplicateHelper<String> dirigeringsCache = new DeduplicateHelper<String>();
-	
-	FileItem file;
-	
-	InputStream is;
-	InputStreamReader isr;
-	BufferedReader br;
-	
-	int lineCount = 0;
 		
 	public AddressSourceDAO(FileItem file) throws Exception {
-		this.file = file;
-
+		super(file);
 
-
-	}
-
-	@Override
-	public String getFilename() {
-		return file.getName();
 	}
 	
 	@Override
 	public void validate() throws IOException {
-		try {
-			is = file.getInputStream();
-			isr = new InputStreamReader(is, Charset.forName("ISO-8859-1") );
-			br = new BufferedReader(isr);
-			
-			String line = br.readLine();
-			String[] parts = line.split(";");
-			int numFields = parts.length;
-			if (numFields != 17) {
-				throw new IOException("Not enough fields in CSV file. Found " + numFields + ", expected 17");
-			}
-
-
-			
-		} catch (Exception e) {
-			try {
-				br.close();
-				isr.close();
-				is.close();
-			} catch (Exception e2) {
-				System.out.println("Error cleaning up resources");
-			}
-			
-			throw e; // Re-throw
-			 
-		}
+		super.validateWithHeader(17, ';');
 	}
 	
 
-	//TODO: Skal csv parsning klares med Apache Commons CSV ?
 
 	@Override
 	public AddressSourceEntry getNextEntry() throws IOException {
@@ -79,7 +32,6 @@
 		if (line.trim().equals(""))
 			return null;
 		
-		//System.out.println(line);
 		
 		AddressSourceEntry entry = new AddressSourceEntry( EntryType.TypeAddressRange);
 		entry.distributor = DAO;
@@ -131,22 +83,10 @@
 	public String getDistributor() {
 		return DAO;
 	}
-
-	@Override //AutoCloseable
-	public void close() throws Exception {
-		System.out.println("Closing " + DAO + " after lines " + lineCount);
-		try {
-			br.close();
-			isr.close();
-			is.close();
-
-			file.delete();
-			
-		} catch (Exception e) {
-			System.out.println("Error on closing " + e.getMessage() );
-		}
-		
-		
+	
+	@Override
+	public boolean calculateDistances() {
+		return true; //DAO skal beregne afstande
 	}
 
 }