Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTom Schindl2016-02-15 12:50:37 +0000
committerTom Schindl2016-02-15 12:50:37 +0000
commit5c9eeb4fe0f2a7ddf7bc7177fab7367d89b6b15a (patch)
tree568a191ea385c8246992216a6708833c140da7df
parent07df4097af215fd8d81ccd364190479e46b8c7de (diff)
downloadorg.eclipse.rap.incubator.e4-5c9eeb4fe0f2a7ddf7bc7177fab7367d89b6b15a.tar.gz
org.eclipse.rap.incubator.e4-5c9eeb4fe0f2a7ddf7bc7177fab7367d89b6b15a.tar.xz
org.eclipse.rap.incubator.e4-5c9eeb4fe0f2a7ddf7bc7177fab7367d89b6b15a.zip
Fix compile error because of removed DIActivator
Instead of use the DIActivator we now use our own Activator
-rw-r--r--bundles/org.eclipse.rap.e4/src/org/eclipse/rap/e4/internal/RAPEventObjectSupplier.java5
1 files changed, 2 insertions, 3 deletions
diff --git a/bundles/org.eclipse.rap.e4/src/org/eclipse/rap/e4/internal/RAPEventObjectSupplier.java b/bundles/org.eclipse.rap.e4/src/org/eclipse/rap/e4/internal/RAPEventObjectSupplier.java
index 3aca70a..590a59b 100644
--- a/bundles/org.eclipse.rap.e4/src/org/eclipse/rap/e4/internal/RAPEventObjectSupplier.java
+++ b/bundles/org.eclipse.rap.e4/src/org/eclipse/rap/e4/internal/RAPEventObjectSupplier.java
@@ -18,7 +18,6 @@ import org.eclipse.e4.core.di.IInjector;
import org.eclipse.e4.core.di.InjectionException;
import org.eclipse.e4.core.di.extensions.EventTopic;
import org.eclipse.e4.core.di.extensions.EventUtils;
-import org.eclipse.e4.core.di.internal.extensions.DIEActivator;
import org.eclipse.e4.core.di.suppliers.ExtendedObjectSupplier;
import org.eclipse.e4.core.di.suppliers.IObjectDescriptor;
import org.eclipse.e4.core.di.suppliers.IRequestor;
@@ -176,7 +175,7 @@ public class RAPEventObjectSupplier extends ExtendedObjectSupplier {
if (registrations.containsKey(subscriber))
return;
}
- BundleContext bundleContext = DIEActivator.getDefault().getBundleContext();
+ BundleContext bundleContext = Activator.getDefault().getBundleContext();
if (bundleContext == null)
throw new InjectionException("Unable to subscribe to events: org.eclipse.e4.core.di.extensions bundle is not activated"); //$NON-NLS-1$
@@ -205,7 +204,7 @@ public class RAPEventObjectSupplier extends ExtendedObjectSupplier {
}
static private EventAdmin getEventAdmin() {
- return DIEActivator.getDefault().getEventAdmin();
+ return Activator.getDefault().getEventAdmin();
}
protected void unsubscribe(IRequestor requestor) {

Back to the top