Fix property bugs

1 files changed, 22 insertions, 11 deletions

diff --git a/BJC-Utils2/src/main/java/bjc/utils/ioutils/SimpleProperties.java b/BJC-Utils2/src/main/java/bjc/utils/ioutils/SimpleProperties.java
index e3b0122..a43b16a 100644
--- a/BJC-Utils2/src/main/java/bjc/utils/ioutils/SimpleProperties.java
+++ b/BJC-Utils2/src/main/java/bjc/utils/ioutils/SimpleProperties.java
@@ -15,7 +15,7 @@ import java.util.Set;
  *
  */
 public class SimpleProperties implements Map<String, String> {
-	private static Map<String, String> props;
+	private Map<String, String> props;
 
 	/**
 	 * Create a new set of simple properties.
@@ -32,33 +32,37 @@ public class SimpleProperties implements Map<String, String> {
 	 * All leading/trailing spaces from the name & body are removed.
 	 * 
 	 * @param is
-	 *                The stream to read from.
+	 *            The stream to read from.
 	 * 
 	 * @param allowDuplicates
-	 *                Whether or not duplicate keys should be allowed.
+	 *            Whether or not duplicate keys should be allowed.
 	 */
 	public void loadFrom(InputStream is, boolean allowDuplicates) {
-		try(Scanner scn = new Scanner(is)) {
-			while(scn.hasNextLine()) {
+		try (Scanner scn = new Scanner(is)) {
+			while (scn.hasNextLine()) {
 				String ln = scn.nextLine().trim();
 
 				/*
 				 * Skip blank lines/comments
 				 */
-				if(ln.equals("")) continue;
-				if(ln.equals("#")) continue;
+				if (ln.equals(""))
+					continue;
+				if (ln.startsWith("#"))
+					continue;
 
 				int sepIdx = ln.indexOf(' ');
 
-				if(sepIdx == -1) {
-					throw new NoSuchElementException(
-							"Properties must be a name, a space, then the body");
+				if (sepIdx == -1) {
+					String fmt = "Properties must be a name, a space, then the body.\n\tOffending line is '%s'";
+					String msg = String.format(fmt, ln);
+
+					throw new NoSuchElementException(msg);
 				}
 
 				String name = ln.substring(0, sepIdx).trim();
 				String body = ln.substring(sepIdx).trim();
 
-				if(!allowDuplicates && containsKey(name)) {
+				if (!allowDuplicates && containsKey(name)) {
 					String msg = String.format("Duplicate key '%s'", name);
 
 					throw new IllegalStateException(msg);
@@ -67,6 +71,13 @@ public class SimpleProperties implements Map<String, String> {
 				put(name, body);
 			}
 		}
+
+		System.out.println("Read properties:");
+		for (Entry<String, String> entry : entrySet()) {
+			System.out.printf("\t'%s'\t'%s'\n", entry.getKey(), entry.getValue());
+		}
+		System.out.println();
+
 	}
 
 	@Override