Merge branch 'release/5.32.0'

[taxeditor.git] / eu.etaxonomy.taxeditor.store / src / main / java / eu / etaxonomy / taxeditor / view / search / derivative / DerivateLabelProvider.java

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/search/derivative/DerivateLabelProvider.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/search/derivative/DerivateLabelProvider.java
index 5e204b482ad25469eb6d4f73640edc4a155bc50d..3bb7814d2cb0dfdf15e64cacc4b32424c2756a16 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/search/derivative/DerivateLabelProvider.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/search/derivative/DerivateLabelProvider.java
@@ -160,7 +160,7 @@ public class DerivateLabelProvider extends ColumnLabelProvider {
         }
         else if (element instanceof DnaSample) {
             DnaSample dnaSample = (DnaSample)element;
-            if (!(dnaSample.getCacheStrategy() instanceof DnaSampleDefaultCacheStrategy)){
+            if (!(dnaSample.cacheStrategy() instanceof DnaSampleDefaultCacheStrategy)){
                 dnaSample.setCacheStrategy(new DnaSampleDefaultCacheStrategy());
             }
             dnaSample.setTitleCache(null);
@@ -455,7 +455,7 @@ public class DerivateLabelProvider extends ColumnLabelProvider {
     private static void addTypeDesignation(DerivedUnit derivedUnit, SpecimenTypeDesignation typeDesignation){
         Collection<SpecimenTypeDesignation> list = typeDesignations.get(derivedUnit);
         if(list==null){
-            list = new ArrayList<SpecimenTypeDesignation>();
+            list = new ArrayList<>();
         }
         list.add(typeDesignation);
         typeDesignations.put(derivedUnit, list);
@@ -466,8 +466,8 @@ public class DerivateLabelProvider extends ColumnLabelProvider {
     }
 
     public void updateLabelCache(Collection<SpecimenOrObservationBase<?>> rootElements) {
-        multiLinkSingleReads = new HashSet<SingleRead>();
-        typeDesignations = new HashMap<DerivedUnit, Collection<SpecimenTypeDesignation>>();
+        multiLinkSingleReads = new HashSet<>();
+        typeDesignations = new HashMap<>();
         for(Entry<SingleRead, Collection<Sequence>> entry:CdmStore.getService(ISequenceService.class).getSingleReadSequencesMap().entrySet()){
             if(entry.getValue().size()>1){
                 multiLinkSingleReads.add(entry.getKey());