hongshaorou/openrocket
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Change implementation of compatible types so they can be declared. Because of the circular references, they cannot be declared in constructor arguments.

Browse Source
This commit is contained in:
Kevin Ruland 2012-04-19 16:03:48 +00:00
parent 0ec9a1531f
commit 6c67c2266a
1 changed files with 11 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
core/src/net/sf/openrocket/preset/ComponentPreset.java
View File

@ -93,35 +93,29 @@ public class ComponentPreset implements Comparable<ComponentPreset> {
ComponentPreset.OUTER_DIAMETER, ComponentPreset.OUTER_DIAMETER,
ComponentPreset.LENGTH} ); ComponentPreset.LENGTH} );
Type[] compatibleTypes;
TypedKey<?>[] displayedColumns; TypedKey<?>[] displayedColumns;
Type( TypedKey<?>[] displayedColumns) { Type( TypedKey<?>[] displayedColumns) {
compatibleTypes = new Type[1];
compatibleTypes[0] = this;
this.displayedColumns = displayedColumns; this.displayedColumns = displayedColumns;
} }
Type( Type[] t, TypedKey<?>[] displayedColumns ) { public List<Type> getCompatibleTypes() {
return compatibleTypeMap.get(Type.this);
compatibleTypes = new Type[t.length+1];
compatibleTypes[0] = this;
for( int i=0; i<t.length; i++ ) {
compatibleTypes[i+1] = t[i];
}
this.displayedColumns = displayedColumns;
}
public Type[] getCompatibleTypes() {
return compatibleTypes;
} }
public TypedKey<?>[] getDisplayedColumns() { public TypedKey<?>[] getDisplayedColumns() {
return displayedColumns; return displayedColumns;
} }
private static Map<Type,List<Type>> compatibleTypeMap = new HashMap<Type,List<Type>>();
static {
compatibleTypeMap.put( BODY_TUBE, Arrays.asList( BODY_TUBE, TUBE_COUPLER) );
compatibleTypeMap.put( TUBE_COUPLER, Arrays.asList( BODY_TUBE,TUBE_COUPLER) );
compatibleTypeMap.put( CENTERING_RING, Arrays.asList( CENTERING_RING, ENGINE_BLOCK ) );
compatibleTypeMap.put( NOSE_CONE, Arrays.asList( NOSE_CONE, TRANSITION));
}
} }
public final static TypedKey<Manufacturer> MANUFACTURER = new TypedKey<Manufacturer>("Manufacturer", Manufacturer.class); public final static TypedKey<Manufacturer> MANUFACTURER = new TypedKey<Manufacturer>("Manufacturer", Manufacturer.class);