From ddd2da0692ad5bc019403b8631e9aff62d886d7d Mon Sep 17 00:00:00 2001
From: Patrick Plitzner <p.plitzner@bgbm.org>
Date: Tue, 1 Dec 2015 15:49:41 +0100
Subject: [PATCH] Fix refresh problem when creating a FieldUnit with no
 previous viewer content

---
 .../taxeditor/editor/view/derivate/DerivateView.java        | 6 +++---
 .../derivate/contextMenu/CreateFieldUnitContextMenu.java    | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

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 0d587c2c2..811c1e334 100644
--- 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
@@ -231,13 +231,13 @@ public class DerivateView extends EditorPart implements IPartContentHasFactualDa
                 cdmEntitySession.bind();
             }
 
+            List<SpecimenOrObservationBase> derivates = null;
             if(derivativeUuids!=null){
                 this.derivateToRootEntityMap = new HashMap<SpecimenOrObservationBase<?>, SpecimenOrObservationBase<?>>();
                 this.rootElements = new HashSet<SpecimenOrObservationBase<?>>();
-                List<SpecimenOrObservationBase> derivates =
-                        CdmStore.getService(IOccurrenceService.class).load(new ArrayList(derivativeUuids), SPECIMEN_INIT_STRATEGY);
-                updateRootEntities(derivates);
+                derivates = CdmStore.getService(IOccurrenceService.class).load(new ArrayList(derivativeUuids), SPECIMEN_INIT_STRATEGY);
             }
+            updateRootEntities(derivates);
             refreshTree(false);
             previousCdmEntitySession.bind();
         }
diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/contextMenu/CreateFieldUnitContextMenu.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/contextMenu/CreateFieldUnitContextMenu.java
index 48c38c82f..dc3176bdc 100644
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/contextMenu/CreateFieldUnitContextMenu.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/contextMenu/CreateFieldUnitContextMenu.java
@@ -89,7 +89,7 @@ public class CreateFieldUnitContextMenu extends CompoundContributionItem {
                                         fieldUnit = CdmBase.deproxy(CdmStore.getService(IOccurrenceService.class).save(fieldUnit), FieldUnit.class);
                                         derivateView.getConversationHolder().commit();
                                         derivateView.addFieldUnit(fieldUnit);
-                                        derivateView.refreshTree();
+                                        derivateView.updateRootEntities();
                                     }
                                 });
                             }
-- 
2.34.1