Restructure new die implementation

1 files changed, 65 insertions, 0 deletions

diff --git a/dice/src/main/java/bjc/dicelang/neodice/diepool/FixedDiePool.java b/dice/src/main/java/bjc/dicelang/neodice/diepool/FixedDiePool.java
new file mode 100644
index 0000000..c60b88a
--- /dev/null
+++ b/dice/src/main/java/bjc/dicelang/neodice/diepool/FixedDiePool.java
@@ -0,0 +1,65 @@
+package bjc.dicelang.neodice.diepool;
+
+import java.util.*;
+
+import bjc.dicelang.neodice.*;
+
+public class FixedDiePool implements DiePool {
+	private final Die[] dice;
+
+	public FixedDiePool(Die[] dice) {
+		this.dice = dice;
+	}
+
+	@Override
+	public int[] roll(Random rng) {
+		int[] results = new int[dice.length];
+		
+		for (int index = 0; index < dice.length; index++) {
+			results[index] = dice[index].roll(rng);
+		}
+		
+		return results;
+	}
+
+	@Override
+	public Die[] contained() {
+		return dice;
+	}
+
+	
+	@Override
+	public String toString() {
+		StringBuilder builder = new StringBuilder();
+		
+		for (int i = 0; i < dice.length; i++) {
+			Die die = dice[i];
+			
+			builder.append(die);
+			
+			// Don't add an extra trailing comma
+			if (i < dice.length - 1) builder.append(", ");
+		}
+		
+		return builder.toString();
+	}
+
+	@Override
+	public int hashCode() {
+		final int prime = 31;
+		int result = 1;
+		result = prime * result + Arrays.hashCode(dice);
+		return result;
+	}
+
+	@Override
+	public boolean equals(Object obj) {
+		if (this == obj)                  return true;
+		if (obj == null)                  return false;
+		if (getClass() != obj.getClass()) return false;
+		
+		FixedDiePool other = (FixedDiePool) obj;
+		
+		return Arrays.equals(dice, other.dice);
+	}
+}
\ No newline at end of file