diff options
author | Lars Vogel | 2014-03-28 19:03:47 +0000 |
---|---|---|
committer | Lars Vogel | 2014-03-28 19:25:02 +0000 |
commit | cb49a10228fc651bf8f972ceef759725a428e61d (patch) | |
tree | 38a7509f8142238046c905a68ad91e5f22ba2e32 | |
parent | 1c42753022d6c4668f040bb523ec42b14067858d (diff) | |
download | eclipse.platform.ui-cb49a10228fc651bf8f972ceef759725a428e61d.tar.gz eclipse.platform.ui-cb49a10228fc651bf8f972ceef759725a428e61d.tar.xz eclipse.platform.ui-cb49a10228fc651bf8f972ceef759725a428e61d.zip |
Bug 431530 - Add @Override and @Deprecated annotations to platform.ui
bundles
Change-Id: I4fb9e7e3dcb66ed9b84d3310cef3da7174574aed
Signed-off-by: Lars Vogel <Lars.Vogel@gmail.com>
3 files changed, 13 insertions, 5 deletions
diff --git a/bundles/org.eclipse.e4.ui.services/src/org/eclipse/e4/ui/internal/services/Activator.java b/bundles/org.eclipse.e4.ui.services/src/org/eclipse/e4/ui/internal/services/Activator.java index 40095ca4c33..bab13e44585 100644 --- a/bundles/org.eclipse.e4.ui.services/src/org/eclipse/e4/ui/internal/services/Activator.java +++ b/bundles/org.eclipse.e4.ui.services/src/org/eclipse/e4/ui/internal/services/Activator.java @@ -36,6 +36,7 @@ public class Activator implements BundleActivator { return singleton; } + @Override public void start(BundleContext context) throws Exception { bundleContext = context; singleton = this; @@ -52,6 +53,7 @@ public class Activator implements BundleActivator { return (EventAdmin) eventAdminTracker.getService(); } + @Override public void stop(BundleContext context) throws Exception { if (contextServiceReg != null) { contextServiceReg.unregister(); diff --git a/bundles/org.eclipse.e4.ui.services/src/org/eclipse/e4/ui/services/internal/events/EventBroker.java b/bundles/org.eclipse.e4.ui.services/src/org/eclipse/e4/ui/services/internal/events/EventBroker.java index 5024a4354bf..7a943dbef18 100644 --- a/bundles/org.eclipse.e4.ui.services/src/org/eclipse/e4/ui/services/internal/events/EventBroker.java +++ b/bundles/org.eclipse.e4.ui.services/src/org/eclipse/e4/ui/services/internal/events/EventBroker.java @@ -70,6 +70,7 @@ public class EventBroker implements IEventBroker { // placeholder } + @Override public boolean send(String topic, Object data) { Event event = constructEvent(topic, data); EventAdmin eventAdmin = Activator.getDefault().getEventAdmin(); @@ -81,6 +82,7 @@ public class EventBroker implements IEventBroker { return true; } + @Override public boolean post(String topic, Object data) { Event event = constructEvent(topic, data); EventAdmin eventAdmin = Activator.getDefault().getEventAdmin(); @@ -109,10 +111,12 @@ public class EventBroker implements IEventBroker { return event; } + @Override public boolean subscribe(String topic, EventHandler eventHandler) { return subscribe(topic, null, eventHandler, false); } - + + @Override public boolean subscribe(String topic, String filter, EventHandler eventHandler, boolean headless) { BundleContext bundleContext = Activator.getDefault().getBundleContext(); if (bundleContext == null) { @@ -137,6 +141,7 @@ public class EventBroker implements IEventBroker { return true; } + @Override public boolean unsubscribe(EventHandler eventHandler) { Collection<ServiceRegistration<?>> handled = registrations .remove(eventHandler); diff --git a/bundles/org.eclipse.e4.ui.services/src/org/eclipse/e4/ui/services/internal/events/UIEventHandler.java b/bundles/org.eclipse.e4.ui.services/src/org/eclipse/e4/ui/services/internal/events/UIEventHandler.java index 926aa55a6ba..cf2a4595924 100644 --- a/bundles/org.eclipse.e4.ui.services/src/org/eclipse/e4/ui/services/internal/events/UIEventHandler.java +++ b/bundles/org.eclipse.e4.ui.services/src/org/eclipse/e4/ui/services/internal/events/UIEventHandler.java @@ -19,22 +19,23 @@ import org.osgi.service.event.EventHandler; * The helper will properly place UI-aware consumers on the main thread. */ public class UIEventHandler implements EventHandler { - + final private EventHandler eventHandler; final private UISynchronize uiSync; - + public UIEventHandler(EventHandler eventHandler, UISynchronize uiSync) { this.eventHandler = eventHandler; this.uiSync = uiSync; } - + @Override public void handleEvent(final Event event) { if (uiSync == null) eventHandler.handleEvent(event); else { uiSync.syncExec(new Runnable() { - + + @Override public void run() { eventHandler.handleEvent(event); } |