merge-update from trunk
authorPatric Plitzner <p.plitzner@bgbm.org>
Wed, 17 Sep 2014 12:39:35 +0000 (12:39 +0000)
committerPatric Plitzner <p.plitzner@bgbm.org>
Wed, 17 Sep 2014 12:39:35 +0000 (12:39 +0000)
1  2 
.gitattributes
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/derivateSearch/DerivateLabelProvider.java
pom.xml

diff --cc .gitattributes
Simple merge
index 6ea97d966a9dda6a98b0a0e2239d29afd379fefd,29d858118abee0684e953b74abfc1c67a627c269..e7e014a1be012519800d0b078e1e6536a1c22e09
@@@ -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
diff --cc pom.xml
Simple merge