Removed NamedObjectProduct in favour of the regular ObjectProduct

1 files changed, 26 insertions, 4 deletions

diff --git a/src/main/java/sevenUnits/utils/ObjectProduct.java b/src/main/java/sevenUnits/utils/ObjectProduct.java
index 830f9d7..110bdc1 100644
--- a/src/main/java/sevenUnits/utils/ObjectProduct.java
+++ b/src/main/java/sevenUnits/utils/ObjectProduct.java
@@ -33,7 +33,7 @@ import java.util.function.Function;
  * @author Adrien Hopkins
  * @since 2019-10-16
  */
-public class ObjectProduct<T> {
+public class ObjectProduct<T> implements Nameable {
 	/**
 	 * Returns an empty ObjectProduct of a certain type
 	 * 
@@ -83,15 +83,32 @@ public class ObjectProduct<T> {
 	final Map<T, Integer> exponents;
 	
 	/**
-	 * Creates the {@code ObjectProduct}.
+	 * The object's name and symbol
+	 */
+	private final NameSymbol nameSymbol;
+	
+	/**
+	 * Creates a {@code ObjectProduct} without a name/symbol.
 	 * 
 	 * @param exponents objects that make up this product
 	 * @since 2019-10-16
 	 */
 	ObjectProduct(final Map<T, Integer> exponents) {
+		this(exponents, NameSymbol.EMPTY);
+	}
+	
+	/**
+	 * Creates the {@code ObjectProduct}.
+	 * 
+	 * @param exponents  objects that make up this product
+	 * @param nameSymbol name and symbol of object product
+	 * @since 2019-10-16
+	 */
+	ObjectProduct(final Map<T, Integer> exponents, NameSymbol nameSymbol) {
 		this.exponents = Collections.unmodifiableMap(
 				ConditionalExistenceCollections.conditionalExistenceMap(exponents,
 						e -> !Integer.valueOf(0).equals(e.getValue())));
+		this.nameSymbol = nameSymbol;
 	}
 	
 	/**
@@ -171,6 +188,11 @@ public class ObjectProduct<T> {
 	}
 	
 	@Override
+	public NameSymbol getNameSymbol() {
+		return this.nameSymbol;
+	}
+	
+	@Override
 	public int hashCode() {
 		return Objects.hash(this.exponents);
 	}
@@ -288,7 +310,7 @@ public class ObjectProduct<T> {
 	 *         {@code nameSymbol}
 	 * @since 2021-12-15
 	 */
-	public NamedObjectProduct<T> withName(NameSymbol nameSymbol) {
-		return new NamedObjectProduct<>(this.exponents, nameSymbol);
+	public ObjectProduct<T> withName(NameSymbol nameSymbol) {
+		return new ObjectProduct<>(this.exponents, nameSymbol);
 	}
 }