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

[debian/openrocket] / core / test / net / sf / openrocket / rocketcomponent / SymmetricComponentVolumeTest.java

diff --git a/core/test/net/sf/openrocket/rocketcomponent/SymmetricComponentVolumeTest.java b/core/test/net/sf/openrocket/rocketcomponent/SymmetricComponentVolumeTest.java
index 285b25a528bb67106da32de559b45f71f8db9af5..5b1e5ecb3e5fedb30b12acfd587a8f2d893c1cef 100644 (file)
--- a/core/test/net/sf/openrocket/rocketcomponent/SymmetricComponentVolumeTest.java
+++ b/core/test/net/sf/openrocket/rocketcomponent/SymmetricComponentVolumeTest.java
@@ -20,7 +20,7 @@ public class SymmetricComponentVolumeTest extends BaseTestCase {
                nc.setFilled(true);
                nc.setType( Transition.Shape.CONICAL );
                nc.setAftRadius(1.0);
-               nc.setMaterial( new Material.Bulk("test",density,true));
+               nc.setMaterial( Material.newUserMaterial(Material.Type.BULK,"test",density));
 
                Coordinate cg = nc.getCG();
 
@@ -54,7 +54,7 @@ public class SymmetricComponentVolumeTest extends BaseTestCase {
                nc.setAftShoulderRadius(1.0);
                nc.setAftShoulderLength(1.0);
                nc.setAftShoulderThickness(1.0);
-               nc.setMaterial( new Material.Bulk("test",density,true));
+               nc.setMaterial( Material.newUserMaterial(Material.Type.BULK,"test",density));
 
                Coordinate cg = nc.getCG();
 
@@ -86,7 +86,7 @@ public class SymmetricComponentVolumeTest extends BaseTestCase {
                nc.setAftRadius(1.0);
                nc.setThickness(0.5);
                nc.setType( Transition.Shape.CONICAL );
-               nc.setMaterial( new Material.Bulk("test",density,true));
+               nc.setMaterial( Material.newUserMaterial(Material.Type.BULK,"test",density));
                
                Coordinate cg = nc.getCG();
 
@@ -128,7 +128,7 @@ public class SymmetricComponentVolumeTest extends BaseTestCase {
                nc.setAftShoulderRadius(1.0);
                nc.setAftShoulderLength(1.0);
                nc.setAftShoulderThickness(0.5);
-               nc.setMaterial( new Material.Bulk("test",density,true));
+               nc.setMaterial( Material.newUserMaterial(Material.Type.BULK,"test",density));
 
                Coordinate cg = nc.getCG();
 
@@ -171,7 +171,7 @@ public class SymmetricComponentVolumeTest extends BaseTestCase {
                nc.setType( Transition.Shape.CONICAL );
                nc.setForeRadius(1.0);
                nc.setAftRadius(2.0);
-               nc.setMaterial( new Material.Bulk("test",density,true));
+               nc.setMaterial( Material.newUserMaterial(Material.Type.BULK,"test",density));
                
                Coordinate cg = nc.getCG();
 
@@ -209,7 +209,7 @@ public class SymmetricComponentVolumeTest extends BaseTestCase {
                nc.setForeShoulderLength(1.0);
                nc.setForeShoulderRadius(1.0);
                nc.setForeShoulderThickness(1.0);
-               nc.setMaterial( new Material.Bulk("test",density,true));
+               nc.setMaterial( Material.newUserMaterial(Material.Type.BULK,"test",density));
                
                Coordinate cg = nc.getCG();
 
@@ -245,7 +245,7 @@ public class SymmetricComponentVolumeTest extends BaseTestCase {
                nc.setForeRadius(0.5);
                nc.setAftRadius(1.0);
                nc.setThickness(0.5);
-               nc.setMaterial( new Material.Bulk("test",density,true));
+               nc.setMaterial( Material.newUserMaterial(Material.Type.BULK,"test",density));
                
                Coordinate cg = nc.getCG();
 
@@ -298,7 +298,7 @@ public class SymmetricComponentVolumeTest extends BaseTestCase {
                nc.setForeShoulderLength(1.0);
                nc.setForeShoulderRadius(0.5);
                nc.setForeShoulderThickness(0.5);  // note this means fore shoulder is filled.
-               nc.setMaterial( new Material.Bulk("test",density,true));
+               nc.setMaterial( Material.newUserMaterial(Material.Type.BULK,"test",density));
                
                Coordinate cg = nc.getCG();
 
@@ -350,7 +350,7 @@ public class SymmetricComponentVolumeTest extends BaseTestCase {
                nc.setForeRadius(0.5);
                nc.setAftRadius(1.0);
                nc.setThickness(0.25);
-               nc.setMaterial( new Material.Bulk("test",density,true));
+               nc.setMaterial( Material.newUserMaterial(Material.Type.BULK,"test",density));
                
                Coordinate cg = nc.getCG();
 
@@ -404,7 +404,7 @@ public class SymmetricComponentVolumeTest extends BaseTestCase {
                nc.setForeShoulderRadius(0.5);
                nc.setForeShoulderThickness(0.25);
                
-               nc.setMaterial( new Material.Bulk("test",density,true));
+               nc.setMaterial( Material.newUserMaterial(Material.Type.BULK,"test",density));
                
                Coordinate cg = nc.getCG();