Implemented the new Units system

Fahrenheit has temporarily been removed; it will be back.

1 files changed, 17 insertions, 18 deletions

diff --git a/src/org/unitConverter/converterGUI/UnitConverterGUI.java b/src/org/unitConverter/converterGUI/UnitConverterGUI.java
index 2d3d1a5..4598971 100644
--- a/src/org/unitConverter/converterGUI/UnitConverterGUI.java
+++ b/src/org/unitConverter/converterGUI/UnitConverterGUI.java
@@ -42,14 +42,13 @@ import javax.swing.JTabbedPane;
 import javax.swing.JTextArea;
 import javax.swing.JTextField;
 
-import org.unitConverter.UnitsDatabase;
-import org.unitConverter.dimension.StandardDimensions;
-import org.unitConverter.dimension.UnitDimension;
-import org.unitConverter.unit.BaseUnit;
-import org.unitConverter.unit.NonlinearUnits;
+import org.unitConverter.math.ObjectProduct;
+import org.unitConverter.unit.BaseDimension;
+import org.unitConverter.unit.LinearUnit;
 import org.unitConverter.unit.SI;
 import org.unitConverter.unit.Unit;
 import org.unitConverter.unit.UnitPrefix;
+import org.unitConverter.unit.UnitDatabase;
 
 /**
  * @author Adrien Hopkins
@@ -66,7 +65,7 @@ final class UnitConverterGUI {
 		 * @since 2019-04-14
 		 * @since v0.2.0
 		 */
-		private static void addDefaults(final UnitsDatabase database) {
+		private static void addDefaults(final UnitDatabase database) {
 			database.addUnit("metre", SI.METRE);
 			database.addUnit("kilogram", SI.KILOGRAM);
 			database.addUnit("gram", SI.KILOGRAM.dividedBy(1000));
@@ -75,24 +74,24 @@ final class UnitConverterGUI {
 			database.addUnit("kelvin", SI.KELVIN);
 			database.addUnit("mole", SI.MOLE);
 			database.addUnit("candela", SI.CANDELA);
-			database.addUnit("bit", SI.SI.getBaseUnit(StandardDimensions.INFORMATION));
-			database.addUnit("unit", SI.SI.getBaseUnit(UnitDimension.EMPTY));
+			database.addUnit("bit", SI.BIT);
+			database.addUnit("unit", SI.ONE);
 			// nonlinear units - must be loaded manually
-			database.addUnit("tempCelsius", NonlinearUnits.CELSIUS);
-			database.addUnit("tempFahrenheit", NonlinearUnits.FAHRENHEIT);
+			database.addUnit("tempCelsius", SI.CELSIUS);
+			// database.addUnit("tempFahrenheit", NonlinearUnits.FAHRENHEIT);
 
 			// load initial dimensions
-			database.addDimension("LENGTH", StandardDimensions.LENGTH);
-			database.addDimension("MASS", StandardDimensions.MASS);
-			database.addDimension("TIME", StandardDimensions.TIME);
-			database.addDimension("TEMPERATURE", StandardDimensions.TEMPERATURE);
+			database.addDimension("LENGTH", SI.Dimensions.LENGTH);
+			database.addDimension("MASS", SI.Dimensions.MASS);
+			database.addDimension("TIME", SI.Dimensions.TIME);
+			database.addDimension("TEMPERATURE", SI.Dimensions.TEMPERATURE);
 		}
 
 		/** The presenter's associated view. */
 		private final View view;
 
 		/** The units known by the program. */
-		private final UnitsDatabase database;
+		private final UnitDatabase database;
 
 		/** The names of all of the units */
 		private final List<String> unitNames;
@@ -119,7 +118,7 @@ final class UnitConverterGUI {
 			this.view = view;
 
 			// load initial units
-			this.database = new UnitsDatabase();
+			this.database = new UnitDatabase();
 			Presenter.addDefaults(this.database);
 
 			this.database.loadUnitsFile(new File("unitsfile.txt"));
@@ -155,7 +154,7 @@ final class UnitConverterGUI {
 			this.dimensionNames.sort(null); // sorts it using Comparable
 
 			// a Predicate that returns true iff the argument is a full base unit
-			final Predicate<Unit> isFullBase = unit -> unit instanceof BaseUnit && ((BaseUnit) unit).isFullBase();
+			final Predicate<Unit> isFullBase = unit -> unit instanceof LinearUnit && ((LinearUnit) unit).isBase();
 
 			// print out unit counts
 			System.out.printf("Successfully loaded %d units with %d unit names (%d base units).%n",
@@ -359,7 +358,7 @@ final class UnitConverterGUI {
 		 */
 		public final boolean unitMatchesDimension(final String unitName, final String dimensionName) {
 			final Unit unit = this.database.getUnit(unitName);
-			final UnitDimension dimension = this.database.getDimension(dimensionName);
+			final ObjectProduct<BaseDimension> dimension = this.database.getDimension(dimensionName);
 			return unit.getDimension().equals(dimension);
 		}