Project

General

Profile

Revision 31fa3b33

ID31fa3b33af1af16e5d2a4322c7ecfced742851d1
Parent 78f978ad
Child 6562ccfe

Added by Andreas Müller about 2 months ago

cleanup

View differences:

cdmlib-model/src/main/java/eu/etaxonomy/cdm/strategy/match/MatchStrategyConfigurator.java
21 21
 */
22 22
public class MatchStrategyConfigurator {
23 23

  
24

  
25 24
    public enum MatchStrategy {
26 25
        NonViralName,
27 26
        TeamOrPerson,
......
95 94
		return strategy;
96 95
	}
97 96

  
98

  
99 97
	/**
100 98
	 * <p>getDefaultReferenceMatchStrategy</p>
101 99
	 *
......
110 108

  
111 109
		return strategy;
112 110
	}
113

  
114

  
115 111
}
cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/CommonServiceImpl.java
6 6
 * The contents of this file are subject to the Mozilla Public License Version 1.1
7 7
 * See LICENSE.TXT at the top of this package for the full license terms.
8 8
 */
9

  
10 9
package eu.etaxonomy.cdm.api.service;
11 10

  
12 11
import java.util.Collection;
......
40 39
import eu.etaxonomy.cdm.strategy.merge.IMergeStrategy;
41 40
import eu.etaxonomy.cdm.strategy.merge.MergeException;
42 41

  
43

  
44 42
@Service
45 43
@Transactional(readOnly = true)
46 44
public class CommonServiceImpl
......
328 326
    @Override
329 327
    public Object initializeCollection(UUID ownerUuid, String fieldName) {
330 328
        return genericDao.initializeCollection(ownerUuid, fieldName);
331

  
332 329
    }
333 330

  
334 331
    @Override
335 332
    public Object initializeCollection(UUID ownerUuid, String fieldName, List<String> propertyPaths) {
336 333
        return genericDao.initializeCollection(ownerUuid, fieldName, propertyPaths);
337

  
338 334
    }
339 335

  
340 336
    @Override
341 337
    public boolean isEmpty(UUID ownerUuid, String fieldName) {
342 338
        return genericDao.isEmpty(ownerUuid, fieldName);
343

  
344 339
    }
345 340

  
346 341
    @Override
......
348 343
        return genericDao.size(ownerUuid, fieldName);
349 344
    }
350 345

  
351

  
352 346
    @Override
353 347
    public Object get(UUID ownerUuid, String fieldName, int index) {
354 348
        return genericDao.get(ownerUuid, fieldName, index);
......
419 413
        return (Map<UUID, T>) originalSourceDao.saveOrUpdateAll((Collection)newInstances);
420 414
    }
421 415

  
422

  
423 416
    @Override
424 417
    public <T extends CdmBase> boolean isMergeable(T cdmBase1, T cdmBase2, IMergeStrategy mergeStrategy) throws MergeException {
425 418
        return genericDao.isMergeable(cdmBase1, cdmBase2, mergeStrategy);

Also available in: Unified diff

Add picture from clipboard (Maximum size: 40 MB)