diff options
| author | Rolf Theunissen | 2020-11-25 16:48:18 +0000 |
|---|---|---|
| committer | Rolf Theunissen | 2021-01-22 17:31:31 +0000 |
| commit | 56e5e895102409c47a3f3e2f4932ff81244f36ae (patch) | |
| tree | 1d51b8b14d4f52d8eb631fe3c35f380323f9fac5 | |
| parent | 204977606931bf8f645c7d201473686db562c4b6 (diff) | |
| download | eclipse.platform.ui-56e5e895102409c47a3f3e2f4932ff81244f36ae.tar.gz eclipse.platform.ui-56e5e895102409c47a3f3e2f4932ff81244f36ae.tar.xz eclipse.platform.ui-56e5e895102409c47a3f3e2f4932ff81244f36ae.zip | |
[cleanup] @Optional on method instead of parameter for @(UI)EventTopicI20210125-1800I20210124-1800I20210123-1800
Change-Id: I2b35a7585b99d518f1b53872d2d868bdfe249e1b
Signed-off-by: Rolf Theunissen <rolf.theunissen@gmail.com>
2 files changed, 6 insertions, 12 deletions
diff --git a/bundles/org.eclipse.e4.ui.workbench/src/org/eclipse/e4/ui/internal/workbench/addons/HandlerProcessingAddon.java b/bundles/org.eclipse.e4.ui.workbench/src/org/eclipse/e4/ui/internal/workbench/addons/HandlerProcessingAddon.java index 1a7bcb214d2..4b2f610a35e 100644 --- a/bundles/org.eclipse.e4.ui.workbench/src/org/eclipse/e4/ui/internal/workbench/addons/HandlerProcessingAddon.java +++ b/bundles/org.eclipse.e4.ui.workbench/src/org/eclipse/e4/ui/internal/workbench/addons/HandlerProcessingAddon.java @@ -67,10 +67,8 @@ public class HandlerProcessingAddon { * The event thrown in the event bus */ @Inject - public void handleHandlerEvent(@Optional @EventTopic(UIEvents.HandlerContainer.TOPIC_HANDLERS) Event event) { - if (event == null) { - return; - } + @Optional + public void handleHandlerEvent(@EventTopic(UIEvents.HandlerContainer.TOPIC_HANDLERS) Event event) { if ((event.getProperty(UIEvents.EventTags.ELEMENT) instanceof MHandlerContainer) && (event.getProperty(UIEvents.EventTags.ELEMENT) instanceof MContext)) { MHandlerContainer handlerContainer = (MHandlerContainer) event.getProperty(UIEvents.EventTags.ELEMENT); @@ -113,10 +111,8 @@ public class HandlerProcessingAddon { */ @Inject - public void handleContextEvent(@Optional @EventTopic(UIEvents.Context.TOPIC_CONTEXT) Event event) { - if (event == null) { - return; - } + @Optional + public void handleContextEvent(@EventTopic(UIEvents.Context.TOPIC_CONTEXT) Event event) { Object origin = event.getProperty(UIEvents.EventTags.ELEMENT); Object context = event.getProperty(UIEvents.EventTags.NEW_VALUE); if ((origin instanceof MHandlerContainer) diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WorkbenchWindow.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WorkbenchWindow.java index 59ab87f7c8d..e05da84dc9c 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WorkbenchWindow.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WorkbenchWindow.java @@ -1146,10 +1146,8 @@ public class WorkbenchWindow implements IWorkbenchWindow { } @Inject - private void hideQuickAccess(@Optional @UIEventTopic(UIEvents.ApplicationElement.TOPIC_TAGS) Event event) { - if (event == null) { - return; - } + @Optional + private void hideQuickAccess(@UIEventTopic(UIEvents.ApplicationElement.TOPIC_TAGS) Event event) { Object origin = event.getProperty(UIEvents.EventTags.ELEMENT); if (!(origin instanceof MToolControl)) { return; |