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.UuidAndTitleCache;
import eu.etaxonomy.cdm.persistence.query.Grouping;
import eu.etaxonomy.cdm.persistence.query.MatchMode;
}
/* (non-Javadoc)
- * @see eu.etaxonomy.cdm.api.service.IService#merge(eu.etaxonomy.cdm.model.common.ICdmBase, boolean)
+ * @see eu.etaxonomy.cdm.api.service.IService#merge(java.util.List, boolean)
*/
@Override
- public AgentBase merge(AgentBase arg0, boolean arg1) {
+ public List<MergeResult<AgentBase>> merge(List<AgentBase> arg0, boolean arg1) {
return defaultService.merge(arg0, arg1);
}
/* (non-Javadoc)
- * @see eu.etaxonomy.cdm.api.service.IService#merge(java.util.List, boolean)
+ * @see eu.etaxonomy.cdm.api.service.IService#merge(eu.etaxonomy.cdm.model.common.ICdmBase, boolean)
*/
@Override
- public List<AgentBase> merge(List<AgentBase> arg0, boolean arg1) {
- return defaultService.merge(arg0, arg1);
+ public MergeResult<AgentBase> merge(AgentBase arg0, boolean arg1) {
+ return defaultService.merge(arg0, arg1);
+ }
+
+ /* (non-Javadoc)
+ * @see eu.etaxonomy.cdm.api.service.IService#loadWithUpdate(java.util.UUID)
+ */
+ @Override
+ public AgentBase loadWithUpdate(UUID arg0) {
+ return defaultService.loadWithUpdate(arg0);
}
+
+
}