ref #6909 Directly update tree when linking with taxon

diff --git a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/e4/TaxonNavigatorE4.java b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/e4/TaxonNavigatorE4.java
index 33610baae88edf1771e5064b5c51d503815b7ba9..3849745c5755a42bd3959cb244dcff68b3b7a36d 100644 (file)
--- a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/e4/TaxonNavigatorE4.java
+++ b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/e4/TaxonNavigatorE4.java
@@ -240,7 +240,7 @@ public class TaxonNavigatorE4 implements
        //Link with taxon selection
        @Inject
        @Optional
-       private void updateCurrentTaxon(@UIEventTopic(WorkbenchEventConstants.CURRENT_ACTIVE_EDITOR)ITaxonEditor editor){
+       public void updateCurrentTaxon(@UIEventTopic(WorkbenchEventConstants.CURRENT_ACTIVE_EDITOR)ITaxonEditor editor){
            if(linkWithTaxon && editor!=null){
                viewer.refresh();
                TaxonNode taxonNode = null;

diff --git a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/e4/handler/LinkWithTaxonHandlerE4.java b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/e4/handler/LinkWithTaxonHandlerE4.java
index 6a158e29366fc22a307fb5c76b28fd7221ee5792..45addcf1639a1f447825ecce68817a1cfa23d025 100644 (file)
--- a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/e4/handler/LinkWithTaxonHandlerE4.java
+++ b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/e4/handler/LinkWithTaxonHandlerE4.java
@@ -16,6 +16,7 @@ import org.eclipse.e4.ui.model.application.ui.basic.MPart;
 import org.eclipse.e4.ui.model.application.ui.menu.MHandledMenuItem;
 import org.eclipse.e4.ui.services.IServiceConstants;
 
+import eu.etaxonomy.taxeditor.event.EventUtility;
 import eu.etaxonomy.taxeditor.navigation.navigator.e4.TaxonNavigatorE4;
 
 /**
@@ -30,6 +31,9 @@ public class LinkWithTaxonHandlerE4 {
     public void execute(@Named(IServiceConstants.ACTIVE_PART)MPart activePart) {
         TaxonNavigatorE4 taxonNavigator = (TaxonNavigatorE4) activePart.getObject();
         taxonNavigator.setLinkWithTaxon(!taxonNavigator.isLinkWithTaxon());
+        if(taxonNavigator.isLinkWithTaxon()){
+            taxonNavigator.updateCurrentTaxon(EventUtility.getTaxonEditor());
+        }
        }
 
     @CanExecute