X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/blobdiff_plain/4b94c9cfe0df4ec8f83395b88d8420c5791a93b4..b18cb5fe9cfd3767378b764458cf0bbf1ec653ac:/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientDescriptionService.java diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientDescriptionService.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientDescriptionService.java index 9ea4d169e..2954833fc 100644 --- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientDescriptionService.java +++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientDescriptionService.java @@ -15,7 +15,54 @@ import java.util.Map; import java.util.Set; import java.util.UUID; -import javax.print.attribute.standard.Media; +import org.hibernate.LockOptions; +import org.hibernate.Session; +import org.hibernate.criterion.Criterion; +import org.hibernate.envers.query.criteria.AuditCriterion; + +import eu.etaxonomy.cdm.api.service.DeleteResult; +import eu.etaxonomy.cdm.api.service.DistributionTree; +import eu.etaxonomy.cdm.api.service.IDescriptionService; +import eu.etaxonomy.cdm.api.service.UpdateResult; +import eu.etaxonomy.cdm.api.service.config.DeleteConfiguratorBase; +import eu.etaxonomy.cdm.api.service.config.IIdentifiableEntityServiceConfigurator; +import eu.etaxonomy.cdm.api.service.dto.FindByIdentifierDTO; +import eu.etaxonomy.cdm.api.service.pager.Pager; +import eu.etaxonomy.cdm.common.monitor.IProgressMonitor; +import eu.etaxonomy.cdm.model.common.Annotation; +import eu.etaxonomy.cdm.model.common.DefinedTerm; +import eu.etaxonomy.cdm.model.common.ISourceable; +import eu.etaxonomy.cdm.model.common.IdentifiableSource; +import eu.etaxonomy.cdm.model.common.LSID; +import eu.etaxonomy.cdm.model.common.Language; +import eu.etaxonomy.cdm.model.common.Marker; +import eu.etaxonomy.cdm.model.common.MarkerType; +import eu.etaxonomy.cdm.model.common.TermVocabulary; +import eu.etaxonomy.cdm.model.description.DescriptionBase; +import eu.etaxonomy.cdm.model.description.DescriptionElementBase; +import eu.etaxonomy.cdm.model.description.Feature; +import eu.etaxonomy.cdm.model.description.FeatureTree; +import eu.etaxonomy.cdm.model.description.PresenceAbsenceTerm; +import eu.etaxonomy.cdm.model.description.TaxonDescription; +import eu.etaxonomy.cdm.model.description.TaxonNameDescription; +import eu.etaxonomy.cdm.model.location.NamedArea; +import eu.etaxonomy.cdm.model.location.NamedAreaLevel; +import eu.etaxonomy.cdm.model.media.Media; +import eu.etaxonomy.cdm.model.media.Rights; +import eu.etaxonomy.cdm.model.name.TaxonNameBase; +import eu.etaxonomy.cdm.model.taxon.Taxon; +import eu.etaxonomy.cdm.model.view.AuditEvent; +import eu.etaxonomy.cdm.model.view.AuditEventRecord; +import eu.etaxonomy.cdm.persistence.dao.common.AuditEventSort; +import eu.etaxonomy.cdm.persistence.dto.MergeResult; +import eu.etaxonomy.cdm.persistence.dto.TermDto; +import eu.etaxonomy.cdm.persistence.dto.UuidAndTitleCache; +import eu.etaxonomy.cdm.persistence.query.Grouping; +import eu.etaxonomy.cdm.persistence.query.MatchMode; +import eu.etaxonomy.cdm.persistence.query.OrderHint; +import eu.etaxonomy.cdm.strategy.cache.common.IIdentifiableEntityCacheStrategy; +import eu.etaxonomy.cdm.strategy.match.IMatchStrategy; +import eu.etaxonomy.cdm.strategy.merge.IMergeStrategy; /** * @author pplitzner @@ -686,7 +733,7 @@ public class TransientDescriptionService implements IDescriptionService { * @see eu.etaxonomy.cdm.api.service.IService#save(eu.etaxonomy.cdm.model.common.ICdmBase) */ @Override - public UUID save(DescriptionBase newInstance) { + public DescriptionBase save(DescriptionBase newInstance) { return null; } @@ -1029,11 +1076,12 @@ public class TransientDescriptionService implements IDescriptionService { * @param descriptionElements * @param targetDescription * @param isPaste + * @return * @see eu.etaxonomy.cdm.api.service.IDescriptionService#moveDescriptionElementsToDescription(java.util.Collection, eu.etaxonomy.cdm.model.description.DescriptionBase, boolean) */ @Override - public void moveDescriptionElementsToDescription(Collection descriptionElements, DescriptionBase targetDescription, boolean isPaste) { - defaultService.moveDescriptionElementsToDescription(descriptionElements, targetDescription, isPaste); + public UpdateResult moveDescriptionElementsToDescription(Collection descriptionElements, DescriptionBase targetDescription, boolean isPaste) { + return defaultService.moveDescriptionElementsToDescription(descriptionElements, targetDescription, isPaste); } /* (non-Javadoc) @@ -1066,13 +1114,46 @@ public class TransientDescriptionService implements IDescriptionService { return defaultService.deleteDescription(description); } + /* (non-Javadoc) + * @see eu.etaxonomy.cdm.api.service.IDescriptionService#pageNamedAreasInUse(boolean, java.lang.Integer, java.lang.Integer) + */ + @Override + public Pager pageNamedAreasInUse(boolean includeAllParents, Integer pageSize, Integer pageNumber) { + return defaultService.pageNamedAreasInUse(includeAllParents, pageSize, pageNumber); + } + + + /* (non-Javadoc) + * @see eu.etaxonomy.cdm.api.service.IService#delete(java.util.UUID) + */ + @Override + public DeleteResult delete(UUID uuid) { + return defaultService.deleteDescription(uuid); + } + + + /* (non-Javadoc) + * @see eu.etaxonomy.cdm.api.service.IDescriptionService#deleteDescription(java.util.UUID) + */ + @Override + public DeleteResult deleteDescription(UUID uuid) { + return defaultService.delete(uuid); + } + + /* (non-Javadoc) + * @see eu.etaxonomy.cdm.api.service.IDescriptionService#deleteDescriptionElement(java.util.UUID) + */ + @Override + public UUID deleteDescriptionElement(UUID uuid) { + return defaultService.deleteDescriptionElement(uuid); + } + /* (non-Javadoc) * @see eu.etaxonomy.cdm.api.service.IDescriptionService#moveTaxonDescriptions(eu.etaxonomy.cdm.model.taxon.Taxon, eu.etaxonomy.cdm.model.taxon.Taxon) */ @Override public UpdateResult moveTaxonDescriptions(Taxon sourceTaxon, Taxon targetTaxon) { return defaultService.moveTaxonDescriptions(sourceTaxon, targetTaxon); - } /* (non-Javadoc) @@ -1085,26 +1166,70 @@ public class TransientDescriptionService implements IDescriptionService { } /* (non-Javadoc) - * @see eu.etaxonomy.cdm.api.service.IDescriptionService#deleteDescriptionElement(java.util.UUID) + * @see eu.etaxonomy.cdm.api.service.IService#delete(java.util.Collection) */ @Override - public UUID deleteDescriptionElement(UUID descriptionElementUuid) { - return defaultService.deleteDescriptionElement(descriptionElementUuid); + public DeleteResult delete(Collection arg0) { + return defaultService.delete(arg0); } /* (non-Javadoc) - * @see eu.etaxonomy.cdm.api.service.IDescriptionService#deleteDescription(java.util.UUID) + * @see eu.etaxonomy.cdm.api.service.IService#merge(java.util.List) */ @Override - public DeleteResult deleteDescription(UUID descriptionUuid) { - return defaultService.deleteDescription(descriptionUuid); + public List merge(List arg0) { + return defaultService.merge(arg0); + } + + /* (non-Javadoc) + * @see eu.etaxonomy.cdm.api.service.IDescriptionService#moveDescriptionElementsToDescription(java.util.Set, java.util.UUID, boolean) + */ + @Override + public UpdateResult moveDescriptionElementsToDescription(Set arg0, UUID arg1, boolean arg2) { + return defaultService.moveDescriptionElementsToDescription(arg0, arg1, arg2); + } + + /* (non-Javadoc) + * @see eu.etaxonomy.cdm.api.service.IDescriptionService#moveDescriptionElementsToDescription(java.util.Set, java.util.UUID, java.lang.String, boolean) + */ + @Override + public UpdateResult moveDescriptionElementsToDescription(Set arg0, UUID arg1, String arg2, boolean arg3) { + return defaultService.moveDescriptionElementsToDescription(arg0, arg1, arg2, arg3); + } + + /* (non-Javadoc) + * @see eu.etaxonomy.cdm.api.service.IService#merge(java.util.List, boolean) + */ + @Override + public List> merge(List arg0, boolean arg1) { + return defaultService.merge(arg0, arg1); + } + + + + /* (non-Javadoc) + * @see eu.etaxonomy.cdm.api.service.IService#merge(eu.etaxonomy.cdm.model.common.ICdmBase, boolean) + */ + @Override + public MergeResult merge(DescriptionBase arg0, boolean arg1) { + return defaultService.merge(arg0, arg1); + } + + /* (non-Javadoc) + * @see eu.etaxonomy.cdm.api.service.IService#loadWithUpdate(java.util.UUID) + */ + @Override + public DescriptionBase loadWithUpdate(UUID arg0) { + return defaultService.loadWithUpdate(arg0); + } + + /* (non-Javadoc) + * @see eu.etaxonomy.cdm.api.service.IDescriptionService#moveTaxonDescription(java.util.UUID, java.util.UUID) + */ + @Override + public UpdateResult moveTaxonDescription(UUID arg0, UUID arg1) { + + return defaultService.moveTaxonDescriptions(arg0, arg1); } - /* (non-Javadoc) - * @see eu.etaxonomy.cdm.api.service.IDescriptionService#pageNamedAreasInUse(boolean, java.lang.Integer, java.lang.Integer) - */ - @Override - public Pager pageNamedAreasInUse(boolean includeAllParents, Integer pageSize, Integer pageNumber) { - return defaultService.pageNamedAreasInUse(includeAllParents, pageSize, pageNumber); - } }