BGBM BDI Projects
/
taxeditor.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix potential NPE
[taxeditor.git]
/
eu.etaxonomy.taxeditor.editor
/
src
/
main
/
java
/
eu
/
etaxonomy
/
taxeditor
/
editor
/
descriptiveDataSet
/
matrix
/
MatrixRowComparator.java
diff --git
a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/descriptiveDataSet/matrix/MatrixRowComparator.java
b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/descriptiveDataSet/matrix/MatrixRowComparator.java
index 930c87e2ccda6354a73578e4dc41b95e2ef06cca..d9eab66b06af0751edc6b23a181ba0200b0b03df 100644
(file)
--- a/
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/descriptiveDataSet/matrix/MatrixRowComparator.java
+++ b/
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/descriptiveDataSet/matrix/MatrixRowComparator.java
@@
-31,9
+31,9
@@
public class MatrixRowComparator implements Comparator<Object>{
private Comparator<TaxonNode> comparator;
public MatrixRowComparator() {
private Comparator<TaxonNode> comparator;
public MatrixRowComparator() {
- if (PreferencesUtil.
getSortNodes
Naturally()){
+ if (PreferencesUtil.
isNodesSorted
Naturally()){
comparator = new TaxonNaturalComparator();
comparator = new TaxonNaturalComparator();
- } else if (PreferencesUtil.
getSortNodesStrictlyAlphabetically
()){
+ } else if (PreferencesUtil.
isNodesSortedByName
()){
comparator = new TaxonNodeByNameComparator();
}else {
comparator = new TaxonNodeByRankAndNameComparator();
comparator = new TaxonNodeByNameComparator();
}else {
comparator = new TaxonNodeByRankAndNameComparator();