--- dao/DaoAdresseVedligehold/src/main/java/dk/daoas/adressevedligehold/AddressSourceFD.java 2016/01/28 13:36:37 2867 +++ dao/DaoAdresseVedligehold/src/main/java/dk/daoas/adressevedligehold/AddressSourceFD.java 2016/01/28 16:12:28 2868 @@ -2,7 +2,6 @@ import java.io.BufferedReader; import java.io.IOException; -import java.io.InputStream; import java.io.InputStreamReader; import java.nio.charset.Charset; import java.util.List; @@ -12,33 +11,17 @@ import com.google.common.base.Splitter; import dk.daoas.adressevedligehold.AddressSourceEntry.EntryType; -import dk.daoas.adressevedligehold.util.DeduplicateHelper; -public class AddressSourceFD implements AddressSource { - - - DeduplicateHelper dirigeringsCache = new DeduplicateHelper(); - - FileItem file; - - InputStream is; - InputStreamReader isr; - BufferedReader br; - - int lineCount = 0; +public class AddressSourceFD extends AbstractAddressSource { + String filenameFirst2; public AddressSourceFD(FileItem file) throws Exception { - this.file = file; + super(file); filenameFirst2 = file.getName().substring(0, 2).toUpperCase(); } - - @Override - public String getFilename() { - return file.getName(); - } @Override public void validate() throws IOException { @@ -132,21 +115,4 @@ return "FD"; } - @Override //AutoCloseable - public void close() throws Exception { - System.out.println("Closing FD after lines " + lineCount); - try { - br.close(); - isr.close(); - is.close(); - - file.delete(); - - } catch (Exception e) { - System.out.println("Error on closing " + e.getMessage() ); - } - - - } - }