Project

General

Profile

« Previous | Next » 

Revision 539106f0

Added by Katja Luther over 5 years ago

ref #7903: add comparator for taxa in cdm light configurator

View differences:

cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/cdmLight/CdmLightClassificationExport.java
11 11
import java.io.File;
12 12
import java.util.ArrayList;
13 13
import java.util.Collections;
14
import java.util.Comparator;
14 15
import java.util.HashSet;
15 16
import java.util.Iterator;
16 17
import java.util.List;
......
169 170
              //create sortIndex for nodes
170 171
                for(Entry<Integer, List<TaxonNodeDto>> entry :state.getNodeChildrenMap().entrySet()){
171 172
                    List<TaxonNodeDto> children = entry.getValue();
172
                    TaxonNodeDtoByRankAndNameComparator comp = new TaxonNodeDtoByRankAndNameComparator();
173
                    Comparator<TaxonNodeDto> comp = state.getConfig().getComparator();
174
                    if (comp == null){
175
                        comp = new TaxonNodeDtoByRankAndNameComparator();
176
                    }
173 177
                    Collections.sort(children, comp);
174 178
                    int index = 0;
175 179
                    for (TaxonNodeDto child:children) {
cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/cdmLight/CdmLightExportConfigurator.java
9 9
package eu.etaxonomy.cdm.io.cdmLight;
10 10

  
11 11
import java.io.File;
12
import java.util.Comparator;
12 13

  
13 14
import eu.etaxonomy.cdm.io.common.CsvIOConfigurator;
14 15
import eu.etaxonomy.cdm.io.common.ExportConfiguratorBase;
15 16
import eu.etaxonomy.cdm.io.common.ExportResultType;
16 17
import eu.etaxonomy.cdm.io.common.mapping.out.IExportTransformer;
18
import eu.etaxonomy.cdm.persistence.dto.TaxonNodeDto;
17 19

  
18 20
/**
19 21
 * @author k.luther
......
39 41

  
40 42
    private boolean isFilterIntextReferences = true;
41 43

  
44
    private Comparator<TaxonNodeDto> comparator;
45

  
42 46
    /**
43 47
     * @param transformer
44 48
     */
......
136 140
    }
137 141

  
138 142

  
143
    /**
144
     * @return the comparator
145
     */
146
    public Comparator<TaxonNodeDto> getComparator() {
147
        return comparator;
148
    }
149

  
150

  
151
    /**
152
     * @param comparator the comparator to set
153
     */
154
    public void setComparator(Comparator<TaxonNodeDto> comparator) {
155
        this.comparator = comparator;
156
    }
157

  
158

  
139 159
//    public Set<UUID> getTaxonNodeUuids() {
140 160
//        return taxonNodeUuids;
141 161
//    }
cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/cdmLight/CdmLightExportResultProcessor.java
105 105
            state.setHomotypicalGroupStore(new HashMap<>());
106 106
            state.setReferenceStore(new HashMap<>());
107 107
            state.setSpecimenStore(new HashMap<>());
108
            state.setNodeChildrenMap(new HashMap<>());
108 109
            //Replace quotes by double quotes
109 110
            for (CdmLightExportTable table: result.keySet()){
110 111
                //schreibe jede Tabelle in einen Stream...

Also available in: Unified diff