Implemented prefix settings, saving & loading of settings

Also fixed some bugs:
- Presenter now has default values for its settings in case they don't load properly
- UnitDatabase ensures its units, prefixes and dimensions have all of the names
you give it

2 files changed, 31 insertions, 15 deletions

diff --git a/src/main/java/sevenUnits/unit/UnitDatabase.java b/src/main/java/sevenUnits/unit/UnitDatabase.java
index 71676a1..12b78a7 100644
--- a/src/main/java/sevenUnits/unit/UnitDatabase.java
+++ b/src/main/java/sevenUnits/unit/UnitDatabase.java
@@ -1315,13 +1315,9 @@ 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.getNameSymbol().equals(NameSymbol.EMPTY)) {
-			this.dimensions.put(name, dimension);
-		} else {
-			final ObjectProduct<BaseDimension> namedDimension = dimension
-					.withName(NameSymbol.ofName(name));
-			this.dimensions.put(name, namedDimension);
-		}
+		final ObjectProduct<BaseDimension> namedDimension = dimension
+				.withName(dimension.getNameSymbol().withExtraName(name));
+		this.dimensions.put(name, namedDimension);
 	}
 	
 	/**
@@ -1373,7 +1369,7 @@ public final class UnitDatabase {
 				throw e;
 			}
 			
-			this.addDimension(name, dimension.withName(NameSymbol.ofName(name)));
+			this.addDimension(name, dimension);
 		}
 	}
 	
@@ -1387,8 +1383,11 @@ public final class UnitDatabase {
 	 * @since v0.1.0
 	 */
 	public void addPrefix(final String name, final UnitPrefix prefix) {
+		Objects.requireNonNull(prefix, "prefix may not be null");
+		final var namedPrefix = prefix
+				.withName(prefix.getNameSymbol().withExtraName(name));
 		this.prefixes.put(Objects.requireNonNull(name, "name must not be null."),
-				Objects.requireNonNull(prefix, "prefix must not be null."));
+				namedPrefix);
 	}
 	
 	/**
@@ -1401,9 +1400,11 @@ public final class UnitDatabase {
 	 * @since v0.1.0
 	 */
 	public void addUnit(final String name, final Unit unit) {
+		Objects.requireNonNull(unit, "unit may not be null");
+		final var namedUnit = unit
+				.withName(unit.getNameSymbol().withExtraName(name));
 		this.prefixlessUnits.put(
-				Objects.requireNonNull(name, "name must not be null."),
-				Objects.requireNonNull(unit, "unit must not be null."));
+				Objects.requireNonNull(name, "name must not be null."), namedUnit);
 	}
 	
 	/**
@@ -1458,8 +1459,7 @@ public final class UnitDatabase {
 					throw e;
 				}
 				final String prefixName = name.substring(0, name.length() - 1);
-				this.addPrefix(prefixName,
-						prefix.withName(NameSymbol.ofName(prefixName)));
+				this.addPrefix(prefixName, prefix);
 			} else {
 				// it's a unit, get the unit
 				final Unit unit;
@@ -1470,8 +1470,7 @@ public final class UnitDatabase {
 					System.err.printf("Parsing error on line %d:%n", lineCounter);
 					throw e;
 				}
-				
-				this.addUnit(name, unit.withName(NameSymbol.ofName(name)));
+				this.addUnit(name, unit);
 			}
 		}
 	}
diff --git a/src/main/java/sevenUnits/utils/NameSymbol.java b/src/main/java/sevenUnits/utils/NameSymbol.java
index 955f980..7ef2967 100644
--- a/src/main/java/sevenUnits/utils/NameSymbol.java
+++ b/src/main/java/sevenUnits/utils/NameSymbol.java
@@ -288,4 +288,21 @@ public final class NameSymbol {
 		else
 			return this.primaryName.orElseGet(this.symbol::orElseThrow);
 	}
+	
+	/**
+	 * Creates and returns a copy of this {@code NameSymbol} with the provided
+	 * extra name. If this {@code NameSymbol} has a primary name, the provided
+	 * name will become an other name, otherwise it will become the primary name.
+	 *
+	 * @since 2022-04-19
+	 */
+	public final NameSymbol withExtraName(String name) {
+		if (this.primaryName.isPresent()) {
+			final var otherNames = new HashSet<>(this.otherNames);
+			otherNames.add(name);
+			return NameSymbol.ofNullable(this.primaryName.orElse(null),
+					this.symbol.orElse(null), otherNames);
+		} else
+			return NameSymbol.ofNullable(name, this.symbol.orElse(null));
+	}
 }
\ No newline at end of file