Project

General

Profile

« Previous | Next » 

Revision 3c4d1aba

Added by Cherian Mathew almost 9 years ago

Make editor compatible with latest cdmlib service layer updates

View differences:

eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/AbstractBulkEditorInput.java
52 52
	private List<T> model;
53 53

  
54 54
	private IEntityCreator<T> entityCreator;
55
	
55

  
56 56
	private static Class serviceClass;
57 57

  
58 58
	/**
......
62 62
	 * @return a {@link eu.etaxonomy.taxeditor.bulkeditor.input.AbstractBulkEditorInput} object.
63 63
	 */
64 64
	static public AbstractBulkEditorInput NewInstance(BulkEditorInputType inputType) {
65
		
65

  
66 66
		return BulkEditorInputType.getInput(inputType);
67 67
	}
68 68

  
......
99 99
	 * @return a T object.
100 100
	 */
101 101
	protected T loadEntity(UUID entityUuid) {
102
		List<String> propertyPaths = Arrays.asList(new String[]{}); 
102
		List<String> propertyPaths = Arrays.asList(new String[]{});
103 103
		return (T) CdmStore.getService(serviceClass).load(entityUuid, propertyPaths);
104 104
	}
105 105

  
......
179 179

  
180 180
		if(getEntityUuid() != null){
181 181

  
182
			T entity = (T) loadEntity(getEntityUuid());
182
			T entity = loadEntity(getEntityUuid());
183 183
			entityList.add(entity);
184 184
			model = entityList;
185 185
		}
......
191 191
			entityList = listEntities(configurator);
192 192

  
193 193
			Collections.sort(entityList, queryComparator);
194
			
194

  
195 195

  
196 196
		}
197 197

  
......
231 231
    public boolean merge(T entity, T mergeTarget) {
232 232
		if (entity instanceof IMergable) {
233 233
			try {
234
				CdmStore.getCommonService().merge((IMergable)mergeTarget, (IMergable)entity, null);				
234
				CdmStore.getCommonService().merge((IMergable)mergeTarget, (IMergable)entity);
235 235
			} catch (MergeException e) {
236 236
				MessagingUtils.errorDialog("Bulk Editor Merge Error",
237 237
						this,
......
279 279
	 * Returns a textual representation given object. The default implementation
280 280
	 * in the abstract base class returns the simple name of the class, this may
281 281
	 * be overwritten to something more specific in subclasses.
282
	 * 
282
	 *
283 283
	 * @param entity
284 284
	 * @return a textual representation given object.
285 285
	 */
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientAgentService.java
784 784
        return defaultService.delete(arg0);
785 785
    }
786 786

  
787
    /* (non-Javadoc)
788
     * @see eu.etaxonomy.cdm.api.service.IService#merge(java.util.List)
789
     */
790
    @Override
791
    public List<AgentBase> merge(List<AgentBase> arg0) {
792
       return defaultService.merge(arg0);
793
    }
794

  
787 795
}
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientClassificationService.java
958 958
        return defaultService.delete(arg0);
959 959
    }
960 960

  
961
    /* (non-Javadoc)
962
     * @see eu.etaxonomy.cdm.api.service.IService#merge(java.util.List)
963
     */
964
    @Override
965
    public List<Classification> merge(List<Classification> arg0) {
966
        return defaultService.merge(arg0);
967
    }
961 968

  
962 969
}
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientCollectionService.java
704 704
		return defaultService.findByIdentifier(clazz, identifier, identifierType, matchmode, includeEntity, pageSize, pageNumber, propertyPaths);
705 705
	}
706 706

  
707

  
707 708
	@Override
708 709
	public DeleteResult delete(UUID arg0) {
709 710
		return defaultService.delete(arg0);
......
717 718
        return defaultService.delete(arg0);
718 719
    }
719 720

  
721
    /* (non-Javadoc)
722
     * @see eu.etaxonomy.cdm.api.service.IService#merge(java.util.List)
723
     */
724
    @Override
725
    public List<Collection> merge(List<Collection> arg0) {
726
        return defaultService.merge(arg0);
727
    }
