Bug 545330 - Problems in javadoc for platform
Fix equinox.framework javadoc issues.
Change-Id: Icef51dd371798eac71404e37a3813ad9df39dc08
Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
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 6a0d4ce..49f8bfe 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 @@
* 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 1544f1f..e9c3f19 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 @@
/**
* 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 7608abe..dc62889 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 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 9c37706..87785e6 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 @@
* 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 c8d03a6..a3b59f9 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 @@
/**
* 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 ea1dce0..1905699 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 @@
/**
* 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 8c80f7e..0766917 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 @@
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 d243177..d86a181 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 d5acd11..fc51616 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 @@
* <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
