Revision 519b4513
Added by Andreas Kohlbecker almost 7 years ago
src/main/java/eu/etaxonomy/cdm/vaadin/component/common/GeoLocationField.java | ||
---|---|---|
73 | 73 |
fieldGroup.bind(errorRadiusField, "errorRadius"); |
74 | 74 |
fieldGroup.bind(referenceSystemField, "referenceSystem"); |
75 | 75 |
|
76 |
referenceSystemField.setEnabled(false); // disabled since not fully implemented |
|
77 |
|
|
78 | 76 |
return root; |
79 | 77 |
} |
80 | 78 |
|
... | ... | |
92 | 90 |
newValue = Point.NewInstance(); |
93 | 91 |
} |
94 | 92 |
super.setInternalValue(newValue); |
95 |
fieldGroup.setItemDataSource(new BeanItem<Point>(newValue)); |
|
93 |
fieldGroup.setItemDataSource(new BeanItem<Point>(newValue)); |
|
94 |
|
|
95 |
referenceSystemField.setEnabled(false); // disabled since not fully implemented |
|
96 |
|
|
96 | 97 |
} |
97 | 98 |
|
98 | 99 |
/** |
src/main/java/eu/etaxonomy/cdm/vaadin/view/name/SpecimenTypeDesignationWorkingsetEditorPresenter.java | ||
---|---|---|
9 | 9 |
package eu.etaxonomy.cdm.vaadin.view.name; |
10 | 10 |
|
11 | 11 |
import java.util.ArrayList; |
12 |
import java.util.Arrays; |
|
13 | 12 |
import java.util.HashSet; |
14 | 13 |
import java.util.Iterator; |
15 | 14 |
import java.util.List; |
... | ... | |
56 | 55 |
|
57 | 56 |
private static final long serialVersionUID = 4255636253714476918L; |
58 | 57 |
|
59 |
private List<String> specimenTypeDesignationWorkingsetInitStrategy = Arrays.asList(new String[]{ |
|
60 |
"typeDesignations.typeStatus.representations", |
|
61 |
"typeDesignations.typeSpecimen.sources", |
|
62 |
"typeDesignations.typeSpecimen.mediaSpecimen.representations.parts", |
|
63 |
"typeDesignations.typeSpecimen.collection", |
|
64 |
"typeDesignations.typeSpecimen.derivedFrom.type", |
|
65 |
"typeDesignations.typeSpecimen.derivedFrom.derivatives", |
|
66 |
// Need to initialize all properties of the DerivedUnit to avoid LIEs while converting DerivedUnit with the DerivedUnitConverter: |
|
67 |
"typeDesignations.typeSpecimen.*", |
|
68 |
}); |
|
69 |
|
|
70 | 58 |
CdmStore<Registration, IRegistrationService> store ; |
71 | 59 |
|
72 | 60 |
protected CdmStore<Registration, IRegistrationService> getStore() { |
... | ... | |
88 | 76 |
RegistrationAndWorkingsetId registrationAndWorkingsetId = (RegistrationAndWorkingsetId)identifier; |
89 | 77 |
List<Integer> ids = new ArrayList<>(); |
90 | 78 |
ids.add(registrationAndWorkingsetId.registrationId); |
91 |
Registration reg = getRepo().getRegistrationService().loadByIds(ids, specimenTypeDesignationWorkingsetInitStrategy).get(0);
|
|
79 |
Registration reg = getRepo().getRegistrationService().loadByIds(ids, null).get(0);
|
|
92 | 80 |
RegistrationDTO regDTO = new RegistrationDTO(reg); |
93 | 81 |
TypeDesignationWorkingSet typeDesignationWorkingSet = regDTO.getTypeDesignationWorkingSet(registrationAndWorkingsetId.workingsetId); |
94 | 82 |
workingSet = regDTO.getSpecimenTypeDesignationWorkingSetDTO(typeDesignationWorkingSet.getBaseEntityReference()); |
src/main/java/eu/etaxonomy/cdm/vaadin/view/name/SpecimenTypeDesignationWorkingsetPopupEditor.java | ||
---|---|---|
95 | 95 |
TextArea localityField = new TextArea("Locality"); |
96 | 96 |
addField(localityField, "locality", 0, row , 2, row); |
97 | 97 |
localityField.setWidth("100%"); |
98 |
// NOTE: setRows and SetCold breaks he width setting, |
|
98 |
// NOTE: setRows and SetCold breaks the width setting,
|
|
99 | 99 |
// see https://github.com/vaadin/framework/issues/3617 |
100 | 100 |
|
101 | 101 |
row++; |
Also available in: Unified diff
ref #6724 removing initstrategy which is no longer nedded after #6687 is fixed and disabling referenceSystemField