ref #7463: adapt the percentage display in status bar for progress of longrunning...

[taxeditor.git] / eu.etaxonomy.taxeditor.store / src / main / java / eu / etaxonomy / taxeditor / util / TaxonTreeNodeLabelProvider.java

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/util/TaxonTreeNodeLabelProvider.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/util/TaxonTreeNodeLabelProvider.java
index 8088c5727fc56c4e4a97cb553ec2c7c2d115d935..a4069ec7b55bc5bf01cea962474a321de80769d7 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/util/TaxonTreeNodeLabelProvider.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/util/TaxonTreeNodeLabelProvider.java
@@ -22,6 +22,7 @@ import eu.etaxonomy.cdm.model.common.IIdentifiableEntity;
 import eu.etaxonomy.cdm.model.taxon.Classification;
 import eu.etaxonomy.cdm.model.taxon.Taxon;
 import eu.etaxonomy.cdm.model.taxon.TaxonNode;
+import eu.etaxonomy.cdm.persistence.dto.TaxonNodeDto;
 import eu.etaxonomy.taxeditor.model.MessagingUtils;
 import eu.etaxonomy.taxeditor.preference.Resources;
 import eu.etaxonomy.taxeditor.security.RequiredPermissions;
@@ -36,7 +37,7 @@ import eu.etaxonomy.taxeditor.store.StoreUtil;
 public class TaxonTreeNodeLabelProvider extends ColumnLabelProvider
 implements IStyledLabelProvider {
 
-    private Styler notGrantedStyler = null;
+    protected Styler notGrantedStyler = null;
 
     /**
      * {@inheritDoc}
@@ -51,8 +52,7 @@ implements IStyledLabelProvider {
         //taxon node
         else if (element instanceof TaxonNode){
             TaxonNode taxonNode = (TaxonNode) HibernateProxyHelper.deproxy(element);
-
-            try{
+          try{
                 Taxon taxon = HibernateProxyHelper.deproxy(taxonNode.getTaxon());
                 if(taxon == null){
                     String text = taxonNode.getClassification().getName() == null ? null : taxonNode.getClassification().getName().getText();
@@ -62,7 +62,15 @@ implements IStyledLabelProvider {
                     return text;
                 }else{
                     try{
-                        return taxon.getName() != null ? ((IIdentifiableEntity) HibernateProxyHelper.deproxy(taxon.getName())).getTitleCache() : new String();
+                        String text= "";
+                            if (taxonNode.isUnplaced()){
+                                text += Character.toString((char)63) + " ";
+                            }
+                            if (taxonNode.isExcluded()){
+                                text +=Character.toString((char)248) + " ";
+                            }
+                        text += taxon.getName() != null ? ((IIdentifiableEntity) HibernateProxyHelper.deproxy(taxon.getName())).getTitleCache() : new String();
+                        return text;
                     }catch(Exception e){
                         MessagingUtils.error(getClass(), e);
                     }
@@ -71,6 +79,18 @@ implements IStyledLabelProvider {
                 MessagingUtils.error(getClass(), e);
             }
         }
+        else if (element instanceof TaxonNodeDto){
+            TaxonNodeDto taxonNode = (TaxonNodeDto) element;
+            String text= "";
+            if (taxonNode.isUnplaced()){
+                text += Character.toString((char)63) + " ";
+            }
+            if (taxonNode.isExcluded()) {
+                text +=Character.toString((char)248) + " ";
+            }
+            text += taxonNode.getTitleCache();
+            return text;
+        }
         return new String();
     }