Project

General

Profile

Revision 16acec00

ID16acec00dddce0243826d76541575424a2c6a2b8
Parent 7dcb230b
Child 82b02bfc, 60b7d5b5

Added by Andreas Müller almost 4 years ago

fix transient services

View differences:

eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientAgentService.java
25 25
import eu.etaxonomy.cdm.api.service.UpdateResult;
26 26
import eu.etaxonomy.cdm.api.service.config.DeleteConfiguratorBase;
27 27
import eu.etaxonomy.cdm.api.service.config.IIdentifiableEntityServiceConfigurator;
28
import eu.etaxonomy.cdm.api.service.dto.FindByIdentifierDTO;
29
import eu.etaxonomy.cdm.api.service.dto.FindByMarkerDTO;
28
import eu.etaxonomy.cdm.api.service.dto.IdentifiedEntityDTO;
29
import eu.etaxonomy.cdm.api.service.dto.MarkedEntityDTO;
30 30
import eu.etaxonomy.cdm.api.service.pager.Pager;
31 31
import eu.etaxonomy.cdm.common.monitor.IProgressMonitor;
32 32
import eu.etaxonomy.cdm.model.agent.Address;
......
749 749
	};
750 750

  
751 751
	@Override
752
	public <S extends AgentBase>  Pager<FindByIdentifierDTO<S>> findByIdentifier(Class<S> clazz, String identifier, DefinedTerm identifierType, MatchMode matchmode, boolean includeEntity, Integer pageSize, Integer pageNumber, List<String> propertyPaths){
752
	public <S extends AgentBase>  Pager<IdentifiedEntityDTO<S>> findByIdentifier(Class<S> clazz, String identifier, DefinedTerm identifierType, MatchMode matchmode, boolean includeEntity, Integer pageSize, Integer pageNumber, List<String> propertyPaths){
753 753
		return defaultService.findByIdentifier(clazz, identifier, identifierType, matchmode, includeEntity, pageSize, pageNumber, propertyPaths);
754 754
	}
755 755

  
......
854 854
	}
855 855

  
856 856
	@Override