728

  
720 729
}
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientDescriptionService.java
1107 1107
		return defaultService.findByIdentifier(clazz, identifier, identifierType, matchmode, includeEntity, pageSize, pageNumber, propertyPaths);
1108 1108
	}
1109 1109

  
1110
	@Override
1111
	public DeleteResult deleteDescription(DescriptionBase description) {
1112
		return defaultService.deleteDescription(description);
1113
	}
1114

  
1110 1115
	/* (non-Javadoc)
1111 1116
	 * @see eu.etaxonomy.cdm.api.service.IDescriptionService#pageNamedAreasInUse(boolean, java.lang.Integer, java.lang.Integer)
1112 1117
	 */
......
1115 1120
	    return defaultService.pageNamedAreasInUse(includeAllParents, pageSize, pageNumber);
1116 1121
	}
1117 1122

  
1118
    /**
1119
     * {@inheritDoc}
1120
     */
1121
    @Override
1122
    public DeleteResult delete(UUID arg0) {
1123
        return defaultService.delete(arg0);
1124
    }
1125 1123

  
1126
    /**
1127
     * {@inheritDoc}
1124
    /* (non-Javadoc)
1125
     * @see eu.etaxonomy.cdm.api.service.IService#delete(java.util.UUID)
1128 1126
     */
1129 1127
    @Override
