From 32d99982bc448ce512cfc8dbfb27dc87f0ab1c71 Mon Sep 17 00:00:00 2001 From: Cherian Mathew Date: Fri, 11 Sep 2015 17:36:20 +0200 Subject: [PATCH] #5223 Replace service methods with similar entity calls --- .../taxeditor/view/derivateSearch/DerivateLabelProvider.java | 4 ++-- 1 file changed, 2 insertions(+), 2 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 4596057aa..99a1d883d 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 @@ -234,7 +234,7 @@ public class DerivateLabelProvider extends ColumnLabelProvider { if(collection!=null){ label += collection.getCode()!=null?"("+collection.getCode()+")"+separator:emptyString; } - String mostSignificantIdentifier = CdmStore.getService(IOccurrenceService.class).getMostSignificantIdentifier(derivedUnit); + String mostSignificantIdentifier = derivedUnit.getMostSignificantIdentifier(); label += mostSignificantIdentifier!=null?mostSignificantIdentifier+separator:emptyString; } else if(derivedUnit.getRecordBasis()==SpecimenOrObservationType.TissueSample){ @@ -305,7 +305,7 @@ public class DerivateLabelProvider extends ColumnLabelProvider { boolean hasCharacterData = false; if(cdmBase.isInstanceOf(SpecimenOrObservationBase.class)){ SpecimenOrObservationBase specimen = HibernateProxyHelper.deproxy(cdmBase, SpecimenOrObservationBase.class); - if(!CdmStore.getService(IOccurrenceService.class).getCharacterDataForSpecimen(specimen.getUuid()).isEmpty()){ + if(specimen.hasCharacterData()){ hasCharacterData = true; } } -- 2.34.1