From 82951e37e10b282d9a7c89f4662990b64949c943 Mon Sep 17 00:00:00 2001
From: bculkin2442 <bjculkin@mix.wvu.edu>
Date: Mon, 29 Feb 2016 10:41:17 -0500
Subject: General code cleanup

---
 .../utils/parserutils/RuleBasedConfigReader.java   | 28 +++++++++++-----------
 1 file changed, 14 insertions(+), 14 deletions(-)

(limited to 'BJC-Utils2/src/main/java/bjc/utils/parserutils/RuleBasedConfigReader.java')

diff --git a/BJC-Utils2/src/main/java/bjc/utils/parserutils/RuleBasedConfigReader.java b/BJC-Utils2/src/main/java/bjc/utils/parserutils/RuleBasedConfigReader.java
index 1190281..d07d725 100644
--- a/BJC-Utils2/src/main/java/bjc/utils/parserutils/RuleBasedConfigReader.java
+++ b/BJC-Utils2/src/main/java/bjc/utils/parserutils/RuleBasedConfigReader.java
@@ -20,12 +20,12 @@ import bjc.utils.funcdata.FunctionalStringTokenizer;
  *            type of the state object to use
  */
 public class RuleBasedConfigReader<E> {
-	private Map<String, BiConsumer<FunctionalStringTokenizer, E>>	pragmas;
-
 	private BiConsumer<FunctionalStringTokenizer, Pair<String, E>>	startRule;
 	private BiConsumer<FunctionalStringTokenizer, E>				continueRule;
 	private Consumer<E>												endRule;
 
+	private Map<String, BiConsumer<FunctionalStringTokenizer, E>>	pragmas;
+
 	/**
 	 * Create a new rule-based config reader
 	 * 
@@ -43,10 +43,15 @@ public class RuleBasedConfigReader<E> {
 		this.startRule = startRule;
 		this.continueRule = continueRule;
 		this.endRule = endRule;
-		
+
 		this.pragmas = new HashMap<>();
 	}
 
+	public void addPragma(String pragName,
+			BiConsumer<FunctionalStringTokenizer, E> pragAct) {
+		pragmas.put(pragName, pragAct);
+	}
+
 	public E fromStream(InputStream is, E initState) {
 		Scanner scn = new Scanner(is);
 
@@ -67,7 +72,7 @@ public class RuleBasedConfigReader<E> {
 
 				String nxtToken = stk.nextToken();
 				if (nxtToken.equals("#")) {
-
+					// Do nothing, this is a comment
 				} else if (nxtToken.equals("pragma")) {
 					String tk = stk.nextToken();
 
@@ -87,16 +92,6 @@ public class RuleBasedConfigReader<E> {
 		return stat;
 	}
 
-	public void addPragma(String pragName,
-			BiConsumer<FunctionalStringTokenizer, E> pragAct) {
-		pragmas.put(pragName, pragAct);
-	}
-
-	public void setStartRule(
-			BiConsumer<FunctionalStringTokenizer, Pair<String, E>> startRule) {
-		this.startRule = startRule;
-	}
-
 	public void setContinueRule(
 			BiConsumer<FunctionalStringTokenizer, E> continueRule) {
 		this.continueRule = continueRule;
@@ -105,4 +100,9 @@ public class RuleBasedConfigReader<E> {
 	public void setEndRule(Consumer<E> endRule) {
 		this.endRule = endRule;
 	}
+
+	public void setStartRule(
+			BiConsumer<FunctionalStringTokenizer, Pair<String, E>> startRule) {
+		this.startRule = startRule;
+	}
 }
-- 
cgit v1.2.3