Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Watson2014-03-05 15:23:12 +0000
committerThomas Watson2014-03-05 15:23:12 +0000
commit82e8bb282bf520275f22cfa6001809cbbe46884e (patch)
treec7bf6db7865defe33b414108c3efb507438c9196
parent55b40625e1a03acd0f4a8c8321238e91e4482c48 (diff)
downloadrt.equinox.framework-82e8bb282bf520275f22cfa6001809cbbe46884e.tar.gz
rt.equinox.framework-82e8bb282bf520275f22cfa6001809cbbe46884e.tar.xz
rt.equinox.framework-82e8bb282bf520275f22cfa6001809cbbe46884e.zip
-rw-r--r--bundles/org.eclipse.osgi/osgi/src/org/osgi/dto/DTO.java17
-rw-r--r--bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/BundleContext.java4
-rw-r--r--bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/launch/Framework.java2
-rw-r--r--bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/wiring/dto/BundleRevisionDTO.java2
4 files changed, 18 insertions, 7 deletions
diff --git a/bundles/org.eclipse.osgi/osgi/src/org/osgi/dto/DTO.java b/bundles/org.eclipse.osgi/osgi/src/org/osgi/dto/DTO.java
index 36dd2d0b9..adaf574b3 100644
--- a/bundles/org.eclipse.osgi/osgi/src/org/osgi/dto/DTO.java
+++ b/bundles/org.eclipse.osgi/osgi/src/org/osgi/dto/DTO.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) OSGi Alliance (2012). All Rights Reserved.
+ * Copyright (c) OSGi Alliance (2012, 2014). 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.
@@ -27,11 +27,16 @@ import java.util.Set;
/**
* Super type for Data Transfer Objects.
*
- * All data transfer objects are easily serializable having only public fields
+ * <p>
+ * A Data Transfer Object (DTO) is easily serializable having only public fields
* of primitive types and their wrapper classes, Strings, and DTOs. List, Set,
* Map and array aggregates may also be used. The aggregates must only hold
* objects of the listed types or aggregates.
*
+ * <p>
+ * The object graph from a Data Transfer Object must be a tree to simplify
+ * serialization and deserialization.
+ *
* @author $Id$
* @NotThreadSafe
*/
@@ -57,9 +62,6 @@ public abstract class DTO {
* Append the specified DTO's string representation to the specified
* StringBuilder.
*
- * <p>
- * This method handles circular DTO references.
- *
* @param result StringBuilder to which the string representation is
* appended.
* @param objectRefs References to "seen" objects.
@@ -95,6 +97,11 @@ public abstract class DTO {
* Append the specified value's string representation to the specified
* StringBuilder.
*
+ * <p>
+ * This method handles cycles in the object graph, using path-based
+ * references, even though the specification requires the object graph from
+ * a DTO to be a tree.
+ *
* @param result StringBuilder to which the string representation is
* appended.
* @param objectRefs References to "seen" objects.
diff --git a/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/BundleContext.java b/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/BundleContext.java
index b0e8da4a4..fbf0b1829 100644
--- a/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/BundleContext.java
+++ b/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/BundleContext.java
@@ -59,7 +59,7 @@ import org.osgi.annotation.versioning.ProviderType;
* The {@code BundleContext} object is only valid during the execution of its
* context bundle; that is, during the period from when the context bundle is in
* the {@code STARTING}, {@code STOPPING}, and {@code ACTIVE} bundle states.
- * However, the {@code BundleContext} object become invalid after
+ * However, the {@code BundleContext} object becomes invalid after
* {@link BundleActivator#stop(BundleContext)} returns (if the bundle has a
* Bundle Activator). The {@code BundleContext} object becomes invalid before
* disposing of any remaining registered services and releasing any remaining
@@ -403,6 +403,8 @@ public interface BundleContext extends BundleReference {
* specified classes.</li>
* <li>A property named {@link Constants#SERVICE_SCOPE} identifying the
* scope of the service.</li>
+ * <li>A property named {@link Constants#SERVICE_BUNDLEID} identifying the
+ * the context bundle.</li>
* </ul>
* Properties with these names in the specified {@code Dictionary} will be
* ignored.</li>
diff --git a/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/launch/Framework.java b/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/launch/Framework.java
index 0fa043dd9..25b603f31 100644
--- a/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/launch/Framework.java
+++ b/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/launch/Framework.java
@@ -72,6 +72,8 @@ public interface Framework extends Bundle {
* {@code ConditionalPermissionAdmin}.</li>
* <li>Be {@link #adapt(Class) adaptable} to the OSGi defined types to which
* a system bundle can be adapted.</li>
+ * <li>Have called the {@code start} method of the extension bundle
+ * activator for all resolved extension bundles.</li>
* </ul>
*
* <p>
diff --git a/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/wiring/dto/BundleRevisionDTO.java b/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/wiring/dto/BundleRevisionDTO.java
index 7f5e82fcc..43d74167b 100644
--- a/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/wiring/dto/BundleRevisionDTO.java
+++ b/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/wiring/dto/BundleRevisionDTO.java
@@ -20,7 +20,7 @@ import org.osgi.framework.wiring.BundleRevision;
import org.osgi.resource.dto.ResourceDTO;
/**
- * Data Transfer Object for a BundleWiring.
+ * Data Transfer Object for a BundleRevision.
*
* <p>
* An installed Bundle can be adapted to provide a {@code BundleRevisionDTO} for

Back to the top