Rename Penalty to IPenalty.

NoCheatPlus · Apr 17, 2018 · 37c12a7 · 37c12a7
1 parent 7269a02
commit 37c12a7
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 13 deletions.
diff --git a/NCPCore/src/main/java/fr/neatmonster/nocheatplus/penalties/AbstractPenalty.java b/NCPCore/src/main/java/fr/neatmonster/nocheatplus/penalties/AbstractPenalty.java
@@ -22,7 +22,7 @@
  * @param <RI>
  *            The input type accepted by this penalty.
  */
-public abstract class AbstractPenalty<RI> implements Penalty<RI> {
+public abstract class AbstractPenalty<RI> implements IPenalty<RI> {
 
     /** The input type accepted by this penalty. */
     private final Class<RI> registeredInput;

diff --git a/NCPCore/src/main/java/fr/neatmonster/nocheatplus/penalties/CancelPenalty.java b/NCPCore/src/main/java/fr/neatmonster/nocheatplus/penalties/CancelPenalty.java
@@ -21,7 +21,7 @@
  * @author asofold
  *
  */
-public final class CancelPenalty implements Penalty<CancelPenalty> {
+public final class CancelPenalty implements IPenalty<CancelPenalty> {
 
     public static final CancelPenalty CANCEL = new CancelPenalty();
     private static boolean locked = false;

diff --git a/NCPCore/src/main/java/fr/neatmonster/nocheatplus/penalties/DefaultPenaltyList.java b/NCPCore/src/main/java/fr/neatmonster/nocheatplus/penalties/DefaultPenaltyList.java
@@ -31,17 +31,17 @@ public class DefaultPenaltyList implements IPenaltyList {
      * @param <RI>
      */
     private static class GenericNode<RI> {
-        private final List<Penalty<RI>> penalties = new LinkedList<Penalty<RI>>();
+        private final List<IPenalty<RI>> penalties = new LinkedList<IPenalty<RI>>();
 
         /**
          * 
          * @param input
          * @param removeAppliedPenalties
-         *            See {@link Penalty#apply(Object)}.
+         *            See {@link IPenalty#apply(Object)}.
          * @return True if the list has been emptied, false otherwise.
          */
         private boolean apply(final RI input, final boolean removeAppliedPenalties) {
-            final Iterator<Penalty<RI>> it = penalties.iterator();
+            final Iterator<IPenalty<RI>> it = penalties.iterator();
             while (it.hasNext()) {
                 if (it.next().apply(input) && removeAppliedPenalties) {
                     it.remove();
@@ -56,7 +56,7 @@ private boolean apply(final RI input, final boolean removeAppliedPenalties) {
 
     @Override
     public <RI> void addPenalty(final Class<RI> registeredInput, 
-            final Penalty<RI> penalty) {
+            final IPenalty<RI> penalty) {
         if (penalty == CancelPenalty.CANCEL) {
             willCancel = true;
         }

diff --git a/...onster/nocheatplus/penalties/Penalty.java → ...nster/nocheatplus/penalties/IPenalty.java b/...onster/nocheatplus/penalties/Penalty.java → ...nster/nocheatplus/penalties/IPenalty.java
@@ -21,7 +21,7 @@
  *
  * @param <RI>
  */
-public interface Penalty<RI> {
+public interface IPenalty<RI> {
 
     /**
      * Get the class that determines the accepted input type.

diff --git a/NCPCore/src/main/java/fr/neatmonster/nocheatplus/penalties/IPenaltyList.java b/NCPCore/src/main/java/fr/neatmonster/nocheatplus/penalties/IPenaltyList.java
@@ -41,7 +41,7 @@ public interface IPenaltyList {
      * @param registeredInput
      * @param penalty
      */
-    public <RI> void addPenalty(Class<RI> registeredInput, Penalty<RI> penalty);
+    public <RI> void addPenalty(Class<RI> registeredInput, IPenalty<RI> penalty);
 
     /**
      * Apply generic penalties registered exactly for the given type, using the
@@ -60,7 +60,7 @@ public <RI, I extends RI> void applyPenaltiesPrecisely(Class<RI> type,
      * @param input
      * @param removeAppliedPenalties
      *            If set to true, penalties that return true for
-     *            {@link Penalty#apply(Object)} will be removed from the list.
+     *            {@link IPenalty#apply(Object)} will be removed from the list.
      */
     public <I> void applyAllApplicablePenalties(I input, 
             boolean removeAppliedPenalties);

diff --git a/NCPCore/src/main/java/fr/neatmonster/nocheatplus/penalties/PenaltyNode.java b/NCPCore/src/main/java/fr/neatmonster/nocheatplus/penalties/PenaltyNode.java
@@ -36,7 +36,7 @@ public class PenaltyNode {
     /** The probability for this node to apply. */
     public final double probability;
     /** Penalty to apply when this node applies. */
-    private final Penalty<?> penalty;
+    private final IPenalty<?> penalty;
     /** Child nodes to test when this node applies. */
     private final PenaltyNode[] childNodes;
     /** Indicate that the result is set with the first child node that applies. */
@@ -47,7 +47,7 @@ public class PenaltyNode {
      * @param random
      * @param penalty
      */
-    public PenaltyNode(Random random, Penalty<?> penalty) {
+    public PenaltyNode(Random random, IPenalty<?> penalty) {
         this(random, 1.0, penalty, null, false);
     }
 
@@ -57,7 +57,7 @@ public PenaltyNode(Random random, Penalty<?> penalty) {
      * @param probability
      * @param penalty
      */
-    public PenaltyNode(Random random, double probability, Penalty<?> penalty) {
+    public PenaltyNode(Random random, double probability, IPenalty<?> penalty) {
         this(random, probability, penalty, null, false);
     }
 
@@ -71,7 +71,7 @@ public PenaltyNode(Random random, double probability, Penalty<?> penalty) {
      * @param abortOnApply
      *            Evaluating child nodes: abort as soon as a child node applies.
      */
-    public PenaltyNode(Random random, double probability, Penalty<?> penalty, Collection<PenaltyNode> childNodes, boolean abortOnApply) {
+    public PenaltyNode(Random random, double probability, IPenalty<?> penalty, Collection<PenaltyNode> childNodes, boolean abortOnApply) {
         this.random = random;
         this.probability = probability;
         this.penalty = penalty;