From: Patric Plitzner Date: Sat, 28 Mar 2015 10:36:08 +0000 (+0000) Subject: - adapted transient service to cdmlib changes X-Git-Tag: 3.6.0~134 X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/commitdiff_plain/0c4bf49838aee05ef138fac9845bad3414c5214e - adapted transient service to cdmlib changes --- 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 0304e35d5..b418af0a2 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 @@ -28,7 +28,6 @@ import eu.etaxonomy.cdm.api.service.config.IIdentifiableEntityServiceConfigurato 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.agent.AgentBase; import eu.etaxonomy.cdm.model.common.Annotation; import eu.etaxonomy.cdm.model.common.DefinedTerm; import eu.etaxonomy.cdm.model.common.ISourceable; @@ -55,6 +54,7 @@ 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.TermDto; import eu.etaxonomy.cdm.persistence.query.Grouping; import eu.etaxonomy.cdm.persistence.query.MatchMode; import eu.etaxonomy.cdm.persistence.query.OrderHint; @@ -1081,14 +1081,6 @@ public class TransientDescriptionService implements IDescriptionService { defaultService.moveDescriptionElementsToDescription(descriptionElements, targetDescription, isPaste); } - /* (non-Javadoc) - * @see eu.etaxonomy.cdm.api.service.IDescriptionService#pageNamedAreasInUse(java.lang.Integer, java.lang.Integer, java.util.List) - */ - @Override - public Pager pageNamedAreasInUse(Integer pageSize, Integer pageNumber, List propertyPaths) { - return defaultService.pageNamedAreasInUse(pageSize, pageNumber, propertyPaths); - } - /* (non-Javadoc) * @see eu.etaxonomy.cdm.api.service.IDescriptionService#getOrderedDistributions(java.util.Set, boolean, boolean, java.util.Set, java.util.Set, java.util.List) */ @@ -1108,7 +1100,7 @@ public class TransientDescriptionService implements IDescriptionService { public DescriptionBase findWithoutFlush(UUID uuid) { return defaultService.findWithoutFlush(uuid); } - + @Override public Pager> findByIdentifier(Class clazz, String identifier, DefinedTerm identifierType, MatchMode matchmode, boolean includeEntity, Integer pageSize, Integer pageNumber, List propertyPaths){ return defaultService.findByIdentifier(clazz, identifier, identifierType, matchmode, includeEntity, pageSize, pageNumber, propertyPaths); @@ -1118,4 +1110,12 @@ public class TransientDescriptionService implements IDescriptionService { public UUID deleteDescription(DescriptionBase description) { 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); + } }