From: Patric Plitzner <p.plitzner@bgbm.org>
Date: Wed, 17 Sep 2014 12:39:35 +0000 (+0000)
Subject: merge-update from trunk
X-Git-Tag: 3.6.0~393^2~35
X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/commitdiff_plain/1c869e725349302736a0d17ea3175475260dc7e3

merge-update from trunk
---

1c869e725349302736a0d17ea3175475260dc7e3
diff --cc eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/derivateSearch/DerivateLabelProvider.java
index 6ea97d966,29d858118..e7e014a1b
--- 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
@@@ -152,14 -151,15 +152,16 @@@ public class DerivateLabelProvider exte
          }
          else if(element instanceof MediaSpecimen){
              MediaSpecimen mediaSpecimen = (MediaSpecimen)element;
-             label += mediaSpecimen.getMediaSpecimen().getTitle()!=null?mediaSpecimen.getMediaSpecimen().getTitle().getText()+", ":"[no motif]";
-             label += mediaSpecimen.getMediaSpecimen().getArtist()!=null?mediaSpecimen.getMediaSpecimen().getArtist()+", ":"";
+             if(mediaSpecimen.getMediaSpecimen()!=null){
+                 label += mediaSpecimen.getMediaSpecimen().getTitle()!=null?mediaSpecimen.getMediaSpecimen().getTitle().getText()+", ":"[no motif]";
+                 label += mediaSpecimen.getMediaSpecimen().getArtist()!=null?mediaSpecimen.getMediaSpecimen().getArtist()+", ":"";
+             }
 -            label += mediaSpecimen.getAccessionNumber()!=null?mediaSpecimen.getAccessionNumber()+", ":"";
 -            Collection collection = mediaSpecimen.getCollection();
 +            eu.etaxonomy.cdm.model.occurrence.Collection collection = mediaSpecimen.getCollection();
              if(collection!=null){
                  label += collection.getName()!=null?collection.getName()+" ":"";
 +                label += collection.getCode()!=null?"("+collection.getCode()+"), ":"";
              }
 +            label += mediaSpecimen.getAccessionNumber()!=null?mediaSpecimen.getAccessionNumber()+", ":"";
          }
          else if(element instanceof DnaSample
                  || (element instanceof DerivedUnit