Project

General

Profile

« Previous | Next » 

Revision e21e3b88

Added by Patrick Plitzner over 8 years ago

Adapt to service changes #5200

View differences:

eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientOccurenceService.java
41 41
import eu.etaxonomy.cdm.api.service.util.TaxonRelationshipEdge;
42 42
import eu.etaxonomy.cdm.common.monitor.IProgressMonitor;
43 43
import eu.etaxonomy.cdm.model.common.Annotation;
44
import eu.etaxonomy.cdm.model.common.CdmBase;
45 44
import eu.etaxonomy.cdm.model.common.DefinedTerm;
46 45
import eu.etaxonomy.cdm.model.common.ICdmBase;
47 46
import eu.etaxonomy.cdm.model.common.ISourceable;
......
58 57
import eu.etaxonomy.cdm.model.media.Rights;
59 58
import eu.etaxonomy.cdm.model.molecular.DnaSample;
60 59
import eu.etaxonomy.cdm.model.molecular.Sequence;
61
import eu.etaxonomy.cdm.model.molecular.SingleRead;
62 60
import eu.etaxonomy.cdm.model.name.SpecimenTypeDesignation;
63 61
import eu.etaxonomy.cdm.model.occurrence.DerivationEvent;
64 62
import eu.etaxonomy.cdm.model.occurrence.DerivedUnit;
......
917 915
        return defaultService.getNonCascadedAssociatedElements(specimen);
918 916
    }
919 917

  
920
    @Override
921
    public DeleteResult deleteDerivateHierarchy(CdmBase from, SpecimenDeleteConfigurator config) {
922
        return defaultService.deleteDerivateHierarchy(from, config);
923
    }
924

  
925 918
    @Override
926 919
    public DeleteResult delete(SpecimenOrObservationBase<?> specimen, SpecimenDeleteConfigurator config) {
927 920
        return defaultService.delete(specimen, config);
......
988 981
	}
989 982

  
990 983

  
991
    /* (non-Javadoc)
992
     * @see eu.etaxonomy.cdm.api.service.IService#delete(java.util.UUID)
993
     */
994 984
    @Override
995 985
    public DeleteResult delete(UUID uuid) {
996 986
        return defaultService.delete(uuid);
......
1001 991
        return defaultService.delete(arg0);
1002 992
    }
1003 993

  
1004
    @Override
1005
    public DeleteResult deleteSingleRead(SingleRead singleRead, Sequence sequence){
1006
        return defaultService.deleteSingleRead(singleRead, sequence);
1007
    }
1008 994

  
1009
    /* (non-Javadoc)
1010
     * @see eu.etaxonomy.cdm.api.service.IService#merge(java.util.List)
1011
     */
1012 995
    @Override
1013 996
    public List<SpecimenOrObservationBase> merge(List<SpecimenOrObservationBase> arg0) {
1014 997
        return defaultService.merge(arg0);
1015 998
    }
1016 999

  
1017
    /* (non-Javadoc)
1018
     * @see eu.etaxonomy.cdm.api.service.IOccurrenceService#deleteDerivateHierarchy(java.util.UUID, eu.etaxonomy.cdm.api.service.config.SpecimenDeleteConfigurator)
1019
     */
1020
    @Override
1021
    public DeleteResult deleteDerivateHierarchy(UUID arg0, SpecimenDeleteConfigurator arg1) {
1022
        return defaultService.deleteDerivateHierarchy(arg0, arg1);
1023
    }
1024

  
1025
    /* (non-Javadoc)
1026
     * @see eu.etaxonomy.cdm.api.service.IOccurrenceService#deleteSingleRead(java.util.UUID, java.util.UUID)
1027
     */
1028
    @Override
1029
    public DeleteResult deleteSingleRead(UUID arg0, UUID arg1) {
1030
        return defaultService.deleteSingleRead(arg0, arg1);
1031
    }
1032

  
1033
    /* (non-Javadoc)
1034
     * @see eu.etaxonomy.cdm.api.service.IOccurrenceService#moveDerivate(java.util.UUID, java.util.UUID, java.util.UUID)
1035
     */
1036 1000
    @Override
1037 1001
    public UpdateResult moveDerivate(UUID arg0, UUID arg1, UUID arg2) {
1038 1002
        return defaultService.moveDerivate(arg0, arg1, arg2);
1039 1003
    }
