Format source code & set explicit UTF-8

1 files changed, 31 insertions, 31 deletions

diff --git a/src/main/java/sevenUnits/unit/Metric.java b/src/main/java/sevenUnits/unit/Metric.java
index 05e82ba..7841987 100644
--- a/src/main/java/sevenUnits/unit/Metric.java
+++ b/src/main/java/sevenUnits/unit/Metric.java
@@ -59,13 +59,13 @@ public final class Metric {
 				.valueOf("Information", "Info"); // non-SI
 		public static final BaseDimension CURRENCY = BaseDimension
 				.valueOf("Currency", "$$"); // non-SI
-		
+
 		// You may NOT get SI.BaseDimensions instances!
 		private BaseDimensions() {
 			throw new AssertionError();
 		}
 	}
-	
+
 	/// base units of the SI
 	// suppressing warnings since these are the same object, but in a different
 	/// form (class)
@@ -89,16 +89,16 @@ public final class Metric {
 				.valueOf(BaseDimensions.INFORMATION, "bit", "b");
 		public static final BaseUnit DOLLAR = BaseUnit
 				.valueOf(BaseDimensions.CURRENCY, "dollar", "$");
-		
+
 		public static final Set<BaseUnit> BASE_UNITS = Set.of(METRE, KILOGRAM,
 				SECOND, AMPERE, KELVIN, MOLE, CANDELA, BIT);
-		
+
 		// You may NOT get SI.BaseUnits instances!
 		private BaseUnits() {
 			throw new AssertionError();
 		}
 	}
