Perform clean code of bundles/org.eclipse.e4.ui.services

Author: eclipse-platform-bot

bundles/org.eclipse.e4.ui.services/src/org/eclipse/e4/ui/internal/services/ContextContextService.java

@@ -27,8 +27,8 @@ public class ContextContextService implements EContextService {
 	static final String LOCAL_CONTEXTS = "localContexts";
 	static final String DEFERRED_UPDATES = "localContexts.updates";
 
-	private IEclipseContext eclipseContext;
-	private ContextManager contextManager;
+	private final IEclipseContext eclipseContext;
+	private final ContextManager contextManager;
 
 	private boolean deferUpdates;
 

bundles/org.eclipse.e4.ui.services/src/org/eclipse/e4/ui/services/internal/events/EventBroker.java

@@ -38,7 +38,7 @@
 public class EventBroker implements IEventBroker {
 
 	// TBD synchronization
-	private Map<EventHandler, Collection<ServiceRegistration<?>>> registrations = new HashMap<>();
+	private final Map<EventHandler, Collection<ServiceRegistration<?>>> registrations = new HashMap<>();
 
 	@Inject
 	@Optional
@@ -139,8 +139,9 @@ public boolean subscribe(String topic, String filter, EventHandler eventHandler,
 	@Override
 	public boolean unsubscribe(EventHandler eventHandler) {
 		Collection<ServiceRegistration<?>> handled = registrations.remove(eventHandler);
-		if (handled == null || handled.isEmpty())
+		if (handled == null || handled.isEmpty()) {
 			return false;
+		}
 		for (ServiceRegistration<?> r : handled) {
 			r.unregister();
 		}

bundles/org.eclipse.e4.ui.services/src/org/eclipse/e4/ui/services/internal/events/UIEventHandler.java

@@ -32,9 +32,9 @@ public UIEventHandler(EventHandler eventHandler, UISynchronize uiSync) {
 
 	@Override
 	public void handleEvent(final Event event) {
-		if (uiSync == null)
+		if (uiSync == null) {
 			eventHandler.handleEvent(event);
-		else {
+		} else {
 			uiSync.syncExec(() -> eventHandler.handleEvent(event));
 		}
 	}