diff options
author | Thomas Watson | 2010-04-09 14:58:46 +0000 |
---|---|---|
committer | Thomas Watson | 2010-04-09 14:58:46 +0000 |
commit | 2c899041a59970e03aed5ec701f41408d11df657 (patch) | |
tree | 7dfe9baa535cca0f11b514389125a4023325f77f /bundles/org.eclipse.osgi | |
parent | 7117ea3fb347dfa50f508aed7fa8b3c69616aae1 (diff) | |
download | rt.equinox.framework-2c899041a59970e03aed5ec701f41408d11df657.tar.gz rt.equinox.framework-2c899041a59970e03aed5ec701f41408d11df657.tar.xz rt.equinox.framework-2c899041a59970e03aed5ec701f41408d11df657.zip |
Bug 308654 - Update to the final released version of osgi core source
Diffstat (limited to 'bundles/org.eclipse.osgi')
5 files changed, 11 insertions, 11 deletions
diff --git a/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/PackagePermission.java b/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/PackagePermission.java index c512a6898..da2f5406c 100644 --- a/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/PackagePermission.java +++ b/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/PackagePermission.java @@ -56,7 +56,7 @@ import java.util.Map; * which is deprecated, implies the <code>import</code> action. * * @ThreadSafe - * @version $Revision: 7318 $ + * @version $Revision: 7189 $ */ public final class PackagePermission extends BasicPermission { @@ -166,8 +166,8 @@ public final class PackagePermission extends BasicPermission { * @param actions <code>exportonly</code>,<code>import</code> (canonical * order). * @throws IllegalArgumentException If the specified name is a filter - * expression and either the specified action is not - * <code>import</code> or the filter has an invalid syntax. + * expression and either the specified action is not + * <code>import</code> or the filter has an invalid syntax. */ public PackagePermission(String name, String actions) { this(name, parseActions(actions)); @@ -189,7 +189,7 @@ public final class PackagePermission extends BasicPermission { * @param exportingBundle The bundle exporting the requested package. * @param actions The action <code>import</code>. * @throws IllegalArgumentException If the specified action is not - * <code>import</code> or the name is a filter expression. + * <code>import</code> or the name is a filter expression. * @since 1.5 */ public PackagePermission(String name, Bundle exportingBundle, String actions) { diff --git a/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/ServicePermission.java b/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/ServicePermission.java index e63e01f97..d2f3c3167 100644 --- a/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/ServicePermission.java +++ b/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/ServicePermission.java @@ -51,7 +51,7 @@ import java.util.Map; * <code>ServicePermission</code> to get the specific service. * * @ThreadSafe - * @version $Revision: 7318 $ + * @version $Revision: 7189 $ */ public final class ServicePermission extends BasicPermission { @@ -167,8 +167,8 @@ public final class ServicePermission extends BasicPermission { * @param name The service class name * @param actions <code>get</code>,<code>register</code> (canonical order) * @throws IllegalArgumentException If the specified name is a filter - * expression and either the specified action is not <code>get</code> - * or the filter has an invalid syntax. + * expression and either the specified action is not + * <code>get</code> or the filter has an invalid syntax. */ public ServicePermission(String name, String actions) { this(name, parseActions(actions)); @@ -189,7 +189,7 @@ public final class ServicePermission extends BasicPermission { * @param reference The requested service. * @param actions The action <code>get</code>. * @throws IllegalArgumentException If the specified action is not - * <code>get</code> or reference is <code>null</code>. + * <code>get</code> or reference is <code>null</code>. * @since 1.5 */ public ServicePermission(ServiceReference reference, String actions) { diff --git a/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/hooks/service/EventHook.java b/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/hooks/service/EventHook.java index cf1f52afd..1249493d6 100644 --- a/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/hooks/service/EventHook.java +++ b/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/hooks/service/EventHook.java @@ -28,7 +28,7 @@ import org.osgi.framework.ServiceEvent; * (register, modify, and unregister service) operations. * * @ThreadSafe - * @version $Revision: 7318 $ + * @version $Revision: 6967 $ */ public interface EventHook { diff --git a/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/hooks/service/FindHook.java b/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/hooks/service/FindHook.java index 5bc878e50..0de1f0bd8 100644 --- a/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/hooks/service/FindHook.java +++ b/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/hooks/service/FindHook.java @@ -28,7 +28,7 @@ import org.osgi.framework.BundleContext; * (get service references) operations. * * @ThreadSafe - * @version $Revision: 7318 $ + * @version $Revision: 6967 $ */ public interface FindHook { diff --git a/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/hooks/service/ListenerHook.java b/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/hooks/service/ListenerHook.java index 192c06b29..5934c0c81 100644 --- a/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/hooks/service/ListenerHook.java +++ b/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/hooks/service/ListenerHook.java @@ -28,7 +28,7 @@ import org.osgi.framework.BundleContext; * addition and removal. * * @ThreadSafe - * @version $Revision: 7318 $ + * @version $Revision: 6967 $ */ public interface ListenerHook { |