Edited the UnitsDatabase API; it now favours prefixless units.

1 files changed, 10 insertions, 8 deletions

diff --git a/src/org/unitConverter/converterGUI/UnitConverterGUI.java b/src/org/unitConverter/converterGUI/UnitConverterGUI.java
index 9314510..49a40d6 100755
--- a/src/org/unitConverter/converterGUI/UnitConverterGUI.java
+++ b/src/org/unitConverter/converterGUI/UnitConverterGUI.java
@@ -24,6 +24,7 @@ import java.math.MathContext;
 import java.text.DecimalFormat;
 import java.util.ArrayList;
 import java.util.Comparator;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 import java.util.function.Predicate;
@@ -143,19 +144,19 @@ final class UnitConverterGUI {
 				return o1.compareTo(o2);
 			};
 
-			this.unitNames = new ArrayList<>(this.units.prefixlessUnitNameSet());
+			this.unitNames = new ArrayList<>(this.units.unitMapPrefixless().keySet());
 			this.unitNames.sort(null); // sorts it using Comparable
 
-			this.unitNamesFiltered = new DelegateListModel<>(new ArrayList<>(this.units.prefixlessUnitNameSet()));
+			this.unitNamesFiltered = new DelegateListModel<>(new ArrayList<>(this.units.unitMapPrefixless().keySet()));
 			this.unitNamesFiltered.sort(null); // sorts it using Comparable
 
-			this.prefixNames = new ArrayList<>(this.units.prefixNameSet());
+			this.prefixNames = new ArrayList<>(this.units.prefixMap().keySet());
 			this.prefixNames.sort(this.prefixNameComparator); // sorts it using my comparator
 
-			this.prefixNamesFiltered = new DelegateListModel<>(new ArrayList<>(this.units.prefixNameSet()));
+			this.prefixNamesFiltered = new DelegateListModel<>(new ArrayList<>(this.units.prefixMap().keySet()));
 			this.prefixNamesFiltered.sort(this.prefixNameComparator); // sorts it using my comparator
 
-			this.dimensionNames = new DelegateListModel<>(new ArrayList<>(this.units.dimensionNameSet()));
+			this.dimensionNames = new DelegateListModel<>(new ArrayList<>(this.units.dimensionMap().keySet()));
 			this.dimensionNames.sort(null); // sorts it using Comparable
 
 			// a Predicate that returns true iff the argument is a full base unit
@@ -163,8 +164,9 @@ final class UnitConverterGUI {
 
 			// print out unit counts
 			System.out.printf("Successfully loaded %d units with %d unit names (%d base units).%n",
-					this.units.prefixlessUnitSet().size(), this.units.prefixlessUnitNameSet().size(),
-					this.units.prefixlessUnitSet().stream().filter(isFullBase).count());
+					new HashSet<>(this.units.unitMapPrefixless().values()).size(),
+					this.units.unitMapPrefixless().size(),
+					new HashSet<>(this.units.unitMapPrefixless().values()).stream().filter(isFullBase).count());
 		}
 
 		/**
@@ -449,7 +451,7 @@ final class UnitConverterGUI {
 		}
 
 		public final Set<String> unitNameSet() {
-			return this.units.prefixlessUnitNameSet();
+			return this.units.unitMapPrefixless().keySet();
 		}
 	}