More BlockReader work

This includes some minor fixes to the BlockReaderCLI, and two new
BlockReader types
* MappedBlockReader - Apply a function to each block, transforming it.
* FlatMappedBlockReader - Apply a function to each block, expanding it
into one or more blocks.

1 files changed, 6 insertions, 1 deletions

diff --git a/BJC-Utils2/src/main/java/bjc/utils/ioutils/blocks/MappedBlockReader.java b/BJC-Utils2/src/main/java/bjc/utils/ioutils/blocks/MappedBlockReader.java
index 1996421..a9cfa57 100644
--- a/BJC-Utils2/src/main/java/bjc/utils/ioutils/blocks/MappedBlockReader.java
+++ b/BJC-Utils2/src/main/java/bjc/utils/ioutils/blocks/MappedBlockReader.java
@@ -29,7 +29,7 @@ public class MappedBlockReader implements BlockReader {
 	@Override	
 	public boolean nextBlock() {
 		if(hasNextBlock()) {
-			current = trans.apply(reader.next());
+			current = transform.apply(reader.next());
 
 			return true;
 		}
@@ -41,4 +41,9 @@ public class MappedBlockReader implements BlockReader {
 	public int getBlockCount() {
 		return reader.getBlockCount();
 	}
+
+	@Override
+	public void close() throws IOException {
+		reader.close();
+	}
 }