diff options
| author | Thomas Watson | 2017-08-22 12:45:55 +0000 |
|---|---|---|
| committer | Thomas Watson | 2017-08-22 12:49:54 +0000 |
| commit | 18b75ba105ec2e868cb0c13dff1662e73813b678 (patch) | |
| tree | 44a294cac6f394b34718ec24819d3370dd3e049d /bundles/org.eclipse.osgi/osgi/src | |
| parent | e47a6cbd20d91e10988d4432e449d6ed4663f320 (diff) | |
| download | rt.equinox.framework-18b75ba105ec2e868cb0c13dff1662e73813b678.tar.gz rt.equinox.framework-18b75ba105ec2e868cb0c13dff1662e73813b678.tar.xz rt.equinox.framework-18b75ba105ec2e868cb0c13dff1662e73813b678.zip | |
Update OSGi APIs for R7I20170830-2000I20170830-0605I20170829-2345I20170829-2000I20170829-0940I20170829-0705I20170828-2000I20170828-1220I20170828-0730I20170827-2000I20170826-1500I20170825-2000I20170824-2000I20170823-2000
Change-Id: Id406562887a18b3afb377f0b8cfa38dddefd837f
Signed-off-by: Thomas Watson <tjwatson@us.ibm.com>
Diffstat (limited to 'bundles/org.eclipse.osgi/osgi/src')
| -rw-r--r-- | bundles/org.eclipse.osgi/osgi/src/org/osgi/service/log/LogEntry.java | 8 | ||||
| -rw-r--r-- | bundles/org.eclipse.osgi/osgi/src/org/osgi/service/resolver/Resolver.java | 10 |
2 files changed, 10 insertions, 8 deletions
diff --git a/bundles/org.eclipse.osgi/osgi/src/org/osgi/service/log/LogEntry.java b/bundles/org.eclipse.osgi/osgi/src/org/osgi/service/log/LogEntry.java index 6b3ee59f7..9dca75876 100644 --- a/bundles/org.eclipse.osgi/osgi/src/org/osgi/service/log/LogEntry.java +++ b/bundles/org.eclipse.osgi/osgi/src/org/osgi/service/log/LogEntry.java @@ -1,5 +1,5 @@ /* - * Copyright (c) OSGi Alliance (2000, 2016). All Rights Reserved. + * Copyright (c) OSGi Alliance (2000, 2017). 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. @@ -68,11 +68,11 @@ public interface LogEntry { int getLevel(); /** - * Returns the human readable message associated with this {@code LogEntry} + * Returns the formatted message associated with this {@code LogEntry} * object. * - * @return {@code String} containing the message associated with this - * {@code LogEntry} object. + * @return {@code String} containing the formatted message associated with + * this {@code LogEntry} object. */ String getMessage(); diff --git a/bundles/org.eclipse.osgi/osgi/src/org/osgi/service/resolver/Resolver.java b/bundles/org.eclipse.osgi/osgi/src/org/osgi/service/resolver/Resolver.java index 555f3cd15..b51c25d7a 100644 --- a/bundles/org.eclipse.osgi/osgi/src/org/osgi/service/resolver/Resolver.java +++ b/bundles/org.eclipse.osgi/osgi/src/org/osgi/service/resolver/Resolver.java @@ -77,13 +77,15 @@ public interface Resolver { Map<Resource, List<Wire>> resolve(ResolveContext context) throws ResolutionException; /** - * Resolves a given dynamic requirement dynamically for the given host - * wiring using the given resolve context and return any new resources and - * wires to the caller. + * Resolves a given requirement dynamically for the given host wiring using + * the given resolve context and return any new resources and wires to the + * caller. * <p> * The requirement must be a {@link Wiring#getResourceRequirements(String) * requirement} of the wiring and must use the - * {@link PackageNamespace#PACKAGE_NAMESPACE package} namespace. + * {@link PackageNamespace#PACKAGE_NAMESPACE package} namespace with a + * {@link Namespace#REQUIREMENT_RESOLUTION_DIRECTIVE resolution} of type + * {@link PackageNamespace#RESOLUTION_DYNAMIC dynamic}. * <p> * The resolve context is not asked for * {@link ResolveContext#getMandatoryResources() mandatory} resources or for |