Project

General

Profile

« Previous | Next » 

Revision 6077af92

Added by Andreas Müller over 3 years ago

cleanup

View differences:

cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/taxon/Taxon.java
1704 1704
        return clone(true, true, true, true);
1705 1705
    }
1706 1706

  
1707
    public Taxon clone(boolean withSynonyms, boolean withTaxonRelations, boolean withDescriptions, boolean withMedia) {
1707
    public Taxon clone(boolean withSynonyms, boolean withTaxonRelations, boolean withDescriptions,
1708
            boolean withMedia) {
1709

  
1708 1710
        Taxon result;
1709 1711
        result = (Taxon)super.clone();
1710 1712

  
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/taxon/TaxonNode.java
837 837
	    }
838 838
	}
839 839

  
840

  
841 840
    /**
842
     * Returns a set containing this node and all nodes that are descendants of this node
843
     *
844
     * @return
841
     * Returns a set containing this node and all nodes that are descendants of this node.
845 842
     */
846 843
	@Transient
847 844
    protected Set<TaxonNode> getDescendants(){
......
1082 1079
     * modifying only some of the attributes.<BR><BR>
1083 1080
     * The child nodes are not copied.<BR>
1084 1081
     * The taxon and parent are the same as for the original taxon node. <BR>
1082
     * <BR>
1083
     * Note: Cloning taxon nodes with cloning taxa (and children) is a complex
1084
     * issue which is better be handled in service layer logic. See according
1085
     * clone method in classification service
1086
     * or taxon node service there.
1085 1087
     *
1086 1088
     * @see java.lang.Object#clone()
1087 1089
     */
cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/IClassificationService.java
261 261
    @Deprecated
262 262
    public List<TaxonNode> loadChildNodesOfTaxonNode(TaxonNode taxonNode, List<String> propertyPaths);
263 263

  
264
    /**
265
     *
266
     * @param classification
267
     * @return
268
     */
269 264
    public List<UuidAndTitleCache<TaxonNode>> getTaxonNodeUuidAndTitleCacheOfAcceptedTaxaByClassification(Classification classification);
270 265

  
271 266
    public Map<UUID, List<MediaRepresentation>> getAllMediaForChildNodes(TaxonNode taxonNode, List<String> propertyPaths, int size, int height, int widthOrDuration, String[] mimeTypes);
......
328 323
     * The highter taxon is defined by rank where the lowest rank equal or above minRank
329 324
     * is taken. If maxRank <> null and no taxon exists with minRank <= rank <= maxRank
330 325
     * no higher taxon is returned for this taxon.
331
     *
332
     * @param taxonUuids
333
     * @param minRank
334
     * @param maxRank
335
     * @return
336 326
     */
337 327
    public List<GroupedTaxonDTO> groupTaxaByHigherTaxon(List<UUID> taxonUuids, UUID classificationUuid, Rank minRank, Rank maxRank);
338 328

  
339
    /**
340
     * @param taxonUuids
341
     * @param classificationUuid
342
     * @param markerType
343
     * @param value
344
     * @return
345
     */
346 329
    public List<GroupedTaxonDTO> groupTaxaByMarkedParents(List<UUID> taxonUuids, UUID classificationUuid,
347 330
            MarkerType markerType, Boolean value);
348 331

  
349

  
350 332
    /**
351 333
     * Returns the most relevant data of a taxon/taxon node, including children, synonyms
352 334
     * and certain ancestors if required.
353
     * @param classificationUuid
354
     * @param taxonUuid
355
     * @param doSynonyms
356
     * @param includeUnpublished
357
     * @param ancestorMarkers
358
     * @return
359 335
     */
360 336
    public TaxonInContextDTO getTaxonInContext(UUID classificationUuid, UUID taxonUuid,
361 337
            Boolean doChildren, Boolean doSynonyms, boolean includeUnpublished, List<UUID> ancestorMarkers,
362 338
            TaxonNodeSortMode sortMode);
363 339

  
364
    /**
365
     * @param classification
366
     * @return
367
     */
368 340
    public UUID saveClassification(Classification classification);
369 341

  
370
    /**
371
     * @param classificationUuid
372
     * @param limit
373
     * @param pattern
374
     * @param searchForClassifications
375
     * @return
376
     */
377 342
    public List<UuidAndTitleCache<TaxonNode>> getTaxonNodeUuidAndTitleCacheOfAcceptedTaxaByClassification(
378 343
            UUID classificationUuid, Integer limit, String pattern, boolean searchForClassifications);
379 344

  
380
    /**
381
     * @param classification
382
     * @param limit
383
     * @param pattern
384
     * @param searchForClassifications
385
     * @return
386
     */
387 345
    public List<UuidAndTitleCache<TaxonNode>> getTaxonNodeUuidAndTitleCacheOfAcceptedTaxaByClassification(
388 346
            Classification classification, Integer limit, String pattern, boolean searchForClassifications);
389 347

  
390
    /**
391
     * @param classificationUuid
392
     * @param searchForClassifications
393
     * @return
394
     */
395 348
    public List<UuidAndTitleCache<TaxonNode>> getTaxonNodeUuidAndTitleCacheOfAcceptedTaxaByClassification(
396 349
            UUID classificationUuid, boolean searchForClassifications);
397 350

  
398
    /**
399
     * @param classification
400
     * @param searchForClassifications
401
     * @return
402
     */
403 351
    public List<UuidAndTitleCache<TaxonNode>> getTaxonNodeUuidAndTitleCacheOfAcceptedTaxaByClassification(
404 352
            Classification classification, boolean searchForClassifications);
405 353

  
406
    /**
407
     * @param classificationUuid
408
     * @param limit
409
     * @param pattern
410
     * @param searchForClassifications
411
     * @param includeDoubtful
412
     * @return
413
     */
414 354
    List<UuidAndTitleCache<TaxonNode>> getTaxonNodeUuidAndTitleCacheOfAcceptedTaxaByClassification(
415 355
            UUID classificationUuid, Integer limit, String pattern, boolean searchForClassifications,
416 356
            boolean includeDoubtful);
cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/ITaxonNodeService.java
272 272

  
273 273
	public List<TaxonNodeDto> taxonNodeDtoParentRank(Classification classification, Rank rank, TaxonBase<?> taxonBase);
274 274

  
275
    /**
276
     * @param nodeUuids
277
     * @param propertyPaths
278
     * @param authentication
279
     * @param openChildren
280
     * @return
281
     */
282
    List<TaxonDistributionDTO> getTaxonDistributionDTO(List<UUID> nodeUuids, List<String> propertyPaths,
275
    public List<TaxonDistributionDTO> getTaxonDistributionDTO(List<UUID> nodeUuids, List<String> propertyPaths,
283 276
            Authentication authentication, boolean openChildren);
284 277

  
285 278
    /**
cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/TaxonNodeServiceImpl.java
94 94
public class TaxonNodeServiceImpl
95 95
           extends AnnotatableServiceBase<TaxonNode, ITaxonNodeDao>
96 96
           implements ITaxonNodeService{
97

  
97 98
    private static final Logger logger = Logger.getLogger(TaxonNodeServiceImpl.class);
98 99

  
99 100
    @Autowired
......
117 118
    @Autowired
118 119
    private IOriginalSourceDao sourceDao;
119 120

  
120

  
121 121
    @Autowired
122 122
    private ITaxonNodeFilterDao nodeFilterDao;
123 123

  

Also available in: Unified diff