Add fallback label and icon in specimen editor

diff --git a/eu.etaxonomy.taxeditor.store/icons/default_derivate-16x16-32.png b/eu.etaxonomy.taxeditor.store/icons/default_derivate-16x16-32.png
new file mode 100644 (file)
index 0000000..366c696
Binary files /dev/null and b/eu.etaxonomy.taxeditor.store/icons/default_derivate-16x16-32.png differ

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/ImageResources.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/ImageResources.java
index 8aab0e7ee1cedace88cf1d8478d8bceb6b4f838c..aadacafdf79e905404c151d13d84a5206a8c2390 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/ImageResources.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/ImageResources.java
@@ -160,6 +160,7 @@ public class ImageResources {
     public static final String AMPLIFICATION_DERIVATE = "amplification_derivate";
     public static final String SINGLE_READ_DERIVATE = "single_read_derivate";
     public static final String SINGLE_READ_DERIVATE_MULTILINK = "single_read_derivate_multilink";
+    public static final String DEFAULT_DERIVATIVE = "default_derivate";
 
     public static final String CHARACTER_DATA_DERIVATE = "character_data_derivate";
 
@@ -388,6 +389,8 @@ public class ImageResources {
                        "single_read_derivate_multilink-16x16-32.png");
                registerImage(registry, CHARACTER_DATA_DERIVATE,
                        "character_data_derivate-16x16-32.png");
+               registerImage(registry, DEFAULT_DERIVATIVE,
+                               "default_derivate-16x16-32.png");
 
                registerImage(registry, WEB,
                        "web.gif");

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/derivateSearch/DerivateLabelProvider.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/derivateSearch/DerivateLabelProvider.java
index 8eabfd07b640e79748116217a2c26ac471d54245..53c92df897ed0c121f314dfebee24ffc6459ce50 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/derivateSearch/DerivateLabelProvider.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/derivateSearch/DerivateLabelProvider.java
@@ -27,11 +27,13 @@ import org.hibernate.LazyInitializationException;
 import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
 import eu.etaxonomy.cdm.api.service.IOccurrenceService;
 import eu.etaxonomy.cdm.api.service.molecular.ISequenceService;
+import eu.etaxonomy.cdm.common.CdmUtils;
 import eu.etaxonomy.cdm.format.CdmFormatterFactory;
 import eu.etaxonomy.cdm.format.ICdmFormatter.FormatKey;
 import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper;
 import eu.etaxonomy.cdm.model.common.CdmBase;
 import eu.etaxonomy.cdm.model.common.DefinedTerm;
+import eu.etaxonomy.cdm.model.common.IdentifiableEntity;
 import eu.etaxonomy.cdm.model.common.Identifier;
 import eu.etaxonomy.cdm.model.molecular.DnaSample;
 import eu.etaxonomy.cdm.model.molecular.Sequence;
@@ -151,7 +153,17 @@ public class DerivateLabelProvider extends ColumnLabelProvider {
                 FormatKey.MEDIA_TITLE, FormatKey.SPACE,
                 FormatKey.MEDIA_ARTIST, FormatKey.SPACE
         };
-        return CdmFormatterFactory.format(element, formatKeys);
+        String text = CdmFormatterFactory.format(element, formatKeys);
+        if(element instanceof IdentifiableEntity){
+               IdentifiableEntity identifiableEntity = (IdentifiableEntity) element;
+               if(identifiableEntity.isProtectedTitleCache()){
+                       text = identifiableEntity.getTitleCache();
+               }
+        }
+        if(CdmUtils.isBlank(text)){
+               return "[-]";
+        }
+               return text;
     }
 
     /** {@inheritDoc} */
@@ -397,7 +409,7 @@ public class DerivateLabelProvider extends ColumnLabelProvider {
                 }
             }
         }
-        return super.getImage(element);
+        return ImageResources.getImage(ImageResources.DEFAULT_DERIVATIVE);
     }
 
     public static Identifier<DnaSample> getCurrentSampleDesignation(CdmBase entity) {