From ffc78867a557a215fc206de21621f8bc999858c3 Mon Sep 17 00:00:00 2001
From: Patric Plitzner
Date: Mon, 7 Jul 2014 13:15:29 +0000
Subject: [PATCH] - adapted some labels in DerivateLabelProvider
---
.../view/derivateSearch/DerivateLabelProvider.java | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
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 6aa6b2963..858023070 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
@@ -20,7 +20,6 @@ import org.hibernate.LazyInitializationException;
import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
import eu.etaxonomy.cdm.api.service.IOccurrenceService;
-import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper;
import eu.etaxonomy.cdm.model.common.DefinedTerm;
import eu.etaxonomy.cdm.model.molecular.DnaSample;
import eu.etaxonomy.cdm.model.molecular.Sequence;
@@ -116,7 +115,9 @@ public class DerivateLabelProvider extends ColumnLabelProvider {
* @return
*/
public static String getDerivateText(Object element){
+ TreeNode parentNode = null;
if(element instanceof TreeNode){
+ parentNode = ((TreeNode) element).getParent();
//unwrap specimen from TreeNode
element = ((TreeNode) element).getValue();
}
@@ -146,8 +147,7 @@ public class DerivateLabelProvider extends ColumnLabelProvider {
else if(element instanceof DnaSample
|| (element instanceof DerivedUnit
&& ((SpecimenOrObservationBase>) element).getRecordBasis()==SpecimenOrObservationType.DnaSample)){
- //TODO implement
- label += element.toString();
+ label += "SampleDesignation?";
}
else if(element instanceof DerivedUnit){
@@ -183,8 +183,12 @@ public class DerivateLabelProvider extends ColumnLabelProvider {
}
else if(element instanceof SingleRead){
SingleRead singleRead = (SingleRead)element;
+ label += "SampleDesignation?"+", ";
label += singleRead.getPrimer()!=null?singleRead.getPrimer().getLabel()+", ":"";
- label += "Marker?";
+ if(parentNode!=null && parentNode.getValue() instanceof Sequence){
+ Sequence sequence = (Sequence) parentNode.getValue();
+ label += sequence.getDnaMarker()!=null?sequence.getDnaMarker():"";
+ }
}
else if(element instanceof SpecimenOrObservationBase){
SpecimenOrObservationBase> derivate = (SpecimenOrObservationBase>) element;
--
2.34.1