Merge branch 'gui-redesign-0.4' into developv0.4.0a1

1 files changed, 19 insertions, 31 deletions

diff --git a/src/main/java/sevenUnits/unit/BaseDimension.java b/src/main/java/sevenUnits/unit/BaseDimension.java
index d5e98ca..bcd57d9 100644
--- a/src/main/java/sevenUnits/unit/BaseDimension.java
+++ b/src/main/java/sevenUnits/unit/BaseDimension.java
@@ -18,70 +18,58 @@ package sevenUnits.unit;
 
 import java.util.Objects;
 
+import sevenUnits.utils.NameSymbol;
+import sevenUnits.utils.Nameable;
+
 /**
  * A dimension that defines a {@code BaseUnit}
  * 
  * @author Adrien Hopkins
  * @since 2019-10-16
  */
-public final class BaseDimension {
+public final class BaseDimension implements Nameable {
 	/**
 	 * Gets a {@code BaseDimension} with the provided name and symbol.
 	 * 
-	 * @param name
-	 *            name of dimension
-	 * @param symbol
-	 *            symbol used for dimension
+	 * @param name   name of dimension
+	 * @param symbol symbol used for dimension
 	 * @return dimension
 	 * @since 2019-10-16
 	 */
 	public static BaseDimension valueOf(final String name, final String symbol) {
 		return new BaseDimension(name, symbol);
 	}
-
+	
 	/**
 	 * The name of the dimension.
 	 */
 	private final String name;
 	/**
-	 * The symbol used by the dimension. Symbols should be short, generally one or two characters.
+	 * The symbol used by the dimension. Symbols should be short, generally one
+	 * or two characters.
 	 */
 	private final String symbol;
-
+	
 	/**
 	 * Creates the {@code BaseDimension}.
 	 * 
-	 * @param name
-	 *            name of unit
-	 * @param symbol
-	 *            symbol of unit
-	 * @throws NullPointerException
-	 *             if any argument is null
+	 * @param name   name of unit
+	 * @param symbol symbol of unit
+	 * @throws NullPointerException if any argument is null
 	 * @since 2019-10-16
 	 */
 	private BaseDimension(final String name, final String symbol) {
 		this.name = Objects.requireNonNull(name, "name must not be null.");
 		this.symbol = Objects.requireNonNull(symbol, "symbol must not be null.");
 	}
-
-	/**
-	 * @return name
-	 * @since 2019-10-16
-	 */
-	public final String getName() {
-		return this.name;
-	}
-
-	/**
-	 * @return symbol
-	 * @since 2019-10-16
-	 */
-	public final String getSymbol() {
-		return this.symbol;
+	
+	@Override
+	public NameSymbol getNameSymbol() {
+		return NameSymbol.of(this.name, this.symbol);
 	}
-
+	
 	@Override
 	public String toString() {
-		return String.format("%s (%s)", this.getName(), this.getSymbol());
+		return String.format("%s (%s)", this.name, this.symbol);
 	}
 }