diff options
| author | Adrien Hopkins <ahopk127@my.yorku.ca> | 2021-12-02 16:46:15 -0500 |
|---|---|---|
| committer | Adrien Hopkins <ahopk127@my.yorku.ca> | 2021-12-02 16:46:15 -0500 |
| commit | 345fa45ae562e4699cc9c2e039dc82c7a66b0451 (patch) | |
| tree | 970052482622edd7e7fa950dfcee66b165818a4f /src/main/java/sevenUnits/unit/LinearUnitValue.java | |
| parent | 54e481cdb7115b236bcddb86b785d88dcc757c39 (diff) | |
| parent | 8ea77520ce58e948eeffc4c2e8c25c69e88ed00a (diff) | |
Merge branch 'testing-upgrades' into develop
Diffstat (limited to 'src/main/java/sevenUnits/unit/LinearUnitValue.java')
| -rw-r--r-- | src/main/java/sevenUnits/unit/LinearUnitValue.java | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/src/main/java/sevenUnits/unit/LinearUnitValue.java b/src/main/java/sevenUnits/unit/LinearUnitValue.java index a36d568..a50e1f5 100644 --- a/src/main/java/sevenUnits/unit/LinearUnitValue.java +++ b/src/main/java/sevenUnits/unit/LinearUnitValue.java @@ -324,17 +324,18 @@ public final class LinearUnitValue { // get rounded strings // if showUncertainty is true, add brackets around the string - final String valueString = showUncertainty ? "(" - : "" + this.value.toString(showUncertainty) - + (showUncertainty ? ")" : ""); - final String baseValueString = showUncertainty ? "(" - : "" + baseValue.toString(showUncertainty) - + (showUncertainty ? ")" : ""); + final String valueString = (showUncertainty ? "(" : "") + + this.value.toString(showUncertainty) + + (showUncertainty ? ")" : ""); + final String baseValueString = (showUncertainty ? "(" : "") + + baseValue.toString(showUncertainty) + + (showUncertainty ? ")" : ""); // create string - if (primaryName.isEmpty() && symbol.isEmpty()) + if (chosenName == null) return String.format("%s unnamed unit (= %s %s)", valueString, - baseValueString, this.unit.getBase()); + baseValueString, this.unit.getBase() + .toString(unit -> unit.getSymbol().orElseThrow())); else return String.format("%s %s", valueString, chosenName); } |