Removed NamedObjectProduct in favour of the regular ObjectProduct

3 files changed, 17 insertions, 20 deletions

diff --git a/src/main/java/sevenUnits/unit/Metric.java b/src/main/java/sevenUnits/unit/Metric.java
index 7ede085..05e82ba 100644
--- a/src/main/java/sevenUnits/unit/Metric.java
+++ b/src/main/java/sevenUnits/unit/Metric.java
@@ -19,7 +19,6 @@ package sevenUnits.unit;
 import java.util.Set;
 
 import sevenUnits.utils.NameSymbol;
-import sevenUnits.utils.NamedObjectProduct;
 import sevenUnits.utils.ObjectProduct;
 
 /**
@@ -115,29 +114,29 @@ public final class Metric {
 	public static final class Dimensions {
 		public static final ObjectProduct<BaseDimension> EMPTY = ObjectProduct
 				.empty();
-		public static final NamedObjectProduct<BaseDimension> LENGTH = ObjectProduct
+		public static final ObjectProduct<BaseDimension> LENGTH = ObjectProduct
 				.oneOf(BaseDimensions.LENGTH)
 				.withName(NameSymbol.of("Length", "L"));
-		public static final NamedObjectProduct<BaseDimension> MASS = ObjectProduct
+		public static final ObjectProduct<BaseDimension> MASS = ObjectProduct
 				.oneOf(BaseDimensions.MASS).withName(NameSymbol.of("Mass", "M"));
-		public static final NamedObjectProduct<BaseDimension> TIME = ObjectProduct
+		public static final ObjectProduct<BaseDimension> TIME = ObjectProduct
 				.oneOf(BaseDimensions.TIME).withName(NameSymbol.of("Time", "T"));
-		public static final NamedObjectProduct<BaseDimension> ELECTRIC_CURRENT = ObjectProduct
+		public static final ObjectProduct<BaseDimension> ELECTRIC_CURRENT = ObjectProduct
 				.oneOf(BaseDimensions.ELECTRIC_CURRENT)
 				.withName(NameSymbol.of("Current", "I"));
-		public static final NamedObjectProduct<BaseDimension> TEMPERATURE = ObjectProduct
+		public static final ObjectProduct<BaseDimension> TEMPERATURE = ObjectProduct
 				.oneOf(BaseDimensions.TEMPERATURE)
 				.withName(NameSymbol.of("Temperature", "\u0398"));
-		public static final NamedObjectProduct<BaseDimension> QUANTITY = ObjectProduct
+		public static final ObjectProduct<BaseDimension> QUANTITY = ObjectProduct
 				.oneOf(BaseDimensions.QUANTITY)
 				.withName(NameSymbol.of("Quantity", "N"));
-		public static final NamedObjectProduct<BaseDimension> LUMINOUS_INTENSITY = ObjectProduct
+		public static final ObjectProduct<BaseDimension> LUMINOUS_INTENSITY = ObjectProduct
 				.oneOf(BaseDimensions.LUMINOUS_INTENSITY)
 				.withName(NameSymbol.of("Luminous Intensity", "J"));
-		public static final NamedObjectProduct<BaseDimension> INFORMATION = ObjectProduct
+		public static final ObjectProduct<BaseDimension> INFORMATION = ObjectProduct
 				.oneOf(BaseDimensions.INFORMATION)
 				.withName(NameSymbol.ofName("Information"));
-		public static final NamedObjectProduct<BaseDimension> CURRENCY = ObjectProduct
+		public static final ObjectProduct<BaseDimension> CURRENCY = ObjectProduct
 				.oneOf(BaseDimensions.CURRENCY)
 				.withName(NameSymbol.ofName("Currency"));
 		
@@ -146,7 +145,7 @@ public final class Metric {
 				.times(LENGTH);
 		public static final ObjectProduct<BaseDimension> VOLUME = AREA
 				.times(LENGTH);
-		public static final NamedObjectProduct<BaseDimension> VELOCITY = LENGTH
+		public static final ObjectProduct<BaseDimension> VELOCITY = LENGTH
 				.dividedBy(TIME).withName(NameSymbol.ofName("Velocity"));
 		public static final ObjectProduct<BaseDimension> ACCELERATION = VELOCITY
 				.dividedBy(TIME);
diff --git a/src/main/java/sevenUnits/unit/Unit.java b/src/main/java/sevenUnits/unit/Unit.java
index 826b59b..14478ba 100644
--- a/src/main/java/sevenUnits/unit/Unit.java
+++ b/src/main/java/sevenUnits/unit/Unit.java
@@ -354,8 +354,8 @@ public abstract class Unit implements Nameable {
 	 * @since 2022-03-10
 	 */
 	public String toDefinitionString() {
-		if (this.unitBase instanceof Nameable)
-			return "derived from " + ((Nameable) this.unitBase).getName();
+		if (!this.unitBase.getNameSymbol().isEmpty())
+			return "derived from " + this.unitBase.getName();
 		else
 			return "derived from "
 					+ this.getBase().toString(BaseUnit::getShortName);
diff --git a/src/main/java/sevenUnits/unit/UnitDatabase.java b/src/main/java/sevenUnits/unit/UnitDatabase.java
index bf6ae64..5591d7d 100644
--- a/src/main/java/sevenUnits/unit/UnitDatabase.java
+++ b/src/main/java/sevenUnits/unit/UnitDatabase.java
@@ -48,7 +48,6 @@ import sevenUnits.utils.ConditionalExistenceCollections;
 import sevenUnits.utils.DecimalComparison;
 import sevenUnits.utils.ExpressionParser;
 import sevenUnits.utils.NameSymbol;
-import sevenUnits.utils.NamedObjectProduct;
 import sevenUnits.utils.ObjectProduct;
 import sevenUnits.utils.UncertainDouble;
 
@@ -1199,7 +1198,7 @@ public final class UnitDatabase {
 	 * @since 2019-03-14
 	 * @since v0.2.0
 	 */
-	private final Map<String, NamedObjectProduct<BaseDimension>> dimensions;
+	private final Map<String, ObjectProduct<BaseDimension>> dimensions;
 	
 	/**
 	 * A map mapping strings to units (including prefixes)
@@ -1317,11 +1316,10 @@ public final class UnitDatabase {
 			final ObjectProduct<BaseDimension> dimension) {
 		Objects.requireNonNull(name, "name may not be null");
 		Objects.requireNonNull(dimension, "dimension may not be null");
-		if (dimension instanceof NamedObjectProduct) {
-			this.dimensions.put(name,
-					(NamedObjectProduct<BaseDimension>) dimension);
+		if (!dimension.getNameSymbol().equals(NameSymbol.EMPTY)) {
+			this.dimensions.put(name, dimension);
 		} else {
-			final NamedObjectProduct<BaseDimension> namedDimension = dimension
+			final ObjectProduct<BaseDimension> namedDimension = dimension
 					.withName(NameSymbol.ofName(name));
 			this.dimensions.put(name, namedDimension);
 		}
@@ -1530,7 +1528,7 @@ public final class UnitDatabase {
 	 * @since 2019-04-13
 	 * @since v0.2.0
 	 */
-	public Map<String, NamedObjectProduct<BaseDimension>> dimensionMap() {
+	public Map<String, ObjectProduct<BaseDimension>> dimensionMap() {
 		return Collections.unmodifiableMap(this.dimensions);
 	}