From 79d3a4a47cbc1fcf17c77c6fc12ff826a3077bac Mon Sep 17 00:00:00 2001
From: bculkin2442 <bjculkin@mix.wvu.edu>
Date: Wed, 6 Apr 2016 13:50:00 -0400
Subject: Minor bugfixes/changes, as well as beginnings of CLI systems

---
 .../components/ComponentDescriptionFileParser.java | 50 +++++++++++++---------
 .../utils/components/FileComponentRepository.java  |  2 +-
 2 files changed, 30 insertions(+), 22 deletions(-)

(limited to 'BJC-Utils2/src/main/java/bjc/utils/components')

diff --git a/BJC-Utils2/src/main/java/bjc/utils/components/ComponentDescriptionFileParser.java b/BJC-Utils2/src/main/java/bjc/utils/components/ComponentDescriptionFileParser.java
index 5ab87bb..254e380 100644
--- a/BJC-Utils2/src/main/java/bjc/utils/components/ComponentDescriptionFileParser.java
+++ b/BJC-Utils2/src/main/java/bjc/utils/components/ComponentDescriptionFileParser.java
@@ -19,54 +19,62 @@ public class ComponentDescriptionFileParser {
 		// This reader works entirely off of pragmas, so no need to handle
 		// rules
 		reader = new RuleBasedConfigReader<>((tokenizer, statePair) -> {
+			// Don't need to do anything on rule start
 		}, (tokenizer, state) -> {
+			// Don't need to do anything on rule continuation
 		}, (state) -> {
+			// Don't need to do anything on rule end
 		});
 
 		reader.addPragma("name", (tokenizer, state) -> {
 			if (!tokenizer.hasMoreTokens()) {
 				throw new PragmaFormatException(
 						"Pragma name requires one string argument");
-			} else {
-				state.setName(ListUtils.collapseTokens(
-						tokenizer.toList((strang) -> strang)));
 			}
+
+			state.setName(ListUtils
+					.collapseTokens(tokenizer.toList((strang) -> strang)));
 		});
 
 		reader.addPragma("author", (tokenizer, state) -> {
 			if (!tokenizer.hasMoreTokens()) {
 				throw new PragmaFormatException(
 						"Pragma author requires one string argument");
-			} else {
-				state.setAuthor(ListUtils.collapseTokens(
-						tokenizer.toList((strang) -> strang)));
 			}
+
+			state.setAuthor(ListUtils
+					.collapseTokens(tokenizer.toList((strang) -> strang)));
 		});
 
 		reader.addPragma("description", (tokenizer, state) -> {
 			if (!tokenizer.hasMoreTokens()) {
 				throw new PragmaFormatException(
 						"Pragma description requires one string argument");
-			} else {
-				state.setDescription(ListUtils.collapseTokens(
-						tokenizer.toList((strang) -> strang)));
 			}
+
+			state.setDescription(ListUtils
+					.collapseTokens(tokenizer.toList((strang) -> strang)));
 		});
 
 		reader.addPragma("version", (tokenizer, state) -> {
 			if (!tokenizer.hasMoreTokens()) {
 				throw new PragmaFormatException(
 						"Pragma name requires one integer argument");
-			} else {
-				String token = tokenizer.nextToken();
-
-				try {
-					state.setVersion(Integer.parseInt(token));
-				} catch (NumberFormatException nfex) {
-					throw new PragmaFormatException("Argument " + token
-							+ " to version pragma isn't a valid integer. "
-							+ "This pragma requires a integer argument");
-				}
+			}
+
+			String token = tokenizer.nextToken();
+
+			try {
+				state.setVersion(Integer.parseInt(token));
+			} catch (NumberFormatException nfex) {
+				PragmaFormatException pfex = new PragmaFormatException(
+						"Argument " + token
+								+ " to version pragma isn't a valid integer. "
+								+ "This pragma requires a integer argument");
+
+				pfex.initCause(nfex);
+
+				throw pfex;
 			}
 		});
 	}
@@ -78,8 +86,8 @@ public class ComponentDescriptionFileParser {
 	 *            The stream to parse from
 	 * @return The description parsed from the stream
 	 */
-	public static ComponentDescription
-			fromStream(InputStream inputSource) {
+	public static ComponentDescription fromStream(
+			InputStream inputSource) {
 		ComponentDescriptionState readState = reader
 				.fromStream(inputSource, new ComponentDescriptionState());
 
diff --git a/BJC-Utils2/src/main/java/bjc/utils/components/FileComponentRepository.java b/BJC-Utils2/src/main/java/bjc/utils/components/FileComponentRepository.java
index 4b8d87b..4aea0d6 100644
--- a/BJC-Utils2/src/main/java/bjc/utils/components/FileComponentRepository.java
+++ b/BJC-Utils2/src/main/java/bjc/utils/components/FileComponentRepository.java
@@ -92,7 +92,7 @@ public class FileComponentRepository<E extends IDescribedComponent>
 					CLASS_LOGGER
 							.warn("Error found reading component from file "
 									+ componentFile.toString()
-									+ ". This component will not be loaded");
+									+ ". This component will not be loaded", ex);
 				}
 
 			}
-- 
cgit v1.2.3