Formatting pass

12 files changed, 67 insertions, 75 deletions

diff --git a/dice/src/main/java/bjc/dicelang/dice/CompoundDie.java b/dice/src/main/java/bjc/dicelang/dice/CompoundDie.java
index 0793872..f7564b7 100644
--- a/dice/src/main/java/bjc/dicelang/dice/CompoundDie.java
+++ b/dice/src/main/java/bjc/dicelang/dice/CompoundDie.java
@@ -14,9 +14,9 @@ public class CompoundDie implements Die {
 	 * Create a new compound die.

 	 *

 	 * @param lft

-	 *                The left die

+	 *        The left die

 	 * @param rght

-	 *                The right die

+	 *        The right die

 	 */

 	public CompoundDie(final Die lft, final Die rght) {

 		left = lft;

@@ -30,7 +30,7 @@ public class CompoundDie implements Die {
 

 	@Override

 	public long optimize() {

-		long leftOpt  = left.optimize();

+		long leftOpt = left.optimize();

 		long rightOpt = right.optimize();

 

 		return Long.parseLong(String.format("%d%d", leftOpt, rightOpt));

@@ -38,7 +38,7 @@ public class CompoundDie implements Die {
 

 	@Override

 	public long roll() {

-		long leftRoll  = left.optimize();

+		long leftRoll = left.optimize();

 		long rightRoll = right.optimize();

 

 		return Long.parseLong(String.format("%d%d", leftRoll, rightRoll));

@@ -52,7 +52,7 @@ public class CompoundDie implements Die {
 

 	@Override

 	public String toString() {

-		String leftString  = left.toString();

+		String leftString = left.toString();

 		String rightString = right.toString();

 

 		return String.format("%sc%s", leftString, rightString);

diff --git a/dice/src/main/java/bjc/dicelang/dice/CompoundingDie.java b/dice/src/main/java/bjc/dicelang/dice/CompoundingDie.java
index 023282e..4101a39 100644
--- a/dice/src/main/java/bjc/dicelang/dice/CompoundingDie.java
+++ b/dice/src/main/java/bjc/dicelang/dice/CompoundingDie.java
@@ -15,17 +15,17 @@ public class CompoundingDie implements Die {
 	private final Die source;

 

 	/* The predicate that marks when to compound. */

-	private final Predicate<Long>   compoundOn;

+	private final Predicate<Long> compoundOn;

 	/* The string version of the predicate, if one exists. */

-	private final String            compoundPattern;

+	private final String compoundPattern;

 

 	/**

 	 * Create a new compounding die with no pattern.

 	 *

 	 * @param src

-	 *                The die to compound from

+	 *        The die to compound from

 	 * @param compound

-	 *                The conditions to compound on

+	 *        The conditions to compound on

 	 */

 	public CompoundingDie(final Die src, final Predicate<Long> compound) {

 		this(src, compound, null);

@@ -35,12 +35,11 @@ public class CompoundingDie implements Die {
 	 * Create a new compounding die with a specified pattern.

 	 *

 	 * @param src

-	 *                The die to compound from

+	 *        The die to compound from

 	 * @param compound

-	 *                The conditions to compound on

+	 *        The conditions to compound on

 	 * @param patt

-	 *                The string pattern the condition came from, for

-	 *                printing

+	 *        The string pattern the condition came from, for printing

 	 */

 	public CompoundingDie(final Die src, final Predicate<Long> compound, final String patt) {

 		source = src;

diff --git a/dice/src/main/java/bjc/dicelang/dice/DiceBox.java b/dice/src/main/java/bjc/dicelang/dice/DiceBox.java
index f3b01a8..a382196 100644
--- a/dice/src/main/java/bjc/dicelang/dice/DiceBox.java
+++ b/dice/src/main/java/bjc/dicelang/dice/DiceBox.java
@@ -160,7 +160,7 @@ public class DiceBox {
 			Die rhs = ((ScalarDiceExpression) right).scalar;
 
 			final DieList lst = new SimpleDieList(lhs, rhs);
-			
+
 			return new ListDiceExpression(lst);
 		}
 
diff --git a/dice/src/main/java/bjc/dicelang/dice/DiceExpression.java b/dice/src/main/java/bjc/dicelang/dice/DiceExpression.java
index 41b2147..a946ea0 100644
--- a/dice/src/main/java/bjc/dicelang/dice/DiceExpression.java
+++ b/dice/src/main/java/bjc/dicelang/dice/DiceExpression.java
@@ -12,6 +12,6 @@ public interface DiceExpression {
 	 * @return The value of the expression as a string.
 	 */
 	public String value();
-	
+
 	public boolean isList();
 }
diff --git a/dice/src/main/java/bjc/dicelang/dice/Die.java b/dice/src/main/java/bjc/dicelang/dice/Die.java
index 630e8b9..80d9458 100644
--- a/dice/src/main/java/bjc/dicelang/dice/Die.java
+++ b/dice/src/main/java/bjc/dicelang/dice/Die.java
@@ -16,8 +16,8 @@ public interface Die {
 	/**

 	 * Optimize this die to a single number.

 	 *

-	 * Calling optimize on dice that return false for canOptimize produces

-	 * undefined behavior

+	 * Calling optimize on dice that return false for canOptimize produces undefined

+	 * behavior

 	 *

 	 * @return The optimized form of this die

 	 */

diff --git a/dice/src/main/java/bjc/dicelang/dice/ExplodingDice.java b/dice/src/main/java/bjc/dicelang/dice/ExplodingDice.java
index e891a1c..c888e08 100644
--- a/dice/src/main/java/bjc/dicelang/dice/ExplodingDice.java
+++ b/dice/src/main/java/bjc/dicelang/dice/ExplodingDice.java
@@ -17,18 +17,18 @@ public class ExplodingDice implements DieList {
 	private final Die source;

 

 	/* The conditions for exploding. */

-	private final Predicate<Long>   explodeOn;

-	private final String            explodePattern;

+	private final Predicate<Long> explodeOn;

+	private final String explodePattern;

 	/* Whether or not to apply a -1 penalty to explosions. */

-	private final boolean           explodePenetrates;

+	private final boolean explodePenetrates;

 

 	/**

 	 * Create a new exploding die.

 	 *

 	 * @param src

-	 *                The source die for exploding.

+	 *        The source die for exploding.

 	 * @param explode

-	 *                The condition to explode on.

+	 *        The condition to explode on.

 	 */

 	public ExplodingDice(final Die src, final Predicate<Long> explode) {

 		this(src, explode, null, false);

@@ -38,15 +38,13 @@ public class ExplodingDice implements DieList {
 	 * Create a new exploding die that may penetrate.

 	 *

 	 * @param src

-	 *                The source die for exploding.

+	 *        The source die for exploding.

 	 * @param explode

-	 *                The condition to explode on.

+	 *        The condition to explode on.

 	 * @param penetrate

-	 *                Whether or not for explosions to penetrate (-1 to

-	 *                exploded die).

+	 *        Whether or not for explosions to penetrate (-1 to exploded die).

 	 */

-	public ExplodingDice(final Die src, final Predicate<Long> explode,

-	                     final boolean penetrate) {

+	public ExplodingDice(final Die src, final Predicate<Long> explode, final boolean penetrate) {

 		this(src, explode, null, penetrate);

 	}

 

@@ -54,17 +52,15 @@ public class ExplodingDice implements DieList {
 	 * Create a new exploding die that may penetrate.

 	 *

 	 * @param src

-	 *                The source die for exploding.

+	 *        The source die for exploding.

 	 * @param explode

-	 *                The condition to explode on.

+	 *        The condition to explode on.

 	 * @param penetrate

-	 *                Whether or not for explosions to penetrate (-1 to

-	 *                exploded die).

+	 *        Whether or not for explosions to penetrate (-1 to exploded die).

 	 * @param patt

-	 *                The string the condition came from, for printing.

+	 *        The string the condition came from, for printing.

 	 */

-	public ExplodingDice(final Die src, final Predicate<Long> explode, final String patt,

-	                     final boolean penetrate) {

+	public ExplodingDice(final Die src, final Predicate<Long> explode, final String patt, final boolean penetrate) {

 		source = src;

 		explodeOn = explode;

 		explodePattern = patt;

@@ -102,9 +98,9 @@ public class ExplodingDice implements DieList {
 		final long resArr[] = new long[resList.size()];

 

 		int i = 0;

-		for(long rll : resList) {

+		for (long rll : resList) {

 			resArr[i] = rll;

-			i        += 1;

+			i += 1;

 		}

 

 		return resArr;

@@ -112,7 +108,7 @@ public class ExplodingDice implements DieList {
 

 	@Override

 	public String toString() {

-		String penString    = explodePenetrates ? "p" : "";

+		String penString = explodePenetrates ? "p" : "";

 		String sourceString = source.toString();

 

 		if (explodePattern == null) {

diff --git a/dice/src/main/java/bjc/dicelang/dice/FudgeDie.java b/dice/src/main/java/bjc/dicelang/dice/FudgeDie.java
index 23951b2..630af61 100644
--- a/dice/src/main/java/bjc/dicelang/dice/FudgeDie.java
+++ b/dice/src/main/java/bjc/dicelang/dice/FudgeDie.java
@@ -14,7 +14,7 @@ public class FudgeDie implements Die {
 	 * Create a new fudge die.
 	 *
 	 * @param nDice
-	 *                The number of dice to roll.
+	 *        The number of dice to roll.
 	 */
 	public FudgeDie(final long nDice) {
 		numDice = new ScalarDie(nDice);
@@ -24,7 +24,7 @@ public class FudgeDie implements Die {
 	 * Create a new fudge die.
 	 *
 	 * @param nDice
-	 *                The number of dice to roll.
+	 *        The number of dice to roll.
 	 */
 	public FudgeDie(final Die nDice) {
 		numDice = nDice;
diff --git a/dice/src/main/java/bjc/dicelang/dice/ListDiceExpression.java b/dice/src/main/java/bjc/dicelang/dice/ListDiceExpression.java
index e47291b..6fde242 100644
--- a/dice/src/main/java/bjc/dicelang/dice/ListDiceExpression.java
+++ b/dice/src/main/java/bjc/dicelang/dice/ListDiceExpression.java
@@ -26,7 +26,7 @@ public class ListDiceExpression implements DiceExpression {
 	public boolean isList() {
 		return true;
 	}
-	
+
 	@Override
 	public String toString() {
 		return list.toString();
diff --git a/dice/src/main/java/bjc/dicelang/dice/MathDie.java b/dice/src/main/java/bjc/dicelang/dice/MathDie.java
index e4f2953..21881a2 100644
--- a/dice/src/main/java/bjc/dicelang/dice/MathDie.java
+++ b/dice/src/main/java/bjc/dicelang/dice/MathDie.java
@@ -7,11 +7,10 @@ package bjc.dicelang.dice;
  *
  */
 public class MathDie implements Die {
-	/* 
-	 * @TODO 10/08/17 Ben Culkin :MathGeneralize
-	 * 	Why do we have the operator types hardcoded, instead of just
-	 * 	having a general thing for applying a binary operator to dice?
-	 * 	Fix this by changing it to the more general form.
+	/*
+	 * @TODO 10/08/17 Ben Culkin :MathGeneralize Why do we have the operator types
+	 * hardcoded, instead of just having a general thing for applying a binary
+	 * operator to dice? Fix this by changing it to the more general form.
 	 */
 	/**
 	 * The types of a math operator.
@@ -47,20 +46,20 @@ public class MathDie implements Die {
 
 	private final MathDie.MathOp type;
 
-	private final Die       left;
-	private final Die       right;
+	private final Die left;
+	private final Die right;
 
 	/**
 	 * Create a new math die.
 	 *
 	 * @param op
-	 *                The operator to apply.
+	 *        The operator to apply.
 	 *
 	 * @param lft
-	 *                The left operand.
+	 *        The left operand.
 	 *
 	 * @param rght
-	 *                The right operand.
+	 *        The right operand.
 	 */
 	public MathDie(final MathDie.MathOp op, final Die lft, final Die rght) {
 		type = op;
diff --git a/dice/src/main/java/bjc/dicelang/dice/ScalarDie.java b/dice/src/main/java/bjc/dicelang/dice/ScalarDie.java
index cbe9d3f..f88ba98 100644
--- a/dice/src/main/java/bjc/dicelang/dice/ScalarDie.java
+++ b/dice/src/main/java/bjc/dicelang/dice/ScalarDie.java
@@ -14,7 +14,7 @@ public class ScalarDie implements Die {
 	 * Create a new scalar die with a set value.
 	 *
 	 * @param vl
-	 *                The value to use.
+	 *        The value to use.
 	 */
 	public ScalarDie(final long vl) {
 		val = vl;
diff --git a/dice/src/main/java/bjc/dicelang/dice/SimpleDie.java b/dice/src/main/java/bjc/dicelang/dice/SimpleDie.java
index 6cae423..40dd136 100644
--- a/dice/src/main/java/bjc/dicelang/dice/SimpleDie.java
+++ b/dice/src/main/java/bjc/dicelang/dice/SimpleDie.java
@@ -8,26 +8,25 @@ package bjc.dicelang.dice;
  */
 public class SimpleDie implements Die {
 	/* The number of dice to roll. */
-	private final Die       numDice;
-	/* 
+	private final Die numDice;
+	/*
 	 * The size of each dice to roll.
 	 *
 	 * Rolled once per role, not once for each dice rolled.
 	 *
-	 * @NOTE
-	 * 	Would having some way to roll it once for each dice rolled be
-	 * 	useful in any sort of case?
+	 * @NOTE Would having some way to roll it once for each dice rolled be useful in
+	 * any sort of case?
 	 */
-	private final Die       diceSize;
+	private final Die diceSize;
 
 	/**
 	 * Create a new dice group.
 	 *
 	 * @param nDice
-	 *                The number of dice.
+	 *        The number of dice.
 	 *
 	 * @param size
-	 *                The size of the dice.
+	 *        The size of the dice.
 	 */
 	public SimpleDie(final long nDice, final long size) {
 		this(new ScalarDie(nDice), new ScalarDie(size));
@@ -37,10 +36,10 @@ public class SimpleDie implements Die {
 	 * Create a new dice group.
 	 *
 	 * @param nDice
-	 *                The number of dice.
+	 *        The number of dice.
 	 *
 	 * @param size
-	 *                The size of the dice.
+	 *        The size of the dice.
 	 */
 	public SimpleDie(final Die nDice, final long size) {
 		this(nDice, new ScalarDie(size));
@@ -50,10 +49,10 @@ public class SimpleDie implements Die {
 	 * Create a new dice group.
 	 *
 	 * @param nDice
-	 *                The number of dice.
+	 *        The number of dice.
 	 *
 	 * @param size
-	 *                The size of the dice.
+	 *        The size of the dice.
 	 */
 	public SimpleDie(final long nDice, final Die size) {
 		this(new ScalarDie(nDice), size);
@@ -63,10 +62,10 @@ public class SimpleDie implements Die {
 	 * Create a new dice group.
 	 *
 	 * @param nDice
-	 *                The number of dice.
+	 *        The number of dice.
 	 *
 	 * @param size
-	 *                The size of the dice.
+	 *        The size of the dice.
 	 */
 	public SimpleDie(final Die nDice, final Die size) {
 		numDice = nDice;
diff --git a/dice/src/main/java/bjc/dicelang/dice/SimpleDieList.java b/dice/src/main/java/bjc/dicelang/dice/SimpleDieList.java
index 8391054..d0728cc 100644
--- a/dice/src/main/java/bjc/dicelang/dice/SimpleDieList.java
+++ b/dice/src/main/java/bjc/dicelang/dice/SimpleDieList.java
@@ -5,29 +5,28 @@ package bjc.dicelang.dice;
  *
  * @author EVE
  *
- * @TODO 10/08/17 Ben Culkin :DieListGeneralize
- * 	DieList in general should be changed to be able to be
- * 	constructed from an arbitrary die using rollSingle and things
- * 	like that.
+ * @TODO 10/08/17 Ben Culkin :DieListGeneralize DieList in general should be
+ *       changed to be able to be constructed from an arbitrary die using
+ *       rollSingle and things like that.
  */
 public class SimpleDieList implements DieList {
 	/* The number of dice to roll. */
-	private final Die       numDice;
-	/* 
+	private final Die numDice;
+	/*
 	 * The size of each die to roll.
 	 *
 	 * Checked once per roll, not once per dice rolled.
 	 */
-	private final Die       size;
+	private final Die size;
 
 	/**
 	 * Create a new list of dice.
 	 *
 	 * @param nDice
-	 *                The number of dice in the list.
+	 *        The number of dice in the list.
 	 *
 	 * @param sze
-	 *                The size of dice in the list.
+	 *        The size of dice in the list.
 	 */
 	public SimpleDieList(final Die nDice, final Die sze) {
 		numDice = nDice;