1130
    public DeleteResult deleteDescription(DescriptionBase arg0) {
1131
        return defaultService.deleteDescription(arg0);
1128
    public DeleteResult delete(UUID uuid) {
1129
        return defaultService.deleteDescription(uuid);
1132 1130
    }
1133 1131

  
1134
    /**
1135
     * {@inheritDoc}
1132

  
1133
    /* (non-Javadoc)
1134
     * @see eu.etaxonomy.cdm.api.service.IDescriptionService#deleteDescription(java.util.UUID)
1136 1135
     */
1137 1136
    @Override
1138
    public DeleteResult deleteDescription(UUID arg0) {
1139
        return defaultService.deleteDescription(arg0);
1137
    public DeleteResult deleteDescription(UUID uuid) {
1138
        return defaultService.delete(uuid);
1140 1139
    }
1141 1140

  
1142
    /**
1143
     * {@inheritDoc}
1141
    /* (non-Javadoc)
1142
     * @see eu.etaxonomy.cdm.api.service.IDescriptionService#deleteDescriptionElement(java.util.UUID)
1144 1143
     */
1145 1144
    @Override
1146
    public UUID deleteDescriptionElement(UUID arg0) {
1147
        return defaultService.deleteDescriptionElement(arg0);
1145
    public UUID deleteDescriptionElement(UUID uuid) {
1146
        return defaultService.deleteDescriptionElement(uuid);
1148 1147
    }
1149 1148

  
1150
    /**
1151
     * {@inheritDoc}
1149
    /* (non-Javadoc)
1150
     * @see eu.etaxonomy.cdm.api.service.IDescriptionService#moveTaxonDescriptions(eu.etaxonomy.cdm.model.taxon.Taxon, eu.etaxonomy.cdm.model.taxon.Taxon)
1152 1151
     */
1153 1152
    @Override
1154
    public UpdateResult moveTaxonDescriptions(Taxon arg0, Taxon arg1) {
1155
        return defaultService.moveTaxonDescriptions(arg0, arg1);
1153
    public UpdateResult moveTaxonDescriptions(Taxon sourceTaxon, Taxon targetTaxon) {
1154
        return defaultService.moveTaxonDescriptions(sourceTaxon, targetTaxon);
1156 1155
    }
1157 1156

  
1158
    /**
1159
     * {@inheritDoc}
1157
    /* (non-Javadoc)
1158
     * @see eu.etaxonomy.cdm.api.service.IDescriptionService#moveTaxonDescriptions(java.util.UUID, java.util.UUID)
1160 1159
     */
1161 1160
    @Override
1162
    public UpdateResult moveTaxonDescriptions(UUID arg0, UUID arg1) {
1163
        return defaultService.moveTaxonDescriptions(arg0, arg1);
1161
    public UpdateResult moveTaxonDescriptions(UUID sourceTaxonUuid, UUID targetTaxonUuid) {
1162
        return defaultService.moveTaxonDescriptions(sourceTaxonUuid, targetTaxonUuid);
1163

  
1164 1164
    }
1165 1165

  
1166 1166
    /* (non-Javadoc)
......
1170 1170
    public DeleteResult delete(Collection<UUID> arg0) {
1171 1171
        return defaultService.delete(arg0);
1172 1172
    }
1173

  
1174
    /* (non-Javadoc)
1175
     * @see eu.etaxonomy.cdm.api.service.IService#merge(java.util.List)
1176
     */
1177
    @Override
1178
    public List<DescriptionBase> merge(List<DescriptionBase> arg0) {
1179
        return defaultService.merge(arg0);
1180
    }
1181

  
1173 1182
}
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientNameService.java
1151 1151
	}
1152 1152

  
1153 1153

  
1154

  
1155 1154
	@Override
1156 1155
	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){
1157 1156
		return defaultService.findByIdentifier(clazz, identifier, identifierType, matchmode, includeEntity, pageSize, pageNumber, propertyPaths);
......
1159 1158

  
1160 1159

  
1161 1160

  
1161
    /* (non-Javadoc)
1162
     * @see eu.etaxonomy.cdm.api.service.INameService#setAsGroupsBasionym(java.util.UUID)
1163
     */
1164
    @Override
1165
    public UpdateResult setAsGroupsBasionym(UUID nameUuid) {
1166
        return defaultService.delete(nameUuid);
1167
    }
1168

  
1169

  
1162 1170
	@Override
1163 1171
	public List<HashMap<String, String>> getNameRecords() {
1164 1172

  
......
1174 1182
        return defaultService.delete(arg0);
1175 1183
    }
1176 1184

  
1177
    /**
1178
     * {@inheritDoc}
1179
     */
1180
    @Override
1181
    public UpdateResult setAsGroupsBasionym(UUID arg0) {
1182
        return defaultService.setAsGroupsBasionym(arg0);
1183
    }
1184

  
1185 1185
    /* (non-Javadoc)
1186 1186
     * @see eu.etaxonomy.cdm.api.service.IService#delete(java.util.Collection)
1187 1187
     */
......
1190 1190
        return defaultService.delete(arg0);
1191 1191
    }
1192 1192

  
1193

  
1194

  
1195

  
1196

  
1197

  
1193
    /* (non-Javadoc)
1194
     * @see eu.etaxonomy.cdm.api.service.IService#merge(java.util.List)
1195
     */
1196
    @Override
1197
    public List<TaxonNameBase> merge(List<TaxonNameBase> arg0) {
1198
        return defaultService.merge(arg0);
1199
    }
1198 1200
}
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientOccurenceService.java
989 989
	    return defaultService.getAllHierarchyDerivatives(specimen);
990 990
	}
991 991

  
992
    /**
993
     * {@inheritDoc}
992

  
993
    /* (non-Javadoc)
994
     * @see eu.etaxonomy.cdm.api.service.IService#delete(java.util.UUID)
994 995
     */
995 996
    @Override
996
    public DeleteResult delete(UUID arg0) {
997
        return defaultService.delete(arg0);
997
    public DeleteResult delete(UUID uuid) {
998
        return defaultService.delete(uuid);
998 999
    }
999 1000

  
1000 1001
    @Override
......
1007 1008
        return defaultService.deleteSingleRead(singleRead, sequence);
1008 1009
    }
1009 1010

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

  
1010 1019

  
1011 1020
}
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientReferenceService.java
710 710
		return defaultService.findByIdentifier(clazz, identifier, identifierType, matchmode, includeEntity, pageSize, pageNumber, propertyPaths);
711 711
	}
712 712

  
713
    /**
714
     * {@inheritDoc}
713
    /* (non-Javadoc)
714
     * @see eu.etaxonomy.cdm.api.service.IService#delete(java.util.UUID)
715 715
     */
