From: Patric Plitzner
Date: Wed, 6 Aug 2014 06:54:46 +0000 (+0000)
Subject: - added type information to DTO
X-Git-Tag: 3.6.0~393^2~52
X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/commitdiff_plain/18751b7490ed10755cf9844bf8c7784478e33876?hp=ff15d0f709f822b06ca7961703144263333aad85;ds=sidebyside
- added type information to DTO
- enhanced media labeling
---
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 858023070..fc1be090d 100644
--- 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
@@ -138,16 +138,17 @@ public class DerivateLabelProvider extends ColumnLabelProvider {
MediaSpecimen mediaSpecimen = (MediaSpecimen)element;
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()+", ":"";
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
&& ((SpecimenOrObservationBase>) element).getRecordBasis()==SpecimenOrObservationType.DnaSample)){
- label += "SampleDesignation?";
+ label += "[no sample designation]";
}
else if(element instanceof DerivedUnit){
@@ -173,17 +174,17 @@ public class DerivateLabelProvider extends ColumnLabelProvider {
}
else if(derivedUnit.getRecordBasis()==SpecimenOrObservationType.TissueSample){
//TODO: implement
- label += "kindofTissue? + SampleDesignation?";
+ label += "kindofTissue? + [no sample designation]";
}
}
else if(element instanceof Sequence){
Sequence sequence = (Sequence)element;
- label += "SampleDesignation?"+", ";
+ label += "[no sample designation]"+", ";
label += sequence.getDnaMarker()!=null?sequence.getDnaMarker():"";
}
else if(element instanceof SingleRead){
SingleRead singleRead = (SingleRead)element;
- label += "SampleDesignation?"+", ";
+ label += "[no sample designation]"+", ";
label += singleRead.getPrimer()!=null?singleRead.getPrimer().getLabel()+", ":"";
if(parentNode!=null && parentNode.getValue() instanceof Sequence){
Sequence sequence = (Sequence) parentNode.getValue();