From 504ca816530efdff06bc202e0432ebd354aec304 Mon Sep 17 00:00:00 2001 From: EVE Date: Tue, 14 Mar 2017 12:07:14 -0400 Subject: Cleanup --- .../utils/parserutils/RuleBasedReaderPragmas.java | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) (limited to 'BJC-Utils2/src/main/java/bjc/utils/parserutils/RuleBasedReaderPragmas.java') diff --git a/BJC-Utils2/src/main/java/bjc/utils/parserutils/RuleBasedReaderPragmas.java b/BJC-Utils2/src/main/java/bjc/utils/parserutils/RuleBasedReaderPragmas.java index 6c660c6..65add27 100644 --- a/BJC-Utils2/src/main/java/bjc/utils/parserutils/RuleBasedReaderPragmas.java +++ b/BJC-Utils2/src/main/java/bjc/utils/parserutils/RuleBasedReaderPragmas.java @@ -1,14 +1,14 @@ package bjc.utils.parserutils; -import java.util.function.BiConsumer; - import bjc.utils.exceptions.PragmaFormatException; import bjc.utils.funcdata.FunctionalStringTokenizer; import bjc.utils.funcutils.ListUtils; +import java.util.function.BiConsumer; + /** * Contains factory methods for common pragma types - * + * * @author ben * */ @@ -16,7 +16,7 @@ public class RuleBasedReaderPragmas { /** * Creates a pragma that takes a single integer argument - * + * * @param * The type of state that goes along with this pragma * @param name @@ -29,9 +29,8 @@ public class RuleBasedReaderPragmas { BiConsumer consumer) { return (tokenizer, state) -> { // Check our input is correct - if (!tokenizer.hasMoreTokens()) { + if(!tokenizer.hasMoreTokens()) throw new PragmaFormatException("Pragma " + name + " requires one integer argument"); - } // Read the argument String token = tokenizer.nextToken(); @@ -39,7 +38,7 @@ public class RuleBasedReaderPragmas { try { // Run the pragma consumer.accept(Integer.parseInt(token), state); - } catch (NumberFormatException nfex) { + } catch(NumberFormatException nfex) { // Tell the user their argument isn't correct PragmaFormatException pfex = new PragmaFormatException( "Argument " + token + " to " + name + " pragma isn't a valid integer. " @@ -55,7 +54,7 @@ public class RuleBasedReaderPragmas { /** * Creates a pragma that takes any number of arguments and collapses * them all into a single string - * + * * @param * The type of state that goes along with this pragma * @param name @@ -68,10 +67,8 @@ public class RuleBasedReaderPragmas { BiConsumer consumer) { return (tokenizer, state) -> { // Check our input - if (!tokenizer.hasMoreTokens()) { - throw new PragmaFormatException( - "Pragma " + name + " requires one or more string arguments"); - } + if(!tokenizer.hasMoreTokens()) throw new PragmaFormatException( + "Pragma " + name + " requires one or more string arguments"); // Build our argument String collapsed = ListUtils.collapseTokens(tokenizer.toList()); -- cgit v1.2.3