857
	public <S extends AgentBase> Pager<FindByMarkerDTO<S>> findByMarker(
857
	public <S extends AgentBase> Pager<MarkedEntityDTO<S>> findByMarker(
858 858
			Class<S> arg0, MarkerType arg1, Boolean arg2, boolean arg3,
859 859
			Integer arg4, Integer arg5, List<String> arg6) {
860 860
		// TODO Auto-generated method stub
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientClassificationService.java
22 22

  
23 23
import eu.etaxonomy.cdm.api.service.DeleteResult;
24 24
import eu.etaxonomy.cdm.api.service.IClassificationService;
25
import eu.etaxonomy.cdm.api.service.NodeSortMode;
25 26
import eu.etaxonomy.cdm.api.service.UpdateResult;
26 27
import eu.etaxonomy.cdm.api.service.config.CreateHierarchyForClassificationConfigurator;
27 28
import eu.etaxonomy.cdm.api.service.config.DeleteConfiguratorBase;
28 29
import eu.etaxonomy.cdm.api.service.config.IIdentifiableEntityServiceConfigurator;
29 30
import eu.etaxonomy.cdm.api.service.config.TaxonDeletionConfigurator;
30
import eu.etaxonomy.cdm.api.service.dto.FindByIdentifierDTO;
31
import eu.etaxonomy.cdm.api.service.dto.FindByMarkerDTO;
32 31
import eu.etaxonomy.cdm.api.service.dto.GroupedTaxonDTO;
32
import eu.etaxonomy.cdm.api.service.dto.IdentifiedEntityDTO;
33
import eu.etaxonomy.cdm.api.service.dto.MarkedEntityDTO;
34
import eu.etaxonomy.cdm.api.service.dto.TaxonInContextDTO;
33 35
import eu.etaxonomy.cdm.api.service.pager.Pager;
34 36
import eu.etaxonomy.cdm.common.monitor.IProgressMonitor;
35 37
import eu.etaxonomy.cdm.model.common.Annotation;
......
904 906

  
905 907

  
906 908
	@Override
907
	public <S extends Classification>  Pager<FindByIdentifierDTO<S>> findByIdentifier(Class<S> clazz, String identifier, DefinedTerm identifierType, MatchMode matchmode, boolean includeEntity, Integer pageSize, Integer pageNumber, List<String> propertyPaths){
909
	public <S extends Classification>  Pager<IdentifiedEntityDTO<S>> findByIdentifier(Class<S> clazz, String identifier, DefinedTerm identifierType, MatchMode matchmode, boolean includeEntity, Integer pageSize, Integer pageNumber, List<String> propertyPaths){
908 910
		return defaultService.findByIdentifier(clazz, identifier, identifierType, matchmode, includeEntity, pageSize, pageNumber, propertyPaths);
909 911
	}
910 912

  
......
1048 1050
	}
1049 1051

  
1050 1052
	@Override
1051
	public <S extends Classification> Pager<FindByMarkerDTO<S>> findByMarker(
1053
	public <S extends Classification> Pager<MarkedEntityDTO<S>> findByMarker(
1052 1054
			Class<S> arg0, MarkerType arg1, Boolean arg2, boolean arg3,
1053 1055
			Integer arg4, Integer arg5, List<String> arg6) {
1054 1056
		// TODO Auto-generated method stub
......
1061 1063
		return null;
1062 1064
	}
1063 1065

  
1066
	@Override
1067
	public TaxonInContextDTO getTaxonInContext(UUID arg0, UUID arg1,
1068
			Boolean arg2, Boolean arg3, List<UUID> arg4, NodeSortMode arg5) {
1069
		// TODO Auto-generated method stub
1070
		return null;
1071
	}
1072

  
1064 1073
   
1065 1074

  
1066 1075

  
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientCollectionService.java
23 23
import eu.etaxonomy.cdm.api.service.ICollectionService;
24 24
import eu.etaxonomy.cdm.api.service.config.DeleteConfiguratorBase;
25 25
import eu.etaxonomy.cdm.api.service.config.IIdentifiableEntityServiceConfigurator;
26
import eu.etaxonomy.cdm.api.service.dto.FindByIdentifierDTO;
27
import eu.etaxonomy.cdm.api.service.dto.FindByMarkerDTO;
26
import eu.etaxonomy.cdm.api.service.dto.IdentifiedEntityDTO;
27
import eu.etaxonomy.cdm.api.service.dto.MarkedEntityDTO;
28 28
import eu.etaxonomy.cdm.api.service.pager.Pager;
29 29
import eu.etaxonomy.cdm.common.monitor.IProgressMonitor;
30 30
import eu.etaxonomy.cdm.model.common.Annotation;
......
693 693
    }
694 694

  
695 695
	@Override
696
	public <S extends Collection>  Pager<FindByIdentifierDTO<S>> findByIdentifier(Class<S> clazz, String identifier, DefinedTerm identifierType, MatchMode matchmode, boolean includeEntity, Integer pageSize, Integer pageNumber, List<String> propertyPaths){
696
	public <S extends Collection>  Pager<IdentifiedEntityDTO<S>> findByIdentifier(Class<S> clazz, String identifier, DefinedTerm identifierType, MatchMode matchmode, boolean includeEntity, Integer pageSize, Integer pageNumber, List<String> propertyPaths){
697 697
		return defaultService.findByIdentifier(clazz, identifier, identifierType, matchmode, includeEntity, pageSize, pageNumber, propertyPaths);
698 698
	}
699 699

  
......
761 761
	}
762 762

  
763 763
	@Override
764
	public <S extends Collection> Pager<FindByMarkerDTO<S>> findByMarker(
764
	public <S extends Collection> Pager<MarkedEntityDTO<S>> findByMarker(
765 765
			Class<S> arg0, MarkerType arg1, Boolean arg2, boolean arg3,
766 766
			Integer arg4, Integer arg5, List<String> arg6) {
767 767
		// TODO Auto-generated method stub
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientDescriptionService.java
26 26
import eu.etaxonomy.cdm.api.service.UpdateResult;
27 27
import eu.etaxonomy.cdm.api.service.config.DeleteConfiguratorBase;
28 28
import eu.etaxonomy.cdm.api.service.config.IIdentifiableEntityServiceConfigurator;
29
import eu.etaxonomy.cdm.api.service.dto.FindByIdentifierDTO;
30
import eu.etaxonomy.cdm.api.service.dto.FindByMarkerDTO;
29
import eu.etaxonomy.cdm.api.service.dto.IdentifiedEntityDTO;
30
import eu.etaxonomy.cdm.api.service.dto.MarkedEntityDTO;
31 31
import eu.etaxonomy.cdm.api.service.pager.Pager;
32 32
import eu.etaxonomy.cdm.common.monitor.IProgressMonitor;
33 33
import eu.etaxonomy.cdm.model.common.Annotation;
......
1098 1098
	}
1099 1099

  
1100 1100
	@Override
1101
	public <S extends DescriptionBase>  Pager<FindByIdentifierDTO<S>> findByIdentifier(Class<S> clazz, String identifier, DefinedTerm identifierType, MatchMode matchmode, boolean includeEntity, Integer pageSize, Integer pageNumber, List<String> propertyPaths){
1101
	public <S extends DescriptionBase>  Pager<IdentifiedEntityDTO<S>> findByIdentifier(Class<S> clazz, String identifier, DefinedTerm identifierType, MatchMode matchmode, boolean includeEntity, Integer pageSize, Integer pageNumber, List<String> propertyPaths){
1102 1102
		return defaultService.findByIdentifier(clazz, identifier, identifierType, matchmode, includeEntity, pageSize, pageNumber, propertyPaths);
1103 1103
	}
1104 1104

  
......
1246 1246
	}
1247 1247

  
1248 1248
	@Override
1249
	public <S extends DescriptionBase> Pager<FindByMarkerDTO<S>> findByMarker(
1249
	public <S extends DescriptionBase> Pager<MarkedEntityDTO<S>> findByMarker(
1250 1250
			Class<S> arg0, MarkerType arg1, Boolean arg2, boolean arg3,
1251 1251
			Integer arg4, Integer arg5, List<String> arg6) {
1252 1252
		// TODO Auto-generated method stub
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientNameService.java
30 30
import eu.etaxonomy.cdm.api.service.config.DeleteConfiguratorBase;
31 31
import eu.etaxonomy.cdm.api.service.config.IIdentifiableEntityServiceConfigurator;
32 32
import eu.etaxonomy.cdm.api.service.config.NameDeletionConfigurator;
33
import eu.etaxonomy.cdm.api.service.dto.FindByIdentifierDTO;
34
import eu.etaxonomy.cdm.api.service.dto.FindByMarkerDTO;
33
import eu.etaxonomy.cdm.api.service.dto.IdentifiedEntityDTO;
34
import eu.etaxonomy.cdm.api.service.dto.MarkedEntityDTO;
35 35
import eu.etaxonomy.cdm.api.service.exception.ReferencedObjectUndeletableException;
36 36
import eu.etaxonomy.cdm.api.service.pager.Pager;
37 37
import eu.etaxonomy.cdm.api.service.search.DocumentSearchResult;
......
1141 1141

  
1142 1142

  
1143 1143
	@Override
1144
	public <S extends TaxonNameBase>  Pager<FindByIdentifierDTO<S>> findByIdentifier(Class<S> clazz, String identifier, DefinedTerm identifierType, MatchMode matchmode, boolean includeEntity, Integer pageSize, Integer pageNumber, List<String> propertyPaths){
1144
	public <S extends TaxonNameBase>  Pager<IdentifiedEntityDTO<S>> findByIdentifier(Class<S> clazz, String identifier, DefinedTerm identifierType, MatchMode matchmode, boolean includeEntity, Integer pageSize, Integer pageNumber, List<String> propertyPaths){
1145 1145
		return defaultService.findByIdentifier(clazz, identifier, identifierType, matchmode, includeEntity, pageSize, pageNumber, propertyPaths);
1146 1146
	}
1147 1147

  
......
1237 1237
	}
1238 1238

  
1239 1239
	@Override
1240
	public <S extends TaxonNameBase> Pager<FindByMarkerDTO<S>> findByMarker(
1240
	public <S extends TaxonNameBase> Pager<MarkedEntityDTO<S>> findByMarker(
1241 1241
			Class<S> arg0, MarkerType arg1, Boolean arg2, boolean arg3,
1242 1242
			Integer arg4, Integer arg5, List<String> arg6) {
1243 1243
		// TODO Auto-generated method stub
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientOccurenceService.java
34 34
import eu.etaxonomy.cdm.api.service.config.IIdentifiableEntityServiceConfigurator;
35 35
import eu.etaxonomy.cdm.api.service.config.SpecimenDeleteConfigurator;
36 36
import eu.etaxonomy.cdm.api.service.dto.FieldUnitDTO;
37
import eu.etaxonomy.cdm.api.service.dto.FindByIdentifierDTO;
38
import eu.etaxonomy.cdm.api.service.dto.FindByMarkerDTO;
37
import eu.etaxonomy.cdm.api.service.dto.IdentifiedEntityDTO;
38
import eu.etaxonomy.cdm.api.service.dto.MarkedEntityDTO;
39 39
import eu.etaxonomy.cdm.api.service.dto.PreservedSpecimenDTO;
40 40
import eu.etaxonomy.cdm.api.service.pager.Pager;
41 41
import eu.etaxonomy.cdm.api.service.search.SearchResult;
......
928 928
    }
929 929

  
930 930
	@Override
931
	public <S extends SpecimenOrObservationBase>  Pager<FindByIdentifierDTO<S>> findByIdentifier(Class<S> clazz, String identifier, DefinedTerm identifierType, MatchMode matchmode, boolean includeEntity, Integer pageSize, Integer pageNumber, List<String> propertyPaths){
931
	public <S extends SpecimenOrObservationBase>  Pager<IdentifiedEntityDTO<S>> findByIdentifier(Class<S> clazz, String identifier, DefinedTerm identifierType, MatchMode matchmode, boolean includeEntity, Integer pageSize, Integer pageNumber, List<String> propertyPaths){
932 932
		return defaultService.findByIdentifier(clazz, identifier, identifierType, matchmode, includeEntity, pageSize, pageNumber, propertyPaths);
933 933
	}
934 934

  
......
1112 1112
	}
1113 1113

  
1114 1114
	@Override
1115
	public <S extends SpecimenOrObservationBase> Pager<FindByMarkerDTO<S>> findByMarker(
1115
	public <S extends SpecimenOrObservationBase> Pager<MarkedEntityDTO<S>> findByMarker(
1116 1116
			Class<S> arg0, MarkerType arg1, Boolean arg2, boolean arg3,
1117 1117
			Integer arg4, Integer arg5, List<String> arg6) {
1118 1118
		// TODO Auto-generated method stub
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientReferenceService.java
24 24
import eu.etaxonomy.cdm.api.service.IReferenceService;
25 25
import eu.etaxonomy.cdm.api.service.config.DeleteConfiguratorBase;
26 26
import eu.etaxonomy.cdm.api.service.config.IIdentifiableEntityServiceConfigurator;
27
import eu.etaxonomy.cdm.api.service.dto.FindByIdentifierDTO;
28
import eu.etaxonomy.cdm.api.service.dto.FindByMarkerDTO;
27
import eu.etaxonomy.cdm.api.service.dto.IdentifiedEntityDTO;
28
import eu.etaxonomy.cdm.api.service.dto.MarkedEntityDTO;
29 29
import eu.etaxonomy.cdm.api.service.pager.Pager;
30 30
import eu.etaxonomy.cdm.common.monitor.IProgressMonitor;
31 31
import eu.etaxonomy.cdm.model.common.Annotation;
......
700 700
	}
701 701

  
702 702
	@Override
703
	public <S extends Reference>  Pager<FindByIdentifierDTO<S>> findByIdentifier(Class<S> clazz, String identifier, DefinedTerm identifierType, MatchMode matchmode, boolean includeEntity, Integer pageSize, Integer pageNumber, List<String> propertyPaths){
703
	public <S extends Reference>  Pager<IdentifiedEntityDTO<S>> findByIdentifier(Class<S> clazz, String identifier, DefinedTerm identifierType, MatchMode matchmode, boolean includeEntity, Integer pageSize, Integer pageNumber, List<String> propertyPaths){
704 704
		return defaultService.findByIdentifier(clazz, identifier, identifierType, matchmode, includeEntity, pageSize, pageNumber, propertyPaths);
705 705
	}
706 706

  
......
780 780
	}
781 781

  
782 782
	@Override
783
	public <S extends Reference> Pager<FindByMarkerDTO<S>> findByMarker(
783
	public <S extends Reference> Pager<MarkedEntityDTO<S>> findByMarker(
784 784
			Class<S> arg0, MarkerType arg1, Boolean arg2, boolean arg3,
785 785
			Integer arg4, Integer arg5, List<String> arg6) {
786 786
		// TODO Auto-generated method stub
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientTaxonService.java
35 35
import eu.etaxonomy.cdm.api.service.config.MatchingTaxonConfigurator;
36 36
import eu.etaxonomy.cdm.api.service.config.SynonymDeletionConfigurator;
37 37
import eu.etaxonomy.cdm.api.service.config.TaxonDeletionConfigurator;
38
import eu.etaxonomy.cdm.api.service.dto.FindByIdentifierDTO;
39
import eu.etaxonomy.cdm.api.service.dto.FindByMarkerDTO;
38
import eu.etaxonomy.cdm.api.service.dto.IdentifiedEntityDTO;
40 39
import eu.etaxonomy.cdm.api.service.dto.IncludedTaxaDTO;
40
import eu.etaxonomy.cdm.api.service.dto.MarkedEntityDTO;
41 41
import eu.etaxonomy.cdm.api.service.exception.DataChangeNoRollbackException;
42 42
import eu.etaxonomy.cdm.api.service.exception.HomotypicalGroupChangeException;
43 43
import eu.etaxonomy.cdm.api.service.pager.Pager;
......
1322 1322
    }
1323 1323

  
1324 1324
    @Override
1325
    public <S extends TaxonBase>  Pager<FindByIdentifierDTO<S>> findByIdentifier(Class<S> clazz, String identifier, DefinedTerm identifierType, MatchMode matchmode, boolean includeEntity, Integer pageSize, Integer pageNumber, List<String> propertyPaths){
1325
    public <S extends TaxonBase>  Pager<IdentifiedEntityDTO<S>> findByIdentifier(Class<S> clazz, String identifier, DefinedTerm identifierType, MatchMode matchmode, boolean includeEntity, Integer pageSize, Integer pageNumber, List<String> propertyPaths){
1326 1326
        return defaultService.findByIdentifier(clazz, identifier, identifierType, matchmode, includeEntity, pageSize, pageNumber, propertyPaths);
1327 1327
    }
1328 1328

  
......
1330 1330
     * @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)
1331 1331
     */
1332 1332
    @Override
1333
    public <S extends TaxonBase> Pager<FindByIdentifierDTO<S>> findByIdentifier(Class<S> clazz, String identifier,
1333
    public <S extends TaxonBase> Pager<IdentifiedEntityDTO<S>> findByIdentifier(Class<S> clazz, String identifier,
1334 1334
            DefinedTerm identifierType, TaxonNode subtreeFilter, MatchMode matchmode, boolean includeEntity,
1335 1335
            Integer pageSize, Integer pageNumber, List<String> propertyPaths) {
1336 1336
        return defaultService.findByIdentifier(clazz, identifier, identifierType, subtreeFilter, matchmode, includeEntity, pageSize, pageNumber, propertyPaths);
......
1504 1504
	}
1505 1505

  
1506 1506
	@Override
1507
	public <S extends TaxonBase> Pager<FindByMarkerDTO<S>> findByMarker(
1507
	public <S extends TaxonBase> Pager<MarkedEntityDTO<S>> findByMarker(
1508 1508
			Class<S> clazz, MarkerType type, Boolean value, TaxonNode subtree,
1509 1509
			boolean includeEntity, Integer size, Integer limit, List<String> path) {
1510 1510
		return defaultService.findByMarker(clazz, type, value, subtree, includeEntity, size, limit, path);
1511 1511
	}
1512 1512

  
1513 1513
	@Override
1514
	public <S extends TaxonBase> Pager<FindByMarkerDTO<S>> findByMarker(
1514
	public <S extends TaxonBase> Pager<MarkedEntityDTO<S>> findByMarker(
1515 1515
			Class<S> arg0, MarkerType arg1, Boolean arg2, boolean arg3,
1516 1516
			Integer arg4, Integer arg5, List<String> arg6) {
1517 1517
		// TODO Auto-generated method stub
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientTermService.java
28 28
import eu.etaxonomy.cdm.api.service.config.DeleteConfiguratorBase;
29 29
import eu.etaxonomy.cdm.api.service.config.IIdentifiableEntityServiceConfigurator;
30 30
import eu.etaxonomy.cdm.api.service.config.TermDeletionConfigurator;
31
import eu.etaxonomy.cdm.api.service.dto.FindByIdentifierDTO;
32
import eu.etaxonomy.cdm.api.service.dto.FindByMarkerDTO;
31
import eu.etaxonomy.cdm.api.service.dto.IdentifiedEntityDTO;
32
import eu.etaxonomy.cdm.api.service.dto.MarkedEntityDTO;
33 33
import eu.etaxonomy.cdm.api.service.pager.Pager;
34 34
import eu.etaxonomy.cdm.common.monitor.IProgressMonitor;
35 35
import eu.etaxonomy.cdm.model.common.Annotation;
......
859 859

  
860 860

  
861 861
    @Override
862
    public <S extends DefinedTermBase>  Pager<FindByIdentifierDTO<S>> findByIdentifier(Class<S> clazz, String identifier, DefinedTerm identifierType, MatchMode matchmode, boolean includeEntity, Integer pageSize, Integer pageNumber, List<String> propertyPaths){
862
    public <S extends DefinedTermBase>  Pager<IdentifiedEntityDTO<S>> findByIdentifier(Class<S> clazz, String identifier, DefinedTerm identifierType, MatchMode matchmode, boolean includeEntity, Integer pageSize, Integer pageNumber, List<String> propertyPaths){
863 863
        return defaultService.findByIdentifier(clazz, identifier, identifierType, matchmode, includeEntity, pageSize, pageNumber, propertyPaths);
864 864
    }
865 865

  
......
927 927
	}
928 928

  
929 929
	@Override
930
	public <S extends DefinedTermBase> Pager<FindByMarkerDTO<S>> findByMarker(
930
	public <S extends DefinedTermBase> Pager<MarkedEntityDTO<S>> findByMarker(
931 931
			Class<S> arg0, MarkerType arg1, Boolean arg2, boolean arg3,
932 932
			Integer arg4, Integer arg5, List<String> arg6) {
933 933
		// TODO Auto-generated method stub

Also available in: Unified diff

Add picture from clipboard (Maximum size: 40 MB)