Project

General

Profile

« Previous | Next » 

Revision ee2bbfeb

Added by Andreas Kohlbecker over 4 years ago

fix #8408 adding select for code editions to nom status row

View differences:

src/main/java/eu/etaxonomy/cdm/vaadin/view/name/TaxonNameEditorPresenter.java
38 38
import eu.etaxonomy.cdm.model.common.AnnotationType;
39 39
import eu.etaxonomy.cdm.model.common.CdmBase;
40 40
import eu.etaxonomy.cdm.model.common.Language;
41
import eu.etaxonomy.cdm.model.name.NomenclaturalCodeEdition;
41 42
import eu.etaxonomy.cdm.model.name.NomenclaturalStatus;
42 43
import eu.etaxonomy.cdm.model.name.NomenclaturalStatusType;
43 44
import eu.etaxonomy.cdm.model.name.Rank;
......
186 187
            public NomenclaturalStatusRow create() {
187 188
                NomenclaturalStatusRow row = new NomenclaturalStatusRow();
188 189

  
189
                BeanItemContainer<DefinedTermBase> buildBeanItemContainer = cdmBeanItemContainerFactory.buildBeanItemContainer(NomenclaturalStatusType.ALTERNATIVE().getVocabulary().getUuid());
190
                row.type.setContainerDataSource(buildBeanItemContainer);
190
                BeanItemContainer<DefinedTermBase> statusTypeItemContainer = cdmBeanItemContainerFactory.buildBeanItemContainer(NomenclaturalStatusType.ALTERNATIVE().getVocabulary().getUuid());
191
                row.type.setContainerDataSource(statusTypeItemContainer);
191 192
                row.type.setItemCaptionMode(ItemCaptionMode.EXPLICIT);
192
                for(DefinedTermBase term : buildBeanItemContainer.getItemIds()){
193
                for(DefinedTermBase term : statusTypeItemContainer.getItemIds()){
193 194
                    row.type.setItemCaption(term, term.getPreferredRepresentation(Language.DEFAULT()).getAbbreviatedLabel());
194 195
                }
195 196
                row.type.setNullSelectionAllowed(false);
......
205 206
                    }
206 207
                });
207 208

  
209
                List<NomenclaturalCodeEdition> nomCodes = NomenclaturalCodeEdition.forCode(RegistrationUIDefaults.NOMENCLATURAL_CODE);
210
                BeanItemContainer<NomenclaturalCodeEdition> codeEditionItemContainer = cdmBeanItemContainerFactory.buildEnumTermItemContainer(
211
                        NomenclaturalCodeEdition.class, nomCodes.toArray(new NomenclaturalCodeEdition[nomCodes.size()])
212
                        );
213
                row.codeEdition.setContainerDataSource(codeEditionItemContainer);
214

  
208 215
                getView().applyDefaultComponentStyle(row.components());
209 216

  
210 217
                return row;

Also available in: Unified diff