diff options
| author | Adrien Hopkins <masterofnumbers17@gmail.com> | 2019-10-21 21:27:59 -0400 |
|---|---|---|
| committer | Adrien Hopkins <masterofnumbers17@gmail.com> | 2019-10-21 21:27:59 -0400 |
| commit | 3c23fd15b88396868101457256173c0c2c29df5c (patch) | |
| tree | b53b58d96ab48aa86438707ab8fa628d32a986e3 /src/org/unitConverter/unit/LinearUnit.java | |
| parent | 8c8f900416981863607c3c39d737ab1be8540e1a (diff) | |
Added unit names and the NameSymbol.
Diffstat (limited to 'src/org/unitConverter/unit/LinearUnit.java')
| -rw-r--r-- | src/org/unitConverter/unit/LinearUnit.java | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/org/unitConverter/unit/LinearUnit.java b/src/org/unitConverter/unit/LinearUnit.java index 1918d6b..2a55dea 100644 --- a/src/org/unitConverter/unit/LinearUnit.java +++ b/src/org/unitConverter/unit/LinearUnit.java @@ -40,7 +40,7 @@ public final class LinearUnit extends Unit { * @since 2019-10-16 */ public static LinearUnit fromUnitValue(final Unit unit, final double value) { - return new LinearUnit(unit.getBase(), unit.convertToBase(value)); + return new LinearUnit(unit.getBase(), NameSymbol.EMPTY, unit.convertToBase(value)); } /** @@ -55,7 +55,7 @@ public final class LinearUnit extends Unit { * @since 2019-10-16 */ public static LinearUnit valueOf(final ObjectProduct<BaseUnit> unitBase, final double conversionFactor) { - return new LinearUnit(unitBase, conversionFactor); + return new LinearUnit(unitBase, NameSymbol.EMPTY, conversionFactor); } /** @@ -78,8 +78,8 @@ public final class LinearUnit extends Unit { * conversion factor between base and unit * @since 2019-10-16 */ - private LinearUnit(final ObjectProduct<BaseUnit> unitBase, final double conversionFactor) { - super(unitBase); + private LinearUnit(final ObjectProduct<BaseUnit> unitBase, final NameSymbol ns, final double conversionFactor) { + super(unitBase, ns); this.conversionFactor = conversionFactor; } @@ -270,7 +270,9 @@ public final class LinearUnit extends Unit { // returns a definition of the unit @Override public String toString() { - return Double.toString(this.conversionFactor) + " * " + this.getBase().toString(BaseUnit::getSymbol); + return this.getPrimaryName().orElse("Unnamed unit") + + (this.getSymbol().isPresent() ? String.format(" (%s)", this.getSymbol().get()) : "") + ", " + + Double.toString(this.conversionFactor) + " * " + this.getBase().toString(u -> u.getSymbol().get()); } /** |