Revision ee2bbfeb
Added by Andreas Kohlbecker over 4 years ago
| src/main/java/eu/etaxonomy/cdm/service/CdmBeanItemContainerFactory.java | ||
|---|---|---|
| 127 | 127 |
* @param values |
| 128 | 128 |
* @return |
| 129 | 129 |
*/ |
| 130 |
public <T extends IEnumTerm<T>> BeanItemContainer<T> buildBeanItemContainer(Class<T> termType, T ... enumTerms) {
|
|
| 130 |
public <T extends IEnumTerm<T>> BeanItemContainer<T> buildEnumTermItemContainer(Class<T> termType, T ... enumTerms) {
|
|
| 131 | 131 |
BeanItemContainer<T> termItemContainer = new BeanItemContainer<>(termType); |
| 132 | 132 |
List<T> termList = Arrays.asList(enumTerms); |
| 133 | 133 |
termItemContainer.addAll(termList); |
| src/main/java/eu/etaxonomy/cdm/vaadin/ui/RegistrationUIDefaults.java | ||
|---|---|---|
| 70 | 70 |
public static final List<Role> COLLECTION_EDITOR_SUB_COLLECTION_VISIBILITY_RESTRICTION = Arrays.asList(Role.ROLE_ADMIN, RolesAndPermissions.ROLE_CURATION); |
| 71 | 71 |
|
| 72 | 72 |
public static NumberFormat NUMBER_FORMAT_OVERRIDE = new DecimalFormat("#");
|
| 73 |
|
|
| 73 | 74 |
} |
| src/main/java/eu/etaxonomy/cdm/vaadin/view/name/NomenclaturalStatusRow.java | ||
|---|---|---|
| 42 | 42 |
ToOneRelatedEntityCombobox<Reference> citation = new ToOneRelatedEntityCombobox<Reference>(null, Reference.class); |
| 43 | 43 |
TextField citationMicroReference = new TextFieldNFix(); |
| 44 | 44 |
TextField ruleConsidered = new TextFieldNFix(); |
| 45 |
NativeSelect codeEdition = new NativeSelect(); |
|
| 45 | 46 |
|
| 46 | 47 |
public NomenclaturalStatusRow() {
|
| 47 | 48 |
|
| ... | ... | |
| 49 | 50 |
citation.setNestedButtonStateUpdater(new ToOneRelatedEntityButtonUpdater<Reference>(citation)); |
| 50 | 51 |
citationMicroReference.setWidth(200, Unit.PIXELS); |
| 51 | 52 |
ruleConsidered.setWidth(200, Unit.PIXELS); |
| 53 |
codeEdition.setWidth(200, Unit.PIXELS); |
|
| 52 | 54 |
} |
| 53 | 55 |
|
| 54 | 56 |
/** |
| ... | ... | |
| 59 | 61 |
type, |
| 60 | 62 |
citation, |
| 61 | 63 |
citationMicroReference, |
| 62 |
ruleConsidered |
|
| 64 |
ruleConsidered, |
|
| 65 |
codeEdition |
|
| 63 | 66 |
}; |
| 64 | 67 |
addAll(Arrays.asList(components)); |
| 65 | 68 |
return components; |
| ... | ... | |
| 70 | 73 |
"type", |
| 71 | 74 |
"citation", |
| 72 | 75 |
"citationMicroReference", |
| 73 |
"ruleConsidered" |
|
| 76 |
"ruleConsidered", |
|
| 77 |
"codeEdition" |
|
| 74 | 78 |
}); |
| 75 | 79 |
return visibleFields; |
| 76 | 80 |
} |
| 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; |
| src/main/java/eu/etaxonomy/cdm/vaadin/view/registration/RegistrationWorkingsetPresenter.java | ||
|---|---|---|
| 230 | 230 |
} |
| 231 | 231 |
} |
| 232 | 232 |
|
| 233 |
RegistrationStatusSelect select = new RegistrationStatusSelect(null, selectFieldFactory.buildBeanItemContainer(
|
|
| 233 |
RegistrationStatusSelect select = new RegistrationStatusSelect(null, selectFieldFactory.buildEnumTermItemContainer(
|
|
| 234 | 234 |
RegistrationStatus.class, |
| 235 | 235 |
availableStatus.toArray(new RegistrationStatus[availableStatus.size()])) |
| 236 | 236 |
); |
Also available in: Unified diff
fix #8408 adding select for code editions to nom status row