Project

General

Profile

« Previous | Next » 

Revision bd424526

Added by Katja Luther over 6 years ago

smaller changes in ForSubtreeConfigurator

View differences:

cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/operation/config/ForSubtreeConfiguratorBase.java
1
/**
2
* Copyright (C) 2017 EDIT
3
* European Distributed Institute of Taxonomy
4
* http://www.e-taxonomy.eu
5
*
6
* The contents of this file are subject to the Mozilla Public License Version 1.1
7
* See LICENSE.TXT at the top of this package for the full license terms.
8
*/
9
package eu.etaxonomy.cdm.io.operation.config;
10

  
11
import java.util.UUID;
12

  
13
import eu.etaxonomy.cdm.common.monitor.IProgressMonitor;
14
import eu.etaxonomy.cdm.io.common.DefaultImportState;
15
import eu.etaxonomy.cdm.io.common.IImportConfigurator;
16
import eu.etaxonomy.cdm.io.common.ImportConfiguratorBase;
17
import eu.etaxonomy.cdm.model.reference.Reference;
18

  
19
/**
20
 * Configurator for the setSecundumForSubtree operation.
21
 *
22
 * @author a.mueller
23
 * @date 06.01.2017
24
 *
25
 */
26
public abstract class ForSubtreeConfiguratorBase<CONFIG extends ImportConfiguratorBase>
27
        extends ImportConfiguratorBase<DefaultImportState<CONFIG>, Object>
28
        implements IImportConfigurator{
29

  
30
    private static final long serialVersionUID = 2756961021157678305L;
31

  
32
    private UUID subtreeUuid;
33
    private boolean includeAcceptedTaxa = true;
34
    private boolean includeSynonyms = true;
35
    private boolean includeSharedTaxa = true;
36
    private IProgressMonitor monitor;
37

  
38
    /**
39
     * @param monitor the monitor to set
40
     */
41
    public void setMonitor(IProgressMonitor monitor) {
42
        this.monitor = monitor;
43
    }
44

  
45
    /**
46
     * @param subtreeUuid
47
     * @param newSecundum
48
     */
49
    public ForSubtreeConfiguratorBase(UUID subtreeUuid, IProgressMonitor monitor) {
50
        super(null);
51
        this.subtreeUuid = subtreeUuid;
52
        this.monitor = monitor;
53
    }
54

  
55
    /**
56
     * @param subtreeUuid
57
     * @param newSecundum
58
     */
59
    public ForSubtreeConfiguratorBase(UUID subtreeUuid) {
60
        super(null);
61
        this.subtreeUuid = subtreeUuid;
62
    }
63

  
64
    public UUID getSubtreeUuid() {
65
        return subtreeUuid;
66
    }
67
    public void setSubtreeUuid(UUID subtreeUuid) {
68
        this.subtreeUuid = subtreeUuid;
69
    }
70

  
71

  
72
    public boolean isIncludeSynonyms() {
73
        return includeSynonyms;
74
    }
75
    public void setIncludeSynonyms(boolean includeSynonyms) {
76
        this.includeSynonyms = includeSynonyms;
77
    }
78

  
79
    public boolean isIncludeAcceptedTaxa() {
80
        return includeAcceptedTaxa;
81
    }
82
    public void setIncludeAcceptedTaxa(boolean includeAcceptedTaxa) {
83
        this.includeAcceptedTaxa = includeAcceptedTaxa;
84
    }
85

  
86
    public boolean isIncludeSharedTaxa() {
87
        return includeSharedTaxa;
88
    }
89
    public void setIncludeSharedTaxa(boolean includeSharedTaxa) {
90
        this.includeSharedTaxa = includeSharedTaxa;
91
    }
92

  
93
    /**
94
     * @return
95
     */
96
    public IProgressMonitor getMonitor() {
97

  
98
        return monitor;
99
    }
100

  
101
    /**
102
     * {@inheritDoc}
103
     */
104
    @SuppressWarnings("rawtypes")
105
    @Override
106
    public DefaultImportState getNewState() {
107
      return new DefaultImportState(this);
108
    }
109

  
110
    /**
111
     * {@inheritDoc}
112
     */
113
    @Override
114
    public Reference getSourceReference() {
115
        return null;
116
    }
117

  
118
    @Override
119
    public boolean isValid(){
120
        return true;
121
    }
122

  
123
}
cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/operation/config/ForSubtreeConfiguratorBaseA.java
1
/**
2
* Copyright (C) 2017 EDIT
3
* European Distributed Institute of Taxonomy
4
* http://www.e-taxonomy.eu
5
*
6
* The contents of this file are subject to the Mozilla Public License Version 1.1
7
* See LICENSE.TXT at the top of this package for the full license terms.
8
*/
9
package eu.etaxonomy.cdm.io.operation.config;
10

  
11
import java.util.UUID;
12

  
13
import eu.etaxonomy.cdm.common.monitor.IProgressMonitor;
14
import eu.etaxonomy.cdm.io.common.DefaultImportState;
15
import eu.etaxonomy.cdm.io.common.IImportConfigurator;
16
import eu.etaxonomy.cdm.io.common.ImportConfiguratorBase;
17
import eu.etaxonomy.cdm.model.reference.Reference;
18

  
19
/**
20
 * Configurator for the setSecundumForSubtree operation.
21
 *
22
 * @author a.mueller
23
 * @date 06.01.2017
24
 *
25
 */
