rename Ord/Equal.AltDef

jbgi · jbgi · commit 732a15176efb · 2016-11-06T17:35:30.000+01:00
diff --git a/core/src/main/java/fj/Equal.java b/core/src/main/java/fj/Equal.java
@@ -53,7 +53,7 @@ default boolean equal(A a1, A a2) {
   /**
    * Primitives functions of Equal: alternative minimal definition and overridable methods.
    */
-  public interface AlternateDefinition<A> extends Definition<A> {
+  public interface AltDefinition<A> extends Definition<A> {
 
     @Override
     boolean equal(A a1, A a2);
@@ -158,7 +158,7 @@ public static <A> Equal<A> equalDef(final Definition<A> definition) {
    * @param definition a definition of the equal instance.
    * @return An equal instance from the given function.
    */
-  public static <A> Equal<A> equalDef(final AlternateDefinition<A> definition) {
+  public static <A> Equal<A> equalDef(final AltDefinition<A> definition) {
     return new Equal<>(definition);
   }
 
@@ -407,7 +407,7 @@ public static <A> Equal<Array<A>> arrayEqual(final Equal<A> ea) {
    */
   public static <A> Equal<Tree<A>> treeEqual(final Equal<A> ea) {
     Definition<A> eaDef = ea.def;
-    return equalDef(new AlternateDefinition<Tree<A>>() {
+    return equalDef(new AltDefinition<Tree<A>>() {
 
       final Definition<P1<Stream<Tree<A>>>> subForestEqDef = p1Equal(streamEqual(equalDef(this))).def;
 
diff --git a/core/src/main/java/fj/Ord.java b/core/src/main/java/fj/Ord.java
@@ -16,7 +16,6 @@
 
 import static fj.Function.apply;
 import static fj.Function.compose;
-import static fj.Function.compose2;
 import static fj.Function.curry;
 import static fj.Semigroup.semigroup;
 import static fj.Semigroup.semigroupDef;
@@ -90,7 +89,7 @@ public Definition<A> dual() {
   /**
    * Primitives functions of Ord: alternative minimal definition and overridable methods.
    */
-  public interface AlternateDefinition<A> extends Definition<A> {
+  public interface AltDefinition<A> extends Definition<A> {
 
     Ordering compare(A a1, A a2);
 
@@ -301,7 +300,7 @@ public static <A> Ord<A> ord(final F<A, F<A, Ordering>> f) {
   }
 
   /**
-   * Returns an order instance that uses the given minimal equality test and ordering definiion.
+   * Returns an order instance that uses the given minimal equality test and ordering definition.
    *
    * @param def The order definition.
    * @return An order instance.
@@ -311,12 +310,12 @@ public static <A> Ord<A> ordDef(final Definition<A> def) {
   }
 
   /**
-   * Returns an order instance that uses the given minimal equality test and ordering definiion.
+   * Returns an order instance that uses the given minimal equality test and ordering definition.
    *
    * @param def The order definition.
    * @return An order instance.
    */
-  public static <A> Ord<A> ordDef(final AlternateDefinition<A> def) {
+  public static <A> Ord<A> ordDef(final AltDefinition<A> def) {
     return new Ord<>(def);
   }
 
