summaryrefslogtreecommitdiff
path: root/src/main/java/sevenUnitsGUI/ViewBot.java
diff options
context:
space:
mode:
authorAdrien Hopkins <ahopk127@my.yorku.ca>2022-02-26 09:53:24 -0500
committerAdrien Hopkins <ahopk127@my.yorku.ca>2022-02-26 09:53:24 -0500
commit07c86e02be29aa3d3d878adce62c5c0a9a458e47 (patch)
treef7b13c71beed93f3af0919a2c835414252bf30c7 /src/main/java/sevenUnitsGUI/ViewBot.java
parentb7eee33a5b162b4057d04d28f45738e3048bf01d (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/sevenUnitsGUI/ViewBot.java')
-rw-r--r--src/main/java/sevenUnitsGUI/ViewBot.java7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/main/java/sevenUnitsGUI/ViewBot.java b/src/main/java/sevenUnitsGUI/ViewBot.java
index 0c0d189..bc5302b 100644
--- a/src/main/java/sevenUnitsGUI/ViewBot.java
+++ b/src/main/java/sevenUnitsGUI/ViewBot.java
@@ -20,6 +20,7 @@ import java.util.Collections;
import java.util.List;
import java.util.Objects;
import java.util.Optional;
+import java.util.OptionalDouble;
import java.util.Set;
import sevenUnits.unit.BaseDimension;
@@ -47,7 +48,7 @@ final class ViewBot implements UnitConversionView, ExpressionConversionView {
/**
* The user-provided string representing the value in {@code fromSelection}
*/
- private String inputValue;
+ private OptionalDouble inputValue;
/** The unit selected in the From selection */
private Optional<Unit> fromSelection;
/** The unit selected in the To selection */
@@ -102,7 +103,7 @@ final class ViewBot implements UnitConversionView, ExpressionConversionView {
}
@Override
- public String getInputValue() {
+ public OptionalDouble getInputValue() {
return this.inputValue;
}
@@ -190,7 +191,7 @@ final class ViewBot implements UnitConversionView, ExpressionConversionView {
* @param inputValue the inputValue to set
* @since 2022-01-29
*/
- public void setInputValue(String inputValue) {
+ public void setInputValue(OptionalDouble inputValue) {
this.inputValue = inputValue;
}