Project

General

Profile

« Previous | Next » 

Revision 1b0d0ec1

Added by Patrick Plitzner over 6 years ago

ref #5714 Fix ordering of source types

  • order by key instead of message
  • always have either taxonomic or media source as first and the other as second

View differences:

eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/supplemental/AbstractOriginalSourceElement.java
89 89 
                return -1;
90 90 
            }
91 91 
            else if(o1!=null && o2 !=null){
92 
                if(entity.getType().equals(OriginalSourceType.PrimaryMediaSource)){
93 
                    if(o1.equals(OriginalSourceType.PrimaryMediaSource)){
92 
                //both are either taxonomic or media
93 
                if(o1.equals(OriginalSourceType.PrimaryTaxonomicSource)
94 
                        && o2.equals(OriginalSourceType.PrimaryMediaSource)){
95 
                    if(entity.getType().equals(OriginalSourceType.PrimaryMediaSource)){
96 
                        return 1;
97 
                    }
98 
                    else{
99 
                        return -1;
100 
                    }
101 
                }
102 
                else if(o2.equals(OriginalSourceType.PrimaryTaxonomicSource)
103 
                        && o1.equals(OriginalSourceType.PrimaryMediaSource)){
104 
                    if(entity.getType().equals(OriginalSourceType.PrimaryMediaSource)){
94 105 
                        return -1;
95 106 
                    }
96 
                    else if(o2.equals(OriginalSourceType.PrimaryMediaSource)){
107 
                    else{
97 108 
                        return 1;
98 109 
                    }
99 110 
                }
111 
                //one is not taxonomic or media
100 112 
                else{
101 
                    if(o1.equals(OriginalSourceType.PrimaryTaxonomicSource)){
113 
                    if(o1.equals(OriginalSourceType.PrimaryTaxonomicSource)
114 
                            ||o1.equals(OriginalSourceType.PrimaryMediaSource)){
102 115 
                        return -1;
116 

  		




  103
  117
  
    
                    }


  		




  104
  
  
    
                    else if(o2.equals(OriginalSourceType.PrimaryTaxonomicSource)){


  		




  
  118
  
    
                    else if(o2.equals(OriginalSourceType.PrimaryTaxonomicSource)


  		




  
  119
  
    
                            || o2.equals(OriginalSourceType.PrimaryMediaSource)){


  		




  105
  120
  
    
                        return 1;


  		




  106
  121
  
    
                    }


  		




  
  122
  
    
                    String message1 = o1.getKey();


  		




  
  123
  
    
                    String message2 = o2.getKey();


  		




  
  124
  
    
                    return message1.compareTo(message2);


  		




  107
  125
  
    
                }


  		




  108
  
  
    
                String message1 = o1.getMessage();


  		




  109
  
  
    
                String message2 = o2.getMessage();


  		




  110
  
  
    
                return message1.compareTo(message2);


  		




  111
  126
  
    
            }


  		




  112
  127
  
    
            return 0;


  		




  113
  128
  
    
        }


  		












Also available in:  Unified diff