Simplified toString of common unit classes

1 files changed, 6 insertions, 14 deletions

diff --git a/src/main/java/sevenUnits/unit/LinearUnit.java b/src/main/java/sevenUnits/unit/LinearUnit.java
index deefc9a..3a28261 100644
--- a/src/main/java/sevenUnits/unit/LinearUnit.java
+++ b/src/main/java/sevenUnits/unit/LinearUnit.java
@@ -370,6 +370,12 @@ public final class LinearUnit extends Unit {
 				this.getConversionFactor() * multiplier.getConversionFactor());
 	}
 	
+	@Override
+	public String toDefinitionString() {
+		return Double.toString(this.conversionFactor) + " "
+				+ this.getBase().toString(BaseUnit::getShortName);
+	}
+	
 	/**
 	 * Returns this unit but to an exponent.
 	 * 
@@ -383,20 +389,6 @@ public final class LinearUnit extends Unit {
 				Math.pow(this.conversionFactor, exponent));
 	}
 	
-	/**
-	 * @return a string providing a definition of this unit
-	 * @since 2019-10-21
-	 */
-	@Override
-	public String toString() {
-		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());
-	}
-	
 	@Override
 	public LinearUnit withName(final NameSymbol ns) {
 		return valueOf(this.getBase(), this.getConversionFactor(), ns);