diff options
| author | Adrien Hopkins <ahopk127@my.yorku.ca> | 2022-04-12 15:17:12 -0500 |
|---|---|---|
| committer | Adrien Hopkins <ahopk127@my.yorku.ca> | 2022-04-16 15:42:12 -0500 |
| commit | 4ad68a29f84538d3fb19eec8e0622731f5a5d7c8 (patch) | |
| tree | d3028d6a10c689abfdc2ed32f630371af22a33dc /src/main/java/sevenUnits/unit/UnitDatabase.java | |
| parent | b1affe92460637211f560d70ee5c8770f3952822 (diff) | |
Removed NamedObjectProduct in favour of the regular ObjectProduct
Diffstat (limited to 'src/main/java/sevenUnits/unit/UnitDatabase.java')
| -rw-r--r-- | src/main/java/sevenUnits/unit/UnitDatabase.java | 12 |
1 files changed, 5 insertions, 7 deletions
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); } |