716 716
    @Override
717
    public DeleteResult delete(UUID arg0) {
718
        return defaultService.delete(arg0);
717
    public DeleteResult delete(UUID uuid) {
718
        return defaultService.delete(uuid);
719 719
    }
720 720

  
721 721
    /* (non-Javadoc)
......
726 726
        return defaultService.delete(arg0);
727 727
    }
728 728

  
729

  
729
    /* (non-Javadoc)
730
     * @see eu.etaxonomy.cdm.api.service.IService#merge(java.util.List)
731
     */
732
    @Override
733
    public List<Reference> merge(List<Reference> arg0) {
734
        return defaultService.merge(arg0);
735
    }
730 736
}
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientTaxonService.java
1 1
// $Id$
2 2
/**
3
* Copyright (C) 2013 EDIT
4
* European Distributed Institute of Taxonomy
5
* http://www.e-taxonomy.eu
6
*
7
* The contents of this file are subject to the Mozilla Public License Version 1.1
8
* See LICENSE.TXT at the top of this package for the full license terms.
9
*/
3
 * Copyright (C) 2013 EDIT
4
 * European Distributed Institute of Taxonomy
5
 * http://www.e-taxonomy.eu
6
 *
7
 * The contents of this file are subject to the Mozilla Public License Version 1.1
8
 * See LICENSE.TXT at the top of this package for the full license terms.
9
 */
10 10
package eu.etaxonomy.taxeditor.editor.view.dataimport.transientServices;
11 11

  
12 12
import java.io.IOException;
......
510 510
    @Override
511 511
    public UpdateResult swapSynonymAndAcceptedTaxon(Synonym arg0, Taxon arg1) {
512 512
        return defaultService.swapSynonymAndAcceptedTaxon(arg0, arg1);
513

  
513 514
    }
514 515

  
515 516
    /**
......
1087 1088
            String queryString, Classification classification, Set<NamedArea> namedAreas,
1088 1089
            Set<PresenceAbsenceTerm> distributionStatus, List<Language> languages, boolean highlightFragments,
1089 1090
            Integer pageSize, Integer pageNumber, List<OrderHint> orderHints, List<String> propertyPaths)
1090
            throws CorruptIndexException, IOException, ParseException, LuceneMultiSearchException {
1091
                    throws CorruptIndexException, IOException, ParseException, LuceneMultiSearchException {
1091 1092
        return defaultService.findTaxaAndNamesByFullText(searchModes, queryString, classification, namedAreas, distributionStatus, languages, highlightFragments, pageSize, pageNumber, orderHints, propertyPaths);
1092 1093
    }
1093 1094

  
......
1344 1345
        return defaultService.getSynonymsByHomotypicGroup(taxon, propertyPaths);
1345 1346
    }
1346 1347

  
1347
	@Override
1348
	public Synonym changeRelatedTaxonToSynonym(Taxon fromTaxon, Taxon toTaxon,
1349
			TaxonRelationshipType oldRelationshipType,
1350
			SynonymRelationshipType synonymRelationshipType)
1351
			throws DataChangeNoRollbackException {
1348
    @Override
1349
    public Synonym changeRelatedTaxonToSynonym(Taxon fromTaxon, Taxon toTaxon,
1350
            TaxonRelationshipType oldRelationshipType,
1351
            SynonymRelationshipType synonymRelationshipType)
1352
                    throws DataChangeNoRollbackException {
1352 1353

  
1353
		return defaultService.changeRelatedTaxonToSynonym(fromTaxon, toTaxon, oldRelationshipType, synonymRelationshipType);
1354
	}
1354
        return defaultService.changeRelatedTaxonToSynonym(fromTaxon, toTaxon, oldRelationshipType, synonymRelationshipType);
1355
    }
1355 1356

  
1356 1357
    /* (non-Javadoc)
1357 1358
     * @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 1372
        return defaultService.listAcceptedTaxaFor(synonymUuid, classificationUuid, pageSize, pageNumber, orderHints, propertyPaths);
1372 1373
    }
1373 1374

  
1374
	@Override
1375
	public DeleteResult isDeletable(TaxonBase object,
1376
			DeleteConfiguratorBase config) {
1377
		// TODO Auto-generated method stub
1378
		return null;
1379
	}
1375
    @Override
1376
    public DeleteResult isDeletable(TaxonBase object,
1377
            DeleteConfiguratorBase config) {
1378
        // TODO Auto-generated method stub
1379
        return null;
1380
    }
1380 1381

  
1381
	@Override
1382
	public IncludedTaxaDTO listIncludedTaxa(UUID taxonUuid,
1383
			IncludedTaxonConfiguration configuration) {
1384
		// TODO Auto-generated method stub
1385
		return null;
1386
	}
1382
    @Override
1383
    public IncludedTaxaDTO listIncludedTaxa(UUID taxonUuid,
1384
            IncludedTaxonConfiguration configuration) {
1385
        // TODO Auto-generated method stub
1386
        return null;
1387
    }
1387 1388

  
1388
	@Override
1389
	public TaxonBase findWithoutFlush(UUID uuid) {
1390
		return defaultService.findWithoutFlush(uuid);
1391
	}
1389
    @Override
1390
    public TaxonBase findWithoutFlush(UUID uuid) {
1391
        return defaultService.findWithoutFlush(uuid);
1392
    }
1392 1393

  
1393 1394
    /* (non-Javadoc)
1394 1395
     * @see eu.etaxonomy.cdm.api.service.ITaxonService#findTaxaByName(eu.etaxonomy.cdm.api.service.config.MatchingTaxonConfigurator)
......
1398 1399
        return defaultService.findTaxaByName(config);
1399 1400
    }
1400 1401

  
1401
	@Override
1402
	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){
1403
		return defaultService.findByIdentifier(clazz, identifier, identifierType, matchmode, includeEntity, pageSize, pageNumber, propertyPaths);
1404
	}
1405

  
1406
	/* (non-Javadoc)
1407
	 * @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)
1408
	 */
