Implement MaterialHolder, a container for the Material objects loaded during processi...

[debian/openrocket] / core / src / net / sf / openrocket / preset / loader / BaseComponentLoader.java

diff --git a/core/src/net/sf/openrocket/preset/loader/BaseComponentLoader.java b/core/src/net/sf/openrocket/preset/loader/BaseComponentLoader.java
index 6f3970942c2bb3f5ab5e6d679efb8acbafe8c620..741b8969e75707d7697fa33860fc7174e2eea639 100644 (file)
--- a/core/src/net/sf/openrocket/preset/loader/BaseComponentLoader.java
+++ b/core/src/net/sf/openrocket/preset/loader/BaseComponentLoader.java
@@ -14,7 +14,7 @@ public abstract class BaseComponentLoader extends RocksimComponentFileLoader {
 
        List<ComponentPreset> presets;
 
-       public BaseComponentLoader(Map<String, Material> materials) {
+       public BaseComponentLoader(MaterialHolder materials) {
                super();
                presets = new ArrayList<ComponentPreset>();
 
@@ -22,7 +22,7 @@ public abstract class BaseComponentLoader extends RocksimComponentFileLoader {
                fileColumns.add( new StringColumnParser("Part No.", ComponentPreset.PARTNO));
                fileColumns.add( new StringColumnParser("Desc.", ComponentPreset.DESCRIPTION));
                fileColumns.add(new MaterialColumnParser(materials));
-               fileColumns.add(new DoubleUnitColumnParser("Mass","Mass units",ComponentPreset.MASS));
+               fileColumns.add(new MassColumnParser("Mass","Mass units"));
 
        }