Split AffixLister pt. 1

2 files changed, 76 insertions, 33 deletions

diff --git a/src/main/java/AffixLister.java b/src/main/java/AffixLister.java
index cbd2e685..efd5bd84 100644
--- a/src/main/java/AffixLister.java
+++ b/src/main/java/AffixLister.java
@@ -25,38 +25,6 @@ public class AffixLister {
 	public static PrintStream normOut = System.out;
 	public static PrintStream errOut = System.err;
 
-	public static class ReplPair {
-		public String find;
-		public String replace;
-
-		public ReplPair() {
-
-		}
-
-		public ReplPair(String f, String r) {
-			find = f;
-			replace = r;
-		}
-	}
-
-	private static List<ReplPair> readReplList(Scanner scn) {
-		List<ReplPair> detals = new ArrayList<>();
-
-		while (scn.hasNextLine()) {
-			String name = scn.nextLine().trim();
-			if (name.equals("")) continue;
-			if (name.startsWith("#")) continue;
-
-			String body;
-			do {
-				body = scn.nextLine().trim();
-			} while (body.startsWith("#"));
-
-			detals.add(new ReplPair(name, body));
-		}
-
-		return detals;
-	}
 	private static Map<String, String> readEffectDetails(Scanner scn) {
 		Map<String, String> detals = new HashMap<>();
 
@@ -104,7 +72,7 @@ public class AffixLister {
 			}
 
 			try (FileReader replListReader = new FileReader("data/replace-list.txt")) {
-				replList = readReplList(new Scanner(replListReader));
+				replList = ReplPair.readList(new Scanner(replListReader));
 			} catch (IOException ioex) {
 				errOut.println("Error loading replacement lists");
 			}
diff --git a/src/main/java/ReplPair.java b/src/main/java/ReplPair.java
new file mode 100644
index 00000000..474f7c93
--- /dev/null
+++ b/src/main/java/ReplPair.java
@@ -0,0 +1,75 @@
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Scanner;
+
+/**
+ * String pairs for replacements.
+ *
+ * @author Ben Culkin
+ */
+public class ReplPair {
+	/**
+	 * The string to look for.
+	 */
+	public String find;
+	/**
+	 * The string to replace it with.
+	 */
+	public String replace;
+
+	/**
+	 * Create a new blank replacement pair.
+	 */
+	public ReplPair() {
+
+	}
+
+	/**
+	 * Create a new replacement pair.
+	 *
+	 * @param f
+	 * 	The string to find.
+	 * @param r
+	 * 	The string to replace.
+	 */
+	public ReplPair(String f, String r) {
+		find = f;
+		replace = r;
+	}
+
+	/**
+	 * Read a list of replacement pairs from an input source.
+	 *
+	 * @param scn
+	 * 	The source to read the replacements from.
+	 */
+	public static List<ReplPair> readList(Scanner scn) {
+		return ReplPair.readList(new ArrayList<>(), scn);
+	}
+
+	/**
+	 * Read a list of replacement pairs from an input source, adding them to
+	 * an existing list.
+	 *
+	 * @param detals
+	 * 	The list to add the replacements to.
+	 * @param scn
+	 * 	The source to read the replacements from.
+	 */
+	public static List<ReplPair> readList(List<ReplPair> detals, Scanner scn) {
+		while (scn.hasNextLine()) {
+			String name = scn.nextLine().trim();
+			if (name.equals("")) continue;
+			if (name.startsWith("#")) continue;
+
+			String body;
+			do {
+				body = scn.nextLine().trim();
+			} while (body.startsWith("#"));
+
+			detals.add(new ReplPair(name, body));
+		}
+
+		return detals;
+	}
+}