Merge branch 'feature-new-units-def' into develop

1 files changed, 5 insertions, 3 deletions

diff --git a/src/org/unitConverter/unit/FunctionalUnit.java b/src/org/unitConverter/unit/FunctionalUnit.java
index e3db43a..7ddd876 100644
--- a/src/org/unitConverter/unit/FunctionalUnit.java
+++ b/src/org/unitConverter/unit/FunctionalUnit.java
@@ -19,13 +19,15 @@ package org.unitConverter.unit;
 import java.util.Objects;
 import java.util.function.DoubleUnaryOperator;
 
+import org.unitConverter.math.ObjectProduct;
+
 /**
  * A unit that uses functional objects to convert to and from its base.
  * 
  * @author Adrien Hopkins
  * @since 2019-05-22
  */
-final class FunctionalUnit extends AbstractUnit {
+final class FunctionalUnit extends Unit {
 	/**
 	 * Returns a unit from its base and the functions it uses to convert to and from its base.
 	 * 
@@ -42,7 +44,7 @@ final class FunctionalUnit extends AbstractUnit {
 	 * @throws NullPointerException
 	 *             if any argument is null
 	 */
-	public static FunctionalUnit valueOf(final BaseUnit base, final DoubleUnaryOperator converterFrom,
+	public static FunctionalUnit valueOf(final ObjectProduct<BaseUnit> base, final DoubleUnaryOperator converterFrom,
 			final DoubleUnaryOperator converterTo) {
 		return new FunctionalUnit(base, converterFrom, converterTo);
 	}
@@ -76,7 +78,7 @@ final class FunctionalUnit extends AbstractUnit {
 	 *             if any argument is null
 	 * @since 2019-05-22
 	 */
-	private FunctionalUnit(final BaseUnit base, final DoubleUnaryOperator converterFrom,
+	private FunctionalUnit(final ObjectProduct<BaseUnit> base, final DoubleUnaryOperator converterFrom,
 			final DoubleUnaryOperator converterTo) {
 		super(base);
 		this.converterFrom = Objects.requireNonNull(converterFrom, "converterFrom must not be null.");