1409
	@Override
1410
	public <S extends TaxonBase> Pager<FindByIdentifierDTO<S>> findByIdentifier(Class<S> clazz, String identifier,
1411
	        DefinedTerm identifierType, TaxonNode subtreeFilter, MatchMode matchmode, boolean includeEntity,
1412
	        Integer pageSize, Integer pageNumber, List<String> propertyPaths) {
1413
	    return defaultService.findByIdentifier(clazz, identifier, identifierType, subtreeFilter, matchmode, includeEntity, pageSize, pageNumber, propertyPaths);
1414
	}
1415

  
1416

  
1417

  
1402
    @Override
1403
    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){
1404
        return defaultService.findByIdentifier(clazz, identifier, identifierType, matchmode, includeEntity, pageSize, pageNumber, propertyPaths);
1405
    }
1418 1406

  
1407
    /* (non-Javadoc)
1408
     * @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)
1409
     */
1410
    @Override
1411
    public <S extends TaxonBase> Pager<FindByIdentifierDTO<S>> findByIdentifier(Class<S> clazz, String identifier,
1412
            DefinedTerm identifierType, TaxonNode subtreeFilter, MatchMode matchmode, boolean includeEntity,
1413
            Integer pageSize, Integer pageNumber, List<String> propertyPaths) {
1414
        return defaultService.findByIdentifier(clazz, identifier, identifierType, subtreeFilter, matchmode, includeEntity, pageSize, pageNumber, propertyPaths);
1415
    }
1419 1416

  
1420 1417

  
1421 1418

  
1422
	@Override
1423
	public SynonymRelationship moveSynonymToAnotherTaxon(
1424
			SynonymRelationship oldSynonymRelation, UUID newTaxonUUID,
1425
			boolean moveHomotypicGroup,
1426
			SynonymRelationshipType newSynonymRelationshipType,
1427
			Reference reference, String referenceDetail, boolean keepReference)
