Partial rewrite of ComboBoxConvention using java generics