De-localize Material and FlightDataType objects when persisting in ork files. Added...

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

diff --git a/core/src/net/sf/openrocket/preset/loader/TransitionLoader.java b/core/src/net/sf/openrocket/preset/loader/TransitionLoader.java
index a8d2903835a226d61e0349ef2e98a3d886de4479..a67695b588f03b96195af9c60de929a8fac3d97d 100644 (file)
--- a/core/src/net/sf/openrocket/preset/loader/TransitionLoader.java
+++ b/core/src/net/sf/openrocket/preset/loader/TransitionLoader.java
@@ -1,15 +1,14 @@
 package net.sf.openrocket.preset.loader;
 
-import java.util.Map;
-
-import net.sf.openrocket.material.Material;
 import net.sf.openrocket.preset.ComponentPreset;
 import net.sf.openrocket.preset.ComponentPreset.Type;
 
+import java.io.File;
+
 public class TransitionLoader extends NoseConeLoader {
 
-       public TransitionLoader(Map<String, Material> materials) {
-               super(materials);
+       public TransitionLoader(MaterialHolder materials, File theBasePath) {
+               super(materials, theBasePath);
                fileColumns.add(new DoubleUnitColumnParser("Front Insert Len","Units",ComponentPreset.FORE_SHOULDER_LENGTH));
                fileColumns.add(new DoubleUnitColumnParser("Front Insert OD","Units",ComponentPreset.FORE_SHOULDER_DIAMETER));
                fileColumns.add(new DoubleUnitColumnParser("Front OD","Units",ComponentPreset.FORE_OUTER_DIAMETER));