Project

General

Profile

« Previous | Next » 

Revision 28a1ff46

Added by Katja Luther over 6 years ago

minor

View differences:

cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/taxon/TaxonNodeDaoHibernateImpl.java
451 451
     */
452 452
    //#3465
453 453
    @Override
454
    public Set<Taxon> setSecundumForSubtreeAcceptedTaxa(TreeIndex subTreeIndex, Reference newSec, boolean overwriteExisting, boolean includeSharedTaxa, boolean emptyDetail) {
454
    public Set<TaxonBase> setSecundumForSubtreeAcceptedTaxa(TreeIndex subTreeIndex, Reference newSec, boolean overwriteExisting, boolean includeSharedTaxa, boolean emptyDetail) {
455 455
        //for some reason this does not work, maybe because the listeners are not activated,
456 456
        //but also the first taxon for some reason does not get updated in terms of secundum, but only by the udpate listener
457 457
//        String where = "SELECT t.id FROM TaxonNode tn JOIN tn.taxon t " +
......
474 474
    }
475 475

  
476 476
    @Override
477
    public Set<Synonym> setSecundumForSubtreeSynonyms(TreeIndex subTreeIndex, Reference newSec, boolean overwriteExisting, boolean includeSharedTaxa, boolean emptyDetail) {
477
    public Set<TaxonBase> setSecundumForSubtreeSynonyms(TreeIndex subTreeIndex, Reference newSec, boolean overwriteExisting, boolean includeSharedTaxa, boolean emptyDetail) {
478 478

  
479 479
        String queryStr = synonymForSubtreeQueryStr(includeSharedTaxa, subTreeIndex);
480 480
        if (!overwriteExisting){
......
499 499
            }
500 500
        }
501 501
        Set<T> result = new HashSet<>(synonymList);
502

  
502 503
        return result;
503 504
    }
504 505

  
cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/taxon/ITaxonNodeDao.java
20 20
import eu.etaxonomy.cdm.model.taxon.Classification;
21 21
import eu.etaxonomy.cdm.model.taxon.Synonym;
22 22
import eu.etaxonomy.cdm.model.taxon.Taxon;
23
import eu.etaxonomy.cdm.model.taxon.TaxonBase;
23 24
import eu.etaxonomy.cdm.model.taxon.TaxonNode;
24 25
import eu.etaxonomy.cdm.model.taxon.TaxonNodeAgentRelation;
25 26
import eu.etaxonomy.cdm.persistence.dao.common.IAnnotatableDao;
......
129 130
     * @param ref
130 131
     * @return
131 132
     */
132
    public Set<Taxon> setSecundumForSubtreeAcceptedTaxa(TreeIndex subTreeIndex, Reference newSec, boolean overwriteExisting, boolean includeSharedTaxa, boolean emptyDetail);
133
    public Set<TaxonBase> setSecundumForSubtreeAcceptedTaxa(TreeIndex subTreeIndex, Reference newSec, boolean overwriteExisting, boolean includeSharedTaxa, boolean emptyDetail);
133 134

  
134 135
    /**
135 136
     * @param ref
136 137
     */
137
    public  Set<Synonym> setSecundumForSubtreeSynonyms(TreeIndex subTreeIndex, Reference newSec, boolean overwriteExisting, boolean includeSharedTaxa, boolean emptyDetail);
138
    public  Set<TaxonBase> setSecundumForSubtreeSynonyms(TreeIndex subTreeIndex, Reference newSec, boolean overwriteExisting, boolean includeSharedTaxa, boolean emptyDetail);
138 139

  
139 140
    /**
140 141
     * @param subTreeIndex

Also available in: Unified diff