From 38f1e562bf1e1d9d2c837317fced7467f2e81adc Mon Sep 17 00:00:00 2001 From: Ben Culkin Date: Thu, 3 Dec 2020 19:24:23 -0500 Subject: Rename interfaces to match Java style Renames several interfaces named in the IWhatever style, which Java doesn't use --- .../java/bjc/dicelang/neodice/die/RerollDie.java | 24 +++++++++++----------- 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'dice/src/main/java/bjc/dicelang/neodice/die/RerollDie.java') diff --git a/dice/src/main/java/bjc/dicelang/neodice/die/RerollDie.java b/dice/src/main/java/bjc/dicelang/neodice/die/RerollDie.java index f8cb0fa..7925c9d 100644 --- a/dice/src/main/java/bjc/dicelang/neodice/die/RerollDie.java +++ b/dice/src/main/java/bjc/dicelang/neodice/die/RerollDie.java @@ -6,8 +6,8 @@ import java.util.function.*; import bjc.dicelang.neodice.*; import bjc.esodata.*; -public class RerollDie implements IDie { - private final IDie contained; +public class RerollDie implements Die { + private final Die contained; private final Predicate condition; private final Function, SideType> chooser; @@ -18,7 +18,7 @@ public class RerollDie implements IDie { private RerollDie( Comparator comparer, - IDie contained, + Die contained, Predicate condition, Function, SideType> chooser) { this.comparer = comparer; @@ -31,7 +31,7 @@ public class RerollDie implements IDie { private RerollDie( Comparator comparer, - IDie contained, + Die contained, Predicate condition, Function, SideType> chooser, int limit) { @@ -57,15 +57,15 @@ public class RerollDie implements IDie { return chooser.apply(newRolls); } - public static > IDie create( - IDie contained, + public static > Die create( + Die contained, Predicate condition, Function, Side> chooser) { return new RerollDie<>(Comparator.naturalOrder(), contained, condition, chooser); } - public static > IDie create( - IDie contained, + public static > Die create( + Die contained, Predicate condition, Function, Side> chooser, int limit) { @@ -73,17 +73,17 @@ public class RerollDie implements IDie { } - public static IDie create( + public static Die create( Comparator comparer, - IDie contained, + Die contained, Predicate condition, Function, Side> chooser) { return new RerollDie(comparer, contained, condition, chooser); } - public static IDie create( + public static Die create( Comparator comparer, - IDie contained, + Die contained, Predicate condition, Function, Side> chooser, int limit) { -- cgit v1.2.3