fix #7111: synchronize sync butoon of navigator with attribute linkWithTaxon

[taxeditor.git] / eu.etaxonomy.taxeditor.navigation / src / main / java / eu / etaxonomy / taxeditor / navigation / navigator / TaxonNodeLabelProvider.java

diff --git a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/TaxonNodeLabelProvider.java b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/TaxonNodeLabelProvider.java
index 492f0e45fa11f02ffa2d7a530b861c21805394f8..b7ec191ac225abfec989831215d7461ec6ecc629 100644 (file)
--- a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/TaxonNodeLabelProvider.java
+++ b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/TaxonNodeLabelProvider.java
@@ -58,7 +58,12 @@ public class TaxonNodeLabelProvider extends ColumnLabelProvider
                        try{
                                Taxon taxon = HibernateProxyHelper.deproxy(taxonNode.getTaxon());
                                if(taxon == null){
-                                       MessagingUtils.error(getClass(), String.format(Messages.TaxonNodeLabelProvider_NODE_WITH_NO_TAXON, element), null);
+                                   String text = taxonNode.getClassification().getName().getText();
+                                       if(text==null){
+                                           text = taxonNode.getClassification().getTitleCache();
+                                       }
+                    return text;
+                                       //MessagingUtils.error(getClass(), String.format(Messages.TaxonNodeLabelProvider_NODE_WITH_NO_TAXON, element), null);
 //                                     throw new RuntimeException("The data your are trying to view is corrupt. Please check your import.");
                                }else{
                                        try{
@@ -80,7 +85,9 @@ public class TaxonNodeLabelProvider extends ColumnLabelProvider
     public String getDescription(Object anElement) {
                if (anElement instanceof TaxonNode) {
                        Taxon data = ((TaxonNode) anElement).getTaxon();
-                       return Messages.TaxonNodeLabelProvider_TAXON + (data != null ? data.getTitleCache() : Messages.TaxonNodeLabelProvider_NO_TAXON);
+                       String text =  (data != null ? Messages.TaxonNodeLabelProvider_TAXON + data.getTitleCache() : Messages.TaxonNodeLabelProvider_CLASSIFICATION + ((TaxonNode)anElement).getClassification().getTitleCache());
+               
+                       return text;
                }
                return null;
        }
@@ -94,7 +101,6 @@ public class TaxonNodeLabelProvider extends ColumnLabelProvider
                        styler = getNotGrantedStyler();
                }
                return new StyledString(getText(element), styler);
-
        }
 
        /**