Revision a695f7fa
Added by Cherian Mathew about 9 years ago
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientAgentService.java | ||
---|---|---|
59 | 59 |
*/ |
60 | 60 |
public class TransientAgentService implements IAgentService { |
61 | 61 |
|
62 |
private IAgentService defaultService; |
|
62 |
private final IAgentService defaultService;
|
|
63 | 63 |
|
64 | 64 |
/** |
65 | 65 |
* @param defaultAgentService |
... | ... | |
757 | 757 |
return defaultService.findByIdentifier(clazz, identifier, identifierType, matchmode, includeEntity, pageSize, pageNumber, propertyPaths); |
758 | 758 |
} |
759 | 759 |
|
760 |
/* (non-Javadoc) |
|
761 |
* @see eu.etaxonomy.cdm.api.service.IService#delete(java.util.UUID) |
|
762 |
*/ |
|
763 |
@Override |
|
764 |
public DeleteResult delete(UUID uuid) { |
|
765 |
return defaultService.delete(uuid); |
|
766 |
} |
|
767 |
|
|
760 | 768 |
} |
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientClassificationService.java | ||
---|---|---|
944 | 944 |
return defaultService.createHierarchyInClassification(arg1, arg2); |
945 | 945 |
} |
946 | 946 |
|
947 |
/* (non-Javadoc) |
|
948 |
* @see eu.etaxonomy.cdm.api.service.IService#delete(java.util.UUID) |
|
949 |
*/ |
|
950 |
@Override |
|
951 |
public DeleteResult delete(UUID uuid) { |
|
952 |
return defaultService.delete(uuid); |
|
953 |
} |
|
954 |
|
|
947 | 955 |
|
948 | 956 |
} |
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientCollectionService.java | ||
---|---|---|
26 | 26 |
import eu.etaxonomy.cdm.api.service.dto.FindByIdentifierDTO; |
27 | 27 |
import eu.etaxonomy.cdm.api.service.pager.Pager; |
28 | 28 |
import eu.etaxonomy.cdm.common.monitor.IProgressMonitor; |
29 |
import eu.etaxonomy.cdm.model.agent.AgentBase; |
|
30 | 29 |
import eu.etaxonomy.cdm.model.common.Annotation; |
31 | 30 |
import eu.etaxonomy.cdm.model.common.DefinedTerm; |
32 | 31 |
import eu.etaxonomy.cdm.model.common.ISourceable; |
... | ... | |
704 | 703 |
public <S extends Collection> Pager<FindByIdentifierDTO<S>> findByIdentifier(Class<S> clazz, String identifier, DefinedTerm identifierType, MatchMode matchmode, boolean includeEntity, Integer pageSize, Integer pageNumber, List<String> propertyPaths){ |
705 | 704 |
return defaultService.findByIdentifier(clazz, identifier, identifierType, matchmode, includeEntity, pageSize, pageNumber, propertyPaths); |
706 | 705 |
} |
706 |
|
|
707 |
/* (non-Javadoc) |
|
708 |
* @see eu.etaxonomy.cdm.api.service.IService#delete(java.util.UUID) |
|
709 |
*/ |
|
710 |
@Override |
|
711 |
public DeleteResult delete(UUID uuid) { |
|
712 |
return defaultService.delete(uuid); |
|
713 |
} |
|
707 | 714 |
} |
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientDescriptionService.java | ||
---|---|---|
23 | 23 |
import eu.etaxonomy.cdm.api.service.DeleteResult; |
24 | 24 |
import eu.etaxonomy.cdm.api.service.DistributionTree; |
25 | 25 |
import eu.etaxonomy.cdm.api.service.IDescriptionService; |
26 |
import eu.etaxonomy.cdm.api.service.UpdateResult; |
|
26 | 27 |
import eu.etaxonomy.cdm.api.service.config.DeleteConfiguratorBase; |
27 | 28 |
import eu.etaxonomy.cdm.api.service.config.IIdentifiableEntityServiceConfigurator; |
28 | 29 |
import eu.etaxonomy.cdm.api.service.dto.FindByIdentifierDTO; |
... | ... | |
1114 | 1115 |
} |
1115 | 1116 |
|
1116 | 1117 |
@Override |
1117 |
public UUID deleteDescription(DescriptionBase description) {
|
|
1118 |
public DeleteResult deleteDescription(DescriptionBase description) {
|
|
1118 | 1119 |
return defaultService.deleteDescription(description); |
1119 | 1120 |
} |
1120 | 1121 |
|
... | ... | |
1122 | 1123 |
* @see eu.etaxonomy.cdm.api.service.IDescriptionService#moveTaxonDescriptions(eu.etaxonomy.cdm.model.taxon.Taxon, eu.etaxonomy.cdm.model.taxon.Taxon) |
1123 | 1124 |
*/ |
1124 | 1125 |
@Override |
1125 |
public void moveTaxonDescriptions(Taxon sourceTaxon, Taxon targetTaxon) {
|
|
1126 |
defaultService.moveTaxonDescriptions(sourceTaxon, targetTaxon); |
|
1126 |
public UpdateResult moveTaxonDescriptions(Taxon sourceTaxon, Taxon targetTaxon) {
|
|
1127 |
return defaultService.moveTaxonDescriptions(sourceTaxon, targetTaxon);
|
|
1127 | 1128 |
|
1128 | 1129 |
} |
1129 | 1130 |
|
... | ... | |
1131 | 1132 |
* @see eu.etaxonomy.cdm.api.service.IDescriptionService#moveTaxonDescriptions(java.util.UUID, java.util.UUID) |
1132 | 1133 |
*/ |
1133 | 1134 |
@Override |
1134 |
public void moveTaxonDescriptions(UUID sourceTaxonUuid, UUID targetTaxonUuid) {
|
|
1135 |
defaultService.moveTaxonDescriptions(sourceTaxonUuid, targetTaxonUuid); |
|
1135 |
public UpdateResult moveTaxonDescriptions(UUID sourceTaxonUuid, UUID targetTaxonUuid) {
|
|
1136 |
return defaultService.moveTaxonDescriptions(sourceTaxonUuid, targetTaxonUuid);
|
|
1136 | 1137 |
|
1137 | 1138 |
} |
1139 |
|
|
1140 |
/* (non-Javadoc) |
|
1141 |
* @see eu.etaxonomy.cdm.api.service.IDescriptionService#deleteDescriptionElement(java.util.UUID) |
|
1142 |
*/ |
|
1143 |
@Override |
|
1144 |
public UUID deleteDescriptionElement(UUID descriptionElementUuid) { |
|
1145 |
return defaultService.deleteDescriptionElement(descriptionElementUuid); |
|
1146 |
} |
|
1147 |
|
|
1148 |
/* (non-Javadoc) |
|
1149 |
* @see eu.etaxonomy.cdm.api.service.IDescriptionService#deleteDescription(java.util.UUID) |
|
1150 |
*/ |
|
1151 |
@Override |
|
1152 |
public DeleteResult deleteDescription(UUID descriptionUuid) { |
|
1153 |
return defaultService.deleteDescription(descriptionUuid); |
|
1154 |
} |
|
1155 |
|
|
1156 |
/* (non-Javadoc) |
|
1157 |
* @see eu.etaxonomy.cdm.api.service.IService#delete(java.util.UUID) |
|
1158 |
*/ |
|
1159 |
@Override |
|
1160 |
public DeleteResult delete(UUID uuid) { |
|
1161 |
return defaultService.delete(uuid); |
|
1162 |
} |
|
1138 | 1163 |
} |
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientNameService.java | ||
---|---|---|
25 | 25 |
|
26 | 26 |
import eu.etaxonomy.cdm.api.service.DeleteResult; |
27 | 27 |
import eu.etaxonomy.cdm.api.service.INameService; |
28 |
import eu.etaxonomy.cdm.api.service.UpdateResult; |
|
28 | 29 |
import eu.etaxonomy.cdm.api.service.config.DeleteConfiguratorBase; |
29 | 30 |
import eu.etaxonomy.cdm.api.service.config.IIdentifiableEntityServiceConfigurator; |
30 | 31 |
import eu.etaxonomy.cdm.api.service.config.NameDeletionConfigurator; |
... | ... | |
34 | 35 |
import eu.etaxonomy.cdm.api.service.search.DocumentSearchResult; |
35 | 36 |
import eu.etaxonomy.cdm.api.service.search.SearchResult; |
36 | 37 |
import eu.etaxonomy.cdm.common.monitor.IProgressMonitor; |
37 |
import eu.etaxonomy.cdm.model.agent.AgentBase; |
|
38 | 38 |
import eu.etaxonomy.cdm.model.common.Annotation; |
39 | 39 |
import eu.etaxonomy.cdm.model.common.CdmBase; |
40 | 40 |
import eu.etaxonomy.cdm.model.common.DefinedTerm; |
... | ... | |
78 | 78 |
*/ |
79 | 79 |
public class TransientNameService implements INameService { |
80 | 80 |
|
81 |
private INameService defaultService; |
|
81 |
private final INameService defaultService;
|
|
82 | 82 |
|
83 | 83 |
/** |
84 | 84 |
* |
... | ... | |
1148 | 1148 |
public TaxonNameBase findWithoutFlush(UUID uuid) { |
1149 | 1149 |
return defaultService.findWithoutFlush(uuid); |
1150 | 1150 |
} |
1151 |
|
|
1151 |
|
|
1152 | 1152 |
@Override |
1153 | 1153 |
public <S extends TaxonNameBase> Pager<FindByIdentifierDTO<S>> findByIdentifier(Class<S> clazz, String identifier, DefinedTerm identifierType, MatchMode matchmode, boolean includeEntity, Integer pageSize, Integer pageNumber, List<String> propertyPaths){ |
1154 | 1154 |
return defaultService.findByIdentifier(clazz, identifier, identifierType, matchmode, includeEntity, pageSize, pageNumber, propertyPaths); |
1155 | 1155 |
} |
1156 | 1156 |
|
1157 |
/* (non-Javadoc) |
|
1158 |
* @see eu.etaxonomy.cdm.api.service.IService#delete(java.util.UUID) |
|
1159 |
*/ |
|
1160 |
@Override |
|
1161 |
public DeleteResult delete(UUID uuid) { |
|
1162 |
return defaultService.delete(uuid); |
|
1163 |
} |
|
1164 |
|
|
1165 |
/* (non-Javadoc) |
|
1166 |
* @see eu.etaxonomy.cdm.api.service.INameService#setAsGroupsBasionym(java.util.UUID) |
|
1167 |
*/ |
|
1168 |
@Override |
|
1169 |
public UpdateResult setAsGroupsBasionym(UUID nameUuid) { |
|
1170 |
return defaultService.delete(nameUuid); |
|
1171 |
} |
|
1172 |
|
|
1157 | 1173 |
|
1158 | 1174 |
} |
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientOccurenceService.java | ||
---|---|---|
38 | 38 |
import eu.etaxonomy.cdm.api.service.search.SearchResult; |
39 | 39 |
import eu.etaxonomy.cdm.api.service.util.TaxonRelationshipEdge; |
40 | 40 |
import eu.etaxonomy.cdm.common.monitor.IProgressMonitor; |
41 |
import eu.etaxonomy.cdm.model.agent.AgentBase; |
|
42 | 41 |
import eu.etaxonomy.cdm.model.common.Annotation; |
43 | 42 |
import eu.etaxonomy.cdm.model.common.CdmBase; |
44 | 43 |
import eu.etaxonomy.cdm.model.common.DefinedTerm; |
... | ... | |
923 | 922 |
return defaultService.findWithoutFlush(uuid); |
924 | 923 |
} |
925 | 924 |
|
926 |
/* (non-Javadoc) |
|
927 |
* @see eu.etaxonomy.cdm.api.service.IOccurrenceService#listFieldUnitsByAssociatedTaxon(java.util.Set, eu.etaxonomy.cdm.model.taxon.Taxon, java.lang.Integer, java.lang.Integer, java.lang.Integer, java.util.List, java.util.List) |
|
928 |
*/ |
|
929 |
@Override |
|
930 |
public Collection<FieldUnit> listFieldUnitsByAssociatedTaxon(Set<TaxonRelationshipEdge> includeRelationships, |
|
931 |
Taxon associatedTaxon, Integer maxDepth, Integer pageSize, Integer pageNumber, List<OrderHint> orderHints, |
|
932 |
List<String> propertyPaths) { |
|
933 |
return defaultService.listFieldUnitsByAssociatedTaxon(includeRelationships, associatedTaxon, maxDepth, pageSize, pageNumber, orderHints, propertyPaths); |
|
934 |
} |
|
925 |
/* (non-Javadoc) |
|
926 |
* @see eu.etaxonomy.cdm.api.service.IOccurrenceService#listFieldUnitsByAssociatedTaxon(eu.etaxonomy.cdm.model.taxon.Taxon, java.util.List, java.util.List) |
|
927 |
*/ |
|
928 |
@Override |
|
929 |
public Collection<SpecimenOrObservationBase> listFieldUnitsByAssociatedTaxon(Taxon associatedTaxon, |
|
930 |
List<OrderHint> orderHints, List<String> propertyPaths) { |
|
931 |
return defaultService.listFieldUnitsByAssociatedTaxon(associatedTaxon, orderHints, propertyPaths); |
|
932 |
} |
|
933 |
|
|
934 |
/* (non-Javadoc) |
|
935 |
* @see eu.etaxonomy.cdm.api.service.IOccurrenceService#pageFieldUnitsByAssociatedTaxon(java.util.Set, eu.etaxonomy.cdm.model.taxon.Taxon, java.lang.Integer, java.lang.Integer, java.lang.Integer, java.util.List, java.util.List) |
|
936 |
*/ |
|
937 |
@Override |
|
938 |
public Pager<SpecimenOrObservationBase> pageFieldUnitsByAssociatedTaxon( |
|
939 |
Set<TaxonRelationshipEdge> includeRelationships, Taxon associatedTaxon, Integer maxDepth, Integer pageSize, |
|
940 |
Integer pageNumber, List<OrderHint> orderHints, List<String> propertyPaths) { |
|
941 |
return defaultService.pageFieldUnitsByAssociatedTaxon(includeRelationships, associatedTaxon, maxDepth, pageSize, pageNumber, orderHints, propertyPaths); |
|
942 |
} |
|
943 |
|
|
935 | 944 |
|
936 | 945 |
/* (non-Javadoc) |
937 | 946 |
* @see eu.etaxonomy.cdm.api.service.IOccurrenceService#assembleDerivateHierarchyDTO(eu.etaxonomy.cdm.model.occurrence.FieldUnit, java.util.UUID) |
... | ... | |
998 | 1007 |
return defaultService.findByIdentifier(clazz, identifier, identifierType, matchmode, includeEntity, pageSize, pageNumber, propertyPaths); |
999 | 1008 |
} |
1000 | 1009 |
|
1010 |
/* (non-Javadoc) |
|
1011 |
* @see eu.etaxonomy.cdm.api.service.IService#delete(java.util.UUID) |
|
1012 |
*/ |
|
1013 |
@Override |
|
1014 |
public DeleteResult delete(UUID uuid) { |
|
1015 |
return defaultService.delete(uuid); |
|
1016 |
} |
|
1017 |
|
|
1001 | 1018 |
} |
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientReferenceService.java | ||
---|---|---|
27 | 27 |
import eu.etaxonomy.cdm.api.service.dto.FindByIdentifierDTO; |
28 | 28 |
import eu.etaxonomy.cdm.api.service.pager.Pager; |
29 | 29 |
import eu.etaxonomy.cdm.common.monitor.IProgressMonitor; |
30 |
import eu.etaxonomy.cdm.model.agent.AgentBase; |
|
31 | 30 |
import eu.etaxonomy.cdm.model.common.Annotation; |
32 | 31 |
import eu.etaxonomy.cdm.model.common.DefinedTerm; |
33 | 32 |
import eu.etaxonomy.cdm.model.common.ISourceable; |
... | ... | |
56 | 55 |
*/ |
57 | 56 |
public class TransientReferenceService implements IReferenceService { |
58 | 57 |
|
59 |
private IReferenceService defaultService; |
|
58 |
private final IReferenceService defaultService;
|
|
60 | 59 |
|
61 | 60 |
/** |
62 | 61 |
* @param defaultReferenceService |
... | ... | |
705 | 704 |
public Reference findWithoutFlush(UUID uuid) { |
706 | 705 |
return defaultService.findWithoutFlush(uuid); |
707 | 706 |
} |
708 |
|
|
707 |
|
|
709 | 708 |
@Override |
710 | 709 |
public <S extends Reference> Pager<FindByIdentifierDTO<S>> findByIdentifier(Class<S> clazz, String identifier, DefinedTerm identifierType, MatchMode matchmode, boolean includeEntity, Integer pageSize, Integer pageNumber, List<String> propertyPaths){ |
711 | 710 |
return defaultService.findByIdentifier(clazz, identifier, identifierType, matchmode, includeEntity, pageSize, pageNumber, propertyPaths); |
712 | 711 |
} |
713 | 712 |
|
713 |
/* (non-Javadoc) |
|
714 |
* @see eu.etaxonomy.cdm.api.service.IService#delete(java.util.UUID) |
|
715 |
*/ |
|
716 |
@Override |
|
717 |
public DeleteResult delete(UUID uuid) { |
|
718 |
return defaultService.delete(uuid); |
|
719 |
} |
|
720 |
|
|
714 | 721 |
} |
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientTaxonService.java | ||
---|---|---|
27 | 27 |
import eu.etaxonomy.cdm.api.service.DeleteResult; |
28 | 28 |
import eu.etaxonomy.cdm.api.service.ITaxonService; |
29 | 29 |
import eu.etaxonomy.cdm.api.service.TaxaAndNamesSearchMode; |
30 |
import eu.etaxonomy.cdm.api.service.UpdateResult; |
|
30 | 31 |
import eu.etaxonomy.cdm.api.service.config.DeleteConfiguratorBase; |
31 | 32 |
import eu.etaxonomy.cdm.api.service.config.IFindTaxaAndNamesConfigurator; |
32 | 33 |
import eu.etaxonomy.cdm.api.service.config.IIdentifiableEntityServiceConfigurator; |
... | ... | |
1426 | 1427 |
return defaultService.deleteSynonym(synonymUuid, taxonUuid, config); |
1427 | 1428 |
} |
1428 | 1429 |
|
1430 |
/* (non-Javadoc) |
|
1431 |
* @see eu.etaxonomy.cdm.api.service.IService#delete(java.util.UUID) |
|
1432 |
*/ |
|
1433 |
@Override |
|
1434 |
public DeleteResult delete(UUID uuid) { |
|
1435 |
return defaultService.delete(uuid); |
|
1436 |
} |
|
1437 |
|
|
1438 |
/* (non-Javadoc) |
|
1439 |
* @see eu.etaxonomy.cdm.api.service.ITaxonService#swapSynonymAndAcceptedTaxon(java.util.UUID, java.util.UUID) |
|
1440 |
*/ |
|
1441 |
@Override |
|
1442 |
public UpdateResult swapSynonymAndAcceptedTaxon(UUID synonymUUid, UUID acceptedTaxonUuid) { |
|
1443 |
return defaultService.swapSynonymAndAcceptedTaxon(synonymUUid, acceptedTaxonUuid); |
|
1444 |
} |
|
1445 |
|
|
1446 |
/* (non-Javadoc) |
|
1447 |
* @see eu.etaxonomy.cdm.api.service.ITaxonService#deleteTaxon(java.util.UUID, eu.etaxonomy.cdm.api.service.config.TaxonDeletionConfigurator, java.util.UUID) |
|
1448 |
*/ |
|
1449 |
@Override |
|
1450 |
public DeleteResult deleteTaxon(UUID taxonUuid, TaxonDeletionConfigurator config, UUID classificationUuid) { |
|
1451 |
return defaultService.deleteTaxon(taxonUuid, config, classificationUuid); |
|
1452 |
} |
|
1453 |
|
|
1429 | 1454 |
|
1430 | 1455 |
|
1431 | 1456 |
|
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientTermService.java | ||
---|---|---|
31 | 31 |
import eu.etaxonomy.cdm.api.service.dto.FindByIdentifierDTO; |
32 | 32 |
import eu.etaxonomy.cdm.api.service.pager.Pager; |
33 | 33 |
import eu.etaxonomy.cdm.common.monitor.IProgressMonitor; |
34 |
import eu.etaxonomy.cdm.model.agent.AgentBase; |
|
35 | 34 |
import eu.etaxonomy.cdm.model.common.Annotation; |
36 | 35 |
import eu.etaxonomy.cdm.model.common.DefinedTerm; |
37 | 36 |
import eu.etaxonomy.cdm.model.common.DefinedTermBase; |
... | ... | |
866 | 865 |
public DefinedTermBase findWithoutFlush(UUID uuid) { |
867 | 866 |
return defaultService.findWithoutFlush(uuid); |
868 | 867 |
} |
869 |
|
|
868 |
|
|
870 | 869 |
|
871 | 870 |
@Override |
872 | 871 |
public <S extends DefinedTermBase> Pager<FindByIdentifierDTO<S>> findByIdentifier(Class<S> clazz, String identifier, DefinedTerm identifierType, MatchMode matchmode, boolean includeEntity, Integer pageSize, Integer pageNumber, List<String> propertyPaths){ |
873 | 872 |
return defaultService.findByIdentifier(clazz, identifier, identifierType, matchmode, includeEntity, pageSize, pageNumber, propertyPaths); |
874 | 873 |
} |
875 | 874 |
|
875 |
/* (non-Javadoc) |
|
876 |
* @see eu.etaxonomy.cdm.api.service.IService#delete(java.util.UUID) |
|
877 |
*/ |
|
878 |
@Override |
|
879 |
public DeleteResult delete(UUID uuid) { |
|
880 |
return defaultService.delete(uuid); |
|
881 |
} |
|
882 |
|
|
876 | 883 |
} |
Also available in: Unified diff
made up-to-date with service layer changes