-	
+
 	/**
 	 * Constants that relate to the SI or other systems.
 	 * 
@@ -109,7 +109,7 @@ public final class Metric {
 		public static final LinearUnit EARTH_GRAVITY = METRE.dividedBy(SECOND)
 				.dividedBy(SECOND).times(9.80665);
 	}
-	
+
 	// dimensions used in the SI, as ObjectProducts
 	public static final class Dimensions {
 		public static final ObjectProduct<BaseDimension> EMPTY = ObjectProduct
@@ -139,7 +139,7 @@ public final class Metric {
 		public static final ObjectProduct<BaseDimension> CURRENCY = ObjectProduct
 				.oneOf(BaseDimensions.CURRENCY)
 				.withName(NameSymbol.ofName("Currency"));
-		
+
 		// derived dimensions without named SI units
 		public static final ObjectProduct<BaseDimension> AREA = LENGTH
 				.times(LENGTH);
@@ -175,7 +175,7 @@ public final class Metric {
 				.dividedBy(LENGTH);
 		public static final ObjectProduct<BaseDimension> SOLID_ANGLE = AREA
 				.dividedBy(AREA);
-		
+
 		// derived dimensions with named SI units
 		public static final ObjectProduct<BaseDimension> FREQUENCY = EMPTY
 				.dividedBy(TIME);
@@ -209,17 +209,17 @@ public final class Metric {
 				.dividedBy(MASS);
 		public static final ObjectProduct<BaseDimension> CATALYTIC_ACTIVITY = QUANTITY
 				.dividedBy(TIME);
-		
+
 		// You may NOT get SI.Dimension instances!
 		private Dimensions() {
 			throw new AssertionError();
 		}
 	}
-	
+
 	/// The units of the SI
 	public static final LinearUnit ONE = LinearUnit
 			.valueOf(ObjectProduct.empty(), 1);
-	
+
 	public static final LinearUnit METRE = BaseUnits.METRE.asLinearUnit()
 			.withName(NameSymbol.of("metre", "m", "meter"));
 	public static final LinearUnit KILOGRAM = BaseUnits.KILOGRAM.asLinearUnit()
@@ -241,7 +241,7 @@ public final class Metric {
 	// Non-base units
 	public static final LinearUnit RADIAN = METRE.dividedBy(METRE)
 			.withName(NameSymbol.of("radian", "rad"));
-	
+
 	public static final LinearUnit STERADIAN = RADIAN.times(RADIAN)
 			.withName(NameSymbol.of("steradian", "sr"));
 	public static final LinearUnit HERTZ = ONE.dividedBy(SECOND)
@@ -290,7 +290,7 @@ public final class Metric {
 	// common derived units included for convenience
 	public static final LinearUnit GRAM = KILOGRAM.dividedBy(1000)
 			.withName(NameSymbol.of("gram", "g"));
-	
+
 	public static final LinearUnit SQUARE_METRE = METRE.toExponent(2)
 			.withName(NameSymbol.of("square metre", "m^2", "square meter",
 					"metre squared", "meter squared"));
@@ -305,7 +305,7 @@ public final class Metric {
 			.fromConversionFunctions(KELVIN.getBase(), tempK -> tempK - 273.15,
 					tempC -> tempC + 273.15)
 			.withName(NameSymbol.of("degree Celsius", "\u00B0C"));
-	
+
 	public static final LinearUnit MINUTE = SECOND.times(60)
 			.withName(NameSymbol.of("minute", "min"));
 	public static final LinearUnit HOUR = MINUTE.times(60)
@@ -349,7 +349,7 @@ public final class Metric {
 			.fromConversionFunctions(ONE.getBase(), pr -> 10 * Math.log10(pr),
 					dB -> Math.pow(10, dB / 10))
 			.withName(NameSymbol.of("decibel", "dB"));
-	
+
 	/// The prefixes of the SI
 	// expanding decimal prefixes
 	public static final UnitPrefix KILO = UnitPrefix.valueOf(1e3)
@@ -368,7 +368,7 @@ public final class Metric {
 			.withName(NameSymbol.of("zetta", "Z"));
 	public static final UnitPrefix YOTTA = UnitPrefix.valueOf(1e24)
 			.withName(NameSymbol.of("yotta", "Y"));
-	
+
 	// contracting decimal prefixes
 	public static final UnitPrefix MILLI = UnitPrefix.valueOf(1e-3)
 			.withName(NameSymbol.of("milli", "m"));
@@ -386,7 +386,7 @@ public final class Metric {
 			.withName(NameSymbol.of("zepto", "z"));
 	public static final UnitPrefix YOCTO = UnitPrefix.valueOf(1e-24)
 			.withName(NameSymbol.of("yocto", "y"));
-	
+
 	// prefixes that don't match the pattern of thousands
 	public static final UnitPrefix DEKA = UnitPrefix.valueOf(1e1)
 			.withName(NameSymbol.of("deka", "da", "deca", "D"));
@@ -408,7 +408,7 @@ public final class Metric {
 			.withName(NameSymbol.of("pebi", "Pi"));
 	public static final UnitPrefix EXBI = PEBI.times(1024)
 			.withName(NameSymbol.of("exbi", "Ei"));
-	
+
 	// a few prefixed units
 	public static final LinearUnit MICROMETRE = Metric.METRE
 			.withPrefix(Metric.MICRO);
@@ -418,7 +418,7 @@ public final class Metric {
 			.withPrefix(Metric.KILO);
 	public static final LinearUnit MEGAMETRE = Metric.METRE
 			.withPrefix(Metric.MEGA);
-	
+
 	public static final LinearUnit MICROLITRE = Metric.LITRE
 			.withPrefix(Metric.MICRO);
 	public static final LinearUnit MILLILITRE = Metric.LITRE
@@ -427,7 +427,7 @@ public final class Metric {
 			.withPrefix(Metric.KILO);
 	public static final LinearUnit MEGALITRE = Metric.LITRE
 			.withPrefix(Metric.MEGA);
-	
+
 	public static final LinearUnit MICROSECOND = Metric.SECOND
 			.withPrefix(Metric.MICRO);
 	public static final LinearUnit MILLISECOND = Metric.SECOND
@@ -436,14 +436,14 @@ public final class Metric {
 			.withPrefix(Metric.KILO);
 	public static final LinearUnit MEGASECOND = Metric.SECOND
 			.withPrefix(Metric.MEGA);
-	
+
 	public static final LinearUnit MICROGRAM = Metric.GRAM
 			.withPrefix(Metric.MICRO);
 	public static final LinearUnit MILLIGRAM = Metric.GRAM
 			.withPrefix(Metric.MILLI);
 	public static final LinearUnit MEGAGRAM = Metric.GRAM
 			.withPrefix(Metric.MEGA);
-	
+
 	public static final LinearUnit MICRONEWTON = Metric.NEWTON
 			.withPrefix(Metric.MICRO);
 	public static final LinearUnit MILLINEWTON = Metric.NEWTON
@@ -452,7 +452,7 @@ public final class Metric {
 			.withPrefix(Metric.KILO);
 	public static final LinearUnit MEGANEWTON = Metric.NEWTON
 			.withPrefix(Metric.MEGA);
-	
+
 	public static final LinearUnit MICROJOULE = Metric.JOULE
 			.withPrefix(Metric.MICRO);
 	public static final LinearUnit MILLIJOULE = Metric.JOULE
@@ -461,7 +461,7 @@ public final class Metric {
 			.withPrefix(Metric.KILO);
 	public static final LinearUnit MEGAJOULE = Metric.JOULE
 			.withPrefix(Metric.MEGA);
-	
+
 	public static final LinearUnit MICROWATT = Metric.WATT
 			.withPrefix(Metric.MICRO);
 	public static final LinearUnit MILLIWATT = Metric.WATT
@@ -470,7 +470,7 @@ public final class Metric {
 			.withPrefix(Metric.KILO);
 	public static final LinearUnit MEGAWATT = Metric.WATT
 			.withPrefix(Metric.MEGA);
-	
+
 	public static final LinearUnit MICROCOULOMB = Metric.COULOMB
 			.withPrefix(Metric.MICRO);
 	public static final LinearUnit MILLICOULOMB = Metric.COULOMB
@@ -479,12 +479,12 @@ public final class Metric {
 			.withPrefix(Metric.KILO);
 	public static final LinearUnit MEGACOULOMB = Metric.COULOMB
 			.withPrefix(Metric.MEGA);
-	
+
 	public static final LinearUnit MICROAMPERE = Metric.AMPERE
 			.withPrefix(Metric.MICRO);
 	public static final LinearUnit MILLIAMPERE = Metric.AMPERE
 			.withPrefix(Metric.MILLI);
-	
+
 	public static final LinearUnit MICROVOLT = Metric.VOLT
 			.withPrefix(Metric.MICRO);
 	public static final LinearUnit MILLIVOLT = Metric.VOLT
@@ -493,16 +493,16 @@ public final class Metric {
 			.withPrefix(Metric.KILO);
 	public static final LinearUnit MEGAVOLT = Metric.VOLT
 			.withPrefix(Metric.MEGA);
-	
+
 	public static final LinearUnit KILOOHM = Metric.OHM.withPrefix(Metric.KILO);
 	public static final LinearUnit MEGAOHM = Metric.OHM.withPrefix(Metric.MEGA);
-	
+
 	// sets of prefixes
 	public static final Set<UnitPrefix> ALL_PREFIXES = Set.of(DEKA, HECTO, KILO,
 			MEGA, GIGA, TERA, PETA, EXA, ZETTA, YOTTA, DECI, CENTI, MILLI, MICRO,
 			NANO, PICO, FEMTO, ATTO, ZEPTO, YOCTO, KIBI, MEBI, GIBI, TEBI, PEBI,
 			EXBI);
-	
+
 	public static final Set<UnitPrefix> DECIMAL_PREFIXES = Set.of(DEKA, HECTO,
 			KILO, MEGA, GIGA, TERA, PETA, EXA, ZETTA, YOTTA, DECI, CENTI, MILLI,
 			MICRO, NANO, PICO, FEMTO, ATTO, ZEPTO, YOCTO);
@@ -514,7 +514,7 @@ public final class Metric {
 			TEBI, PEBI, EXBI);
 	public static final Set<UnitPrefix> REDUCING_PREFIXES = Set.of(DECI, CENTI,
 			MILLI, MICRO, NANO, PICO, FEMTO, ATTO, ZEPTO, YOCTO);
-	
+
 	// You may NOT get SI instances!
 	private Metric() {
 		throw new AssertionError();