Revision 495f8632
Added by Andreas Müller about 5 years ago
src/main/java/eu/etaxonomy/cdm/dataInserter/RegistrationRequiredDataInserter.java | ||
---|---|---|
30 | 30 |
import eu.etaxonomy.cdm.api.application.CdmRepository; |
31 | 31 |
import eu.etaxonomy.cdm.api.service.pager.Pager; |
32 | 32 |
import eu.etaxonomy.cdm.model.agent.Institution; |
33 |
import eu.etaxonomy.cdm.model.common.DefinedTerm; |
|
34 |
import eu.etaxonomy.cdm.model.common.DefinedTermBase; |
|
35 | 33 |
import eu.etaxonomy.cdm.model.common.GrantedAuthorityImpl; |
36 | 34 |
import eu.etaxonomy.cdm.model.common.Group; |
37 |
import eu.etaxonomy.cdm.model.common.TermVocabulary; |
|
38 | 35 |
import eu.etaxonomy.cdm.model.name.NomenclaturalStatus; |
39 | 36 |
import eu.etaxonomy.cdm.model.name.NomenclaturalStatusType; |
40 | 37 |
import eu.etaxonomy.cdm.model.name.Rank; |
41 | 38 |
import eu.etaxonomy.cdm.model.name.TaxonName; |
42 | 39 |
import eu.etaxonomy.cdm.model.taxon.Taxon; |
43 | 40 |
import eu.etaxonomy.cdm.model.taxon.TaxonBase; |
41 |
import eu.etaxonomy.cdm.model.term.DefinedTerm; |
|
42 |
import eu.etaxonomy.cdm.model.term.DefinedTermBase; |
|
43 |
import eu.etaxonomy.cdm.model.term.TermVocabulary; |
|
44 | 44 |
import eu.etaxonomy.cdm.persistence.dao.hibernate.taxonGraph.AbstractHibernateTaxonGraphProcessor; |
45 | 45 |
import eu.etaxonomy.cdm.persistence.dao.taxonGraph.TaxonGraphException; |
46 | 46 |
import eu.etaxonomy.cdm.persistence.hibernate.permission.CRUD; |
src/main/java/eu/etaxonomy/cdm/vaadin/component/CdmBeanItemContainerFactory.java | ||
---|---|---|
18 | 18 |
import eu.etaxonomy.cdm.api.application.CdmRepository; |
19 | 19 |
import eu.etaxonomy.cdm.api.service.pager.Pager; |
20 | 20 |
import eu.etaxonomy.cdm.model.common.CdmBase; |
21 |
import eu.etaxonomy.cdm.model.common.DefinedTermBase;
|
|
22 |
import eu.etaxonomy.cdm.model.common.IEnumTerm;
|
|
23 |
import eu.etaxonomy.cdm.model.common.TermType;
|
|
24 |
import eu.etaxonomy.cdm.model.common.TermVocabulary;
|
|
21 |
import eu.etaxonomy.cdm.model.term.DefinedTermBase;
|
|
22 |
import eu.etaxonomy.cdm.model.term.IEnumTerm;
|
|
23 |
import eu.etaxonomy.cdm.model.term.TermType;
|
|
24 |
import eu.etaxonomy.cdm.model.term.TermVocabulary;
|
|
25 | 25 |
import eu.etaxonomy.cdm.persistence.query.OrderHint; |
26 | 26 |
|
27 | 27 |
/** |
src/main/java/eu/etaxonomy/cdm/vaadin/component/common/FilterableAnnotationsField.java | ||
---|---|---|
33 | 33 |
|
34 | 34 |
import eu.etaxonomy.cdm.model.common.Annotation; |
35 | 35 |
import eu.etaxonomy.cdm.model.common.AnnotationType; |
36 |
import eu.etaxonomy.cdm.model.common.DefinedTermBase; |
|
37 | 36 |
import eu.etaxonomy.cdm.model.common.Language; |
37 |
import eu.etaxonomy.cdm.model.term.DefinedTermBase; |
|
38 | 38 |
import eu.etaxonomy.cdm.vaadin.util.converter.SetToListConverter; |
39 | 39 |
import eu.etaxonomy.cdm.vaadin.util.filter.CdmTermFilter; |
40 | 40 |
import eu.etaxonomy.vaadin.component.CompositeCustomField; |
src/main/java/eu/etaxonomy/cdm/vaadin/component/distributionStatus/AreaAndTaxonSettingsConfigWindow.java | ||
---|---|---|
42 | 42 |
|
43 | 43 |
import eu.etaxonomy.cdm.common.CdmUtils; |
44 | 44 |
import eu.etaxonomy.cdm.i18n.Messages; |
45 |
import eu.etaxonomy.cdm.model.common.TermVocabulary; |
|
46 | 45 |
import eu.etaxonomy.cdm.model.location.NamedArea; |
47 | 46 |
import eu.etaxonomy.cdm.model.taxon.Classification; |
48 | 47 |
import eu.etaxonomy.cdm.model.taxon.TaxonNode; |
48 |
import eu.etaxonomy.cdm.model.term.TermVocabulary; |
|
49 | 49 |
import eu.etaxonomy.cdm.persistence.dto.UuidAndTitleCache; |
50 | 50 |
import eu.etaxonomy.cdm.vaadin.container.CdmSQLContainer; |
51 | 51 |
import eu.etaxonomy.cdm.vaadin.container.NamedAreaContainer; |
src/main/java/eu/etaxonomy/cdm/vaadin/container/NamedAreaContainer.java | ||
---|---|---|
8 | 8 |
import com.vaadin.data.util.BeanItemContainer; |
9 | 9 |
|
10 | 10 |
import eu.etaxonomy.cdm.model.common.CdmBase; |
11 |
import eu.etaxonomy.cdm.model.common.OrderedTermVocabulary; |
|
12 |
import eu.etaxonomy.cdm.model.common.TermVocabulary; |
|
13 | 11 |
import eu.etaxonomy.cdm.model.location.NamedArea; |
12 |
import eu.etaxonomy.cdm.model.term.OrderedTermVocabulary; |
|
13 |
import eu.etaxonomy.cdm.model.term.TermVocabulary; |
|
14 | 14 |
|
15 | 15 |
/** |
16 | 16 |
* A container containing the {@link NamedArea}s of a specified {@link TermVocabulary}. |
src/main/java/eu/etaxonomy/cdm/vaadin/container/PresenceAbsenceTermContainer.java | ||
---|---|---|
12 | 12 |
import com.vaadin.data.util.BeanItemContainer; |
13 | 13 |
import com.vaadin.server.VaadinSession; |
14 | 14 |
|
15 |
import eu.etaxonomy.cdm.model.common.TermType; |
|
16 | 15 |
import eu.etaxonomy.cdm.model.description.PresenceAbsenceTerm; |
17 | 16 |
import eu.etaxonomy.cdm.model.metadata.CdmPreference; |
18 | 17 |
import eu.etaxonomy.cdm.model.metadata.PreferencePredicate; |
18 |
import eu.etaxonomy.cdm.model.term.TermType; |
|
19 | 19 |
import eu.etaxonomy.cdm.vaadin.util.CdmSpringContextHelper; |
20 | 20 |
import eu.etaxonomy.cdm.vaadin.util.DistributionEditorUtil; |
21 | 21 |
|
src/main/java/eu/etaxonomy/cdm/vaadin/model/registration/KindOfUnitTerms.java | ||
---|---|---|
10 | 10 |
|
11 | 11 |
import java.util.UUID; |
12 | 12 |
|
13 |
import eu.etaxonomy.cdm.model.common.DefinedTerm;
|
|
14 |
import eu.etaxonomy.cdm.model.common.TermType;
|
|
15 |
import eu.etaxonomy.cdm.model.common.TermVocabulary;
|
|
13 |
import eu.etaxonomy.cdm.model.term.DefinedTerm;
|
|
14 |
import eu.etaxonomy.cdm.model.term.TermType;
|
|
15 |
import eu.etaxonomy.cdm.model.term.TermVocabulary;
|
|
16 | 16 |
|
17 | 17 |
/** |
18 | 18 |
* Terms to be used as kindOfUnit for {@link SpecimenOrObservationBase#setKindOfUnit()}. |
src/main/java/eu/etaxonomy/cdm/vaadin/model/registration/RegistrationTermLists.java | ||
---|---|---|
13 | 13 |
import java.util.List; |
14 | 14 |
import java.util.UUID; |
15 | 15 |
|
16 |
import eu.etaxonomy.cdm.model.common.DefinedTerm; |
|
17 | 16 |
import eu.etaxonomy.cdm.model.name.NameTypeDesignationStatus; |
18 | 17 |
import eu.etaxonomy.cdm.model.name.SpecimenTypeDesignationStatus; |
18 |
import eu.etaxonomy.cdm.model.term.DefinedTerm; |
|
19 | 19 |
/** |
20 | 20 |
* @author a.kohlbecker |
21 | 21 |
* @since Jun 23, 2017 |
src/main/java/eu/etaxonomy/cdm/vaadin/model/registration/SpecimenTypeDesignationDTO.java | ||
---|---|---|
16 | 16 |
import eu.etaxonomy.cdm.api.utility.DerivedUnitConversionException; |
17 | 17 |
import eu.etaxonomy.cdm.api.utility.DerivedUnitConverter; |
18 | 18 |
import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper; |
19 |
import eu.etaxonomy.cdm.model.common.DefinedTerm; |
|
20 | 19 |
import eu.etaxonomy.cdm.model.common.IdentifiableSource; |
21 | 20 |
import eu.etaxonomy.cdm.model.media.Media; |
22 | 21 |
import eu.etaxonomy.cdm.model.media.MediaRepresentation; |
... | ... | |
30 | 29 |
import eu.etaxonomy.cdm.model.occurrence.MediaSpecimen; |
31 | 30 |
import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationType; |
32 | 31 |
import eu.etaxonomy.cdm.model.reference.Reference; |
32 |
import eu.etaxonomy.cdm.model.term.DefinedTerm; |
|
33 | 33 |
|
34 | 34 |
/** |
35 | 35 |
* A DTO which is use in the context of the {@link SpecimenTypeDesignationWorkingSetDTO} which is backed up |
src/main/java/eu/etaxonomy/cdm/vaadin/util/CdmQueryFactory.java | ||
---|---|---|
23 | 23 |
|
24 | 24 |
import eu.etaxonomy.cdm.common.CdmUtils; |
25 | 25 |
import eu.etaxonomy.cdm.model.common.Language; |
26 |
import eu.etaxonomy.cdm.model.common.Representation; |
|
27 | 26 |
import eu.etaxonomy.cdm.model.location.NamedArea; |
27 |
import eu.etaxonomy.cdm.model.term.Representation; |
|
28 | 28 |
import eu.etaxonomy.cdm.vaadin.statement.CdmStatementDelegate; |
29 | 29 |
|
30 | 30 |
/** |
src/main/java/eu/etaxonomy/cdm/vaadin/util/DistributionEditorUtil.java | ||
---|---|---|
8 | 8 |
import com.vaadin.ui.Notification; |
9 | 9 |
import com.vaadin.ui.Notification.Type; |
10 | 10 |
|
11 |
import eu.etaxonomy.cdm.model.common.TermVocabulary; |
|
12 | 11 |
import eu.etaxonomy.cdm.model.location.NamedArea; |
13 | 12 |
import eu.etaxonomy.cdm.model.taxon.Classification; |
14 | 13 |
import eu.etaxonomy.cdm.model.taxon.TaxonNode; |
14 |
import eu.etaxonomy.cdm.model.term.TermVocabulary; |
|
15 | 15 |
import eu.etaxonomy.cdm.vaadin.view.distributionStatus.IDistributionTableView; |
16 | 16 |
|
17 | 17 |
/** |
src/main/java/eu/etaxonomy/cdm/vaadin/util/converter/PresenceAbsenceTermUuidTitleStringConverter.java | ||
---|---|---|
12 | 12 |
import java.util.UUID; |
13 | 13 |
|
14 | 14 |
import eu.etaxonomy.cdm.model.common.Language; |
15 |
import eu.etaxonomy.cdm.model.common.Representation; |
|
16 | 15 |
import eu.etaxonomy.cdm.model.description.PresenceAbsenceTerm; |
16 |
import eu.etaxonomy.cdm.model.term.Representation; |
|
17 | 17 |
import eu.etaxonomy.cdm.vaadin.util.CdmSpringContextHelper; |
18 | 18 |
import eu.etaxonomy.cdm.vaadin.util.DistributionEditorUtil; |
19 | 19 |
|
src/main/java/eu/etaxonomy/cdm/vaadin/util/filter/CdmTermFilter.java | ||
---|---|---|
11 | 11 |
import java.util.List; |
12 | 12 |
|
13 | 13 |
import com.vaadin.data.Container.Filter; |
14 |
|
|
15 |
import eu.etaxonomy.cdm.model.term.TermBase; |
|
16 |
|
|
14 | 17 |
import com.vaadin.data.Item; |
15 | 18 |
import com.vaadin.data.Property; |
16 | 19 |
|
17 |
import eu.etaxonomy.cdm.model.common.TermBase; |
|
18 |
|
|
19 | 20 |
/** |
20 | 21 |
* @author a.kohlbecker |
21 | 22 |
* @since Jun 21, 2018 |
src/main/java/eu/etaxonomy/cdm/vaadin/view/distributionStatus/DistributionTablePresenter.java | ||
---|---|---|
37 | 37 |
import eu.etaxonomy.cdm.api.utility.UserHelper; |
38 | 38 |
import eu.etaxonomy.cdm.i18n.Messages; |
39 | 39 |
import eu.etaxonomy.cdm.model.common.CdmBase; |
40 |
import eu.etaxonomy.cdm.model.common.DefinedTermBase; |
|
41 | 40 |
import eu.etaxonomy.cdm.model.common.Language; |
42 |
import eu.etaxonomy.cdm.model.common.OrderedTermVocabulary; |
|
43 |
import eu.etaxonomy.cdm.model.common.Representation; |
|
44 |
import eu.etaxonomy.cdm.model.common.TermVocabulary; |
|
45 | 41 |
import eu.etaxonomy.cdm.model.description.DescriptionBase; |
46 | 42 |
import eu.etaxonomy.cdm.model.description.DescriptionElementBase; |
47 | 43 |
import eu.etaxonomy.cdm.model.description.Distribution; |
... | ... | |
52 | 48 |
import eu.etaxonomy.cdm.model.taxon.Classification; |
53 | 49 |
import eu.etaxonomy.cdm.model.taxon.Taxon; |
54 | 50 |
import eu.etaxonomy.cdm.model.taxon.TaxonNode; |
51 |
import eu.etaxonomy.cdm.model.term.DefinedTermBase; |
|
52 |
import eu.etaxonomy.cdm.model.term.OrderedTermVocabulary; |
|
53 |
import eu.etaxonomy.cdm.model.term.Representation; |
|
54 |
import eu.etaxonomy.cdm.model.term.TermVocabulary; |
|
55 | 55 |
import eu.etaxonomy.cdm.vaadin.container.CdmSQLContainer; |
56 | 56 |
import eu.etaxonomy.cdm.vaadin.container.PresenceAbsenceTermContainer; |
57 | 57 |
import eu.etaxonomy.cdm.vaadin.util.CdmQueryFactory; |
src/main/java/eu/etaxonomy/cdm/vaadin/view/distributionStatus/DistributionTableViewBean.java | ||
---|---|---|
40 | 40 |
import eu.etaxonomy.cdm.i18n.Messages; |
41 | 41 |
import eu.etaxonomy.cdm.model.common.CdmBase; |
42 | 42 |
import eu.etaxonomy.cdm.model.common.Language; |
43 |
import eu.etaxonomy.cdm.model.common.Representation; |
|
44 | 43 |
import eu.etaxonomy.cdm.model.description.DescriptionElementBase; |
45 | 44 |
import eu.etaxonomy.cdm.model.description.PresenceAbsenceTerm; |
46 | 45 |
import eu.etaxonomy.cdm.model.location.NamedArea; |
47 | 46 |
import eu.etaxonomy.cdm.model.taxon.Taxon; |
47 |
import eu.etaxonomy.cdm.model.term.Representation; |
|
48 | 48 |
import eu.etaxonomy.cdm.vaadin.component.distributionStatus.AreaAndTaxonSettingsConfigWindow; |
49 | 49 |
import eu.etaxonomy.cdm.vaadin.component.distributionStatus.DetailWindow; |
50 | 50 |
import eu.etaxonomy.cdm.vaadin.component.distributionStatus.DistributionStatusSettingsConfigWindow; |
src/main/java/eu/etaxonomy/cdm/vaadin/view/distributionStatus/settings/AreaAndTaxonSettingsPresenter.java | ||
---|---|---|
17 | 17 |
import com.vaadin.data.util.IndexedContainer; |
18 | 18 |
import com.vaadin.server.VaadinSession; |
19 | 19 |
|
20 |
import eu.etaxonomy.cdm.model.common.TermType; |
|
21 |
import eu.etaxonomy.cdm.model.common.TermVocabulary; |
|
22 | 20 |
import eu.etaxonomy.cdm.model.location.NamedArea; |
23 | 21 |
import eu.etaxonomy.cdm.model.metadata.CdmPreference; |
24 | 22 |
import eu.etaxonomy.cdm.model.metadata.PreferencePredicate; |
25 | 23 |
import eu.etaxonomy.cdm.model.taxon.Classification; |
26 | 24 |
import eu.etaxonomy.cdm.model.taxon.TaxonNode; |
25 |
import eu.etaxonomy.cdm.model.term.TermType; |
|
26 |
import eu.etaxonomy.cdm.model.term.TermVocabulary; |
|
27 | 27 |
import eu.etaxonomy.cdm.vaadin.util.CdmSpringContextHelper; |
28 | 28 |
import eu.etaxonomy.cdm.vaadin.util.DistributionEditorUtil; |
29 | 29 |
|
src/main/java/eu/etaxonomy/cdm/vaadin/view/name/SpecimenTypeDesignationDTORow.java | ||
---|---|---|
16 | 16 |
import com.vaadin.ui.ListSelect; |
17 | 17 |
import com.vaadin.ui.TextField; |
18 | 18 |
|
19 |
import eu.etaxonomy.cdm.model.common.DefinedTerm; |
|
20 | 19 |
import eu.etaxonomy.cdm.model.occurrence.Collection; |
21 | 20 |
import eu.etaxonomy.cdm.model.reference.Reference; |
21 |
import eu.etaxonomy.cdm.model.term.DefinedTerm; |
|
22 | 22 |
import eu.etaxonomy.cdm.vaadin.component.CollectionRow; |
23 | 23 |
import eu.etaxonomy.cdm.vaadin.component.CollectionRowItemCollection; |
24 | 24 |
import eu.etaxonomy.cdm.vaadin.component.CollectionRowRepresentative; |
src/main/java/eu/etaxonomy/cdm/vaadin/view/name/SpecimenTypeDesignationWorkingsetEditorPresenter.java | ||
---|---|---|
31 | 31 |
import eu.etaxonomy.cdm.model.agent.Person; |
32 | 32 |
import eu.etaxonomy.cdm.model.agent.TeamOrPersonBase; |
33 | 33 |
import eu.etaxonomy.cdm.model.common.CdmBase; |
34 |
import eu.etaxonomy.cdm.model.common.TermType; |
|
35 | 34 |
import eu.etaxonomy.cdm.model.location.Country; |
36 | 35 |
import eu.etaxonomy.cdm.model.name.Registration; |
37 | 36 |
import eu.etaxonomy.cdm.model.name.SpecimenTypeDesignation; |
38 | 37 |
import eu.etaxonomy.cdm.model.occurrence.Collection; |
39 | 38 |
import eu.etaxonomy.cdm.model.reference.Reference; |
39 |
import eu.etaxonomy.cdm.model.term.TermType; |
|
40 | 40 |
import eu.etaxonomy.cdm.persistence.dao.common.Restriction; |
41 | 41 |
import eu.etaxonomy.cdm.persistence.dao.common.Restriction.Operator; |
42 | 42 |
import eu.etaxonomy.cdm.persistence.hibernate.permission.CRUD; |
src/main/java/eu/etaxonomy/cdm/vaadin/view/name/TaxonNameEditorPresenter.java | ||
---|---|---|
30 | 30 |
import eu.etaxonomy.cdm.model.agent.TeamOrPersonBase; |
31 | 31 |
import eu.etaxonomy.cdm.model.common.AnnotationType; |
32 | 32 |
import eu.etaxonomy.cdm.model.common.CdmBase; |
33 |
import eu.etaxonomy.cdm.model.common.TermType; |
|
34 | 33 |
import eu.etaxonomy.cdm.model.name.Rank; |
35 | 34 |
import eu.etaxonomy.cdm.model.name.TaxonName; |
36 | 35 |
import eu.etaxonomy.cdm.model.name.TaxonNameFactory; |
37 | 36 |
import eu.etaxonomy.cdm.model.reference.Reference; |
38 | 37 |
import eu.etaxonomy.cdm.model.reference.ReferenceFactory; |
39 | 38 |
import eu.etaxonomy.cdm.model.reference.ReferenceType; |
39 |
import eu.etaxonomy.cdm.model.term.TermType; |
|
40 | 40 |
import eu.etaxonomy.cdm.persistence.dao.common.Restriction; |
41 | 41 |
import eu.etaxonomy.cdm.persistence.dao.common.Restriction.Operator; |
42 | 42 |
import eu.etaxonomy.cdm.persistence.hibernate.permission.CRUD; |
src/main/java/eu/etaxonomy/cdm/vaadin/view/registration/ListPresenter.java | ||
---|---|---|
32 | 32 |
import eu.etaxonomy.cdm.api.service.dto.RegistrationDTO; |
33 | 33 |
import eu.etaxonomy.cdm.api.service.pager.Pager; |
34 | 34 |
import eu.etaxonomy.cdm.api.service.registration.IRegistrationWorkingSetService; |
35 |
import eu.etaxonomy.cdm.model.common.DefinedTermBase; |
|
36 | 35 |
import eu.etaxonomy.cdm.model.common.User; |
37 | 36 |
import eu.etaxonomy.cdm.model.name.NameTypeDesignationStatus; |
38 | 37 |
import eu.etaxonomy.cdm.model.name.RegistrationStatus; |
39 | 38 |
import eu.etaxonomy.cdm.model.name.SpecimenTypeDesignationStatus; |
40 | 39 |
import eu.etaxonomy.cdm.model.name.TypeDesignationStatusBase; |
41 | 40 |
import eu.etaxonomy.cdm.model.reference.Reference; |
41 |
import eu.etaxonomy.cdm.model.term.DefinedTermBase; |
|
42 | 42 |
import eu.etaxonomy.cdm.vaadin.component.CdmBeanItemContainerFactory; |
43 | 43 |
import eu.etaxonomy.cdm.vaadin.component.registration.RegistrationItem; |
44 | 44 |
import eu.etaxonomy.cdm.vaadin.event.EntityChangeEvent; |
src/test/java/eu/etaxonomy/cdm/service/SpecimenTypeDesignationWorkingSetServiceImplTest.java | ||
---|---|---|
29 | 29 |
import eu.etaxonomy.cdm.api.application.CdmRepository; |
30 | 30 |
import eu.etaxonomy.cdm.api.utility.DerivedUnitConversionException; |
31 | 31 |
import eu.etaxonomy.cdm.model.agent.Team; |
32 |
import eu.etaxonomy.cdm.model.common.DefinedTerm; |
|
33 | 32 |
import eu.etaxonomy.cdm.model.common.Language; |
34 | 33 |
import eu.etaxonomy.cdm.model.common.LanguageString; |
35 | 34 |
import eu.etaxonomy.cdm.model.name.NomenclaturalCode; |
... | ... | |
44 | 43 |
import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationBase; |
45 | 44 |
import eu.etaxonomy.cdm.model.reference.Reference; |
46 | 45 |
import eu.etaxonomy.cdm.model.reference.ReferenceFactory; |
46 |
import eu.etaxonomy.cdm.model.term.DefinedTerm; |
|
47 | 47 |
import eu.etaxonomy.cdm.ref.TypedEntityReference; |
48 | 48 |
import eu.etaxonomy.cdm.vaadin.model.registration.KindOfUnitTerms; |
49 | 49 |
import eu.etaxonomy.cdm.vaadin.model.registration.SpecimenTypeDesignationDTO; |
Also available in: Unified diff
ref #8162 adapt vaadin to new term package