diff options
Diffstat (limited to 'BJC-Utils2/src')
| -rw-r--r-- | BJC-Utils2/src/main/java/bjc/utils/ioutils/Prompter.java | 2 | ||||
| -rw-r--r-- | BJC-Utils2/src/main/java/bjc/utils/ioutils/blocks/Block.java (renamed from BJC-Utils2/src/main/java/bjc/utils/ioutils/Block.java) | 2 | ||||
| -rw-r--r-- | BJC-Utils2/src/main/java/bjc/utils/ioutils/blocks/BlockReader.java (renamed from BJC-Utils2/src/main/java/bjc/utils/ioutils/BlockReader.java) | 2 | ||||
| -rw-r--r-- | BJC-Utils2/src/main/java/bjc/utils/ioutils/blocks/BlockReaders.java (renamed from BJC-Utils2/src/main/java/bjc/utils/ioutils/BlockReaders.java) | 160 | ||||
| -rw-r--r-- | BJC-Utils2/src/main/java/bjc/utils/ioutils/blocks/LayeredBlockReader.java (renamed from BJC-Utils2/src/main/java/bjc/utils/ioutils/LayeredBlockReader.java) | 2 | ||||
| -rw-r--r-- | BJC-Utils2/src/main/java/bjc/utils/ioutils/blocks/PushbackBlockReader.java (renamed from BJC-Utils2/src/main/java/bjc/utils/ioutils/PushbackBlockReader.java) | 2 | ||||
| -rw-r--r-- | BJC-Utils2/src/main/java/bjc/utils/ioutils/blocks/SerialBlockReader.java (renamed from BJC-Utils2/src/main/java/bjc/utils/ioutils/SerialBlockReader.java) | 2 | ||||
| -rw-r--r-- | BJC-Utils2/src/main/java/bjc/utils/ioutils/blocks/SimpleBlockReader.java (renamed from BJC-Utils2/src/main/java/bjc/utils/ioutils/SimpleBlockReader.java) | 2 | ||||
| -rw-r--r-- | BJC-Utils2/src/main/java/bjc/utils/ioutils/blocks/TriggeredBlockReader.java (renamed from BJC-Utils2/src/main/java/bjc/utils/ioutils/TriggeredBlockReader.java) | 2 |
9 files changed, 89 insertions, 87 deletions
diff --git a/BJC-Utils2/src/main/java/bjc/utils/ioutils/Prompter.java b/BJC-Utils2/src/main/java/bjc/utils/ioutils/Prompter.java index ac6e558..eed53ae 100644 --- a/BJC-Utils2/src/main/java/bjc/utils/ioutils/Prompter.java +++ b/BJC-Utils2/src/main/java/bjc/utils/ioutils/Prompter.java @@ -1,5 +1,7 @@ package bjc.utils.ioutils; +import bjc.utils.ioutils.blocks.TriggeredBlockReader; + import java.io.PrintStream; /** diff --git a/BJC-Utils2/src/main/java/bjc/utils/ioutils/Block.java b/BJC-Utils2/src/main/java/bjc/utils/ioutils/blocks/Block.java index 19de1ae..e92644e 100644 --- a/BJC-Utils2/src/main/java/bjc/utils/ioutils/Block.java +++ b/BJC-Utils2/src/main/java/bjc/utils/ioutils/blocks/Block.java @@ -1,4 +1,4 @@ -package bjc.utils.ioutils; +package bjc.utils.ioutils.blocks; /** * Represents a block of text read in from a source. diff --git a/BJC-Utils2/src/main/java/bjc/utils/ioutils/BlockReader.java b/BJC-Utils2/src/main/java/bjc/utils/ioutils/blocks/BlockReader.java index f019e09..d45a4f3 100644 --- a/BJC-Utils2/src/main/java/bjc/utils/ioutils/BlockReader.java +++ b/BJC-Utils2/src/main/java/bjc/utils/ioutils/blocks/BlockReader.java @@ -1,4 +1,4 @@ -package bjc.utils.ioutils; +package bjc.utils.ioutils.blocks; import java.io.IOException; import java.util.Iterator; diff --git a/BJC-Utils2/src/main/java/bjc/utils/ioutils/BlockReaders.java b/BJC-Utils2/src/main/java/bjc/utils/ioutils/blocks/BlockReaders.java index 3d71f52..ca82b51 100644 --- a/BJC-Utils2/src/main/java/bjc/utils/ioutils/BlockReaders.java +++ b/BJC-Utils2/src/main/java/bjc/utils/ioutils/blocks/BlockReaders.java @@ -1,81 +1,81 @@ -package bjc.utils.ioutils;
-
-import java.io.Reader;
-
-/**
- * Utility methods for constructing instances of {@link BlockReader}
- *
- * @author bjculkin
- *
- */
-public class BlockReaders {
- /**
- * Create a new simple block reader that works off a regex.
- *
- * @param blockDelim
- * The regex that separates blocks.
- *
- * @param source
- * The reader to get blocks from.
- *
- * @return A configured simple reader.
- */
- public static SimpleBlockReader simple(String blockDelim, Reader source) {
- return new SimpleBlockReader(blockDelim, source);
- }
-
- /**
- * Create a new pushback block reader.
- *
- * @param src
- * The block reader to read blocks from.
- *
- * @return A configured pushback reader.
- */
- public static PushbackBlockReader pushback(BlockReader src) {
- return new PushbackBlockReader(src);
- }
-
- /**
- * Create a new triggered block reader.
- *
- * @param source
- * The block reader to read blocks from.
- *
- * @param action
- * The action to execute before reading a block.
- *
- * @return A configured triggered block reader.
- */
- public static BlockReader trigger(BlockReader source, Runnable action) {
- return new TriggeredBlockReader(source, action);
- }
-
- /**
- * Create a new layered block reader.
- *
- * @param primary
- * The first source to read blocks from.
- *
- * @param secondary
- * The second source to read blocks from.
- *
- * @return A configured layered block reader.
- */
- public static BlockReader layered(BlockReader primary, BlockReader secondary) {
- return new LayeredBlockReader(primary, secondary);
- }
-
- /**
- * Create a new serial block reader.
- *
- * @param readers
- * The readers to pull from, in the order to pull from
- * them.
- *
- * @return A configured serial block reader.
- */
- public static BlockReader serial(BlockReader... readers) {
- return new SerialBlockReader(readers);
- }
+package bjc.utils.ioutils.blocks; + +import java.io.Reader; + +/** + * Utility methods for constructing instances of {@link BlockReader} + * + * @author bjculkin + * + */ +public class BlockReaders { + /** + * Create a new simple block reader that works off a regex. + * + * @param blockDelim + * The regex that separates blocks. + * + * @param source + * The reader to get blocks from. + * + * @return A configured simple reader. + */ + public static SimpleBlockReader simple(String blockDelim, Reader source) { + return new SimpleBlockReader(blockDelim, source); + } + + /** + * Create a new pushback block reader. + * + * @param src + * The block reader to read blocks from. + * + * @return A configured pushback reader. + */ + public static PushbackBlockReader pushback(BlockReader src) { + return new PushbackBlockReader(src); + } + + /** + * Create a new triggered block reader. + * + * @param source + * The block reader to read blocks from. + * + * @param action + * The action to execute before reading a block. + * + * @return A configured triggered block reader. + */ + public static BlockReader trigger(BlockReader source, Runnable action) { + return new TriggeredBlockReader(source, action); + } + + /** + * Create a new layered block reader. + * + * @param primary + * The first source to read blocks from. + * + * @param secondary + * The second source to read blocks from. + * + * @return A configured layered block reader. + */ + public static BlockReader layered(BlockReader primary, BlockReader secondary) { + return new LayeredBlockReader(primary, secondary); + } + + /** + * Create a new serial block reader. + * + * @param readers + * The readers to pull from, in the order to pull from + * them. + * + * @return A configured serial block reader. + */ + public static BlockReader serial(BlockReader... readers) { + return new SerialBlockReader(readers); + } }
\ No newline at end of file diff --git a/BJC-Utils2/src/main/java/bjc/utils/ioutils/LayeredBlockReader.java b/BJC-Utils2/src/main/java/bjc/utils/ioutils/blocks/LayeredBlockReader.java index ed7a1b9..9ece6df 100644 --- a/BJC-Utils2/src/main/java/bjc/utils/ioutils/LayeredBlockReader.java +++ b/BJC-Utils2/src/main/java/bjc/utils/ioutils/blocks/LayeredBlockReader.java @@ -1,4 +1,4 @@ -package bjc.utils.ioutils; +package bjc.utils.ioutils.blocks; import java.io.IOException; diff --git a/BJC-Utils2/src/main/java/bjc/utils/ioutils/PushbackBlockReader.java b/BJC-Utils2/src/main/java/bjc/utils/ioutils/blocks/PushbackBlockReader.java index d67e01a..96906ae 100644 --- a/BJC-Utils2/src/main/java/bjc/utils/ioutils/PushbackBlockReader.java +++ b/BJC-Utils2/src/main/java/bjc/utils/ioutils/blocks/PushbackBlockReader.java @@ -1,4 +1,4 @@ -package bjc.utils.ioutils; +package bjc.utils.ioutils.blocks; import java.io.IOException; import java.util.Deque; diff --git a/BJC-Utils2/src/main/java/bjc/utils/ioutils/SerialBlockReader.java b/BJC-Utils2/src/main/java/bjc/utils/ioutils/blocks/SerialBlockReader.java index 0ae969d..2363468 100644 --- a/BJC-Utils2/src/main/java/bjc/utils/ioutils/SerialBlockReader.java +++ b/BJC-Utils2/src/main/java/bjc/utils/ioutils/blocks/SerialBlockReader.java @@ -1,4 +1,4 @@ -package bjc.utils.ioutils; +package bjc.utils.ioutils.blocks; import java.io.IOException; import java.util.Deque; diff --git a/BJC-Utils2/src/main/java/bjc/utils/ioutils/SimpleBlockReader.java b/BJC-Utils2/src/main/java/bjc/utils/ioutils/blocks/SimpleBlockReader.java index 6b868bb..6ee1d57 100644 --- a/BJC-Utils2/src/main/java/bjc/utils/ioutils/SimpleBlockReader.java +++ b/BJC-Utils2/src/main/java/bjc/utils/ioutils/blocks/SimpleBlockReader.java @@ -1,4 +1,4 @@ -package bjc.utils.ioutils; +package bjc.utils.ioutils.blocks; import java.io.IOException; import java.io.LineNumberReader; diff --git a/BJC-Utils2/src/main/java/bjc/utils/ioutils/TriggeredBlockReader.java b/BJC-Utils2/src/main/java/bjc/utils/ioutils/blocks/TriggeredBlockReader.java index dd89223..cfe72c2 100644 --- a/BJC-Utils2/src/main/java/bjc/utils/ioutils/TriggeredBlockReader.java +++ b/BJC-Utils2/src/main/java/bjc/utils/ioutils/blocks/TriggeredBlockReader.java @@ -1,4 +1,4 @@ -package bjc.utils.ioutils; +package bjc.utils.ioutils.blocks; import java.io.IOException; |