diff options
| author | Adrien Hopkins <ahopk127@my.yorku.ca> | 2022-07-17 16:16:56 -0500 |
|---|---|---|
| committer | Adrien Hopkins <ahopk127@my.yorku.ca> | 2022-07-17 16:16:56 -0500 |
| commit | a6ba3bcae1e7530ef14b8eea3fcd1f4629ba03b8 (patch) | |
| tree | 0ee9c844d6458c13310bc644f49b1021219e6531 /src/main | |
| parent | f31efa6a6c58188d5637ab69950227a6ba92530b (diff) | |
All dimension names are now in title case
Diffstat (limited to 'src/main')
| -rw-r--r-- | src/main/java/sevenUnitsGUI/Presenter.java | 10 | ||||
| -rw-r--r-- | src/main/resources/dimensionfile.txt | 16 |
2 files changed, 13 insertions, 13 deletions
diff --git a/src/main/java/sevenUnitsGUI/Presenter.java b/src/main/java/sevenUnitsGUI/Presenter.java index a5c4d48..abdd1f6 100644 --- a/src/main/java/sevenUnitsGUI/Presenter.java +++ b/src/main/java/sevenUnitsGUI/Presenter.java @@ -90,10 +90,10 @@ public final class Presenter { database.addUnit("tempFahrenheit", BritishImperial.FAHRENHEIT); // load initial dimensions - database.addDimension("LENGTH", Metric.Dimensions.LENGTH); - database.addDimension("MASS", Metric.Dimensions.MASS); - database.addDimension("TIME", Metric.Dimensions.TIME); - database.addDimension("TEMPERATURE", Metric.Dimensions.TEMPERATURE); + database.addDimension("Length", Metric.Dimensions.LENGTH); + database.addDimension("Mass", Metric.Dimensions.MASS); + database.addDimension("Time", Metric.Dimensions.TIME); + database.addDimension("Temperature", Metric.Dimensions.TEMPERATURE); } /** @@ -622,7 +622,7 @@ public final class Presenter { * @return true iff the One-Way Conversion feature is available (views that * show units as a list will have metric units removed from the From * unit list and imperial/USC units removed from the To unit list) - * + * * @since 2022-03-30 */ public boolean oneWayConversionEnabled() { diff --git a/src/main/resources/dimensionfile.txt b/src/main/resources/dimensionfile.txt index a946677..d767e9f 100644 --- a/src/main/resources/dimensionfile.txt +++ b/src/main/resources/dimensionfile.txt @@ -6,13 +6,13 @@ # I have excluded electric current, quantity and luminous intensity since their units are exclusively SI. -LENGTH ! -MASS ! -TIME ! -TEMPERATURE ! +Length ! +Mass ! +Time ! +Temperature ! # Derived Dimensions -Area LENGTH^2 -Volume LENGTH^3 -Velocity LENGTH / TIME -Energy MASS * Velocity^2
\ No newline at end of file +Area Length^2 +Volume Length^3 +Velocity Length / Time +Energy Mass * Velocity^2
\ No newline at end of file |