Project

General

Profile

« Previous | Next » 

Revision a3c56b93

Added by Patrick Plitzner over 5 years ago

ref #7887 Use DTOs in term editor

View differences:

eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/DefinedTermSorter.java
10 10
package eu.etaxonomy.taxeditor.editor.definedterm;
11 11

  
12 12
import org.eclipse.jface.viewers.Viewer;
13
import org.eclipse.jface.viewers.ViewerSorter;
13
import org.eclipse.jface.viewers.ViewerComparator;
14 14

  
15 15
import eu.etaxonomy.cdm.model.common.OrderedTermBase;
16
import eu.etaxonomy.cdm.persistence.dto.TermDto;
16 17

  
17 18
/**
18 19
 * @author pplitzner
19 20
 * @date 13.02.2018
20 21
 *
21 22
 */
22
public class DefinedTermSorter extends ViewerSorter {
23
public class DefinedTermSorter extends ViewerComparator {
23 24

  
24 25
    @Override
25 26
    public int compare(Viewer viewer, Object e1, Object e2) {
26
        // the comparison value in this method determines the
27
     // the comparison value in this method determines the
27 28
        // location <-> add term method used in the MoveDefinedTermOperation
28 29
        // execute call
30
        //FIXME: remove this when all viewer are changed to use DTOs
29 31
        if(e1 instanceof OrderedTermBase && e2 instanceof OrderedTermBase) {
30 32
            OrderedTermBase otbe1 = (OrderedTermBase)e1;
31 33
            OrderedTermBase otbe2 = (OrderedTermBase)e2;
......
36 38
            } else{
37 39
                return 1;
38 40
            }
39
        } else {
41
        }
42
        else if(e1 instanceof TermDto && e2 instanceof TermDto) {
43
            TermDto termDto1 = (TermDto)e1;
44
            TermDto termDto2 = (TermDto)e2;
45
            if(termDto1.getOrderIndex() == termDto2.getOrderIndex()) {
46
                return 0;
47
            } else if (termDto1.getOrderIndex() < termDto2.getOrderIndex()){
48
                return -1;
49
            } else{
50
                return 1;
51
            }
52
        }
53
        else {
40 54
            return super.compare(viewer, e1, e2);
41 55
        }
42 56
    }

Also available in: Unified diff