Implemented expression conversion, tests now pass

1 files changed, 9 insertions, 6 deletions

diff --git a/src/main/java/sevenUnitsGUI/TabbedView.java b/src/main/java/sevenUnitsGUI/TabbedView.java
index c3a05e2..1d40087 100644
--- a/src/main/java/sevenUnitsGUI/TabbedView.java
+++ b/src/main/java/sevenUnitsGUI/TabbedView.java
@@ -23,6 +23,7 @@ import java.awt.GridLayout;
 import java.awt.event.KeyEvent;
 import java.text.DecimalFormat;
 import java.text.NumberFormat;
+import java.text.ParseException;
 import java.util.AbstractSet;
 import java.util.Collections;
 import java.util.Iterator;
@@ -59,6 +60,7 @@ import sevenUnits.ProgramInfo;
 import sevenUnits.unit.BaseDimension;
 import sevenUnits.unit.Unit;
 import sevenUnits.unit.UnitPrefix;
+import sevenUnits.unit.UnitValue;
 import sevenUnits.utils.NamedObjectProduct;
 import sevenUnits.utils.ObjectProduct;
 
@@ -140,7 +142,7 @@ final class TabbedView implements ExpressionConversionView, UnitConversionView {
 	/** The combo box that selects dimensions */
 	private final JComboBox<NamedObjectProduct<BaseDimension>> dimensionSelector;
 	/** The panel for inputting values in the dimension-based converter */
-	private final JTextField valueInput;
+	private final JFormattedTextField valueInput;
 	/** The panel for "From" in the dimension-based converter */
 	private final SearchBoxList<Unit> fromSearch;
 	/** The panel for "To" in the dimension-based converter */
@@ -543,12 +545,13 @@ final class TabbedView implements ExpressionConversionView, UnitConversionView {
 	
 	@Override
 	public OptionalDouble getInputValue() {
-		final String text = this.valueInput.getText();
 		try {
-			return OptionalDouble.of(Double.parseDouble(text));
-		} catch (final NumberFormatException e) {
+			this.valueInput.commitEdit();
+		} catch (final ParseException e) {
 			return OptionalDouble.empty();
 		}
+		return OptionalDouble
+				.of(((Number) this.valueInput.getValue()).doubleValue());
 	}
 	
 	@Override
@@ -604,8 +607,8 @@ final class TabbedView implements ExpressionConversionView, UnitConversionView {
 	}
 	
 	@Override
-	public void showUnitConversionOutput(String outputString) {
-		this.unitOutput.setText(outputString);
+	public void showUnitConversionOutput(UnitValue input, UnitValue output) {
+		this.unitOutput.setText(input + " = " + output);
 	}
 	
 }