Added centering rings and engine blocks presets

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

diff --git a/core/src/net/sf/openrocket/preset/ComponentPreset.java b/core/src/net/sf/openrocket/preset/ComponentPreset.java
index 5c42e7bd4a47f66a070fb9525d5ecf7327752f64..9ee7c0096fc1ce134359f387026cb1e6afed9fa5 100644 (file)
--- a/core/src/net/sf/openrocket/preset/ComponentPreset.java
+++ b/core/src/net/sf/openrocket/preset/ComponentPreset.java
@@ -13,10 +13,7 @@ import java.util.Map;
 
 import net.sf.openrocket.material.Material;
 import net.sf.openrocket.motor.Manufacturer;
-import net.sf.openrocket.rocketcomponent.BodyTube;
 import net.sf.openrocket.rocketcomponent.ExternalComponent.Finish;
-import net.sf.openrocket.rocketcomponent.NoseCone;
-import net.sf.openrocket.rocketcomponent.Transition;
 import net.sf.openrocket.rocketcomponent.Transition.Shape;
 import net.sf.openrocket.unit.UnitGroup;
 import net.sf.openrocket.util.BugException;
@@ -43,8 +40,9 @@ public class ComponentPreset implements Comparable<ComponentPreset> {
                BODY_TUBE( new TypedKey<?>[] {
                                ComponentPreset.MANUFACTURER,
                                ComponentPreset.PARTNO,
-                               ComponentPreset.OUTER_DIAMETER,
+                               ComponentPreset.DESCRIPTION,
                                ComponentPreset.INNER_DIAMETER,
+                               ComponentPreset.OUTER_DIAMETER,
                                ComponentPreset.LENGTH} ),
                                
                NOSE_CONE( new TypedKey<?>[] {
@@ -53,6 +51,7 @@ public class ComponentPreset implements Comparable<ComponentPreset> {
                                ComponentPreset.DESCRIPTION,
                                ComponentPreset.SHAPE,
                                ComponentPreset.OUTER_DIAMETER,
+                               ComponentPreset.SHOULDER_DIAMETER,
                                ComponentPreset.LENGTH} ),
 
                TRANSITION( new TypedKey<?>[] {
@@ -76,8 +75,25 @@ public class ComponentPreset implements Comparable<ComponentPreset> {
                                ComponentPreset.PARTNO,
                                ComponentPreset.DESCRIPTION,
                                ComponentPreset.OUTER_DIAMETER,
+                               ComponentPreset.LENGTH} ),
+
+               CENTERING_RING( new TypedKey<?>[] {
+                               ComponentPreset.MANUFACTURER,
+                               ComponentPreset.PARTNO,
+                               ComponentPreset.DESCRIPTION,
+                               ComponentPreset.INNER_DIAMETER,
+                               ComponentPreset.OUTER_DIAMETER,
+                               ComponentPreset.LENGTH} ),
+
+               ENGINE_BLOCK( new TypedKey<?>[] {
+                               ComponentPreset.MANUFACTURER,
+                               ComponentPreset.PARTNO,
+                               ComponentPreset.DESCRIPTION,
+                               ComponentPreset.INNER_DIAMETER,
+                               ComponentPreset.OUTER_DIAMETER,
                                ComponentPreset.LENGTH} );
 
+
                Type[] compatibleTypes;
                TypedKey<?>[] displayedColumns;