ref #8785: adapt label provider to dto

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 f99b01a93a1e2915ca0fe3a10211246442806ce2..e8c6bbebf2e07de56706fccef317e84691fd41e9 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
@@ -17,9 +17,6 @@ import eu.etaxonomy.cdm.model.description.SpecimenDescription;
 import eu.etaxonomy.cdm.model.description.TaxonDescription;
 import eu.etaxonomy.cdm.persistence.dto.TaxonNodeDto;
 import eu.etaxonomy.cdm.persistence.dto.TaxonNodeDtoByNameComparator;
-import eu.etaxonomy.cdm.persistence.dto.TaxonNodeDtoByRankAndNameComparator;
-import eu.etaxonomy.cdm.persistence.dto.TaxonNodeDtoNaturalComparator;
-import eu.etaxonomy.taxeditor.preference.PreferencesUtil;
 
 /**
  * @author pplitzner
@@ -31,13 +28,14 @@ public class MatrixRowComparator implements Comparator<Object>{
     private Comparator<TaxonNodeDto> comparator;
 
     public MatrixRowComparator() {
-        if (PreferencesUtil.isNodesSortedNaturally()){
-            comparator = new TaxonNodeDtoNaturalComparator();
-        } else if (PreferencesUtil.isNodesSortedByName()){
-            comparator = new TaxonNodeDtoByNameComparator();
-        }else {
-            comparator = new TaxonNodeDtoByRankAndNameComparator();
-        }
+        comparator = new TaxonNodeDtoByNameComparator();
+//        if (PreferencesUtil.isNodesSortedNaturally()){
+//            comparator = new TaxonNodeDtoNaturalComparator();
+//        } else if (PreferencesUtil.isNodesSortedByName()){
+//            comparator = new TaxonNodeDtoByNameComparator();
+//        }else {
+//            comparator = new TaxonNodeDtoByRankAndNameComparator();
+//        }
     }
 
     @Override

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/descriptiveDataSet/matrix/supplementalInfo/SupplementalInfoDisplayConverter.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/descriptiveDataSet/matrix/supplementalInfo/SupplementalInfoDisplayConverter.java
index d5d9ed78aebc962cd233f8555d9a48c3a2250e9e..303201ea03b5b3068fd8a5af87bf447e351048a3 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/descriptiveDataSet/matrix/supplementalInfo/SupplementalInfoDisplayConverter.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/descriptiveDataSet/matrix/supplementalInfo/SupplementalInfoDisplayConverter.java
@@ -10,6 +10,8 @@ package eu.etaxonomy.taxeditor.editor.descriptiveDataSet.matrix.supplementalInfo
 
 import org.eclipse.nebula.widgets.nattable.data.convert.DisplayConverter;
 
+import eu.etaxonomy.cdm.api.service.dto.DescriptionBaseDto;
+import eu.etaxonomy.cdm.api.service.dto.RowWrapperDTO;
 import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper;
 import eu.etaxonomy.cdm.model.agent.AgentBase;
 import eu.etaxonomy.cdm.model.location.NamedArea;
@@ -52,6 +54,10 @@ public class SupplementalInfoDisplayConverter extends DisplayConverter{
         }
         else if(HibernateProxyHelper.isInstanceOf(canonicalValue, NamedArea.class)){
             displayValue = HibernateProxyHelper.deproxy(canonicalValue, NamedArea.class).getLabel();
+        }else if (canonicalValue instanceof RowWrapperDTO){
+            displayValue = ((RowWrapperDTO)canonicalValue).getDescription().getDescription().getTitleCache();
+        }else if (canonicalValue instanceof DescriptionBaseDto){
+            displayValue = ((DescriptionBaseDto)canonicalValue).getDescription().getTitleCache();
         }
 
         if(displayValue.isEmpty() && canonicalValue!=null){