Add missing Overried annotation in o.e.equinox.app.

Change-Id: I8e5b9a1699c5db97704e0eb0e3e9dfec1a724452
Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>

13 files changed, 94 insertions, 15 deletions

diff --git a/bundles/org.eclipse.equinox.app/src/org/eclipse/equinox/internal/app/Activator.java b/bundles/org.eclipse.equinox.app/src/org/eclipse/equinox/internal/app/Activator.java
index 75e7a9411..5773e0732 100644
--- a/bundles/org.eclipse.equinox.app/src/org/eclipse/equinox/internal/app/Activator.java
+++ b/bundles/org.eclipse.equinox.app/src/org/eclipse/equinox/internal/app/Activator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2005, 2008 IBM Corporation and others.
+ * Copyright (c) 2005, 2018 IBM Corporation and others.
  *
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
@@ -42,6 +42,7 @@ public class Activator implements BundleActivator, ServiceTrackerCustomizer {
 	private ServiceTracker registryTracker;
 	private IExtensionRegistry registry;
 
+	@Override
 	public void start(BundleContext bc) {
 		_context = bc;
 		// doing simple get service here because we expect the PackageAdmin service to always be available
@@ -65,6 +66,7 @@ public class Activator implements BundleActivator, ServiceTrackerCustomizer {
 		}
 	}
 
+	@Override
 	public void stop(BundleContext bc) {
 		// stop the app commands for the console
 		try {
@@ -114,6 +116,7 @@ public class Activator implements BundleActivator, ServiceTrackerCustomizer {
 			CommandLineArgs.processCommandLine(envInfo);
 	}
 
+	@Override
 	public Object addingService(ServiceReference reference) {
 		BundleContext context = _context;
 		if (context == null)
@@ -143,10 +146,12 @@ public class Activator implements BundleActivator, ServiceTrackerCustomizer {
 		return null;
 	}
 
+	@Override
 	public void modifiedService(ServiceReference reference, Object service) {
 		// do nothing
 	}
 
+	@Override
 	public void removedService(ServiceReference reference, Object service) {
 		EclipseAppContainer currentContainer = null;
 		synchronized (this) {
@@ -169,6 +174,7 @@ public class Activator implements BundleActivator, ServiceTrackerCustomizer {
 			tracker.open(allServices);
 		else
 			AccessController.doPrivileged(new PrivilegedAction() {
+				@Override
 				public Object run() {
 					tracker.open(allServices);
 					return null;
@@ -181,6 +187,7 @@ public class Activator implements BundleActivator, ServiceTrackerCustomizer {
 		if (System.getSecurityManager() == null)
 			return tracker.getService();
 		return AccessController.doPrivileged(new PrivilegedAction() {
+			@Override
 			public Object run() {
 				return tracker.getService();
 			}
@@ -192,6 +199,7 @@ public class Activator implements BundleActivator, ServiceTrackerCustomizer {
 		if (System.getSecurityManager() == null)
 			return bundle.getLocation();
 		return (String) AccessController.doPrivileged(new PrivilegedAction() {
+			@Override
 			public Object run() {
 				return bundle.getLocation();
 			}
diff --git a/bundles/org.eclipse.equinox.app/src/org/eclipse/equinox/internal/app/AnyThreadAppLauncher.java b/bundles/org.eclipse.equinox.app/src/org/eclipse/equinox/internal/app/AnyThreadAppLauncher.java
index 36ca906db..ff89f652a 100644
--- a/bundles/org.eclipse.equinox.app/src/org/eclipse/equinox/internal/app/AnyThreadAppLauncher.java
+++ b/bundles/org.eclipse.equinox.app/src/org/eclipse/equinox/internal/app/AnyThreadAppLauncher.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
+ * Copyright (c) 2005, 2018 IBM Corporation and others.
  *
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
@@ -16,13 +16,14 @@ package org.eclipse.equinox.internal.app;
 
 import org.eclipse.osgi.framework.log.FrameworkLogEntry;
 
-public class AnyThreadAppLauncher implements Runnable{
+public class AnyThreadAppLauncher implements Runnable {
 	private EclipseAppHandle appHandle;
 
 	private AnyThreadAppLauncher(EclipseAppHandle appHandle) {
 		this.appHandle = appHandle;
 	}
 
+	@Override
 	public void run() {
 		try {
 			// pasing null will cause EclipseAppHandle to get the correct arguments
diff --git a/bundles/org.eclipse.equinox.app/src/org/eclipse/equinox/internal/app/AppCommands.java b/bundles/org.eclipse.equinox.app/src/org/eclipse/equinox/internal/app/AppCommands.java
index c8f764adb..ce6db7ec4 100644
--- a/bundles/org.eclipse.equinox.app/src/org/eclipse/equinox/internal/app/AppCommands.java
+++ b/bundles/org.eclipse.equinox.app/src/org/eclipse/equinox/internal/app/AppCommands.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2005, 2011 IBM Corporation and others.
+ * Copyright (c) 2005, 2018 IBM Corporation and others.
  *
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
@@ -89,6 +89,7 @@ public class AppCommands implements CommandProvider {
 			scheduledApplications.close();
 	}
 
+	@Override
 	public String getHelp() {
 		return getHelp(null);
 	}
diff --git a/bundles/org.eclipse.equinox.app/src/org/eclipse/equinox/internal/app/AppPersistence.java b/bundles/org.eclipse.equinox.app/src/org/eclipse/equinox/internal/app/AppPersistence.java
index 288c54e22..a34964ed1 100644
--- a/bundles/org.eclipse.equinox.app/src/org/eclipse/equinox/internal/app/AppPersistence.java
+++ b/bundles/org.eclipse.equinox.app/src/org/eclipse/equinox/internal/app/AppPersistence.java
@@ -354,6 +354,7 @@ public class AppPersistence implements ServiceTrackerCustomizer {
 	}
 
 	static class AppTimer implements Runnable {
+		@Override
 		public void run() {
 			int lastMin = -1;
 			while (!shutdown) {
@@ -413,6 +414,7 @@ public class AppPersistence implements ServiceTrackerCustomizer {
 		}
 	}
 
+	@Override
 	public Object addingService(ServiceReference reference) {
 		if (configLocation != null)
 			return null; // only care about one configuration
@@ -422,10 +424,12 @@ public class AppPersistence implements ServiceTrackerCustomizer {
 		return configLocation;
 	}
 
+	@Override
 	public void modifiedService(ServiceReference reference, Object service) {
 		// don't care
 	}
 
+	@Override
 	public void removedService(ServiceReference reference, Object service) {
 		if (service == configLocation)
 			configLocation = null;
diff --git a/bundles/org.eclipse.equinox.app/src/org/eclipse/equinox/internal/app/DefaultApplicationListener.java b/bundles/org.eclipse.equinox.app/src/org/eclipse/equinox/internal/app/DefaultApplicationListener.java
index 05abaa024..399f59427 100644
--- a/bundles/org.eclipse.equinox.app/src/org/eclipse/equinox/internal/app/DefaultApplicationListener.java
+++ b/bundles/org.eclipse.equinox.app/src/org/eclipse/equinox/internal/app/DefaultApplicationListener.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2007, 2010 IBM Corporation and others.
+ * Copyright (c) 2007, 2018 IBM Corporation and others.
  *
  *  This program and the accompanying materials
  *  are made available under the terms of the Eclipse Public License 2.0
@@ -58,6 +58,7 @@ public class DefaultApplicationListener implements ApplicationRunnable, ServiceT
 		}
 	}
 
+	@Override
 	public Object run(Object context) {
 		if (handleTracker == null)
 			return getResult(); // app has ended, return the result
@@ -106,6 +107,7 @@ public class DefaultApplicationListener implements ApplicationRunnable, ServiceT
 		return running;
 	}
 
+	@Override
 	public void stop() {
 		if (handleTracker == null)
 			return;
@@ -121,14 +123,17 @@ public class DefaultApplicationListener implements ApplicationRunnable, ServiceT
 		}
 	}
 
+	@Override
 	public Object addingService(ServiceReference reference) {
 		return Activator.getContext().getService(reference);
 	}
 
+	@Override
 	public void modifiedService(ServiceReference reference, Object service) {
 		// do nothing
 	}
 
+	@Override
 	synchronized public void removedService(ServiceReference reference, Object service) {
 		running = false;
 		// only wait for 5 seconds; this may timeout if forcing an application to quit takes too long
diff --git a/bundles/org.eclipse.equinox.app/src/org/eclipse/equinox/internal/app/EclipseAppContainer.java b/bundles/org.eclipse.equinox.app/src/org/eclipse/equinox/internal/app/EclipseAppContainer.java
index 512cc6868..b3aba5f9a 100644
--- a/bundles/org.eclipse.equinox.app/src/org/eclipse/equinox/internal/app/EclipseAppContainer.java
+++ b/bundles/org.eclipse.equinox.app/src/org/eclipse/equinox/internal/app/EclipseAppContainer.java
@@ -80,7 +80,7 @@ public class EclipseAppContainer implements IRegistryEventListener, SynchronousB
 	/* @GuardedBy(lock) */
 	private EclipseAppHandle activeScopedSingleton; // the current scoped singleton handle
 	/* @GuardedBy(lock) */
-	private HashMap/*<<String> <ArrayList <EclipseAppHandle>> */activeLimited; // Map of handles that have cardinality limits
+	private HashMap/*<<String> <ArrayList <EclipseAppHandle>> */ activeLimited; // Map of handles that have cardinality limits
 	private String defaultAppId;
 	private DefaultApplicationListener defaultAppListener;
 	private ParameterizedRunnable defaultMainThreadAppHandle; // holds the default app handle to be run on the main thread
@@ -229,6 +229,7 @@ public class EclipseAppContainer implements IRegistryEventListener, SynchronousB
 			this.serviceProps = serviceProps;
 		}
 
+		@Override
 		public Object run() {
 			return context.registerService(serviceClasses, serviceObject, serviceProps);
 		}
@@ -367,6 +368,7 @@ public class EclipseAppContainer implements IRegistryEventListener, SynchronousB
 		}
 	}
 
+	@Override
 	public void bundleChanged(BundleEvent event) {
 		// if this is not the system bundle stopping then ignore the event
 		if ((BundleEvent.STOPPING & event.getType()) == 0 || event.getBundle().getBundleId() != 0)
@@ -597,6 +599,7 @@ public class EclipseAppContainer implements IRegistryEventListener, SynchronousB
 		}
 	}
 
+	@Override
 	public Object addingService(ServiceReference reference) {
 		ApplicationLauncher appLauncher;
 		ParameterizedRunnable appRunnable;
@@ -618,28 +621,34 @@ public class EclipseAppContainer implements IRegistryEventListener, SynchronousB
 		return appLauncher;
 	}
 
+	@Override
 	public void modifiedService(ServiceReference reference, Object service) {
 		// Do nothing
 	}
 
+	@Override
 	public void removedService(ServiceReference reference, Object service) {
 		// Do nothing
 	}
 
+	@Override
 	public void added(IExtension[] extensions) {
 		for (int i = 0; i < extensions.length; i++)
 			createAppDescriptor(extensions[i]);
 	}
 
+	@Override
 	public void added(IExtensionPoint[] extensionPoints) {
 		// nothing
 	}
 
+	@Override
 	public void removed(IExtension[] extensions) {
 		for (int i = 0; i < extensions.length; i++)
 			removeAppDescriptor(extensions[i].getUniqueIdentifier());
 	}
 
+	@Override
 	public void removed(IExtensionPoint[] extensionPoints) {
 		// nothing
 	}
diff --git a/bundles/org.eclipse.equinox.app/src/org/eclipse/equinox/internal/app/EclipseAppDescriptor.java b/bundles/org.eclipse.equinox.app/src/org/eclipse/equinox/internal/app/EclipseAppDescriptor.java
index 06ee7f790..7282e61dc 100644
--- a/bundles/org.eclipse.equinox.app/src/org/eclipse/equinox/internal/app/EclipseAppDescriptor.java
+++ b/bundles/org.eclipse.equinox.app/src/org/eclipse/equinox/internal/app/EclipseAppDescriptor.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2005, 2007 IBM Corporation and others.
+ * Copyright (c) 2005, 2018 IBM Corporation and others.
  *
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
@@ -80,11 +80,13 @@ public class EclipseAppDescriptor extends ApplicationDescriptor {
 		this.iconURL = iconResult;
 	}
 
+	@Override
 	protected Map getPropertiesSpecific(String locale) {
 		// just use the service properties; for now we do not localize any properties
 		return getServiceProperties();
 	}
 
+	@Override
 	protected ApplicationHandle launchSpecific(Map arguments) throws Exception {
 		// if this application is locked throw an exception.
 		if (getLocked().booleanValue())
@@ -108,12 +110,14 @@ public class EclipseAppDescriptor extends ApplicationDescriptor {
 		return appHandle;
 	}
 
+	@Override
 	protected synchronized void lockSpecific() {
 		locked = Boolean.TRUE;
 		// make sure the service properties are updated with the latest lock info
 		refreshProperties();
 	}
 
+	@Override
 	protected synchronized void unlockSpecific() {
 		locked = Boolean.FALSE;
 		// make sure the service properties are updated with the latest lock info
@@ -200,12 +204,14 @@ public class EclipseAppDescriptor extends ApplicationDescriptor {
 		return appContainer;
 	}
 
+	@Override
 	public boolean matchDNChain(String pattern) {
 		if (contributor == null)
 			return false;
 		return BundleSignerCondition.getCondition(contributor, new ConditionInfo(BundleSignerCondition.class.getName(), new String[] {pattern})).isSatisfied();
 	}
 
+	@Override
 	protected boolean isLaunchableSpecific() {
 		return true;
 	}
diff --git a/bundles/org.eclipse.equinox.app/src/org/eclipse/equinox/internal/app/EclipseAppHandle.java b/bundles/org.eclipse.equinox.app/src/org/eclipse/equinox/internal/app/EclipseAppHandle.java
index e0b18b0d3..acf964056 100644
--- a/bundles/org.eclipse.equinox.app/src/org/eclipse/equinox/internal/app/EclipseAppHandle.java
+++ b/bundles/org.eclipse.equinox.app/src/org/eclipse/equinox/internal/app/EclipseAppHandle.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2005, 2010 IBM Corporation and others.
+ * Copyright (c) 2005, 2018 IBM Corporation and others.
  *
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
@@ -65,6 +65,7 @@ public class EclipseAppHandle extends ApplicationHandle implements ApplicationRu
 			this.arguments = new HashMap(arguments);
 	}
 
+	@Override
 	synchronized public String getState() {
 		switch (status) {
 			case FLAG_STARTING :
@@ -82,6 +83,7 @@ public class EclipseAppHandle extends ApplicationHandle implements ApplicationRu
 		}
 	}
 
+	@Override
 	protected void destroySpecific() {
 		// when this method is called we must force the application to exit.
 		// first set the status to stopping
@@ -168,10 +170,12 @@ public class EclipseAppHandle extends ApplicationHandle implements ApplicationRu
 		}
 	}
 
+	@Override
 	public Map getArguments() {
 		return arguments;
 	}
 
+	@Override
 	public Object run(Object context) throws Exception {
 		if (context != null) {
 			// always force the use of the context if it is not null
@@ -241,6 +245,7 @@ public class EclipseAppHandle extends ApplicationHandle implements ApplicationRu
 		return result;
 	}
 
+	@Override
 	public void stop() {
 		try {
 			destroy();
@@ -251,6 +256,7 @@ public class EclipseAppHandle extends ApplicationHandle implements ApplicationRu
 
 	}
 
+	@Override
 	public void applicationRunning() {
 		// first set the application handle status to running
 		setAppStatus(EclipseAppHandle.FLAG_ACTIVE);
@@ -259,11 +265,13 @@ public class EclipseAppHandle extends ApplicationHandle implements ApplicationRu
 		if (monitors == null)
 			return;
 		SafeRunner.run(new ISafeRunnable() {
+			@Override
 			public void handleException(Throwable e) {
 				// just continue ... the exception has already been logged by
 				// handleException(ISafeRunnable)
 			}
 
+			@Override
 			public void run() throws Exception {
 				for (int i = 0; i < monitors.length; i++) {
 					StartupMonitor monitor = (StartupMonitor) Activator.getContext().getService(monitors[i]);
@@ -289,6 +297,7 @@ public class EclipseAppHandle extends ApplicationHandle implements ApplicationRu
 			return null;
 		// Implement our own Comparator to sort services
 		Arrays.sort(refs, new Comparator() {
+			@Override
 			public int compare(Object o1, Object o2) {
 				// sort in descending order
 				// sort based on service ranking first; highest rank wins
@@ -331,34 +340,40 @@ public class EclipseAppHandle extends ApplicationHandle implements ApplicationRu
 		return configs[0];
 	}
 
+	@Override
 	public String getBrandingApplication() {
 		IBranding branding = ((EclipseAppDescriptor) getApplicationDescriptor()).getContainerManager().getBranding();
 		return branding == null ? null : branding.getApplication();
 	}
 
+	@Override
 	public Bundle getBrandingBundle() {
 		IBranding branding = ((EclipseAppDescriptor) getApplicationDescriptor()).getContainerManager().getBranding();
 		return branding == null ? null : branding.getDefiningBundle();
 
 	}
 
+	@Override
 	public String getBrandingDescription() {
 		IBranding branding = ((EclipseAppDescriptor) getApplicationDescriptor()).getContainerManager().getBranding();
 		return branding == null ? null : branding.getDescription();
 
 	}
 
+	@Override
 	public String getBrandingId() {
 		IBranding branding = ((EclipseAppDescriptor) getApplicationDescriptor()).getContainerManager().getBranding();
 		return branding == null ? null : branding.getId();
 	}
 
+	@Override
 	public String getBrandingName() {
 		IBranding branding = ((EclipseAppDescriptor) getApplicationDescriptor()).getContainerManager().getBranding();
 		return branding == null ? null : branding.getName();
 
 	}
 
+	@Override
 	public String getBrandingProperty(String key) {
 		IBranding branding = ((EclipseAppDescriptor) getApplicationDescriptor()).getContainerManager().getBranding();
 		return branding == null ? null : branding.getProperty(key);
@@ -379,6 +394,7 @@ public class EclipseAppHandle extends ApplicationHandle implements ApplicationRu
 		return null;
 	}
 
+	@Override
 	public synchronized Object getExitValue(long timeout) throws ApplicationException, InterruptedException {
 		if (handleRegistration == null && application == null)
 			return result;
@@ -396,6 +412,7 @@ public class EclipseAppHandle extends ApplicationHandle implements ApplicationRu
 		return result;
 	}
 
+	@Override
 	public void setResult(Object result, IApplication application) {
 		setInternalResult(result == null ? NULL_RESULT : result, true, application);
 	}
diff --git a/bundles/org.eclipse.equinox.app/src/org/eclipse/equinox/internal/app/EclipseScheduledApplication.java b/bundles/org.eclipse.equinox.app/src/org/eclipse/equinox/internal/app/EclipseScheduledApplication.java
index d8d86c530..6b70469dc 100644
--- a/bundles/org.eclipse.equinox.app/src/org/eclipse/equinox/internal/app/EclipseScheduledApplication.java
+++ b/bundles/org.eclipse.equinox.app/src/org/eclipse/equinox/internal/app/EclipseScheduledApplication.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
+ * Copyright (c) 2005, 2018 IBM Corporation and others.
  *
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
@@ -51,6 +51,7 @@ public class EclipseScheduledApplication implements ScheduledApplication, EventH
 		Activator.openTracker(appTracker, false);
 	}
 
+	@Override
 	public String getScheduleId() {
 		return id;
 	}
@@ -59,30 +60,35 @@ public class EclipseScheduledApplication implements ScheduledApplication, EventH
 		return appPid;
 	}
 
+	@Override
 	public synchronized String getTopic() {
 		if (removed)
 			throw new IllegalStateException(Messages.scheduled_app_removed);
 		return topic;
 	}
 
+	@Override
 	public synchronized String getEventFilter() {
 		if (removed)
 			throw new IllegalStateException(Messages.scheduled_app_removed);
 		return eventFilter;
 	}
 
+	@Override
 	public synchronized boolean isRecurring() {
 		if (removed)
 			throw new IllegalStateException(Messages.scheduled_app_removed);
 		return recurring;
 	}
 
+	@Override
 	public synchronized ApplicationDescriptor getApplicationDescriptor() {
 		if (removed)
 			throw new IllegalStateException(Messages.scheduled_app_removed);
 		return (ApplicationDescriptor) Activator.getService(appTracker);
 	}
 
+	@Override
 	public synchronized Map getArguments() {
 		if (removed)
 			throw new IllegalStateException(Messages.scheduled_app_removed);
@@ -95,6 +101,7 @@ public class EclipseScheduledApplication implements ScheduledApplication, EventH
 		return result;
 	}
 
+	@Override
 	public synchronized void remove() {
 		if (removed)
 			return;
@@ -106,6 +113,7 @@ public class EclipseScheduledApplication implements ScheduledApplication, EventH
 		appTracker.close();
 	}
 
+	@Override
 	public synchronized void handleEvent(Event event) {
 		try {
 			if (removed)
@@ -145,6 +153,7 @@ public class EclipseScheduledApplication implements ScheduledApplication, EventH
 		/*
 		 * does the proper TopicPermission check for the event topic
 		 */
+		@Override
 		public void checkGuard(Object object) throws SecurityException {
 			SecurityManager sm = System.getSecurityManager();
 			if (sm != null)
diff --git a/bundles/org.eclipse.equinox.app/src/org/eclipse/equinox/internal/app/ErrorApplication.java b/bundles/org.eclipse.equinox.app/src/org/eclipse/equinox/internal/app/ErrorApplication.java
index 095f636f7..fff5742b6 100644
--- a/bundles/org.eclipse.equinox.app/src/org/eclipse/equinox/internal/app/ErrorApplication.java
+++ b/bundles/org.eclipse.equinox.app/src/org/eclipse/equinox/internal/app/ErrorApplication.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
+ * Copyright (c) 2005, 2018 IBM Corporation and others.
  *
  *  This program and the accompanying materials
  *  are made available under the terms of the Eclipse Public License 2.0
@@ -24,6 +24,7 @@ import org.eclipse.equinox.app.IApplicationContext;
 public class ErrorApplication implements IApplication {
 	static final String ERROR_EXCEPTION = "error.exception"; //$NON-NLS-1$
 
+	@Override
 	public Object start(IApplicationContext context) throws Exception {
 		Exception error = (Exception) context.getArguments().get(ERROR_EXCEPTION);
 		if (error != null)
@@ -31,6 +32,7 @@ public class ErrorApplication implements IApplication {
 		throw new IllegalStateException();
 	}
 
+	@Override
 	public void stop() {
 		// do nothing
 	}
diff --git a/bundles/org.eclipse.equinox.app/src/org/eclipse/equinox/internal/app/MainApplicationLauncher.java b/bundles/org.eclipse.equinox.app/src/org/eclipse/equinox/internal/app/MainApplicationLauncher.java
index 582deee41..42bcbee98 100644
--- a/bundles/org.eclipse.equinox.app/src/org/eclipse/equinox/internal/app/MainApplicationLauncher.java
+++ b/bundles/org.eclipse.equinox.app/src/org/eclipse/equinox/internal/app/MainApplicationLauncher.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
+ * Copyright (c) 2008, 2018 IBM Corporation and others.
  *
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
@@ -28,6 +28,7 @@ public class MainApplicationLauncher implements ApplicationRunnable {
 		this.appContainer = appContainer;
 	}
 
+	@Override
 	public Object run(Object context) throws Exception {
 		appContainer.startDefaultApp(false);
 		ApplicationRunnable mainHandle = getMainHandle();
@@ -40,6 +41,7 @@ public class MainApplicationLauncher implements ApplicationRunnable {
 		return launchMainApp;
 	}
 
+	@Override
 	public void stop() {
 		// force the application to quit
 		ApplicationRunnable handle = getMainHandle();
diff --git a/bundles/org.eclipse.equinox.app/src/org/eclipse/equinox/internal/app/ProductExtensionBranding.java b/bundles/org.eclipse.equinox.app/src/org/eclipse/equinox/internal/app/ProductExtensionBranding.java
index 5c8281dfe..13f4b0f3c 100644
--- a/bundles/org.eclipse.equinox.app/src/org/eclipse/equinox/internal/app/ProductExtensionBranding.java
+++ b/bundles/org.eclipse.equinox.app/src/org/eclipse/equinox/internal/app/ProductExtensionBranding.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2004, 2006 IBM Corporation and others.
+ * Copyright (c) 2004, 2018 IBM Corporation and others.
  *
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
@@ -14,10 +14,10 @@
 package org.eclipse.equinox.internal.app;
 
 import java.util.HashMap;
-import org.eclipse.core.runtime.*;
+import org.eclipse.core.runtime.IConfigurationElement;
 import org.osgi.framework.Bundle;
 
-public class ProductExtensionBranding implements IBranding{
+public class ProductExtensionBranding implements IBranding {
 	private static final String ATTR_DESCRIPTION = "description"; //$NON-NLS-1$
 	private static final String ATTR_NAME = "name"; //$NON-NLS-1$
 	private static final String ATTR_APPLICATION = "application"; //$NON-NLS-1$
@@ -53,30 +53,37 @@ public class ProductExtensionBranding implements IBranding{
 		definingBundle = Activator.getBundle(element.getContributor());
 	}
 
+	@Override
 	public Bundle getDefiningBundle() {
 		return definingBundle;
 	}
 
+	@Override
 	public String getApplication() {
 		return application;
 	}
 
+	@Override
 	public String getName() {
 		return name;
 	}
 
+	@Override
 	public String getDescription() {
 		return description;
 	}
 
+	@Override
 	public String getId() {
 		return id;
 	}
 
+	@Override
 	public String getProperty(String key) {
 		return (String) properties.get(key);
 	}
 
+	@Override
 	public Object getProduct() {
 		return null;
 	}
diff --git a/bundles/org.eclipse.equinox.app/src/org/eclipse/equinox/internal/app/ProviderExtensionBranding.java b/bundles/org.eclipse.equinox.app/src/org/eclipse/equinox/internal/app/ProviderExtensionBranding.java
index 5b44c8cc2..3e80f49cb 100644
--- a/bundles/org.eclipse.equinox.app/src/org/eclipse/equinox/internal/app/ProviderExtensionBranding.java
+++ b/bundles/org.eclipse.equinox.app/src/org/eclipse/equinox/internal/app/ProviderExtensionBranding.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
+ * Copyright (c) 2007, 2018 IBM Corporation and others.
  *
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
@@ -17,34 +17,42 @@ import org.osgi.framework.Bundle;
 
 public class ProviderExtensionBranding implements IBranding {
 	Object product;
+
 	public ProviderExtensionBranding(Object product) {
 		this.product = product;
 	}
 
+	@Override
 	public String getApplication() {
 		return (String) EclipseAppContainer.callMethod(product, "getApplication", null, null); //$NON-NLS-1$
 	}
 
+	@Override
 	public Bundle getDefiningBundle() {
 		return (Bundle) EclipseAppContainer.callMethod(product, "getDefiningBundle", null, null); //$NON-NLS-1$
 	}
 
+	@Override
 	public String getDescription() {
 		return (String) EclipseAppContainer.callMethod(product, "getDescription", null, null); //$NON-NLS-1$
 	}
 
+	@Override
 	public String getId() {
 		return (String) EclipseAppContainer.callMethod(product, "getId", null, null); //$NON-NLS-1$
 	}
 
+	@Override
 	public String getName() {
 		return (String) EclipseAppContainer.callMethod(product, "getName", null, null); //$NON-NLS-1$
 	}
 
+	@Override
 	public String getProperty(String key) {
 		return (String) EclipseAppContainer.callMethod(product, "getProperty", new Class[] {String.class}, new Object[] {key}); //$NON-NLS-1$
 	}
 
+	@Override
 	public Object getProduct() {
 		return product;
 	}