Merge branch 'hotfix/4.8.1' into develop

[taxeditor.git] / eu.etaxonomy.taxeditor.editor / src / main / java / eu / etaxonomy / taxeditor / editor / view / derivate / DerivateView.java

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 8242ef97deacb82f1b65622b39fe2af30764ffbd..a536b023d6cba0c8a6fa5e088170dca824163696 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
@@ -164,8 +164,8 @@ public class DerivateView implements IPartContentHasFactualData, IConversationEn
      * {@inheritDoc}
      */
     public void init(DerivateViewEditorInput editorInput){
-        this.derivateToRootEntityMap = new HashMap<SpecimenOrObservationBase<?>, SpecimenOrObservationBase<?>>();
-        this.rootElements = new HashSet<SpecimenOrObservationBase<?>>();
+        this.derivateToRootEntityMap = new HashMap<>();
+        this.rootElements = new HashSet<>();
 
         //init tree
         Collection<UUID> derivativeUuids = editorInput.getDerivativeUuids();
@@ -258,8 +258,8 @@ public class DerivateView implements IPartContentHasFactualData, IConversationEn
 
             List<SpecimenOrObservationBase> derivates = null;
             if(derivativeUuids!=null){
-                this.derivateToRootEntityMap = new HashMap<SpecimenOrObservationBase<?>, SpecimenOrObservationBase<?>>();
-                this.rootElements = new HashSet<SpecimenOrObservationBase<?>>();
+                this.derivateToRootEntityMap = new HashMap<>();
+                this.rootElements = new HashSet<>();
                 derivates = CdmStore.getService(IOccurrenceService.class).load(new ArrayList(derivativeUuids), SPECIMEN_INIT_STRATEGY);
             }
             updateRootEntities(derivates);
@@ -270,8 +270,8 @@ public class DerivateView implements IPartContentHasFactualData, IConversationEn
 
     public void updateRootEntities(List<SpecimenOrObservationBase> derivates) {
         if(derivates!=null){
-            this.derivateToRootEntityMap = new HashMap<SpecimenOrObservationBase<?>, SpecimenOrObservationBase<?>>();
-            this.rootElements = new HashSet<SpecimenOrObservationBase<?>>();
+            this.derivateToRootEntityMap = new HashMap<>();
+            this.rootElements = new HashSet<>();
             for (SpecimenOrObservationBase derivate : derivates) {
 
                 if(derivate instanceof FieldUnit){
@@ -300,7 +300,7 @@ public class DerivateView implements IPartContentHasFactualData, IConversationEn
         //set selection to derivatives if the filter criteria
         //taxon assignment or derivative type are set
         if(derivates!=null && !derivateSearchCompositeController.isDefaultSearch()){
-            List<TreeNode> nodesToSelect = new ArrayList<TreeNode>();
+            List<TreeNode> nodesToSelect = new ArrayList<>();
             for (SpecimenOrObservationBase specimenOrObservationBase : derivates) {
                 nodesToSelect.add(new TreeNode(specimenOrObservationBase));
             }
@@ -334,7 +334,7 @@ public class DerivateView implements IPartContentHasFactualData, IConversationEn
         // commit the conversation and start a new transaction immediately
         conversation.commit(true);
 
-        CdmStore.getService(IOccurrenceService.class).merge(new ArrayList<SpecimenOrObservationBase>(rootElements), true);
+        CdmStore.getService(IOccurrenceService.class).merge(new ArrayList<>(rootElements), true);
 
         monitor.worked(1);
 
@@ -400,7 +400,7 @@ public class DerivateView implements IPartContentHasFactualData, IConversationEn
                 "sources" //$NON-NLS-1$
         });
         Map<Object, List<String>> specimenPropertyPathMap =
-                new HashMap<Object, List<String>>();
+                new HashMap<>();
         specimenPropertyPathMap.put(SpecimenOrObservationBase.class,specimenPropertyPaths);
         return specimenPropertyPathMap;
     }
@@ -523,7 +523,7 @@ public class DerivateView implements IPartContentHasFactualData, IConversationEn
             }
             if(selectedTaxon!=null){
                 Collection<SpecimenOrObservationBase> fieldUnits = CdmStore.getService(IOccurrenceService.class).listFieldUnitsByAssociatedTaxon(selectedTaxon, null, null);
-                Collection<UUID> uuids = new HashSet<UUID>();
+                Collection<UUID> uuids = new HashSet<>();
                 for (SpecimenOrObservationBase specimenOrObservationBase : fieldUnits) {
                     uuids.add(specimenOrObservationBase.getUuid());
                 }
@@ -554,7 +554,7 @@ public class DerivateView implements IPartContentHasFactualData, IConversationEn
      */
     @Override
     public List<SpecimenOrObservationBase<?>> getRootEntities() {
-        return new ArrayList<SpecimenOrObservationBase<?>>(rootElements);
+        return new ArrayList<>(rootElements);
     }
 
     public void toggleListenToSelectionChange(MPart part) {