26
public abstract class ForSubtreeConfiguratorBase<CONFIG extends ImportConfiguratorBase>
27
        extends ImportConfiguratorBase<DefaultImportState<CONFIG>, Object>
28
        implements IImportConfigurator{
29

  
30
    private static final long serialVersionUID = 2756961021157678305L;
31

  
32
    private UUID subtreeUuid;
33
    private boolean includeAcceptedTaxa = true;
34
    private boolean includeSynonyms = true;
35
    private boolean includeSharedTaxa = true;
36
    private IProgressMonitor monitor;
37

  
38
    /**
39
     * @param monitor the monitor to set
40
     */
41
    public void setMonitor(IProgressMonitor monitor) {
42
        this.monitor = monitor;
43
    }
44

  
45
    /**
46
     * @param subtreeUuid
47
     * @param newSecundum
48
     */
49
    public ForSubtreeConfiguratorBase(UUID subtreeUuid, IProgressMonitor monitor) {
50
        super(null);
51
        this.subtreeUuid = subtreeUuid;
52
        this.monitor = monitor;
53
    }
54

  
55
    /**
56
     * @param subtreeUuid
57
     * @param newSecundum
58
     */
59
    public ForSubtreeConfiguratorBase(UUID subtreeUuid) {
60
        super(null);
61
        this.subtreeUuid = subtreeUuid;
62
    }
63

  
64
    public UUID getSubtreeUuid() {
65
        return subtreeUuid;
66
    }
67
    public void setSubtreeUuid(UUID subtreeUuid) {
68
        this.subtreeUuid = subtreeUuid;
69
    }
70

  
71

  
72
    public boolean isIncludeSynonyms() {
73
        return includeSynonyms;
74
    }
75
    public void setIncludeSynonyms(boolean includeSynonyms) {
76
        this.includeSynonyms = includeSynonyms;
77
    }
78

  
79
    public boolean isIncludeAcceptedTaxa() {
80
        return includeAcceptedTaxa;
81
    }
82
    public void setIncludeAcceptedTaxa(boolean includeAcceptedTaxa) {
83
        this.includeAcceptedTaxa = includeAcceptedTaxa;
84
    }
85

  
86
    public boolean isIncludeSharedTaxa() {
87
        return includeSharedTaxa;
88
    }
89
    public void setIncludeSharedTaxa(boolean includeSharedTaxa) {
90
        this.includeSharedTaxa = includeSharedTaxa;
91
    }
92

  
93
    /**
94
     * @return
95
     */
96
    public IProgressMonitor getMonitor() {
97

  
98
        return monitor;
99
    }
100

  
101
    /**
102
     * {@inheritDoc}
103
     */
104
    @SuppressWarnings("rawtypes")
105
    @Override
106
    public DefaultImportState getNewState() {
107
      return new DefaultImportState(this);
108
    }
109

  
110
    /**
111
     * {@inheritDoc}
112
     */
113
    @Override
114
    public Reference getSourceReference() {
115
        return null;
116
    }
117

  
118
    @Override
119
    public boolean isValid(){
120
        return true;
121
    }
122

  
123
}
cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/taxon/TaxonNodeDaoHibernateImpl.java
43 43
import eu.etaxonomy.cdm.persistence.dao.taxon.IClassificationDao;
44 44
import eu.etaxonomy.cdm.persistence.dao.taxon.ITaxonDao;
45 45
import eu.etaxonomy.cdm.persistence.dao.taxon.ITaxonNodeDao;
46
import eu.etaxonomy.cdm.persistence.dto.MergeResult;
46 47
import eu.etaxonomy.cdm.persistence.dto.UuidAndTitleCache;
47 48

  
48 49
/**
......
492 493
        Query query = getSession().createQuery(queryStr);
493 494
        @SuppressWarnings("unchecked")
494 495
        List<T> synonymList = query.list();
496
        MergeResult mergeResult;
497
        Set<T> result = new HashSet<>();
495 498
        for (T taxonBase : synonymList){
499
            taxonBase = (T) taxonDao.load(taxonBase.getUuid());
500

  
496 501
            taxonBase.setSec(newSec);
497 502
            if (emptyDetail){
498 503
                taxonBase.setSecMicroReference(null);
499 504
            }
500
        }
501
        Set<T> result = new HashSet<>(synonymList);
502 505

  
503
        return result;
506
           result.add(taxonBase);
507

  
508
        }
509
      return result;
504 510
    }
505 511

  
506 512

  
cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/ITaxonNodeService.java
14 14
import java.util.Set;
15 15
import java.util.UUID;
16 16

  
17
import eu.etaxonomy.cdm.api.service.config.SetSecundumForSubtreeConfigurator;
17
import eu.etaxonomy.cdm.api.service.config.SecundumForSubtreeConfigurator;
18 18
import eu.etaxonomy.cdm.api.service.config.TaxonDeletionConfigurator;
19 19
import eu.etaxonomy.cdm.api.service.pager.Pager;
20 20
import eu.etaxonomy.cdm.common.monitor.IProgressMonitor;
......
252 252
     * @param configurator
253 253
     * @return UpdateResult
254 254
     */
