cleanup

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/DerivateView.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/DerivateView.java
index 3c1806c334ae4cb177b2e396697684e6fa51cc1e..b34c78daccaf80200c41408019929779840533d7 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/DerivateView.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/DerivateView.java
@@ -341,7 +341,7 @@ public class DerivateView implements IPartContentHasFactualData, IConversationEn
         //taxon assignment or derivative type are set
         if(derivates!=null && !derivateSearchCompositeController.isDefaultSearch()){
             List<TreeNode> nodesToSelect = new ArrayList<>();
-            for (SpecimenOrObservationBase specimenOrObservationBase : derivates) {
+            for (SpecimenOrObservationBase<?> specimenOrObservationBase : derivates) {
                 nodesToSelect.add(new TreeNode(specimenOrObservationBase));
             }
             setSelection(new StructuredSelection(nodesToSelect));

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 8a38f74809b3e138126c2c5507d2ff7b06c4fa87..3f1f1aa2d545c1a656b017944ebd677772fb642c 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
@@ -474,8 +474,8 @@ public class DerivateLabelProvider extends ColumnLabelProvider {
             }
         }
         if(rootElements!=null){
-            Collection<DerivedUnit> derivedUnits = new ArrayList<DerivedUnit>();
-            for (SpecimenOrObservationBase specimenOrObservationBase : rootElements) {
+            Collection<DerivedUnit> derivedUnits = new ArrayList<>();
+            for (SpecimenOrObservationBase<?> specimenOrObservationBase : rootElements) {
                 List<DerivedUnit> childUnits = CdmStore.getService(IOccurrenceService.class).getAllChildDerivatives(specimenOrObservationBase.getUuid());
                 if (childUnits != null){
                     derivedUnits.addAll(childUnits);