return 1;
}
// sort by type (Primary taxonomic > Primary Media > others
// alphabetically by reference title cache)
if (type1 != null && type1.equals(OriginalSourceType.PrimaryTaxonomicSource)
return 1;
}
// sort by type (Primary taxonomic > Primary Media > others
// alphabetically by reference title cache)
if (type1 != null && type1.equals(OriginalSourceType.PrimaryTaxonomicSource)
- if (type1 != null && type1.equals(OriginalSourceType.PrimaryMediaSource)
- && type2!=null && !type2.equals(OriginalSourceType.PrimaryTaxonomicSource)) {
+
+ if ((type1 == null || type1.equals(OriginalSourceType.PrimaryMediaSource))
+ && (type2==null || !type2.equals(OriginalSourceType.PrimaryMediaSource))) {
if(citation1!=null && citation2!=null){
return citation1.getTitleCache().compareTo(citation2.getTitleCache());
}
if(citation1!=null && citation2!=null){
return citation1.getTitleCache().compareTo(citation2.getTitleCache());
}