AStyle pass

6 files changed, 39 insertions, 23 deletions

diff --git a/dice-lang/src/bjc/dicelang/dice/CompoundingDie.java b/dice-lang/src/bjc/dicelang/dice/CompoundingDie.java
index 4b3f137..023282e 100644
--- a/dice-lang/src/bjc/dicelang/dice/CompoundingDie.java
+++ b/dice-lang/src/bjc/dicelang/dice/CompoundingDie.java
@@ -51,7 +51,7 @@ public class CompoundingDie implements Die {
 

 	@Override

 	public boolean canOptimize() {

-		if(source.canOptimize()) {

+		if (source.canOptimize()) {

 			/* We can only be optimized for a result of zero. */

 			return source.optimize() == 0;

 		}

diff --git a/dice-lang/src/bjc/dicelang/dice/DiceBox.java b/dice-lang/src/bjc/dicelang/dice/DiceBox.java
index 41b31af..f7bf719 100644
--- a/dice-lang/src/bjc/dicelang/dice/DiceBox.java
+++ b/dice-lang/src/bjc/dicelang/dice/DiceBox.java
@@ -24,7 +24,7 @@ public class DiceBox {
 		try {
 			return doParseExpression(expString);
 		} catch (Exception ex) {
-			/* 
+			/*
 			 * @TODO 10/08/17 Ben Culkin :DieErrors :ErrorRefactor
 			 * 	Use different types of exceptions to provide
 			 * 	better error messages. */
@@ -34,7 +34,7 @@ public class DiceBox {
 			return null;
 		}
 	}
-	
+
 	private static DieExpression doParseExpression(final String expString) {
 		/* Only bother with valid expressions. */
 		if (!isValidExpression(expString)) {
@@ -96,10 +96,12 @@ public class DiceBox {
 			final DieExpression right = parseExpression(dieParts[1]);
 
 			/* :ErrorRefactor */
-			if(left.isList) {
-				System.out.printf("ERROR: Expected a scalar die expression for lhs of compound die, got a list expression instead (%s)\n", left);
-			} else if(right.isList) {
-				System.out.printf("ERROR: Expected a scalar die expression for rhs of compound die, got a list expression instead (%s)\n", right);
+			if (left.isList) {
+				System.out.printf("ERROR: Expected a scalar die expression for lhs of compound die, got a list expression instead (%s)\n",
+				                  left);
+			} else if (right.isList) {
+				System.out.printf("ERROR: Expected a scalar die expression for rhs of compound die, got a list expression instead (%s)\n",
+				                  right);
 			}
 
 			final Die compound = new CompoundDie(left.scalar, right.scalar);
@@ -167,7 +169,7 @@ public class DiceBox {
 	 */
 	private static final String     scalarDie        = "[\\+\\-]?\\d+sd";
 	private static final Pattern    scalarDiePattern = Pattern.compile(
-			String.format("\\A%s\\Z", scalarDie));
+	                        String.format("\\A%s\\Z", scalarDie));
 
 	/*
 	 * Defines a simple die.
@@ -258,23 +260,25 @@ public class DiceBox {
 	 * @return Whether or not the string is a valid command.
 	 */
 	public static boolean isValidExpression(final String exp) {
-		if (scalarDiePattern.matcher(exp).matches())
+		if (scalarDiePattern.matcher(exp).matches()) {
 			return true;
-		else if (simpleDiePattern.matcher(exp).matches())
+		} else if (simpleDiePattern.matcher(exp).matches()) {
 			return true;
-		else if (fudgeDiePattern.matcher(exp).matches())
+		} else if (fudgeDiePattern.matcher(exp).matches()) {
 			return true;
-		else if (compoundDiePattern.matcher(exp).matches())
+		} else if (compoundDiePattern.matcher(exp).matches()) {
 			return true;
-		else if (compoundingDiePattern.matcher(exp).matches())
+		} else if (compoundingDiePattern.matcher(exp).matches()) {
 			return true;
-		else if (explodingDiePattern.matcher(exp).matches())
+		} else if (explodingDiePattern.matcher(exp).matches()) {
 			return true;
-		else if (penetratingDiePattern.matcher(exp).matches())
+		} else if (penetratingDiePattern.matcher(exp).matches()) {
 			return true;
-		else if (diceListPattern.matcher(exp).matches())
+		} else if (diceListPattern.matcher(exp).matches()) {
 			return true;
-		else return false;
+		} else {
+			return false;
+		}
 	}
 
 	/*
diff --git a/dice-lang/src/bjc/dicelang/dice/DieExpression.java b/dice-lang/src/bjc/dicelang/dice/DieExpression.java
index edf7684..71b7a68 100644
--- a/dice-lang/src/bjc/dicelang/dice/DieExpression.java
+++ b/dice-lang/src/bjc/dicelang/dice/DieExpression.java
@@ -46,7 +46,9 @@ public class DieExpression {
 
 	@Override
 	public String toString() {
-		if (isList) return list.toString();
+		if (isList) {
+			return list.toString();
+		}
 
 		return scalar.toString();
 	}
@@ -57,7 +59,9 @@ public class DieExpression {
 	 * @return The value of the expression as a string.
 	 */
 	public String value() {
-		if (isList) return Arrays.toString(list.roll());
+		if (isList) {
+			return Arrays.toString(list.roll());
+		}
 
 		return Long.toString(scalar.roll());
 	}
diff --git a/dice-lang/src/bjc/dicelang/dice/ExplodingDice.java b/dice-lang/src/bjc/dicelang/dice/ExplodingDice.java
index 7036f32..6458f04 100644
--- a/dice-lang/src/bjc/dicelang/dice/ExplodingDice.java
+++ b/dice-lang/src/bjc/dicelang/dice/ExplodingDice.java
@@ -116,7 +116,9 @@ public class ExplodingDice implements DieList {
 

 	@Override

 	public String toString() {

-		if (explodePattern == null) return source + (explodePenetrates ? "p" : "") + "!";

+		if (explodePattern == null) {

+			return source + (explodePenetrates ? "p" : "") + "!";

+		}

 

 		return source + (explodePenetrates ? "p" : "") + "!" + explodePattern;

 	}

diff --git a/dice-lang/src/bjc/dicelang/dice/SimpleDie.java b/dice-lang/src/bjc/dicelang/dice/SimpleDie.java
index 60c5d53..ee10070 100644
--- a/dice-lang/src/bjc/dicelang/dice/SimpleDie.java
+++ b/dice-lang/src/bjc/dicelang/dice/SimpleDie.java
@@ -65,7 +65,9 @@ public class SimpleDie implements Die {
 
 	@Override
 	public boolean canOptimize() {
-		if (diceSize.canOptimize() && diceSize.optimize() <= 1) return numDice.canOptimize();
+		if (diceSize.canOptimize() && diceSize.optimize() <= 1) {
+			return numDice.canOptimize();
+		}
 
 		return false;
 	}
@@ -74,7 +76,9 @@ public class SimpleDie implements Die {
 	public long optimize() {
 		final long optSize = diceSize.optimize();
 
-		if (optSize == 0) return 0;
+		if (optSize == 0) {
+			return 0;
+		}
 
 		return numDice.optimize();
 	}
diff --git a/dice-lang/src/bjc/dicelang/dice/SimpleDieList.java b/dice-lang/src/bjc/dicelang/dice/SimpleDieList.java
index 84896ea..4546238 100644
--- a/dice-lang/src/bjc/dicelang/dice/SimpleDieList.java
+++ b/dice-lang/src/bjc/dicelang/dice/SimpleDieList.java
@@ -26,7 +26,9 @@ public class SimpleDieList implements DieList {
 
 	@Override
 	public boolean canOptimize() {
-		if (size.canOptimize() && size.optimize() <= 1) return numDice.canOptimize();
+		if (size.canOptimize() && size.optimize() <= 1) {
+			return numDice.canOptimize();
+		}
 
 		return false;
 	}