Fix misc. compile errors

1 files changed, 11 insertions, 5 deletions

diff --git a/BJC-Utils2/src/main/java/bjc/utils/ioutils/blocks/ToggledBlockReader.java b/BJC-Utils2/src/main/java/bjc/utils/ioutils/blocks/ToggledBlockReader.java
index 07a9a49..8f39b8f 100644
--- a/BJC-Utils2/src/main/java/bjc/utils/ioutils/blocks/ToggledBlockReader.java
+++ b/BJC-Utils2/src/main/java/bjc/utils/ioutils/blocks/ToggledBlockReader.java
@@ -2,7 +2,7 @@ package bjc.utils.ioutils.blocks;
 
 import java.io.IOException;
 
-import bjc.utils.date.BooleanToggle;
+import bjc.utils.data.BooleanToggle;
 
 public class ToggledBlockReader implements BlockReader {
 	private BlockReader leftSource;
@@ -26,14 +26,14 @@ public class ToggledBlockReader implements BlockReader {
 
 	@Override
 	public boolean hasNextBlock() {
-		if(leftToggle.peek()) return left.hasNextBlock();
-		else                  return right.hasNextBlock();
+		if(leftToggle.peek()) return leftSource.hasNextBlock();
+		else                  return rightSource.hasNextBlock();
 	}
 
 	@Override
 	public Block getBlock() {
-		if(leftToggle.peek()) return left.getBlock();
-		else                  return right.getBlock();
+		if(leftToggle.peek()) return leftSource.getBlock();
+		else                  return rightSource.getBlock();
 	}
 
 	@Override
@@ -54,4 +54,10 @@ public class ToggledBlockReader implements BlockReader {
 	public int getBlockCount() {
 		return blockNo;
 	}
+	
+	@Override
+	public void close() throws IOException {
+		leftSource.close();
+		rightSource.close();
+	}
 }