diff options
| author | Adrien Hopkins <ahopk127@my.yorku.ca> | 2022-07-17 16:25:04 -0500 |
|---|---|---|
| committer | Adrien Hopkins <ahopk127@my.yorku.ca> | 2022-07-17 16:25:04 -0500 |
| commit | 59a95816053cc3dd9ad49fcecc078940a8835774 (patch) | |
| tree | 8d3ac45478468fe772618aa6d44c4879152738b5 /src/main/java | |
| parent | 6015694bbec91db777530d1cba1be34b832e9a8a (diff) | |
| parent | b76c06eb393c7c6d9a3ece66efec1fd20311b7e8 (diff) | |
Merge branch 'release-0.4.0' into develop
Diffstat (limited to 'src/main/java')
| -rw-r--r-- | src/main/java/sevenUnits/ProgramInfo.java | 4 | ||||
| -rw-r--r-- | src/main/java/sevenUnitsGUI/Presenter.java | 10 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/main/java/sevenUnits/ProgramInfo.java b/src/main/java/sevenUnits/ProgramInfo.java index 6ebe66c..3fc0ef9 100644 --- a/src/main/java/sevenUnits/ProgramInfo.java +++ b/src/main/java/sevenUnits/ProgramInfo.java @@ -26,9 +26,9 @@ import sevenUnits.utils.SemanticVersionNumber; */ public final class ProgramInfo { - /** The version number (0.4.0-beta.1) */ + /** The version number (0.4.0) */ public static final SemanticVersionNumber VERSION = SemanticVersionNumber - .preRelease(0, 4, 0, "beta", 1); + .stableVersion(0, 4, 0); private ProgramInfo() { // this class is only for static variables, you shouldn't be able to 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() { |