diff options
author | Alexander Kurtakov | 2019-03-18 17:04:41 +0000 |
---|---|---|
committer | Alexander Kurtakov | 2019-03-18 17:12:59 +0000 |
commit | 3e325f00aa328c339fa605cecdd99da447984d9a (patch) | |
tree | 8f150dd2a9646b7080987ece700ce479837d7872 | |
parent | 98755ac911c90491b65ff46484728203b93ede79 (diff) | |
download | rt.equinox.framework-3e325f00aa328c339fa605cecdd99da447984d9a.tar.gz rt.equinox.framework-3e325f00aa328c339fa605cecdd99da447984d9a.tar.xz rt.equinox.framework-3e325f00aa328c339fa605cecdd99da447984d9a.zip |
Bug 545330 - Problems in javadoc for platformI20190329-0120I20190328-1800I20190327-1800I20190326-2305I20190326-1800I20190325-1800I20190325-0105I20190324-1800I20190323-1800I20190322-1800I20190321-1800I20190321-0435I20190321-0245I20190320-1800I20190318-1800
Fix equinox.framework javadoc issues.
Change-Id: Icef51dd371798eac71404e37a3813ad9df39dc08
Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
9 files changed, 12 insertions, 12 deletions
diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/service/resolver/BundleDelta.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/service/resolver/BundleDelta.java index 6a0d4ce55..49f8bfeae 100644 --- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/service/resolver/BundleDelta.java +++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/service/resolver/BundleDelta.java @@ -114,9 +114,9 @@ public interface BundleDelta extends Comparable<BundleDelta> { * The natural order of elements is determined by the bundle id of the * BundleDescription that this bundle delta is for. * - * @return int which should be <0 if the receiver should sort before the + * @return int which should be <0 if the receiver should sort before the * argument, 0 if the receiver should sort in the same position as - * the argument, and >0 if the receiver should sort after the + * the argument, and >0 if the receiver should sort after the * argument. * @param obj * another BundleDelta an object to compare the receiver to diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/service/resolver/Resolver.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/service/resolver/Resolver.java index 1544f1f42..e9c3f196b 100644 --- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/service/resolver/Resolver.java +++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/service/resolver/Resolver.java @@ -86,7 +86,7 @@ public interface Resolver { /** * Notifies the resolver a bundle has been added to the state. - * @param bundle + * @param bundle the bundle added */ public void bundleAdded(BundleDescription bundle); diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/service/resolver/State.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/service/resolver/State.java index 7608abe69..dc62889d8 100644 --- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/service/resolver/State.java +++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/service/resolver/State.java @@ -387,12 +387,12 @@ public interface State { public StateDelta resolve(BundleDescription[] resolve, boolean discard); /** - * Sets the version overrides which are to be applied during the resolutoin + * Sets the version overrides which are to be applied during the resolution * of this state. Version overrides allow external forces to * refine/override the version constraints setup by the components in the * state. * - * @param value + * @param value Format undefined. * @deprecated The exact form of this has never been defined. There is * no alternative method available. */ diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/service/resolver/StateDelta.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/service/resolver/StateDelta.java index 9c3770625..87785e670 100644 --- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/service/resolver/StateDelta.java +++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/service/resolver/StateDelta.java @@ -35,8 +35,8 @@ public interface StateDelta { * included. Otherwise, all bundle deltas whose type's bit-wise and with the * mask is non-zero are included. * - * @param mask - * @param exact + * @param mask match mask + * @param exact whether exact match or bit-wise matching should be performed * @return an array of bundle deltas matching the given match criteria. */ public BundleDelta[] getChanges(int mask, boolean exact); diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/signedcontent/SignedContent.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/signedcontent/SignedContent.java index c8d03a6cf..a3b59f923 100644 --- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/signedcontent/SignedContent.java +++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/signedcontent/SignedContent.java @@ -64,7 +64,7 @@ public interface SignedContent { /** * Returns true if the content is signed; false otherwise. This is a convenience method - * equivalent to calling <code>{@link #getSignerInfos()}.length > 0</code> + * equivalent to calling <code>{@link #getSignerInfos()}.length > 0</code> * @return true if the content is signed */ public boolean isSigned(); diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/signedcontent/SignedContentEntry.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/signedcontent/SignedContentEntry.java index ea1dce0e2..190569947 100644 --- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/signedcontent/SignedContentEntry.java +++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/signedcontent/SignedContentEntry.java @@ -46,7 +46,7 @@ public interface SignedContentEntry { /** * Returns true if the entry is signed; false otherwise. This is a convenience method - * equivalent to calling <code>{@link #getSignerInfos()}.length > 0</code> + * equivalent to calling <code>{@link #getSignerInfos()}.length > 0</code> * @return true if the content is signed */ public boolean isSigned(); diff --git a/bundles/org.eclipse.osgi/supplement/META-INF/MANIFEST.MF b/bundles/org.eclipse.osgi/supplement/META-INF/MANIFEST.MF index 8c80f7e9a..0766917eb 100644 --- a/bundles/org.eclipse.osgi/supplement/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.osgi/supplement/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.equinox.supplement -Bundle-Version: 1.8.200.qualifier +Bundle-Version: 1.8.300.qualifier Bundle-Vendor: %providerName Bundle-Localization: plugin Export-Package: org.eclipse.equinox.log;version="1.0", diff --git a/bundles/org.eclipse.osgi/supplement/pom.xml b/bundles/org.eclipse.osgi/supplement/pom.xml index d24317799..d86a181ff 100644 --- a/bundles/org.eclipse.osgi/supplement/pom.xml +++ b/bundles/org.eclipse.osgi/supplement/pom.xml @@ -21,7 +21,7 @@ <groupId>org.eclipse.equinox</groupId> <artifactId>org.eclipse.equinox.supplement</artifactId> - <version>1.8.200-SNAPSHOT</version> + <version>1.8.300-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project> diff --git a/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/service/debug/DebugTrace.java b/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/service/debug/DebugTrace.java index d5acd1108..fc51616fe 100644 --- a/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/service/debug/DebugTrace.java +++ b/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/service/debug/DebugTrace.java @@ -34,7 +34,7 @@ package org.eclipse.osgi.service.debug; * <p> * Note that the pipe character ("|") is reserved for internal use. If this character * happens to occur in any of the thread name, the option, the message or an Exception - * message, it will be escaped to the corresponding HTML representation ("&#124;"). + * message, it will be escaped to the corresponding HTML representation ("&#124;"). * </p> * * @since 3.5 |