255
    public UpdateResult setSecundumForSubtree(SetSecundumForSubtreeConfigurator config);
255
    public UpdateResult setSecundumForSubtree(SecundumForSubtreeConfigurator config);
256 256

  
257 257

  
258 258
    /**
......
296 296
     * @param configurator
297 297
     * @return
298 298
     */
299
    UUID monitSetSecundum(SetSecundumForSubtreeConfigurator configurator);
299
    UUID monitSetSecundum(SecundumForSubtreeConfigurator configurator);
300 300

  
301 301
}
cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/TaxonNodeServiceImpl.java
26 26

  
27 27
import eu.etaxonomy.cdm.api.service.UpdateResult.Status;
28 28
import eu.etaxonomy.cdm.api.service.config.NodeDeletionConfigurator.ChildHandling;
29
import eu.etaxonomy.cdm.api.service.config.SetSecundumForSubtreeConfigurator;
29
import eu.etaxonomy.cdm.api.service.config.SecundumForSubtreeConfigurator;
30 30
import eu.etaxonomy.cdm.api.service.config.TaxonDeletionConfigurator;
31 31
import eu.etaxonomy.cdm.api.service.config.TaxonNodeDeletionConfigurator;
32 32
import eu.etaxonomy.cdm.api.service.dto.CdmEntityIdentifier;
......
757 757

  
758 758
    @Override
759 759
    @Transactional
