ref #6925 Set active editor to null if all are closed

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/e4/TaxonNameEditorE4.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/e4/TaxonNameEditorE4.java
index 75a4c666af1c7a3856082f526b83157d49aef381..3b60785c430d404449485579c51d88a5ae284026 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/e4/TaxonNameEditorE4.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/e4/TaxonNameEditorE4.java
@@ -501,6 +501,7 @@ public class TaxonNameEditorE4 implements IConversationEnabled, IDirtyMarkable,
             conversation.unregisterForDataStoreChanges(this);
             conversation.close();
         }
+        eventBroker.post(WorkbenchEventConstants.CURRENT_ACTIVE_EDITOR, null);
        }
 
        /** {@inheritDoc} */

diff --git a/eu.etaxonomy.taxeditor.store/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.store/META-INF/MANIFEST.MF
index 4846d04c0332ac8ebbe26f56d880ba82e9dfea6c..93ff2b7d27855d68287b12f0f7e21c4e42a5eb54 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/META-INF/MANIFEST.MF
+++ b/eu.etaxonomy.taxeditor.store/META-INF/MANIFEST.MF
@@ -88,7 +88,9 @@ Require-Bundle: org.eclipse.osgi,
  org.eclipse.e4.core.commands;bundle-version="0.11.100",
  org.eclipse.e4.ui.services;bundle-version="1.2.100",
  org.eclipse.e4.ui.model.workbench;bundle-version="1.2.0",
- org.eclipse.e4.core.contexts;bundle-version="1.5.1"
+ org.eclipse.e4.core.contexts;bundle-version="1.5.1",
+ org.eclipse.osgi.services,
+ org.eclipse.e4.core.services
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
 Import-Package: eu.etaxonomy.taxeditor.webapp,

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/event/EventUtility.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/event/EventUtility.java
index f076234c8d32aa224b6d2f7a22cf3585f6d576b3..a279d2fad55a597e29d6acc890139f25ca6e4e14 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/event/EventUtility.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/event/EventUtility.java
@@ -78,4 +78,25 @@ public class EventUtility {
         return shell;
     }
 
+//    private EventHandler testHandler;
+//
+//    @Inject
+//    public EventUtility(IEventBroker eventBroker) {
+//        testHandler = new EventHandler() {
+//
+//            @Override
+//            public void handleEvent(Event event) {
+//                Object part = event.getProperty(UIEvents.EventTags.ELEMENT);
+//                boolean tbr =(Boolean) event.getProperty(UIEvents.EventTags.NEW_VALUE);
+//                if (part instanceof MPart){
+//                    System.out.println("Part "+((MPart)part).getElementId()+" is "+(!tbr?"NOT":"")+" visible");
+//                }
+//                else if(part instanceof MPlaceholder){
+//                    System.out.println("Part "+((MPlaceholder)part).getRef().getElementId()+" is "+(!tbr?"NOT":"")+" visible");
+//                }
+//            }
+//        };
+//        eventBroker.subscribe(UIEvents.UIElement.TOPIC_TOBERENDERED, testHandler);
+//    }
+
 }