diff options
| author | Adrien Hopkins <ahopk127@my.yorku.ca> | 2022-02-26 09:53:24 -0500 |
|---|---|---|
| committer | Adrien Hopkins <ahopk127@my.yorku.ca> | 2022-02-26 09:53:24 -0500 |
| commit | 07c86e02be29aa3d3d878adce62c5c0a9a458e47 (patch) | |
| tree | f7b13c71beed93f3af0919a2c835414252bf30c7 /src/main/java/sevenUnits/utils/ObjectProduct.java | |
| parent | b7eee33a5b162b4057d04d28f45738e3048bf01d (diff) | |
Implemented unit conversion, with a few problems
TabbedView now displays its units, but with their toString method which shows
their definition in addition to their name
Diffstat (limited to 'src/main/java/sevenUnits/utils/ObjectProduct.java')
| -rw-r--r-- | src/main/java/sevenUnits/utils/ObjectProduct.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/main/java/sevenUnits/utils/ObjectProduct.java b/src/main/java/sevenUnits/utils/ObjectProduct.java index d4f88b9..926ce10 100644 --- a/src/main/java/sevenUnits/utils/ObjectProduct.java +++ b/src/main/java/sevenUnits/utils/ObjectProduct.java @@ -26,8 +26,6 @@ import java.util.Objects; import java.util.Set; import java.util.function.Function; -import sevenUnits.unit.NameSymbol; - /** * An immutable product of multiple objects of a type, such as base units. The * objects can be multiplied and exponentiated. @@ -246,7 +244,9 @@ public class ObjectProduct<T> { */ @Override public String toString() { - return this.toString(Object::toString); + return this.toString(o -> o instanceof Nameable + ? ((Nameable) o).getNameSymbol().shortName() + : o.toString()); } /** |