summaryrefslogtreecommitdiff
path: root/src/main
diff options
context:
space:
mode:
Diffstat (limited to 'src/main')
-rw-r--r--src/main/java/sevenUnitsGUI/ViewBot.java44
1 files changed, 38 insertions, 6 deletions
diff --git a/src/main/java/sevenUnitsGUI/ViewBot.java b/src/main/java/sevenUnitsGUI/ViewBot.java
index bc4103c..cc070e2 100644
--- a/src/main/java/sevenUnitsGUI/ViewBot.java
+++ b/src/main/java/sevenUnitsGUI/ViewBot.java
@@ -16,6 +16,7 @@
*/
package sevenUnitsGUI;
+import java.util.Collections;
import java.util.List;
import java.util.Objects;
import java.util.Optional;
@@ -56,6 +57,8 @@ final class ViewBot implements UnitConversionView, ExpressionConversionView {
private List<? extends Unit> fromUnits;
/** The units available in the To selection */
private List<? extends Unit> toUnits;
+ /** Saved output values of all unit conversions */
+ private List<String> unitConversionOutputValues;
/**
* Creates a new {@code ViewBot} with a new presenter.
@@ -75,6 +78,10 @@ final class ViewBot implements UnitConversionView, ExpressionConversionView {
return this.dimensions;
}
+ public List<String> getExpressionConversionOutputs() {
+ throw new UnsupportedOperationException("Not implemented yet");
+ }
+
@Override
public String getFromExpression() {
return this.fromExpression;
@@ -89,8 +96,8 @@ final class ViewBot implements UnitConversionView, ExpressionConversionView {
* @return the units available for selection in From
* @since 2022-01-29
*/
- public List<? extends Unit> getFromUnits() {
- return this.fromUnits;
+ public List<Unit> getFromUnits() {
+ return Collections.unmodifiableList(this.fromUnits);
}
@Override
@@ -107,8 +114,8 @@ final class ViewBot implements UnitConversionView, ExpressionConversionView {
}
@Override
- public Optional<? extends ObjectProduct<BaseDimension>> getSelectedDimension() {
- return this.selectedDimension;
+ public Optional<ObjectProduct<BaseDimension>> getSelectedDimension() {
+ return this.selectedDimension.map(x -> x);
}
@Override
@@ -125,8 +132,16 @@ final class ViewBot implements UnitConversionView, ExpressionConversionView {
* @return the units available for selection in To
* @since 2022-01-29
*/
- public List<? extends Unit> getToUnits() {
- return this.toUnits;
+ public List<Unit> getToUnits() {
+ return Collections.unmodifiableList(this.toUnits);
+ }
+
+ /**
+ * @return the unitConversionOutputValues
+ * @since 2022-02-10
+ */
+ public List<String> getUnitConversionOutputValues() {
+ return this.unitConversionOutputValues;
}
@Override
@@ -157,6 +172,14 @@ final class ViewBot implements UnitConversionView, ExpressionConversionView {
"fromSelection cannot be null");
}
+ /**
+ * @param fromSelection the fromSelection to set
+ * @since 2022-02-10
+ */
+ public void setFromSelection(Unit fromSelection) {
+ this.setFromSelection(Optional.of(fromSelection));
+ }
+
@Override
public void setFromUnits(List<? extends Unit> units) {
this.fromUnits = Objects.requireNonNull(units, "units may not be null");
@@ -170,6 +193,11 @@ final class ViewBot implements UnitConversionView, ExpressionConversionView {
this.inputValue = inputValue;
}
+ public void setSelectedDimension(
+ ObjectProduct<BaseDimension> selectedDimension) {
+ this.setSelectedDimension(Optional.of(selectedDimension));
+ }
+
/**
* @param selectedDimension the selectedDimension to set
* @since 2022-01-29
@@ -200,6 +228,10 @@ final class ViewBot implements UnitConversionView, ExpressionConversionView {
"toSelection cannot be null.");
}
+ public void setToSelection(Unit toSelection) {
+ this.setToSelection(Optional.of(toSelection));
+ }
+
@Override
public void setToUnits(List<? extends Unit> units) {
this.toUnits = Objects.requireNonNull(units, "units may not be null");