Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrey Loskutov2015-08-02 17:47:41 +0000
committerAndrey Loskutov2015-08-09 17:26:21 +0000
commit70c1bbc97cbddfe017e595a53f53e1dcfef7fca1 (patch)
tree06333d6fc0ff6f50de7d5c077279e9ea45f5259b /bundles/org.eclipse.equinox.preferences/src/org/eclipse/core/internal/preferences/Activator.java
parent31eb328d6c88c8853568b939ead70c0120522321 (diff)
downloadrt.equinox.bundles-70c1bbc97cbddfe017e595a53f53e1dcfef7fca1.tar.gz
rt.equinox.bundles-70c1bbc97cbddfe017e595a53f53e1dcfef7fca1.tar.xz
rt.equinox.bundles-70c1bbc97cbddfe017e595a53f53e1dcfef7fca1.zip
Code cleanup: added @Override annotations
Bug: 470699 Change-Id: Ia11cb1fcbe8bd1d6d61285ce72373d0b2474459e Signed-off-by: Andrey Loskutov <loskutov@gmx.de>
Diffstat (limited to 'bundles/org.eclipse.equinox.preferences/src/org/eclipse/core/internal/preferences/Activator.java')
-rw-r--r--bundles/org.eclipse.equinox.preferences/src/org/eclipse/core/internal/preferences/Activator.java7
1 files changed, 6 insertions, 1 deletions
diff --git a/bundles/org.eclipse.equinox.preferences/src/org/eclipse/core/internal/preferences/Activator.java b/bundles/org.eclipse.equinox.preferences/src/org/eclipse/core/internal/preferences/Activator.java
index 0358b4f24..78f4db61c 100644
--- a/bundles/org.eclipse.equinox.preferences/src/org/eclipse/core/internal/preferences/Activator.java
+++ b/bundles/org.eclipse.equinox.preferences/src/org/eclipse/core/internal/preferences/Activator.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2005, 2011 IBM Corporation and others.
+ * Copyright (c) 2005, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -59,6 +59,7 @@ public class Activator implements BundleActivator, ServiceTrackerCustomizer {
/* (non-Javadoc)
* @see org.osgi.framework.BundleActivator#start(org.osgi.framework.BundleContext)
*/
+ @Override
public void start(BundleContext context) throws Exception {
bundleContext = context;
// Open the services first before processing the command-line args, order is important! (Bug 150288)
@@ -78,6 +79,7 @@ public class Activator implements BundleActivator, ServiceTrackerCustomizer {
/* (non-Javadoc)
* @see org.osgi.framework.BundleActivator#stop(org.osgi.framework.BundleContext)
*/
+ @Override
public void stop(BundleContext context) throws Exception {
PreferencesOSGiUtils.getDefault().closeServices();
if (registryServiceTracker != null) {
@@ -102,6 +104,7 @@ public class Activator implements BundleActivator, ServiceTrackerCustomizer {
/* (non-Javadoc)
* @see org.osgi.util.tracker.ServiceTrackerCustomizer#addingService(org.osgi.framework.ServiceReference)
*/
+ @Override
public synchronized Object addingService(ServiceReference reference) {
Object service = bundleContext.getService(reference);
// this check is important as it avoids early loading of PreferenceServiceRegistryHelper and allows
@@ -129,6 +132,7 @@ public class Activator implements BundleActivator, ServiceTrackerCustomizer {
/* (non-Javadoc)
* @see org.osgi.util.tracker.ServiceTrackerCustomizer#modifiedService(org.osgi.framework.ServiceReference, java.lang.Object)
*/
+ @Override
public void modifiedService(ServiceReference reference, Object service) {
// nothing to do
}
@@ -136,6 +140,7 @@ public class Activator implements BundleActivator, ServiceTrackerCustomizer {
/* (non-Javadoc)
* @see org.osgi.util.tracker.ServiceTrackerCustomizer#removedService(org.osgi.framework.ServiceReference, java.lang.Object)
*/
+ @Override
public synchronized void removedService(ServiceReference reference, Object service) {
PreferencesService.getDefault().setRegistryHelper(null);
bundleContext.ungetService(reference);

Back to the top