diff options
Diffstat (limited to 'bundles/org.eclipse.osgi/osgi/src/org')
4 files changed, 9 insertions, 8 deletions
diff --git a/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/BundleContext.java b/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/BundleContext.java index 9d2721473..b0e8da4a4 100644 --- a/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/BundleContext.java +++ b/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/BundleContext.java @@ -641,7 +641,7 @@ public interface BundleContext extends BundleReference { * highest ranking (as specified in its {@link Constants#SERVICE_RANKING} * property) is returned. * <p> - * If there is a tie in ranking, the service with the lowest service ID (as + * If there is a tie in ranking, the service with the lowest service id (as * specified in its {@link Constants#SERVICE_ID} property); that is, the * service that was registered first is returned. * @@ -671,7 +671,7 @@ public interface BundleContext extends BundleReference { * If multiple such services exist, the service with the highest ranking (as * specified in its {@link Constants#SERVICE_RANKING} property) is returned. * <p> - * If there is a tie in ranking, the service with the lowest service ID (as + * If there is a tie in ranking, the service with the lowest service id (as * specified in its {@link Constants#SERVICE_ID} property); that is, the * service that was registered first is returned. * diff --git a/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/Constants.java b/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/Constants.java index 83b8d5021..44d23c409 100644 --- a/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/Constants.java +++ b/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/Constants.java @@ -1283,9 +1283,10 @@ public interface Constants { * * <p> * The value of this property is assigned by the Framework when a service is - * registered. The Framework assigns a unique value that is larger than all - * previously assigned values since the Framework was started. These values - * are NOT persistent across restarts of the Framework. + * registered. The Framework assigns a unique, non-negative value that is + * larger than all previously assigned values since the Framework was + * started. These values are NOT persistent across restarts of the + * Framework. */ String SERVICE_ID = "service.id"; diff --git a/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/dto/ServiceReferenceDTO.java b/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/dto/ServiceReferenceDTO.java index 53c7703ae..2c70b84f2 100644 --- a/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/dto/ServiceReferenceDTO.java +++ b/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/dto/ServiceReferenceDTO.java @@ -37,7 +37,7 @@ import org.osgi.framework.ServiceReference; */ public class ServiceReferenceDTO extends DTO { /** - * The {@code service.id} of the service. + * The id of the service. * * @see Constants#SERVICE_ID */ diff --git a/bundles/org.eclipse.osgi/osgi/src/org/osgi/util/tracker/ServiceTracker.java b/bundles/org.eclipse.osgi/osgi/src/org/osgi/util/tracker/ServiceTracker.java index 1f7fd0674..a0af979aa 100644 --- a/bundles/org.eclipse.osgi/osgi/src/org/osgi/util/tracker/ServiceTracker.java +++ b/bundles/org.eclipse.osgi/osgi/src/org/osgi/util/tracker/ServiceTracker.java @@ -1,5 +1,5 @@ /* - * Copyright (c) OSGi Alliance (2000, 2013). All Rights Reserved. + * Copyright (c) OSGi Alliance (2000, 2014). All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -544,7 +544,7 @@ public class ServiceTracker<S, T> implements ServiceTrackerCustomizer<S, T> { * If multiple services are being tracked, the service with the highest * ranking (as specified in its {@code service.ranking} property) is * returned. If there is a tie in ranking, the service with the lowest - * service ID (as specified in its {@code service.id} property); that is, + * service id (as specified in its {@code service.id} property); that is, * the service that was registered first is returned. This is the same * algorithm used by {@code BundleContext.getServiceReference}. * |