From: Cherian Mathew Date: Fri, 22 May 2015 09:25:01 +0000 (+0200) Subject: fixed problems with merge X-Git-Tag: remoting-3.9.0~184 X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/commitdiff_plain/d61bbb8bde2c0df3abe89a0a243159073f1ef4b1 fixed problems with merge --- diff --git a/.gitignore b/.gitignore index 4829b148d..ee184e833 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ /.project +eu.etaxonomy.taxeditor.cdmlib/src/main/resources/etc/jetty/* eu.etaxonomy.taxeditor.application/.settings eu.etaxonomy.taxeditor.application/target eu.etaxonomy.taxeditor.bulkeditor/.settings 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 905eb319e..569d7de93 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 @@ -770,4 +770,12 @@ public class TransientAgentService implements IAgentService { return defaultService.convertTeam2Person(arg0); } + /* (non-Javadoc) + * @see eu.etaxonomy.cdm.api.service.IService#delete(java.util.UUID) + */ + @Override + public DeleteResult delete(UUID uuid) { + return defaultService.delete(uuid); + } + } 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..8324c4587 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,53 @@ 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.common.UuidAndTitleCache; +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.TermDto; +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 @@ -1066,45 +1112,52 @@ 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.IDescriptionService#moveTaxonDescriptions(eu.etaxonomy.cdm.model.taxon.Taxon, eu.etaxonomy.cdm.model.taxon.Taxon) + * @see eu.etaxonomy.cdm.api.service.IService#delete(java.util.UUID) */ @Override - public UpdateResult moveTaxonDescriptions(Taxon sourceTaxon, Taxon targetTaxon) { - return defaultService.moveTaxonDescriptions(sourceTaxon, targetTaxon); - + public DeleteResult delete(UUID uuid) { + return defaultService.deleteDescription(uuid); } + /* (non-Javadoc) - * @see eu.etaxonomy.cdm.api.service.IDescriptionService#moveTaxonDescriptions(java.util.UUID, java.util.UUID) + * @see eu.etaxonomy.cdm.api.service.IDescriptionService#deleteDescription(java.util.UUID) */ @Override - public UpdateResult moveTaxonDescriptions(UUID sourceTaxonUuid, UUID targetTaxonUuid) { - return defaultService.moveTaxonDescriptions(sourceTaxonUuid, targetTaxonUuid); - + 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 descriptionElementUuid) { - return defaultService.deleteDescriptionElement(descriptionElementUuid); + public UUID deleteDescriptionElement(UUID uuid) { + return defaultService.deleteDescriptionElement(uuid); } /* (non-Javadoc) - * @see eu.etaxonomy.cdm.api.service.IDescriptionService#deleteDescription(java.util.UUID) + * @see eu.etaxonomy.cdm.api.service.IDescriptionService#moveTaxonDescriptions(eu.etaxonomy.cdm.model.taxon.Taxon, eu.etaxonomy.cdm.model.taxon.Taxon) */ @Override - public DeleteResult deleteDescription(UUID descriptionUuid) { - return defaultService.deleteDescription(descriptionUuid); + public UpdateResult moveTaxonDescriptions(Taxon sourceTaxon, Taxon targetTaxon) { + return defaultService.moveTaxonDescriptions(sourceTaxon, targetTaxon); } - /* (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.IDescriptionService#moveTaxonDescriptions(java.util.UUID, java.util.UUID) + */ + @Override + public UpdateResult moveTaxonDescriptions(UUID sourceTaxonUuid, UUID targetTaxonUuid) { + return defaultService.moveTaxonDescriptions(sourceTaxonUuid, targetTaxonUuid); + } } 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 ee0368a35..05a570ddc 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 @@ -1171,6 +1171,14 @@ public class TransientNameService implements INameService { return defaultService.getNameRecords(); } + /* (non-Javadoc) + * @see eu.etaxonomy.cdm.api.service.IService#delete(java.util.UUID) + */ + @Override + public DeleteResult delete(UUID uuid) { + return defaultService.delete(uuid); + } + } 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 601d0313e..6c5ea95a0 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 @@ -1056,5 +1056,13 @@ public class TransientOccurenceService implements IOccurrenceService { return defaultService.getAllHierarchyDerivatives(specimen); } + /* (non-Javadoc) + * @see eu.etaxonomy.cdm.api.service.IService#delete(java.util.UUID) + */ + @Override + public DeleteResult delete(UUID uuid) { + return defaultService.delete(uuid); + } + } 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 a4ce21b0a..09045a7b4 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 @@ -1456,4 +1456,12 @@ public class TransientTaxonService implements ITaxonService { return defaultService.moveSynonymToAnotherTaxon(oldSynonymRelation, newTaxonUUID, moveHomotypicGroup, newSynonymRelationshipType, reference, referenceDetail, keepReference); } + /* (non-Javadoc) + * @see eu.etaxonomy.cdm.api.service.IService#delete(java.util.UUID) + */ + @Override + public DeleteResult delete(UUID uuid) { + return defaultService.delete(uuid); + } + } diff --git a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/operation/MoveTaxonOperation.java b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/operation/MoveTaxonOperation.java index 385a89297..835b5ba29 100644 --- a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/operation/MoveTaxonOperation.java +++ b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/operation/MoveTaxonOperation.java @@ -9,9 +9,6 @@ package eu.etaxonomy.taxeditor.navigation.navigator.operation; -import java.util.Map; -import java.util.Set; - import org.eclipse.core.commands.ExecutionException; import org.eclipse.core.commands.operations.IUndoContext; import org.eclipse.core.runtime.IAdaptable; @@ -47,9 +44,6 @@ public class MoveTaxonOperation extends AbstractPersistentPostOperation { * A reference to the former taxonomical parents */ - private final Map oldParentTreeNodes; - - private final Set taxonNodes; private final TaxonNode taxonNode; diff --git a/eu.etaxonomy.taxeditor.test/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.test/META-INF/MANIFEST.MF index fb85112f5..1ad0bcb62 100644 --- a/eu.etaxonomy.taxeditor.test/META-INF/MANIFEST.MF +++ b/eu.etaxonomy.taxeditor.test/META-INF/MANIFEST.MF @@ -6,7 +6,6 @@ Bundle-Version: 3.4.0.qualifier Bundle-ActivationPolicy: lazy Bundle-Vendor: EDIT Bundle-RequiredExecutionEnvironment: JavaSE-1.6 - Require-Bundle: org.apache.log4j, org.eclipse.ui, org.eclipse.core.runtime,