- String[] split = typeList.split(",");
- types = new FlightDataType[split.length];
- for (int i = 0; i < split.length; i++) {
- String typeName = split[i];
- FlightDataType matching = findFlightDataType(typeName);
+ String[] typeNames = typeList.split(",");
+ String[] typeKeys = null;
+ if ( typeKeyList != null ) {
+ typeKeys = typeKeyList.split(",");
+ }
+ types = new FlightDataType[typeNames.length];
+ for (int i = 0; i < typeNames.length; i++) {
+ String typeName = typeNames[i];
+ String typeKey = (typeKeys != null ) ? typeKeys[i] : null ;
+ FlightDataType matching = findFlightDataType(typeKey, typeName);