From: Cherian Mathew Date: Thu, 2 Jul 2015 09:15:14 +0000 (+0200) Subject: Make editor compatible with latest cdmlib service layer updates X-Git-Tag: 3.7.0~1^2~23 X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/commitdiff_plain/3c4d1aba65fc0183c8f67d04be3291062eb78710 Make editor compatible with latest cdmlib service layer updates --- diff --git a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/AbstractBulkEditorInput.java b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/AbstractBulkEditorInput.java index e5b852b5a..82cd23320 100644 --- a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/AbstractBulkEditorInput.java +++ b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/AbstractBulkEditorInput.java @@ -52,7 +52,7 @@ public abstract class AbstractBulkEditorInput implements IEd private List model; private IEntityCreator entityCreator; - + private static Class serviceClass; /** @@ -62,7 +62,7 @@ public abstract class AbstractBulkEditorInput implements IEd * @return a {@link eu.etaxonomy.taxeditor.bulkeditor.input.AbstractBulkEditorInput} object. */ static public AbstractBulkEditorInput NewInstance(BulkEditorInputType inputType) { - + return BulkEditorInputType.getInput(inputType); } @@ -99,7 +99,7 @@ public abstract class AbstractBulkEditorInput implements IEd * @return a T object. */ protected T loadEntity(UUID entityUuid) { - List propertyPaths = Arrays.asList(new String[]{}); + List propertyPaths = Arrays.asList(new String[]{}); return (T) CdmStore.getService(serviceClass).load(entityUuid, propertyPaths); } @@ -179,7 +179,7 @@ public abstract class AbstractBulkEditorInput implements IEd if(getEntityUuid() != null){ - T entity = (T) loadEntity(getEntityUuid()); + T entity = loadEntity(getEntityUuid()); entityList.add(entity); model = entityList; } @@ -191,7 +191,7 @@ public abstract class AbstractBulkEditorInput implements IEd entityList = listEntities(configurator); Collections.sort(entityList, queryComparator); - + } @@ -231,7 +231,7 @@ public abstract class AbstractBulkEditorInput implements IEd public boolean merge(T entity, T mergeTarget) { if (entity instanceof IMergable) { try { - CdmStore.getCommonService().merge((IMergable)mergeTarget, (IMergable)entity, null); + CdmStore.getCommonService().merge((IMergable)mergeTarget, (IMergable)entity); } catch (MergeException e) { MessagingUtils.errorDialog("Bulk Editor Merge Error", this, @@ -279,7 +279,7 @@ public abstract class AbstractBulkEditorInput implements IEd * Returns a textual representation given object. The default implementation * in the abstract base class returns the simple name of the class, this may * be overwritten to something more specific in subclasses. - * + * * @param entity * @return a textual representation given object. */ diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientAgentService.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientAgentService.java index a20f3a722..383939371 100644 --- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientAgentService.java +++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientAgentService.java @@ -784,4 +784,12 @@ public class TransientAgentService implements IAgentService { return defaultService.delete(arg0); } + /* (non-Javadoc) + * @see eu.etaxonomy.cdm.api.service.IService#merge(java.util.List) + */ + @Override + public List merge(List arg0) { + return defaultService.merge(arg0); + } + } diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientClassificationService.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientClassificationService.java index 91ec434be..0423feb29 100644 --- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientClassificationService.java +++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientClassificationService.java @@ -958,5 +958,12 @@ public class TransientClassificationService implements IClassificationService { return defaultService.delete(arg0); } + /* (non-Javadoc) + * @see eu.etaxonomy.cdm.api.service.IService#merge(java.util.List) + */ + @Override + public List merge(List arg0) { + return defaultService.merge(arg0); + } } diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientCollectionService.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientCollectionService.java index 9544c1d01..5e5f0e2fd 100644 --- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientCollectionService.java +++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientCollectionService.java @@ -704,6 +704,7 @@ public class TransientCollectionService implements ICollectionService { return defaultService.findByIdentifier(clazz, identifier, identifierType, matchmode, includeEntity, pageSize, pageNumber, propertyPaths); } + @Override public DeleteResult delete(UUID arg0) { return defaultService.delete(arg0); @@ -717,4 +718,12 @@ public class TransientCollectionService implements ICollectionService { return defaultService.delete(arg0); } + /* (non-Javadoc) + * @see eu.etaxonomy.cdm.api.service.IService#merge(java.util.List) + */ + @Override + public List merge(List arg0) { + return defaultService.merge(arg0); + } + } 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 e9803317c..690275f19 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 @@ -1107,6 +1107,11 @@ public class TransientDescriptionService implements IDescriptionService { return defaultService.findByIdentifier(clazz, identifier, identifierType, matchmode, includeEntity, pageSize, pageNumber, propertyPaths); } + @Override + public DeleteResult deleteDescription(DescriptionBase description) { + return defaultService.deleteDescription(description); + } + /* (non-Javadoc) * @see eu.etaxonomy.cdm.api.service.IDescriptionService#pageNamedAreasInUse(boolean, java.lang.Integer, java.lang.Integer) */ @@ -1115,52 +1120,47 @@ public class TransientDescriptionService implements IDescriptionService { return defaultService.pageNamedAreasInUse(includeAllParents, pageSize, pageNumber); } - /** - * {@inheritDoc} - */ - @Override - public DeleteResult delete(UUID arg0) { - return defaultService.delete(arg0); - } - /** - * {@inheritDoc} + /* (non-Javadoc) + * @see eu.etaxonomy.cdm.api.service.IService#delete(java.util.UUID) */ @Override - public DeleteResult deleteDescription(DescriptionBase arg0) { - return defaultService.deleteDescription(arg0); + public DeleteResult delete(UUID uuid) { + return defaultService.deleteDescription(uuid); } - /** - * {@inheritDoc} + + /* (non-Javadoc) + * @see eu.etaxonomy.cdm.api.service.IDescriptionService#deleteDescription(java.util.UUID) */ @Override - public DeleteResult deleteDescription(UUID arg0) { - return defaultService.deleteDescription(arg0); + public DeleteResult deleteDescription(UUID uuid) { + return defaultService.delete(uuid); } - /** - * {@inheritDoc} + /* (non-Javadoc) + * @see eu.etaxonomy.cdm.api.service.IDescriptionService#deleteDescriptionElement(java.util.UUID) */ @Override - public UUID deleteDescriptionElement(UUID arg0) { - return defaultService.deleteDescriptionElement(arg0); + public UUID deleteDescriptionElement(UUID uuid) { + return defaultService.deleteDescriptionElement(uuid); } - /** - * {@inheritDoc} + /* (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 arg0, Taxon arg1) { - return defaultService.moveTaxonDescriptions(arg0, arg1); + public UpdateResult moveTaxonDescriptions(Taxon sourceTaxon, Taxon targetTaxon) { + return defaultService.moveTaxonDescriptions(sourceTaxon, targetTaxon); } - /** - * {@inheritDoc} + /* (non-Javadoc) + * @see eu.etaxonomy.cdm.api.service.IDescriptionService#moveTaxonDescriptions(java.util.UUID, java.util.UUID) */ @Override - public UpdateResult moveTaxonDescriptions(UUID arg0, UUID arg1) { - return defaultService.moveTaxonDescriptions(arg0, arg1); + public UpdateResult moveTaxonDescriptions(UUID sourceTaxonUuid, UUID targetTaxonUuid) { + return defaultService.moveTaxonDescriptions(sourceTaxonUuid, targetTaxonUuid); + } /* (non-Javadoc) @@ -1170,4 +1170,13 @@ public class TransientDescriptionService implements IDescriptionService { public DeleteResult delete(Collection arg0) { return defaultService.delete(arg0); } + + /* (non-Javadoc) + * @see eu.etaxonomy.cdm.api.service.IService#merge(java.util.List) + */ + @Override + public List merge(List arg0) { + return defaultService.merge(arg0); + } + } diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientNameService.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientNameService.java index 92fbdb1b4..dfac64577 100644 --- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientNameService.java +++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientNameService.java @@ -1151,7 +1151,6 @@ public class TransientNameService implements INameService { } - @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); @@ -1159,6 +1158,15 @@ public class TransientNameService implements INameService { + /* (non-Javadoc) + * @see eu.etaxonomy.cdm.api.service.INameService#setAsGroupsBasionym(java.util.UUID) + */ + @Override + public UpdateResult setAsGroupsBasionym(UUID nameUuid) { + return defaultService.delete(nameUuid); + } + + @Override public List> getNameRecords() { @@ -1174,14 +1182,6 @@ public class TransientNameService implements INameService { return defaultService.delete(arg0); } - /** - * {@inheritDoc} - */ - @Override - public UpdateResult setAsGroupsBasionym(UUID arg0) { - return defaultService.setAsGroupsBasionym(arg0); - } - /* (non-Javadoc) * @see eu.etaxonomy.cdm.api.service.IService#delete(java.util.Collection) */ @@ -1190,9 +1190,11 @@ public class TransientNameService implements INameService { return defaultService.delete(arg0); } - - - - - + /* (non-Javadoc) + * @see eu.etaxonomy.cdm.api.service.IService#merge(java.util.List) + */ + @Override + public List merge(List arg0) { + return defaultService.merge(arg0); + } } diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientOccurenceService.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientOccurenceService.java index f09d350fb..f0d190081 100644 --- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientOccurenceService.java +++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientOccurenceService.java @@ -989,12 +989,13 @@ public class TransientOccurenceService implements IOccurrenceService { return defaultService.getAllHierarchyDerivatives(specimen); } - /** - * {@inheritDoc} + + /* (non-Javadoc) + * @see eu.etaxonomy.cdm.api.service.IService#delete(java.util.UUID) */ @Override - public DeleteResult delete(UUID arg0) { - return defaultService.delete(arg0); + public DeleteResult delete(UUID uuid) { + return defaultService.delete(uuid); } @Override @@ -1007,5 +1008,13 @@ public class TransientOccurenceService implements IOccurrenceService { return defaultService.deleteSingleRead(singleRead, sequence); } + /* (non-Javadoc) + * @see eu.etaxonomy.cdm.api.service.IService#merge(java.util.List) + */ + @Override + public List merge(List arg0) { + return defaultService.merge(arg0); + } + } diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientReferenceService.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientReferenceService.java index 3e28bf56c..7cf667109 100644 --- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientReferenceService.java +++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientReferenceService.java @@ -710,12 +710,12 @@ public class TransientReferenceService implements IReferenceService { return defaultService.findByIdentifier(clazz, identifier, identifierType, matchmode, includeEntity, pageSize, pageNumber, propertyPaths); } - /** - * {@inheritDoc} + /* (non-Javadoc) + * @see eu.etaxonomy.cdm.api.service.IService#delete(java.util.UUID) */ @Override - public DeleteResult delete(UUID arg0) { - return defaultService.delete(arg0); + public DeleteResult delete(UUID uuid) { + return defaultService.delete(uuid); } /* (non-Javadoc) @@ -726,5 +726,11 @@ public class TransientReferenceService implements IReferenceService { return defaultService.delete(arg0); } - + /* (non-Javadoc) + * @see eu.etaxonomy.cdm.api.service.IService#merge(java.util.List) + */ + @Override + public List merge(List arg0) { + return defaultService.merge(arg0); + } } diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientTaxonService.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientTaxonService.java index 08c3e7ecb..be1212a6f 100644 --- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientTaxonService.java +++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientTaxonService.java @@ -1,12 +1,12 @@ // $Id$ /** -* Copyright (C) 2013 EDIT -* European Distributed Institute of Taxonomy -* http://www.e-taxonomy.eu -* -* The contents of this file are subject to the Mozilla Public License Version 1.1 -* See LICENSE.TXT at the top of this package for the full license terms. -*/ + * Copyright (C) 2013 EDIT + * European Distributed Institute of Taxonomy + * http://www.e-taxonomy.eu + * + * The contents of this file are subject to the Mozilla Public License Version 1.1 + * See LICENSE.TXT at the top of this package for the full license terms. + */ package eu.etaxonomy.taxeditor.editor.view.dataimport.transientServices; import java.io.IOException; @@ -510,6 +510,7 @@ public class TransientTaxonService implements ITaxonService { @Override public UpdateResult swapSynonymAndAcceptedTaxon(Synonym arg0, Taxon arg1) { return defaultService.swapSynonymAndAcceptedTaxon(arg0, arg1); + } /** @@ -1087,7 +1088,7 @@ public class TransientTaxonService implements ITaxonService { String queryString, Classification classification, Set namedAreas, Set distributionStatus, List languages, boolean highlightFragments, Integer pageSize, Integer pageNumber, List orderHints, List propertyPaths) - throws CorruptIndexException, IOException, ParseException, LuceneMultiSearchException { + throws CorruptIndexException, IOException, ParseException, LuceneMultiSearchException { return defaultService.findTaxaAndNamesByFullText(searchModes, queryString, classification, namedAreas, distributionStatus, languages, highlightFragments, pageSize, pageNumber, orderHints, propertyPaths); } @@ -1344,14 +1345,14 @@ public class TransientTaxonService implements ITaxonService { return defaultService.getSynonymsByHomotypicGroup(taxon, propertyPaths); } - @Override - public Synonym changeRelatedTaxonToSynonym(Taxon fromTaxon, Taxon toTaxon, - TaxonRelationshipType oldRelationshipType, - SynonymRelationshipType synonymRelationshipType) - throws DataChangeNoRollbackException { + @Override + public Synonym changeRelatedTaxonToSynonym(Taxon fromTaxon, Taxon toTaxon, + TaxonRelationshipType oldRelationshipType, + SynonymRelationshipType synonymRelationshipType) + throws DataChangeNoRollbackException { - return defaultService.changeRelatedTaxonToSynonym(fromTaxon, toTaxon, oldRelationshipType, synonymRelationshipType); - } + return defaultService.changeRelatedTaxonToSynonym(fromTaxon, toTaxon, oldRelationshipType, synonymRelationshipType); + } /* (non-Javadoc) * @see eu.etaxonomy.cdm.api.service.ITaxonService#pageAcceptedTaxaFor(java.util.UUID, java.util.UUID, java.lang.Integer, java.lang.Integer, java.util.List, java.util.List) @@ -1371,24 +1372,24 @@ public class TransientTaxonService implements ITaxonService { return defaultService.listAcceptedTaxaFor(synonymUuid, classificationUuid, pageSize, pageNumber, orderHints, propertyPaths); } - @Override - public DeleteResult isDeletable(TaxonBase object, - DeleteConfiguratorBase config) { - // TODO Auto-generated method stub - return null; - } + @Override + public DeleteResult isDeletable(TaxonBase object, + DeleteConfiguratorBase config) { + // TODO Auto-generated method stub + return null; + } - @Override - public IncludedTaxaDTO listIncludedTaxa(UUID taxonUuid, - IncludedTaxonConfiguration configuration) { - // TODO Auto-generated method stub - return null; - } + @Override + public IncludedTaxaDTO listIncludedTaxa(UUID taxonUuid, + IncludedTaxonConfiguration configuration) { + // TODO Auto-generated method stub + return null; + } - @Override - public TaxonBase findWithoutFlush(UUID uuid) { - return defaultService.findWithoutFlush(uuid); - } + @Override + public TaxonBase findWithoutFlush(UUID uuid) { + return defaultService.findWithoutFlush(uuid); + } /* (non-Javadoc) * @see eu.etaxonomy.cdm.api.service.ITaxonService#findTaxaByName(eu.etaxonomy.cdm.api.service.config.MatchingTaxonConfigurator) @@ -1398,53 +1399,47 @@ public class TransientTaxonService implements ITaxonService { return defaultService.findTaxaByName(config); } - @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); - } - - /* (non-Javadoc) - * @see eu.etaxonomy.cdm.api.service.ITaxonService#findByIdentifier(java.lang.Class, java.lang.String, eu.etaxonomy.cdm.model.common.DefinedTerm, eu.etaxonomy.cdm.model.taxon.TaxonNode, eu.etaxonomy.cdm.persistence.query.MatchMode, boolean, java.lang.Integer, java.lang.Integer, java.util.List) - */ - @Override - public Pager> findByIdentifier(Class clazz, String identifier, - DefinedTerm identifierType, TaxonNode subtreeFilter, MatchMode matchmode, boolean includeEntity, - Integer pageSize, Integer pageNumber, List propertyPaths) { - return defaultService.findByIdentifier(clazz, identifier, identifierType, subtreeFilter, matchmode, includeEntity, pageSize, pageNumber, propertyPaths); - } - - - + @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); + } + /* (non-Javadoc) + * @see eu.etaxonomy.cdm.api.service.ITaxonService#findByIdentifier(java.lang.Class, java.lang.String, eu.etaxonomy.cdm.model.common.DefinedTerm, eu.etaxonomy.cdm.model.taxon.TaxonNode, eu.etaxonomy.cdm.persistence.query.MatchMode, boolean, java.lang.Integer, java.lang.Integer, java.util.List) + */ + @Override + public Pager> findByIdentifier(Class clazz, String identifier, + DefinedTerm identifierType, TaxonNode subtreeFilter, MatchMode matchmode, boolean includeEntity, + Integer pageSize, Integer pageNumber, List propertyPaths) { + return defaultService.findByIdentifier(clazz, identifier, identifierType, subtreeFilter, matchmode, includeEntity, pageSize, pageNumber, propertyPaths); + } - @Override - public SynonymRelationship moveSynonymToAnotherTaxon( - SynonymRelationship oldSynonymRelation, UUID newTaxonUUID, - boolean moveHomotypicGroup, - SynonymRelationshipType newSynonymRelationshipType, - Reference reference, String referenceDetail, boolean keepReference) - throws HomotypicalGroupChangeException { - - return defaultService.moveSynonymToAnotherTaxon(oldSynonymRelation, newTaxonUUID, moveHomotypicGroup, newSynonymRelationshipType, reference, referenceDetail, keepReference); - } + /* (non-Javadoc) + * @see eu.etaxonomy.cdm.api.service.ITaxonService#deleteSynonym(java.util.UUID, java.util.UUID, eu.etaxonomy.cdm.api.service.config.SynonymDeletionConfigurator) + */ + @Override + public DeleteResult deleteSynonym(UUID synonymUuid, UUID taxonUuid, SynonymDeletionConfigurator config) { + return defaultService.deleteSynonym(synonymUuid, taxonUuid, config); + } /** * {@inheritDoc} + */ @Override - public DeleteResult delete(UUID arg0) { - return defaultService.delete(arg0); + public UpdateResult swapSynonymAndAcceptedTaxon(UUID synonymUUid, UUID acceptedTaxonUuid) { + return defaultService.swapSynonymAndAcceptedTaxon(synonymUUid, acceptedTaxonUuid); } - /** - * {@inheritDoc} + /* (non-Javadoc) + * @see eu.etaxonomy.cdm.api.service.ITaxonService#deleteTaxon(java.util.UUID, eu.etaxonomy.cdm.api.service.config.TaxonDeletionConfigurator, java.util.UUID) */ @Override - public DeleteResult deleteSynonym(UUID arg0, UUID arg1, SynonymDeletionConfigurator arg2) { - return defaultService.deleteSynonym(arg0, arg1, arg2); + public DeleteResult deleteTaxon(UUID taxonUuid, TaxonDeletionConfigurator config, UUID classificationUuid) { + return defaultService.deleteTaxon(taxonUuid, config, classificationUuid); } @@ -1458,16 +1453,24 @@ public class TransientTaxonService implements ITaxonService { * {@inheritDoc} */ @Override - public DeleteResult deleteTaxon(UUID arg0, TaxonDeletionConfigurator arg1, UUID arg2) { - return defaultService.deleteTaxon(arg0, arg1, arg2); + public SynonymRelationship moveSynonymToAnotherTaxon( + SynonymRelationship oldSynonymRelation, UUID newTaxonUUID, + boolean moveHomotypicGroup, + SynonymRelationshipType newSynonymRelationshipType, + Reference reference, String referenceDetail, boolean keepReference) + throws HomotypicalGroupChangeException { + + return defaultService.moveSynonymToAnotherTaxon(oldSynonymRelation, newTaxonUUID, moveHomotypicGroup, newSynonymRelationshipType, reference, referenceDetail, keepReference); } - /** - * {@inheritDoc} + + /* (non-Javadoc) + * @see eu.etaxonomy.cdm.api.service.IService#delete(java.util.UUID) */ @Override - public UpdateResult swapSynonymAndAcceptedTaxon(UUID arg0, UUID arg1) { - return defaultService.swapSynonymAndAcceptedTaxon(arg0, arg1); + public DeleteResult delete(UUID uuid) { + return defaultService.delete(uuid); + } /* (non-Javadoc) @@ -1478,4 +1481,19 @@ public class TransientTaxonService implements ITaxonService { return defaultService.delete(arg0); } + /* (non-Javadoc) + * @see eu.etaxonomy.cdm.api.service.IService#merge(java.util.List) + */ + @Override + public List merge(List arg0) { + return defaultService.merge(arg0); + } + + /* (non-Javadoc) + * @see eu.etaxonomy.cdm.api.service.ITaxonService#deleteSynonym(java.util.UUID, eu.etaxonomy.cdm.api.service.config.SynonymDeletionConfigurator) + */ + @Override + public DeleteResult deleteSynonym(UUID arg0, SynonymDeletionConfigurator arg1) { + return defaultService.deleteSynonym(arg0, arg1); + } } diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientTermService.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientTermService.java index 48c3673e8..af6537698 100644 --- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientTermService.java +++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientTermService.java @@ -1,12 +1,12 @@ // $Id$ /** -* Copyright (C) 2013 EDIT -* European Distributed Institute of Taxonomy -* http://www.e-taxonomy.eu -* -* The contents of this file are subject to the Mozilla Public License Version 1.1 -* See LICENSE.TXT at the top of this package for the full license terms. -*/ + * Copyright (C) 2013 EDIT + * European Distributed Institute of Taxonomy + * http://www.e-taxonomy.eu + * + * The contents of this file are subject to the Mozilla Public License Version 1.1 + * See LICENSE.TXT at the top of this package for the full license terms. + */ package eu.etaxonomy.taxeditor.editor.view.dataimport.transientServices; import java.net.URI; @@ -846,11 +846,11 @@ public class TransientTermService implements ITermService { return defaultService.findByIdInVocabulary(id, vocabularyUuid, clazz); } - @Override - public DeleteResult isDeletable(DefinedTermBase object, - DeleteConfiguratorBase config) { - return defaultService.isDeletable(object, config); - } + @Override + public DeleteResult isDeletable(DefinedTermBase object, + DeleteConfiguratorBase config) { + return defaultService.isDeletable(object, config); + } /* (non-Javadoc) * @see eu.etaxonomy.cdm.api.service.ITermService#listByTermType(eu.etaxonomy.cdm.model.common.TermType, java.lang.Integer, java.lang.Integer, java.util.List, java.util.List) @@ -861,23 +861,23 @@ public class TransientTermService implements ITermService { return defaultService.listByTermType(termType, limit, start, orderHints, propertyPaths); } - @Override - public DefinedTermBase findWithoutFlush(UUID uuid) { - return defaultService.findWithoutFlush(uuid); - } + @Override + public DefinedTermBase 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); - } + @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); + } - /** - * {@inheritDoc} + /* (non-Javadoc) + * @see eu.etaxonomy.cdm.api.service.IService#delete(java.util.UUID) */ @Override - public DeleteResult delete(UUID arg0) { - return defaultService.delete(arg0); + public DeleteResult delete(UUID uuid) { + return defaultService.delete(uuid); } /* (non-Javadoc) @@ -888,5 +888,11 @@ public class TransientTermService implements ITermService { return defaultService.delete(arg0); } - + /* (non-Javadoc) + * @see eu.etaxonomy.cdm.api.service.IService#merge(java.util.List) + */ + @Override + public List merge(List arg0) { + return defaultService.merge(arg0); + } }