catch up with branch daily
Signed-off-by: Ralf Mollik <ramollik@compex-commerce.com>
diff --git a/org.eclipse.osbp.osgi.hybrid.api/META-INF/MANIFEST.MF b/org.eclipse.osbp.osgi.hybrid.api/META-INF/MANIFEST.MF
index a5f0ae1..3874fcc 100644
--- a/org.eclipse.osbp.osgi.hybrid.api/META-INF/MANIFEST.MF
+++ b/org.eclipse.osbp.osgi.hybrid.api/META-INF/MANIFEST.MF
@@ -47,8 +47,7 @@
org.eclipse.osbp.eventbroker;version="0.9.0",
org.eclipse.osbp.ui.api.themes;version="0.9.0",
org.eclipse.osbp.ui.api.useraccess;version="0.9.0",
- org.eclipse.osbp.utils.session;version="0.9.0",
- org.osgi.service.event;version="1.3.0"
+ org.eclipse.osbp.utils.session;version="0.9.0"
Bundle-Activator: org.eclipse.osbp.osgi.hybrid.api.Activator
Service-Component: OSGI-INF/*.xml
Bundle-ActivationPolicy: lazy
diff --git a/org.eclipse.osbp.osgi.hybrid.api/src/org/eclipse/osbp/osgi/hybrid/api/AbstractHybridVaaclipseView.java b/org.eclipse.osbp.osgi.hybrid.api/src/org/eclipse/osbp/osgi/hybrid/api/AbstractHybridVaaclipseView.java
index 9b193bf..7387d59 100644
--- a/org.eclipse.osbp.osgi.hybrid.api/src/org/eclipse/osbp/osgi/hybrid/api/AbstractHybridVaaclipseView.java
+++ b/org.eclipse.osbp.osgi.hybrid.api/src/org/eclipse/osbp/osgi/hybrid/api/AbstractHybridVaaclipseView.java
@@ -14,21 +14,18 @@
*/
package org.eclipse.osbp.osgi.hybrid.api;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
import java.util.Collection;
import java.util.List;
import java.util.Map;
import java.util.Set;
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
import javax.inject.Inject;
import javax.swing.Timer;
import org.eclipse.e4.core.contexts.IEclipseContext;
import org.eclipse.e4.core.services.events.IEventBroker;
import org.eclipse.e4.ui.model.application.MApplication;
+import org.eclipse.e4.ui.model.application.ui.MElementContainer;
import org.eclipse.e4.ui.model.application.ui.MUIElement;
import org.eclipse.e4.ui.model.application.ui.advanced.MPerspective;
import org.eclipse.e4.ui.model.application.ui.basic.MPart;
@@ -37,6 +34,7 @@
import org.eclipse.osbp.bpm.api.IBlipBPMConstants;
import org.eclipse.osbp.core.api.persistence.IPersistenceService;
import org.eclipse.osbp.dsl.common.datatypes.IDto;
+import org.eclipse.osbp.runtime.common.event.SelectionStore;
import org.eclipse.osbp.runtime.web.vaadin.databinding.VaadinObservables;
import org.eclipse.osbp.ui.api.themes.IThemeResourceService;
import org.eclipse.osbp.ui.api.themes.IThemeResourceService.ThemeResourceType;
@@ -105,21 +103,20 @@
// video.setShowControls(false);
}
- @PostConstruct
public void initView() {
- partService = fEclipseContext.get(EPartService.class);
- partService.addPartListener(this);
- HybridVaadinVaaclipseConnector.instance(fEclipseContext).addListener(this);
- HybridVaadinVaaclipseConnector.instance(fEclipseContext).setE4Application(fE4App);
+ if(fEclipseContext != null) {
+ partService = fEclipseContext.get(EPartService.class);
+ partService.addPartListener(this);
+ HybridVaadinVaaclipseConnector.instance(fEclipseContext).addListener(this);
+ HybridVaadinVaaclipseConnector.instance(fEclipseContext).setE4Application(fE4App);
+ }
VaadinObservables.getRealm(UI.getCurrent());
-// UI.getCurrent().setPollInterval(pollingInterval);
createView(fParent);
postInit(null);
renderData();
}
- @PreDestroy
- public void preDestroy() {
+ public void destroyView() {
fRecursiveFocusBlurListener.detach();
HybridVaadinVaaclipseConnector.instance(fEclipseContext).removeListener(this);
partService.removePartListener(this);
