From d9437c1d328ccc2b26bd0aae19c2aff7140e466b Mon Sep 17 00:00:00 2001 From: bculkin2442 Date: Sun, 17 Apr 2016 15:57:20 -0400 Subject: Minor cleanups --- dice-lang/src/main/java/bjc/dicelang/ComplexDice.java | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'dice-lang/src/main/java/bjc/dicelang/ComplexDice.java') diff --git a/dice-lang/src/main/java/bjc/dicelang/ComplexDice.java b/dice-lang/src/main/java/bjc/dicelang/ComplexDice.java index 9b8f0bd..7ed4e3b 100644 --- a/dice-lang/src/main/java/bjc/dicelang/ComplexDice.java +++ b/dice-lang/src/main/java/bjc/dicelang/ComplexDice.java @@ -11,15 +11,15 @@ public class ComplexDice implements IDiceExpression { /** * Create a dice from a string expression * - * @param dice + * @param expression * The string to parse the dice from * @return A dice group parsed from the string */ - public static IDiceExpression fromString(String dice) { + public static IDiceExpression fromString(String expression) { /* * Split it on the dice type marker */ - String[] strangs = dice.split("d"); + String[] strangs = expression.split("d"); try { /* @@ -129,6 +129,11 @@ public class ComplexDice implements IDiceExpression { @Override public int optimize() { + if (!canOptimize()) { + throw new UnsupportedOperationException( + "This complex dice cannot be optimized"); + } + return nDice.optimize(); } } \ No newline at end of file -- cgit v1.2.3