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

1 files changed, 10 insertions, 4 deletions

diff --git a/src/main/java/sevenUnitsGUI/TabbedView.java b/src/main/java/sevenUnitsGUI/TabbedView.java
index e92b661..c3a05e2 100644
--- a/src/main/java/sevenUnitsGUI/TabbedView.java
+++ b/src/main/java/sevenUnitsGUI/TabbedView.java
@@ -28,6 +28,7 @@ import java.util.Collections;
 import java.util.Iterator;
 import java.util.NoSuchElementException;
 import java.util.Optional;
+import java.util.OptionalDouble;
 import java.util.Set;
 
 import javax.swing.BorderFactory;
@@ -212,7 +213,7 @@ final class TabbedView implements ExpressionConversionView, UnitConversionView {
 			this.dimensionSelector = new JComboBox<>();
 			inBetweenPanel.add(this.dimensionSelector, BorderLayout.PAGE_START);
 			this.dimensionSelector
-					.addItemListener(e -> this.presenter.applyDimensionFilter());
+					.addItemListener(e -> this.presenter.updateView());
 			
 			final JLabel arrowLabel = new JLabel("-->");
 			inBetweenPanel.add(arrowLabel, BorderLayout.CENTER);
@@ -326,9 +327,9 @@ final class TabbedView implements ExpressionConversionView, UnitConversionView {
 		this.masterPane.setMnemonicAt(5, KeyEvent.VK_S);
 		
 		// ============ FINALIZE CREATION OF VIEW ============
+		this.presenter.postViewInitialize();
 		this.frame.pack();
 		this.frame.setVisible(true);
-		
 	}
 	
 	/**
@@ -541,8 +542,13 @@ final class TabbedView implements ExpressionConversionView, UnitConversionView {
 	}
 	
 	@Override
-	public String getInputValue() {
-		return this.valueInput.getText();
+	public OptionalDouble getInputValue() {
+		final String text = this.valueInput.getText();
+		try {
+			return OptionalDouble.of(Double.parseDouble(text));
+		} catch (final NumberFormatException e) {
+			return OptionalDouble.empty();
+		}
 	}
 	
 	@Override