From 654a69ca0a0c1ab86aea2f6be63fe60eac61105a Mon Sep 17 00:00:00 2001 From: student Date: Mon, 12 Feb 2018 16:20:10 -0500 Subject: Formatting pass --- dice/src/main/java/bjc/dicelang/dice/CompoundDie.java | 4 ++-- .../main/java/bjc/dicelang/dice/CompoundingDie.java | 10 +++++----- dice/src/main/java/bjc/dicelang/dice/DiceBox.java | 4 ++-- .../src/main/java/bjc/dicelang/dice/ExplodingDice.java | 18 +++++++++--------- dice/src/main/java/bjc/dicelang/dice/FudgeDie.java | 4 ++-- .../java/bjc/dicelang/dice/ListDiceExpression.java | 2 +- dice/src/main/java/bjc/dicelang/dice/MathDie.java | 6 +++--- dice/src/main/java/bjc/dicelang/dice/ScalarDie.java | 2 +- dice/src/main/java/bjc/dicelang/dice/SimpleDie.java | 16 ++++++++-------- .../src/main/java/bjc/dicelang/dice/SimpleDieList.java | 4 ++-- 10 files changed, 35 insertions(+), 35 deletions(-) (limited to 'dice/src') diff --git a/dice/src/main/java/bjc/dicelang/dice/CompoundDie.java b/dice/src/main/java/bjc/dicelang/dice/CompoundDie.java index f7564b7..a06e3c4 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; diff --git a/dice/src/main/java/bjc/dicelang/dice/CompoundingDie.java b/dice/src/main/java/bjc/dicelang/dice/CompoundingDie.java index 4101a39..5ddbfda 100644 --- a/dice/src/main/java/bjc/dicelang/dice/CompoundingDie.java +++ b/dice/src/main/java/bjc/dicelang/dice/CompoundingDie.java @@ -23,9 +23,9 @@ public class CompoundingDie implements Die { * 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 compound) { this(src, compound, null); @@ -35,11 +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 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 a382196..7841079 100644 --- a/dice/src/main/java/bjc/dicelang/dice/DiceBox.java +++ b/dice/src/main/java/bjc/dicelang/dice/DiceBox.java @@ -16,7 +16,7 @@ public class DiceBox { * Parse a die expression from a string. * * @param expString - * The string to parse. + * The string to parse. * * @return The die expression from the string, or null if it wasn't one */ @@ -255,7 +255,7 @@ public class DiceBox { * Check if a given string is a valid die expression. * * @param exp - * The string to check validity of. + * The string to check validity of. * * @return Whether or not the string is a valid command. */ diff --git a/dice/src/main/java/bjc/dicelang/dice/ExplodingDice.java b/dice/src/main/java/bjc/dicelang/dice/ExplodingDice.java index c888e08..4b92c88 100644 --- a/dice/src/main/java/bjc/dicelang/dice/ExplodingDice.java +++ b/dice/src/main/java/bjc/dicelang/dice/ExplodingDice.java @@ -26,9 +26,9 @@ public class ExplodingDice implements DieList { * 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 explode) { this(src, explode, null, false); @@ -38,11 +38,11 @@ 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 explode, final boolean penetrate) { this(src, explode, null, penetrate); @@ -52,13 +52,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). * @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 explode, final String patt, final boolean penetrate) { source = src; diff --git a/dice/src/main/java/bjc/dicelang/dice/FudgeDie.java b/dice/src/main/java/bjc/dicelang/dice/FudgeDie.java index 630af61..4b1f281 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 6fde242..f8ff588 100644 --- a/dice/src/main/java/bjc/dicelang/dice/ListDiceExpression.java +++ b/dice/src/main/java/bjc/dicelang/dice/ListDiceExpression.java @@ -11,7 +11,7 @@ public class ListDiceExpression implements DiceExpression { * Create a list die expression. * * @param lst - * The list value of this expression. + * The list value of this expression. */ public ListDiceExpression(final DieList lst) { list = lst; diff --git a/dice/src/main/java/bjc/dicelang/dice/MathDie.java b/dice/src/main/java/bjc/dicelang/dice/MathDie.java index 21881a2..87fdfe7 100644 --- a/dice/src/main/java/bjc/dicelang/dice/MathDie.java +++ b/dice/src/main/java/bjc/dicelang/dice/MathDie.java @@ -53,13 +53,13 @@ public class MathDie implements Die { * 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 f88ba98..9aae256 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 40dd136..f598ae5 100644 --- a/dice/src/main/java/bjc/dicelang/dice/SimpleDie.java +++ b/dice/src/main/java/bjc/dicelang/dice/SimpleDie.java @@ -23,10 +23,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 long size) { this(new ScalarDie(nDice), new ScalarDie(size)); @@ -36,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)); @@ -49,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); @@ -62,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 d0728cc..3516a4f 100644 --- a/dice/src/main/java/bjc/dicelang/dice/SimpleDieList.java +++ b/dice/src/main/java/bjc/dicelang/dice/SimpleDieList.java @@ -23,10 +23,10 @@ public class SimpleDieList implements DieList { * 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; -- cgit v1.2.3