1040 1004

  
1041
    /* (non-Javadoc)
1042
     * @see eu.etaxonomy.cdm.api.service.IOccurrenceService#moveDerivate(eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationBase, eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationBase, eu.etaxonomy.cdm.model.occurrence.DerivedUnit)
1043
     */
1044 1005
    @Override
1045 1006
    public boolean moveDerivate(SpecimenOrObservationBase<?> from, SpecimenOrObservationBase<?> to, DerivedUnit derivate) {
1046 1007
        return defaultService.moveDerivate(from, to, derivate);
1047 1008
    }
1048 1009

  
1049
    /* (non-Javadoc)
1050
     * @see eu.etaxonomy.cdm.api.service.IOccurrenceService#moveSequence(java.util.UUID, java.util.UUID, java.util.UUID)
1051
     */
1052 1010
    @Override
1053 1011
    public UpdateResult moveSequence(UUID arg0, UUID arg1, UUID arg2) {
1054 1012
        return defaultService.moveSequence(arg0, arg1, arg2);
......
1060 1018
        return defaultService.getMediainHierarchy(arg0, arg1, arg2, arg3);
1061 1019
    }
1062 1020

  
1063
    /* (non-Javadoc)
1064
     * @see eu.etaxonomy.cdm.api.service.IService#merge(java.util.List, boolean)
1065
     */
1066 1021
    @Override
1067 1022
    public List<MergeResult<SpecimenOrObservationBase>> merge(List<SpecimenOrObservationBase> arg0, boolean arg1) {
1068 1023
        return defaultService.merge(arg0, arg1);
1069 1024
    }
1070 1025

  
1071
    /* (non-Javadoc)
1072
     * @see eu.etaxonomy.cdm.api.service.IService#merge(eu.etaxonomy.cdm.model.common.ICdmBase, boolean)
1073
     */
1074 1026
    @Override
1075 1027
    public MergeResult<SpecimenOrObservationBase> merge(SpecimenOrObservationBase arg0, boolean arg1) {
1076 1028
        return defaultService.merge(arg0, arg1);
......
1085 1037
        return defaultService.listAssociatedTaxa(arg0, arg1, arg2, arg3, arg4);
1086 1038
    }
1087 1039

  
1088
    /* (non-Javadoc)
1089
     * @see eu.etaxonomy.cdm.api.service.IService#loadWithUpdate(java.util.UUID)
1090
     */
1091 1040
    @Override
1092 1041
    public SpecimenOrObservationBase loadWithUpdate(UUID arg0) {
1093 1042
        return defaultService.loadWithUpdate(arg0);
1094 1043
    }
1095 1044

  
1045
    /**
1046
     * {@inheritDoc}
1047
     */
1048
    @Override
1049
    public DeleteResult delete(UUID arg0, SpecimenDeleteConfigurator arg1) {
1050
        return defaultService.delete(arg0, arg1);
1051
    }
1052

  
1096 1053
}
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/operation/DeleteDerivateOperation.java
80 80
                && treeNode.getValue().equals(element)
81 81
                && treeNode.getParent()!=null
82 82
                && treeNode.getParent().getValue() instanceof Sequence){
83
            deleteResult = CdmStore.getService(IOccurrenceService.class).deleteSingleRead(((SingleRead)element).getUuid(),
83
            deleteResult = CdmStore.getService(ISequenceService.class).deleteSingleRead(((SingleRead)element).getUuid(),
84 84
                    ((Sequence) treeNode.getParent().getValue()).getUuid());
85 85
        } else if(element instanceof Sequence){
86
            deleteResult = CdmStore.getService(ISequenceService.class).delete(element.getUuid(), deleteConfigurator);
86
            deleteResult = CdmStore.getService(ISequenceService.class).delete(element.getUuid());
87 87
        } else {
88
            deleteResult = CdmStore.getService(IOccurrenceService.class).deleteDerivateHierarchy(element.getUuid(), deleteConfigurator);
88
            deleteResult = CdmStore.getService(IOccurrenceService.class).delete(element.getUuid(), deleteConfigurator);
89 89
        }
90 90
        if(deleteResult.isOk()){
91 91
            if(getPostOperationEnabled() instanceof DerivateView){

Also available in: Unified diff