760
    public UpdateResult setSecundumForSubtree(SetSecundumForSubtreeConfigurator config) {
760
    public UpdateResult setSecundumForSubtree(SecundumForSubtreeConfigurator config) {
761 761
        UpdateResult result = new UpdateResult();
762 762
       // IProgressMonitor monitor = config.getMonitor();
763 763
        IProgressMonitor monitor = config.getMonitor();
764 764
        if (monitor == null){
765 765
            monitor = DefaultProgressMonitor.NewInstance();
766 766
        }
767

  
767 768
        monitor.beginTask("Update Secundum Reference", 100);
768 769
        if (config.getSubtreeUuid() == null){
769 770
            result.setError();
......
771 772
            monitor.done();
772 773
            return result;
773 774
        }
774
        TaxonNode subTree = find(config.getSubtreeUuid());
775
        TaxonNode subTree = load(config.getSubtreeUuid());
775 776
        if (subTree == null){
776 777
            result.setError();
777 778
            result.addException(new NullPointerException("Subtree does not exist"));
......
784 785
        if (config.isIncludeAcceptedTaxa()){
785 786
            monitor.subTask("Update Accepted Taxa");
786 787
            Set<TaxonBase> updatedTaxa = dao.setSecundumForSubtreeAcceptedTaxa(subTreeIndex, config.getNewSecundum(), config.isOverwriteExistingAccepted(), config.isIncludeSharedTaxa(), config.isEmptySecundumDetail());
787
            taxonService.saveOrUpdate(updatedTaxa);
788
//            taxonService.saveOrUpdate(updatedTaxa);
789

  
788 790
            result.addUpdatedObjects(updatedTaxa);
789 791
        }
790 792
        if (config.isIncludeSynonyms()){
791 793
            monitor.subTask("Update Synonyms");
792 794
            Set<TaxonBase> updatedSynonyms = dao.setSecundumForSubtreeSynonyms(subTreeIndex, config.getNewSecundum(), config.isOverwriteExistingSynonyms(), config.isIncludeSharedTaxa() , config.isEmptySecundumDetail());
793
            taxonService.saveOrUpdate(updatedSynonyms);
795
//            taxonService.saveOrUpdate(updatedSynonyms);
796

  
794 797
            result.addUpdatedObjects(updatedSynonyms);
795 798
        }
796 799

  
......
858 861
    }
859 862

  
860 863
    @Override
861
    public UUID monitSetSecundum(final SetSecundumForSubtreeConfigurator configurator) {
864
    public UUID monitSetSecundum(final SecundumForSubtreeConfigurator configurator) {
862 865
        RemotingProgressMonitorThread monitorThread = new RemotingProgressMonitorThread() {
863 866
            @Override
864 867
            public Serializable doRun(IRemotingProgressMonitor monitor) {
865

  
866 868
                configurator.setMonitor(monitor);
867 869
                UpdateResult result = setSecundumForSubtree(configurator);
868

  
869 870
                return result;
870 871
            }
871 872
        };
cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/config/ForSubtreeConfiguratorBase.java
1
/**
2
* Copyright (C) 2017 EDIT
3
* European Distributed Institute of Taxonomy
4
* http://www.e-taxonomy.eu
5
*
6
* The contents of this file are subject to the Mozilla Public License Version 1.1
7
* See LICENSE.TXT at the top of this package for the full license terms.
8
*/
9
package eu.etaxonomy.cdm.api.service.config;
10

  
11
import java.io.Serializable;
12
import java.util.UUID;
13

  
14
import eu.etaxonomy.cdm.common.monitor.IProgressMonitor;
15

  
16
/**
17
 * Configurator for the setSecundumForSubtree operation.
18
 *
19
 * @author a.mueller
20
 * @date 06.01.2017
21
 *
22
 */
23
public abstract class ForSubtreeConfiguratorBase implements Serializable{//<CONFIG extends ImportConfiguratorBase>
24
//        extends ImportConfiguratorBase<DefaultImportState<CONFIG>, Object>
25
//        implements IImportConfigurator{
26

  
27
    private static final long serialVersionUID = 2756961021157678305L;
28

  
29
    private UUID subtreeUuid;
30
    private boolean includeAcceptedTaxa = true;
31
    private boolean includeSynonyms = true;
32
    private boolean includeSharedTaxa = true;
33
    private IProgressMonitor monitor;
34

  
35
    /**
36
     * @param monitor the monitor to set
37
     */
38
    public void setMonitor(IProgressMonitor monitor) {
39
        this.monitor = monitor;
40
    }
41

  
42
    /**
43
     * @param subtreeUuid
44
     * @param newSecundum
45
     */
46
    public ForSubtreeConfiguratorBase(UUID subtreeUuid, IProgressMonitor monitor) {
47
//        super(null);
48
        this.subtreeUuid = subtreeUuid;
49
        this.monitor = monitor;
50
    }
51

  
52
    /**
53
     * @param subtreeUuid
54
     * @param newSecundum
55
     */
56
    public ForSubtreeConfiguratorBase(UUID subtreeUuid) {
57
//        super(null);
58
        this.subtreeUuid = subtreeUuid;
59
    }
60

  
61
    public UUID getSubtreeUuid() {
62
        return subtreeUuid;
63
    }
64
    public void setSubtreeUuid(UUID subtreeUuid) {
65
        this.subtreeUuid = subtreeUuid;
66
    }
67

  
68

  
69
    public boolean isIncludeSynonyms() {
70
        return includeSynonyms;
71
    }
72
    public void setIncludeSynonyms(boolean includeSynonyms) {
73
        this.includeSynonyms = includeSynonyms;
74
    }
75

  
76
    public boolean isIncludeAcceptedTaxa() {
77
        return includeAcceptedTaxa;
78
    }
79
    public void setIncludeAcceptedTaxa(boolean includeAcceptedTaxa) {
80
        this.includeAcceptedTaxa = includeAcceptedTaxa;
81
    }
82

  
83
    public boolean isIncludeSharedTaxa() {
84
        return includeSharedTaxa;
85
    }
86
    public void setIncludeSharedTaxa(boolean includeSharedTaxa) {
87
        this.includeSharedTaxa = includeSharedTaxa;
88
    }
89

  
90
    /**
91
     * @return
92
     */
93
    public IProgressMonitor getMonitor() {
94

  
95
        return monitor;
96
    }
97

  
98
//    /**
99
//     * {@inheritDoc}
100
//     */
101
//    @SuppressWarnings("rawtypes")
102
//    @Override
103
//    public DefaultImportState getNewState() {
104
//      return new DefaultImportState(this);
105
//    }
106

  
107
//    /**
108
//     * {@inheritDoc}
109
//     */
110
//    @Override
111
//    public Reference getSourceReference() {
112
//        return null;
113
//    }
114
//
115
//    @Override
116
//    public boolean isValid(){
117
//        return true;
118
//    }
119

  
120
}
cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/config/PublishForSubtreeConfigurator.java
1
/**
2
* Copyright (C) 2017 EDIT
3
* European Distributed Institute of Taxonomy
4
* http://www.e-taxonomy.eu
5
*
6
* The contents of this file are subject to the Mozilla Public License Version 1.1
7
* See LICENSE.TXT at the top of this package for the full license terms.
8
*/
9
package eu.etaxonomy.cdm.api.service.config;
10

  
11
import java.util.UUID;
12

  
13
import eu.etaxonomy.cdm.common.monitor.IProgressMonitor;
14

  
15
/**
16
 * Configurator for the setPublishForSubtree operation.
17
 *
18
 * @author a.mueller
19
 * @date 13.09.2017
20
 *
21
 */
22
public class PublishForSubtreeConfigurator
23
            extends ForSubtreeConfiguratorBase{
24

  
25
    private static final long serialVersionUID = 1202667588493272030L;
26

  
27
    private boolean publish = false;
28

  
29
    /**
30
     * @param subtreeUuid
31
     * @param newSecundum
32
     */
33
    public PublishForSubtreeConfigurator(UUID subtreeUuid, boolean publish, IProgressMonitor monitor) {
34
        super(subtreeUuid, monitor);
35
        this.publish = publish;
36
    }
37

  
38
    /**
39
     * @param subtreeUuid
40
     * @param newSecundum
41
     */
42
    public PublishForSubtreeConfigurator(UUID subtreeUuid) {
43
        super(subtreeUuid);
44
        // this.newSecundum = newSecundum;
45
    }
46

  
47
    public boolean isPublish() {
48
        return publish;
49
    }
50
    public void setPublish(boolean publish) {
51
        this.publish = publish;
52
    }
53

  
54

  
55

  
56
}
cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/config/SetSecundumForSubtreeConfigurator.java
1
package eu.etaxonomy.cdm.api.service.config;
2

  
3
import java.io.Serializable;
4

  
5
/**
6
* Copyright (C) 2017 EDIT
7
* European Distributed Institute of Taxonomy
8
* http://www.e-taxonomy.eu
9
*
10
* The contents of this file are subject to the Mozilla Public License Version 1.1
11
* See LICENSE.TXT at the top of this package for the full license terms.
12
*/
13

  
14

  
15
import java.util.UUID;
16

  
17
import eu.etaxonomy.cdm.common.monitor.IRemotingProgressMonitor;
18
import eu.etaxonomy.cdm.model.reference.Reference;
19

  
20
/**
21
 * Configurator for the setSecundumForSubtree operation.
22
 *
23
 * @author a.mueller
24
 * @date 06.01.2017
25
 *
26
 */
27
public class SetSecundumForSubtreeConfigurator implements Serializable{
28
    private UUID subtreeUuid;
29
    private Reference newSecundum;
30
    private boolean includeAcceptedTaxa = true;
31
    private boolean includeSynonyms = true;
32
    private boolean overwriteExistingAccepted = true;
33
    private boolean overwriteExistingSynonyms = true;
34
    private boolean emptySecundumDetail = true;
35
    private boolean includeSharedTaxa = true;
36
    private IRemotingProgressMonitor monitor;
37

  
38
    /**
39
     * @param monitor the monitor to set
40
     */
41
    public void setMonitor(IRemotingProgressMonitor monitor) {
42
        this.monitor = monitor;
43
    }
44

  
45
    /**
46
     * @param subtreeUuid
47
     * @param newSecundum
48
     */
49
    public SetSecundumForSubtreeConfigurator(UUID subtreeUuid, Reference newSecundum, IRemotingProgressMonitor monitor) {
50
        this.subtreeUuid = subtreeUuid;
51
        this.newSecundum = newSecundum;
52
        this.monitor = monitor;
53
    }
54

  
55
    /**
56
     * @param subtreeUuid
57
     * @param newSecundum
58
     */
59
    public SetSecundumForSubtreeConfigurator(UUID subtreeUuid) {
60
        this.subtreeUuid = subtreeUuid;
61
        // this.newSecundum = newSecundum;
62
    }
63

  
64
    /**
65
     * @return the subtreeUuid
66
     */
67
    public UUID getSubtreeUuid() {
68
        return subtreeUuid;
69
    }
70

  
71
    /**
72
     * @param subtreeUuid
73
     *            the subtreeUuid to set
74
     */
75
    public void setSubtreeUuid(UUID subtreeUuid) {
76
        this.subtreeUuid = subtreeUuid;
77
    }
78

  
79
    /**
80
     * @return the newSecundum
81
     */
82
    public Reference getNewSecundum() {
83
        return newSecundum;
84
    }
85

  
86
    /**
87
     * @param newSecundum
88
     *            the newSecundum to set
89
     */
90
    public void setNewSecundum(Reference newSecundum) {
91
        this.newSecundum = newSecundum;
92
    }
93

  
94
    /**
95
     * @return the overrideExisting
96
     */
97
    public boolean isOverwriteExistingAccepted() {
98
        return overwriteExistingAccepted;
99
    }
100

  
101
    /**
102
     * @param overrideExisting
103
     *            the overrideExisting to set
104
     */
105
    public void setOverwriteExistingAccepted(boolean overwriteExistingAccepted) {
106
        this.overwriteExistingAccepted = overwriteExistingAccepted;
107
    }
108

  
109
    /**
110
     * @return the overrideExisting
111
     */
112
    public boolean isOverwriteExistingSynonyms() {
113
        return overwriteExistingSynonyms;
114
    }
115

  
116
    /**
117
     * @param overrideExisting
118
     *            the overrideExisting to set
119
     */
120
    public void setOverwriteExistingSynonyms(boolean overwriteExistingSynonyms) {
121
        this.overwriteExistingSynonyms = overwriteExistingSynonyms;
122
    }
123

  
124
    /**
125
     * @return the emptySecundumDetail
126
     */
127
    public boolean isEmptySecundumDetail() {
128
        return emptySecundumDetail;
129
    }
130

  
131
    /**
132
     * @param emptySecundumDetail
133
     *            the emptySecundumDetail to set
134
     */
135
    public void setEmptySecundumDetail(boolean emptySecundumDetail) {
136
        this.emptySecundumDetail = emptySecundumDetail;
137
    }
138

  
139
    /**
140
     * @return the includeSynonyms
141
     */
142
    public boolean isIncludeSynonyms() {
143
        return includeSynonyms;
144
    }
145

  
146
    /**
147
     * @param includeSynonyms
148
     *            the includeSynonyms to set
149
     */
150
    public void setIncludeSynonyms(boolean includeSynonyms) {
151
        this.includeSynonyms = includeSynonyms;
152
    }
153

  
154
    /**
155
     * @return the includeAcceptedTaxa
156
     */
157
    public boolean isIncludeAcceptedTaxa() {
158
        return includeAcceptedTaxa;
159
    }
160

  
161
    /**
162
     * @param includeAcceptedTaxa
163
     *            the includeAcceptedTaxa to set
164
     */
165
    public void setIncludeAcceptedTaxa(boolean includeAcceptedTaxa) {
166
        this.includeAcceptedTaxa = includeAcceptedTaxa;
167
    }
168

  
169
    /**
170
     * @return the includeSharedTaxa
171
     */
172
    public boolean isIncludeSharedTaxa() {
173
        return includeSharedTaxa;
174
    }
175

  
176
    /**
177
     * @param includeSharedTaxa
178
     *            the includeSharedTaxa to set
179
     */
180
    public void setIncludeSharedTaxa(boolean includeSharedTaxa) {
181
        this.includeSharedTaxa = includeSharedTaxa;
182
    }
183

  
184
    /**
185
     * @return
186
     */
187
    public IRemotingProgressMonitor getMonitor() {
188

  
189
        return monitor;
190
    }
191

  
192
}
cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/TaxonNodeServiceImplTest.java
29 29
import org.unitils.dbunit.annotation.DataSet;
30 30
import org.unitils.spring.annotation.SpringBeanByType;
31 31

  
32
import eu.etaxonomy.cdm.api.service.config.SetSecundumForSubtreeConfigurator;
32
import eu.etaxonomy.cdm.api.service.config.SecundumForSubtreeConfigurator;
33 33
import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper;
34 34
import eu.etaxonomy.cdm.model.common.CdmBase;
35 35
import eu.etaxonomy.cdm.model.description.PolytomousKey;
......
724 724
        Assert.assertNotNull(taxon5.getSecMicroReference());
725 725

  
726 726
        //set secundum
727
        SetSecundumForSubtreeConfigurator config = new SetSecundumForSubtreeConfigurator(subTreeUuid);
727
        SecundumForSubtreeConfigurator config = new SecundumForSubtreeConfigurator(subTreeUuid);
728 728
        config.setNewSecundum(newSec);
729 729
        taxonNodeService.setSecundumForSubtree(config);
730 730

  
......
758 758
        Assert.assertNotNull(taxon5.getSecMicroReference());
759 759

  
760 760
        //set secundum
761
        SetSecundumForSubtreeConfigurator config = new SetSecundumForSubtreeConfigurator(subTreeUuid, newSec, null);
761
        SecundumForSubtreeConfigurator config = new SecundumForSubtreeConfigurator(subTreeUuid, newSec, null);
762 762
        config.setOverwriteExistingAccepted(false);
763 763
        config.setOverwriteExistingSynonyms(false);
764 764
        taxonNodeService.setSecundumForSubtree(config);
......
793 793
        Assert.assertNotNull(taxon5.getSecMicroReference());
794 794

  
795 795
        //set secundum
796
        SetSecundumForSubtreeConfigurator config = new SetSecundumForSubtreeConfigurator(subTreeUuid, newSec, null);
796
        SecundumForSubtreeConfigurator config = new SecundumForSubtreeConfigurator(subTreeUuid, newSec, null);
797 797
        config.setIncludeSynonyms(false);
798 798
        taxonNodeService.setSecundumForSubtree(config);
799 799

  
800
        commitAndStartNewTransaction(new String[]{"TaxonBase","TaxonBase_AUD"});
800
//        commitAndStartNewTransaction(new String[]{"TaxonBase","TaxonBase_AUD"});
801 801
        Assert.assertEquals(newSec, taxonService.find(1).getSec());
802 802
        Assert.assertNull(taxonService.find(2).getSec());
803 803
        Assert.assertNull(taxonService.find(3).getSec());
......
825 825
        Assert.assertNotNull(taxon5.getSecMicroReference());
826 826

  
827 827
        //set secundum
828
        SetSecundumForSubtreeConfigurator config = new SetSecundumForSubtreeConfigurator(subTreeUuid, newSec, null);
828
        SecundumForSubtreeConfigurator config = new SecundumForSubtreeConfigurator(subTreeUuid, newSec, null);
829 829
        config.setIncludeAcceptedTaxa(false);
830 830
        taxonNodeService.setSecundumForSubtree(config);
831 831

  
......
859 859
        Assert.assertNotNull(taxon5.getSecMicroReference());
860 860

  
861 861
        //set secundum
862
        SetSecundumForSubtreeConfigurator config = new SetSecundumForSubtreeConfigurator(subTreeUuid, newSec, null);
862
        SecundumForSubtreeConfigurator config = new SecundumForSubtreeConfigurator(subTreeUuid, newSec, null);
863 863
        config.setIncludeSharedTaxa(false);
864 864
        taxonNodeService.setSecundumForSubtree(config);
865 865

  
......
886 886
        Assert.assertTrue(taxonService.find(5).isPublish());
887 887

  
888 888
        //set publish
889
//        SetSecundumForSubtreeConfigurator config = new SetPublishForSubtreeConfigurator(subTreeUuid);
889
//        SecundumForSubtreeConfigurator config = new SetPublishForSubtreeConfigurator(subTreeUuid);
890 890
//        config.setNewSecundum(newSec);
891 891
        boolean publish = false;
892 892
        taxonNodeService.setPublishForSubtree(subTreeUuid,  publish, true, true, true, null);
......
912 912
        Assert.assertTrue(taxonService.find(5).isPublish());
913 913

  
914 914
        //set secundum
915
//        SetSecundumForSubtreeConfigurator config = new SetPublishForSubtreeConfigurator(subTreeUuid, newSec, null);
915
//        SecundumForSubtreeConfigurator config = new SetPublishForSubtreeConfigurator(subTreeUuid, newSec, null);
916 916
//        config.setIncludeSynonyms(false);
917 917
        boolean publish = false;
918 918
        taxonNodeService.setPublishForSubtree(subTreeUuid,  publish, true, false, true, null);
......
938 938
        Assert.assertTrue(taxonService.find(5).isPublish());
939 939

  
940 940
        //set secundum
941
//        SetSecundumForSubtreeConfigurator config = new SetPublishForSubtreeConfigurator(subTreeUuid, newSec, null);
941
//        SecundumForSubtreeConfigurator config = new SetPublishForSubtreeConfigurator(subTreeUuid, newSec, null);
942 942
//        config.setIncludeAcceptedTaxa(false);
943 943
        boolean publish = false;
944 944
        taxonNodeService.setPublishForSubtree(subTreeUuid,  publish, false, true, true, null);
......
965 965
        Assert.assertTrue(taxonService.find(5).isPublish());
966 966

  
967 967
        //set secundum
968
     //   SetSecundumForSubtreeConfigurator config = new SetPublishForSubtreeConfigurator(subTreeUuid, newSec, null);
968
     //   SecundumForSubtreeConfigurator config = new SetPublishForSubtreeConfigurator(subTreeUuid, newSec, null);
969 969
   //     config.setIncludeSharedTaxa(false);
970 970
        boolean publish = false;
971 971
        taxonNodeService.setPublishForSubtree(subTreeUuid, publish, true, true, false, null);

Also available in: Unified diff