Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Watson2012-03-12 20:35:33 +0000
committerThomas Watson2012-03-12 20:35:33 +0000
commitab0400d0839454ce89348cb734c0a7cdfeead48c (patch)
tree0e0e3ee5b582de2c7d719f8bd83ec92cb086dc2f
parent5eb6a8a82812d75aa088d67c29af43e69b83a780 (diff)
downloadrt.equinox.framework-ab0400d0839454ce89348cb734c0a7cdfeead48c.tar.gz
rt.equinox.framework-ab0400d0839454ce89348cb734c0a7cdfeead48c.tar.xz
rt.equinox.framework-ab0400d0839454ce89348cb734c0a7cdfeead48c.zip
[R5] OSGi javadoc updatesv20120312-2035
-rw-r--r--bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/Constants.java10
-rw-r--r--bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/FrameworkUtil.java14
-rw-r--r--bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/launch/FrameworkFactory.java4
-rw-r--r--bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/namespace/BundleNamespace.java4
-rw-r--r--bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/namespace/HostNamespace.java4
-rw-r--r--bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/namespace/IdentityNamespace.java4
6 files changed, 20 insertions, 20 deletions
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 60892d488..6d07a4c3e 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
@@ -1437,11 +1437,11 @@ public interface Constants {
* Service property marking the service for export. It defines the
* interfaces under which this service can be exported. This list must be a
* subset of the types under which the service was registered. The single
- * value of an asterisk ("*", \u002A) indicates all the
- * interface types under which the service was registered excluding the
- * non-interface types. It is strongly recommended to only export interface
- * types and not concrete classes due to the complexity of creating proxies
- * for some type of concrete classes.
+ * value of an asterisk ({@code '*'} \u002A) indicates all the interface
+ * types under which the service was registered excluding the non-interface
+ * types. It is strongly recommended to only export interface types and not
+ * concrete classes due to the complexity of creating proxies for some type
+ * of concrete classes.
*
* <p>
* This property may be supplied in the {@code properties}
diff --git a/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/FrameworkUtil.java b/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/FrameworkUtil.java
index b2a9c9607..1f46ea2bb 100644
--- a/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/FrameworkUtil.java
+++ b/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/FrameworkUtil.java
@@ -81,7 +81,7 @@ public class FrameworkUtil {
/**
* Match a Distinguished Name (DN) chain against a pattern. DNs can be
- * matched using wildcards. A wildcard ('*' &#92;u002A) replaces all
+ * matched using wildcards. A wildcard ({@code '*'} &#92;u002A) replaces all
* possible values. Due to the structure of the DN, the comparison is more
* complicated than string-based wildcard matching.
* <p>
@@ -153,8 +153,8 @@ public class FrameworkUtil {
* </pre>
*
* <p>
- * A match pattern may contain a chain of DN match patterns. The
- * semicolon(';' &#92;u003B) must be used to separate DN match patterns in a
+ * A match pattern may contain a chain of DN match patterns. The semicolon(
+ * {@code ';'} &#92;u003B) must be used to separate DN match patterns in a
* chain. Wildcards can also be used to match against a complete DN within a
* chain.
* <p>
@@ -167,10 +167,10 @@ public class FrameworkUtil {
* </pre>
* <p>
* The wildcard ('*') matches zero or one DN in the chain, however,
- * sometimes it is necessary to match a longer chain. The minus sign ('-'
- * &#92;u002D) represents zero or more DNs, whereas the asterisk only
- * represents a single DN. For example, to match a DN where the Tweety Inc.
- * is in the DN chain, use the following expression:
+ * sometimes it is necessary to match a longer chain. The minus sign (
+ * {@code '-'} &#92;u002D) represents zero or more DNs, whereas the asterisk
+ * only represents a single DN. For example, to match a DN where the Tweety
+ * Inc. is in the DN chain, use the following expression:
* </p>
*
* <pre>
diff --git a/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/launch/FrameworkFactory.java b/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/launch/FrameworkFactory.java
index c398d278c..1684e14aa 100644
--- a/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/launch/FrameworkFactory.java
+++ b/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/launch/FrameworkFactory.java
@@ -32,8 +32,8 @@ import org.osgi.framework.Bundle;
* This UTF-8 encoded resource must contain the name of the framework
* implementation's FrameworkFactory implementation class. Space and tab
* characters, including blank lines, in the resource must be ignored. The
- * number sign ('#' &#92;u0023) and all characters following it on each line are
- * a comment and must be ignored.
+ * number sign ({@code '#'} &#92;u0023) and all characters following it on each
+ * line are a comment and must be ignored.
*
* <p>
* Launchers can find the name of the FrameworkFactory implementation class in
diff --git a/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/namespace/BundleNamespace.java b/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/namespace/BundleNamespace.java
index 0332b3e66..339f12047 100644
--- a/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/namespace/BundleNamespace.java
+++ b/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/namespace/BundleNamespace.java
@@ -82,8 +82,8 @@ public final class BundleNamespace extends AbstractWiringNamespace {
/**
* The capability directive identifying if the resource is a singleton. A
* {@code String} value of &quot;{@code true}&quot; indicates the resource
- * is a singleton; any other value or <code>null</code> indicates the
- * resource is not a singleton.
+ * is a singleton; any other value or {@code null} indicates the resource is
+ * not a singleton.
*
* <p>
* This directive should be examined using the {@link IdentityNamespace
diff --git a/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/namespace/HostNamespace.java b/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/namespace/HostNamespace.java
index 5c3378e59..aa3cc744c 100644
--- a/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/namespace/HostNamespace.java
+++ b/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/namespace/HostNamespace.java
@@ -83,8 +83,8 @@ public final class HostNamespace extends AbstractWiringNamespace {
/**
* The capability directive identifying if the resource is a singleton. A
* {@code String} value of &quot;{@code true}&quot; indicates the resource
- * is a singleton; any other value or <code>null</code> indicates the
- * resource is not a singleton.
+ * is a singleton; any other value or {@code null} indicates the resource is
+ * not a singleton.
*
* <p>
* This directive should be examined using the {@link IdentityNamespace
diff --git a/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/namespace/IdentityNamespace.java b/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/namespace/IdentityNamespace.java
index de0d2d851..e34dcaba1 100644
--- a/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/namespace/IdentityNamespace.java
+++ b/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/namespace/IdentityNamespace.java
@@ -57,8 +57,8 @@ public final class IdentityNamespace extends Namespace {
/**
* The capability directive identifying if the resource is a singleton. A
* {@code String} value of &quot;true&quot; indicates the resource is a
- * singleton; any other value or <code>null</code> indicates the resource is
- * not a singleton.
+ * singleton; any other value or {@code null} indicates the resource is not
+ * a singleton.
*/
public static final String CAPABILITY_SINGLETON_DIRECTIVE = "singleton";

Back to the top