1428
			throws HomotypicalGroupChangeException {
1429

  
1430
		return defaultService.moveSynonymToAnotherTaxon(oldSynonymRelation, newTaxonUUID, moveHomotypicGroup, newSynonymRelationshipType, reference, referenceDetail, keepReference);
1431
	}
1419
    /* (non-Javadoc)
1420
     * @see eu.etaxonomy.cdm.api.service.ITaxonService#deleteSynonym(java.util.UUID, java.util.UUID, eu.etaxonomy.cdm.api.service.config.SynonymDeletionConfigurator)
1421
     */
1422
    @Override
1423
    public DeleteResult deleteSynonym(UUID synonymUuid, UUID taxonUuid, SynonymDeletionConfigurator config) {
1424
        return defaultService.deleteSynonym(synonymUuid, taxonUuid, config);
1425
    }
1432 1426

  
1433 1427

  
1434 1428
    /**
1435 1429
     * {@inheritDoc}
1430

  
1436 1431
     */
1437 1432
    @Override
1438
    public DeleteResult delete(UUID arg0) {
1439
        return defaultService.delete(arg0);
1433
    public UpdateResult swapSynonymAndAcceptedTaxon(UUID synonymUUid, UUID acceptedTaxonUuid) {
1434
        return defaultService.swapSynonymAndAcceptedTaxon(synonymUUid, acceptedTaxonUuid);
1440 1435
    }
1441 1436

  
1442
    /**
1443
     * {@inheritDoc}
1437
    /* (non-Javadoc)
1438
     * @see eu.etaxonomy.cdm.api.service.ITaxonService#deleteTaxon(java.util.UUID, eu.etaxonomy.cdm.api.service.config.TaxonDeletionConfigurator, java.util.UUID)
1444 1439
     */
1445 1440
    @Override
1446
    public DeleteResult deleteSynonym(UUID arg0, UUID arg1, SynonymDeletionConfigurator arg2) {
1447
        return defaultService.deleteSynonym(arg0, arg1, arg2);
1441
    public DeleteResult deleteTaxon(UUID taxonUuid, TaxonDeletionConfigurator config, UUID classificationUuid) {
1442
        return defaultService.deleteTaxon(taxonUuid, config, classificationUuid);
1448 1443
    }
1449 1444

  
1450 1445

  
......
1458 1453
     * {@inheritDoc}
1459 1454
     */
1460 1455
    @Override
1461
    public DeleteResult deleteTaxon(UUID arg0, TaxonDeletionConfigurator arg1, UUID arg2) {
1462
        return defaultService.deleteTaxon(arg0, arg1, arg2);
1456
    public SynonymRelationship moveSynonymToAnotherTaxon(
1457
            SynonymRelationship oldSynonymRelation, UUID newTaxonUUID,
1458
            boolean moveHomotypicGroup,
1459
            SynonymRelationshipType newSynonymRelationshipType,
1460
            Reference reference, String referenceDetail, boolean keepReference)
1461
                    throws HomotypicalGroupChangeException {
1462

  
1463
        return defaultService.moveSynonymToAnotherTaxon(oldSynonymRelation, newTaxonUUID, moveHomotypicGroup, newSynonymRelationshipType, reference, referenceDetail, keepReference);
1463 1464
    }
1464 1465

  
1465
    /**
1466
     * {@inheritDoc}
1466

  
1467
    /* (non-Javadoc)
1468
     * @see eu.etaxonomy.cdm.api.service.IService#delete(java.util.UUID)
1467 1469
     */
1468 1470
    @Override
1469
    public UpdateResult swapSynonymAndAcceptedTaxon(UUID arg0, UUID arg1) {
1470
        return defaultService.swapSynonymAndAcceptedTaxon(arg0, arg1);
1471
    public DeleteResult delete(UUID uuid) {
1472
        return defaultService.delete(uuid);
1473

  
1471 1474
    }
1472 1475

  
1473 1476
    /* (non-Javadoc)
......
1478 1481
        return defaultService.delete(arg0);
1479 1482
    }
1480 1483

  
1484
    /* (non-Javadoc)
1485
     * @see eu.etaxonomy.cdm.api.service.IService#merge(java.util.List)
1486
     */
1487
    @Override
1488
    public List<TaxonBase> merge(List<TaxonBase> arg0) {
1489
        return defaultService.merge(arg0);
1490
    }
1491

  
1492
    /* (non-Javadoc)
1493
     * @see eu.etaxonomy.cdm.api.service.ITaxonService#deleteSynonym(java.util.UUID, eu.etaxonomy.cdm.api.service.config.SynonymDeletionConfigurator)
1494
     */
1495
    @Override
1496
    public DeleteResult deleteSynonym(UUID arg0, SynonymDeletionConfigurator arg1) {
1497
        return defaultService.deleteSynonym(arg0, arg1);
1498
    }
1481 1499
}
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientTermService.java
1 1
// $Id$
2 2
/**
3
* Copyright (C) 2013 EDIT
4
* European Distributed Institute of Taxonomy
5
* http://www.e-taxonomy.eu
6
*
7
* The contents of this file are subject to the Mozilla Public License Version 1.1
8
* See LICENSE.TXT at the top of this package for the full license terms.
9
*/
3
 * Copyright (C) 2013 EDIT
4
 * European Distributed Institute of Taxonomy
5
 * http://www.e-taxonomy.eu
6
 *
7
 * The contents of this file are subject to the Mozilla Public License Version 1.1
8
 * See LICENSE.TXT at the top of this package for the full license terms.
9
 */
10 10
package eu.etaxonomy.taxeditor.editor.view.dataimport.transientServices;
11 11

  
12 12
import java.net.URI;
......
846 846
        return defaultService.findByIdInVocabulary(id, vocabularyUuid, clazz);
847 847
    }
848 848

  
849
	@Override
850
	public DeleteResult isDeletable(DefinedTermBase object,
851
			DeleteConfiguratorBase config) {
852
		return defaultService.isDeletable(object, config);
853
	}
849
    @Override
850
    public DeleteResult isDeletable(DefinedTermBase object,
851
            DeleteConfiguratorBase config) {
852
        return defaultService.isDeletable(object, config);
853
    }
854 854

  
855 855
    /* (non-Javadoc)
856 856
     * @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 861
        return defaultService.listByTermType(termType, limit, start, orderHints, propertyPaths);
862 862
    }
863 863

  
864
	@Override
865
	public DefinedTermBase findWithoutFlush(UUID uuid) {
866
		return defaultService.findWithoutFlush(uuid);
867
	}
864
    @Override
865
    public DefinedTermBase findWithoutFlush(UUID uuid) {
866
        return defaultService.findWithoutFlush(uuid);
867
    }
868 868

  
869 869

  
870
	@Override
871
	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){
872
		return defaultService.findByIdentifier(clazz, identifier, identifierType, matchmode, includeEntity, pageSize, pageNumber, propertyPaths);
873
	}
870
    @Override
871
    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){
872
        return defaultService.findByIdentifier(clazz, identifier, identifierType, matchmode, includeEntity, pageSize, pageNumber, propertyPaths);
873
    }
874 874

  
875
    /**
876
     * {@inheritDoc}
875
    /* (non-Javadoc)
876
     * @see eu.etaxonomy.cdm.api.service.IService#delete(java.util.UUID)
877 877
     */
878 878
    @Override
879
    public DeleteResult delete(UUID arg0) {
880
        return defaultService.delete(arg0);
879
    public DeleteResult delete(UUID uuid) {
880
        return defaultService.delete(uuid);
881 881
    }
882 882

  
883 883
    /* (non-Javadoc)
......
888 888
        return defaultService.delete(arg0);
889 889
    }
890 890

  
891

  
891
    /* (non-Javadoc)
892
     * @see eu.etaxonomy.cdm.api.service.IService#merge(java.util.List)
893
     */
894
    @Override
895
    public List<DefinedTermBase> merge(List<DefinedTermBase> arg0) {
896
        return defaultService.merge(arg0);
897
    }
892 898
}

Also available in: Unified diff