ref #6905, #6597 Propagate selection for supplemental data view

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/e4/AbstractCdmEditorPartE4.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/e4/AbstractCdmEditorPartE4.java
index bd58deb0b4c0c85d856c06d8990d2aab7a0f3659..a066de4c3b716f19e1b861db0c20049715f8246d 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/e4/AbstractCdmEditorPartE4.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/e4/AbstractCdmEditorPartE4.java
@@ -55,12 +55,13 @@ public abstract class AbstractCdmEditorPartE4 implements IConversationEnabled, I
         }
     }
 
-    public void showViewer(IStructuredSelection selection){
+    public void showViewer(IStructuredSelection selection, MPart activePart){
         if(viewer!=null){
             Object element = selection.getFirstElement();
             if(selection.getFirstElement()!=null){
                 viewer.setInput(element);
             }
+            selectionProvidingPart = activePart;
         }
     }
 

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/e4/details/DetailsPartE4.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/e4/details/DetailsPartE4.java
index 47b1bc79bb50a33ff54448da68bc19dbabe457da..21f7d5c0acfb920d8cd9371f7fc28c281f04cf0a 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/e4/details/DetailsPartE4.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/e4/details/DetailsPartE4.java
@@ -90,8 +90,7 @@ public class DetailsPartE4 extends AbstractCdmEditorPartE4{
                     return;
                 }
             }
-            showViewer(structuredSelection);
-            selectionProvidingPart = activePart;
+            showViewer(structuredSelection, activePart);
             return;
         }
         else{

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/e4/supplementaldata/SupplementalDataPartE4.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/e4/supplementaldata/SupplementalDataPartE4.java
index a56d5d58dd7182a76341e735f04e5cabb21e3c04..a0f2f506d4b5e2fef85a46fa9bca5295fbebe323 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/e4/supplementaldata/SupplementalDataPartE4.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/e4/supplementaldata/SupplementalDataPartE4.java
@@ -121,7 +121,7 @@ public class SupplementalDataPartE4 extends AbstractCdmEditorPartE4 {
                    structuredSelection = new StructuredSelection(((GbifResponse)structuredSelection.getFirstElement()).getDerivedUnitFacade().innerDerivedUnit());
                }
 
-               showViewer(structuredSelection);
+               showViewer(structuredSelection, activePart);
                return;
            }else{
                showEmptyPage();