true, meaning that
* subsequent calls to {@link #get()} will not block), or {@link #isDone()} to
* determine if all operations and results have been completed.
- *
*
* If {@link #hasValue()} is true, then the client may access status information
* associated with the completed operation(s) via {@link #getStatus()}. Until
@@ -72,8 +71,7 @@ public interface IFuture
* ---Controlliing Bundles---
*
* ---Displaying Status---
*
- *
*
- *
* ---Controlling StartLevel--- *
*
* ---Eclipse Runtime commands---
@@ -1873,7 +1873,7 @@ private void getRequiredBundlePackages(BundleWire requiredWire, Set
*
* @param array The array of objects to sort
*/
@@ -33,13 +32,14 @@ public static void sortByString(Object[] array) {
* Sorts the array of objects by their string representation in ascending order.
*
* This is a version of C.A.R Hoare's Quick Sort algorithm.
+ *
* For example, an Equinox attribute definition will contain all XML attributes
* specified as part of the <AD/> element with namespaces other than the
* metatype namespace as extension attributes.
+ *
* For example, an Equinox object class definition will contain all XML
* attributes specified as part of the <OCD/> element with namespaces
* other than the metatype namespace as extension attributes.
+ *
* Extension of MetaTypeProvider
+ *
* Provides methods to:
- *
- * - getPids() get the Pids for a given Locale
- *
- * - getFactoryPids() get the Factory Pids for a given Locale
- *
+ *
+ * Concurrent Semantics
+ *
* Note that this is an internal interface and is not intended for external use.
- * start < 0 or
- * end >= array.length
+ * @exception ArrayIndexOutOfBoundsException when start < 0 or
+ * end >= array.length
*/
public static void qSortByString(Object[] array, int start, int stop) {
if (start >= stop)
@@ -95,9 +95,9 @@ public static void qSortByString(Object[] array, int start, int stop) {
* not implement Comparable or
* elements cannot be compared to each
* other
- * @exception IllegalArgumentException when start > end
- * @exception ArrayIndexOutOfBoundsException when start < 0 or
- * end > array.size()
+ * @exception IllegalArgumentException when {@code start > end}
+ * @exception ArrayIndexOutOfBoundsException when {@code start < 0} or
+ * {@code end > array.size()}
*/
@SuppressWarnings("unchecked")
public static void sort(Object[] array, int start, int end) {
@@ -137,9 +137,9 @@ public static void sort(Object[] array, int start, int end) {
* not implement Comparable or
* elements cannot be compared to each
* other
- * @exception IllegalArgumentException when start > end
- * @exception ArrayIndexOutOfBoundsException when start < 0 or
- * end > array.size()
+ * @exception IllegalArgumentException when {@code start > end}
+ * @exception ArrayIndexOutOfBoundsException when {@code start < 0} or
+ * {@code end > array.size()}
*/
public static void dsort(Object[] array, int start, int end) {
// first sort in ascending order
diff --git a/bundles/org.eclipse.equinox.device/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.device/META-INF/MANIFEST.MF
index 9b68e64c3b8..de980fb0ed8 100644
--- a/bundles/org.eclipse.equinox.device/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.equinox.device/META-INF/MANIFEST.MF
@@ -1,6 +1,6 @@
Bundle-ManifestVersion: 2
Bundle-Name: %bundleName
-Bundle-Version: 1.2.100.qualifier
+Bundle-Version: 1.2.200.qualifier
Bundle-Activator: org.eclipse.equinox.device.Activator
Bundle-SymbolicName: org.eclipse.equinox.device;deprecated:="Deprecated without any direct replacement, please use a different implementation or get in contact with the Equinox team to fix up this one"
Bundle-Vendor: %bundleVendor
diff --git a/bundles/org.eclipse.equinox.device/src/org/eclipse/equinox/device/DriverTracker.java b/bundles/org.eclipse.equinox.device/src/org/eclipse/equinox/device/DriverTracker.java
index 7304509dce2..e0222bc5833 100644
--- a/bundles/org.eclipse.equinox.device/src/org/eclipse/equinox/device/DriverTracker.java
+++ b/bundles/org.eclipse.equinox.device/src/org/eclipse/equinox/device/DriverTracker.java
@@ -33,21 +33,25 @@ public class DriverTracker extends ServiceTracker {
/** LogService object */
protected LogTracker log;
- /** Dictionary mapping DRIVER_ID strings <==> Driver ServiceReferences */
+ /**
+ * Dictionary mapping {@code DRIVER_ID strings <==> Driver ServiceReferences}
+ */
protected Hashtable
+ *
*/
public class MetaTypeInformationImpl extends MetaTypeProviderImpl implements EquinoxMetaTypeInformation {
static final String[] emptyStringArray = new String[0];
diff --git a/bundles/org.eclipse.equinox.preferences.tests/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.preferences.tests/META-INF/MANIFEST.MF
index be122a375bf..af92641f217 100644
--- a/bundles/org.eclipse.equinox.preferences.tests/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.equinox.preferences.tests/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Bundle-Name: Preferences Tests
Bundle-Vendor: Eclipse.org - Equinox
Bundle-Category: test
Bundle-SymbolicName: org.eclipse.equinox.preferences.tests
-Bundle-Version: 3.10.100.qualifier
+Bundle-Version: 3.10.200.qualifier
Require-Bundle: org.junit
Import-Package:
org.eclipse.core.internal.preferences,
diff --git a/bundles/org.eclipse.equinox.preferences.tests/src/org/eclipse/equinox/preferences/tests/EclipsePreferencesTest.java b/bundles/org.eclipse.equinox.preferences.tests/src/org/eclipse/equinox/preferences/tests/EclipsePreferencesTest.java
index 111d2a9b08f..7025a87facd 100644
--- a/bundles/org.eclipse.equinox.preferences.tests/src/org/eclipse/equinox/preferences/tests/EclipsePreferencesTest.java
+++ b/bundles/org.eclipse.equinox.preferences.tests/src/org/eclipse/equinox/preferences/tests/EclipsePreferencesTest.java
@@ -22,7 +22,6 @@
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.ICoreRunnable;
-import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.core.runtime.Platform;
@@ -32,7 +31,6 @@
import org.eclipse.core.runtime.preferences.IEclipsePreferences.INodeChangeListener;
import org.eclipse.core.runtime.preferences.IEclipsePreferences.IPreferenceChangeListener;
import org.eclipse.core.runtime.preferences.IEclipsePreferences.NodeChangeEvent;
-import org.eclipse.core.runtime.preferences.IEclipsePreferences.PreferenceChangeEvent;
import org.eclipse.core.runtime.preferences.IScopeContext;
import org.eclipse.core.runtime.preferences.InstanceScope;
import org.eclipse.osgi.service.datalocation.Location;
@@ -97,27 +95,22 @@ private void initLocation(BundleContext bundleContext)
/**
* Concurrent access to listener collection should not lead to exceptions
*
- * @see https://bugs.eclipse.org/bugs/show_bug.cgi?id=444188
+ * @see bug
+ * 444188
*/
@Test
public void testConcurrentPreferenceChangeListener() throws InterruptedException, CoreException {
final IEclipsePreferences node = createTestNode();
final int runSize = 100000;
- executeInTwoThreads(new ICoreRunnable() {
- @Override
- public void run(IProgressMonitor monitor) throws CoreException {
- IPreferenceChangeListener listener = new IPreferenceChangeListener() {
- @Override
- public void preferenceChange(PreferenceChangeEvent event) {
- }
- };
- for (int i = 0; i < runSize && !monitor.isCanceled(); i++) {
- node.addPreferenceChangeListener(listener); // Should not throw
- node.put("x", "y"); // Should not throw
- node.remove("x"); // Should not throw
- node.removePreferenceChangeListener(listener); // Should not throw
- }
+ executeInTwoThreads(monitor -> {
+ IPreferenceChangeListener listener = event -> {
+ };
+ for (int i = 0; i < runSize && !monitor.isCanceled(); i++) {
+ node.addPreferenceChangeListener(listener); // Should not throw
+ node.put("x", "y"); // Should not throw
+ node.remove("x"); // Should not throw
+ node.removePreferenceChangeListener(listener); // Should not throw
}
});
}
@@ -125,47 +118,41 @@ public void preferenceChange(PreferenceChangeEvent event) {
/**
* Concurrent access to listener collection should not lead to exceptions
*
- * @see https://bugs.eclipse.org/bugs/show_bug.cgi?id=444188
+ * @see bug
+ * 444188
*/
@Test
public void testConcurrentNodeChangeListener() throws InterruptedException, CoreException {
final IEclipsePreferences node = createTestNode();
final int runSize = 100000;
- executeInTwoThreads(new ICoreRunnable() {
- @Override
- public void run(IProgressMonitor monitor) throws CoreException {
- INodeChangeListener listener = new INodeChangeListener() {
-
- @Override
- public void removed(NodeChangeEvent event) {
- }
-
- @Override
- public void added(NodeChangeEvent event) {
- }
- };
- for (int i = 0; i < runSize && !monitor.isCanceled(); i++) {
- node.addNodeChangeListener(listener); // Should not throw
- try {
- node.node(Thread.currentThread().getName()).removeNode(); // Should not throw
- } catch (BackingStoreException e) {
- throw new CoreException(
- new Status(IStatus.ERROR, "org.eclipse.core.tests.runtime", 0, "", null));
- }
- node.removeNodeChangeListener(listener); // Should not throw
+ executeInTwoThreads(monitor -> {
+ INodeChangeListener listener = new INodeChangeListener() {
+
+ @Override
+ public void removed(NodeChangeEvent event) {
+ }
+
+ @Override
+ public void added(NodeChangeEvent event) {
+ }
+ };
+ for (int i = 0; i < runSize && !monitor.isCanceled(); i++) {
+ node.addNodeChangeListener(listener); // Should not throw
+ try {
+ node.node(Thread.currentThread().getName()).removeNode(); // Should not throw
+ } catch (BackingStoreException e) {
+ throw new CoreException(new Status(IStatus.ERROR, "org.eclipse.core.tests.runtime", 0, "", null));
}
+ node.removeNodeChangeListener(listener); // Should not throw
}
});
}
private static void executeInTwoThreads(final ICoreRunnable runnable) throws InterruptedException, CoreException {
final CountDownLatch latch = new CountDownLatch(1);
- Job job = Job.create("", new ICoreRunnable() {
- @Override
- public void run(IProgressMonitor monitor) throws CoreException {
- latch.countDown();
- runnable.run(monitor);
- }
+ Job job = Job.create("", (ICoreRunnable) monitor -> {
+ latch.countDown();
+ runnable.run(monitor);
});
job.schedule();
try {
diff --git a/bundles/org.eclipse.equinox.preferences/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.preferences/META-INF/MANIFEST.MF
index 62d96129573..7f13b3ae44d 100644
--- a/bundles/org.eclipse.equinox.preferences/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.equinox.preferences/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.equinox.preferences; singleton:=true
-Bundle-Version: 3.11.200.qualifier
+Bundle-Version: 3.11.300.qualifier
Bundle-Activator: org.eclipse.core.internal.preferences.Activator
Bundle-Vendor: %providerName
Bundle-Localization: plugin
diff --git a/bundles/org.eclipse.equinox.preferences/src/org/eclipse/core/internal/preferences/BundleStateScope.java b/bundles/org.eclipse.equinox.preferences/src/org/eclipse/core/internal/preferences/BundleStateScope.java
index 5ef46fe61c4..8c3ce08a38a 100644
--- a/bundles/org.eclipse.equinox.preferences/src/org/eclipse/core/internal/preferences/BundleStateScope.java
+++ b/bundles/org.eclipse.equinox.preferences/src/org/eclipse/core/internal/preferences/BundleStateScope.java
@@ -30,8 +30,11 @@
* following way:
*
*
- * @Reference(target = "(type=bundle)")
+ *
*/
public class BundleStateScope implements IScopeContext {
diff --git a/bundles/org.eclipse.equinox.region/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.region/META-INF/MANIFEST.MF
index cccc76c7230..e0cc967edb7 100644
--- a/bundles/org.eclipse.equinox.region/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.equinox.region/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.eclipse.equinox.region
-Bundle-Version: 1.5.500.qualifier
+Bundle-Version: 1.5.600.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Fragment-Host: system.bundle
ExtensionBundle-Activator: org.eclipse.equinox.internal.region.RegionManager
diff --git a/bundles/org.eclipse.equinox.region/src/org/eclipse/equinox/internal/region/BundleIdBasedRegion.java b/bundles/org.eclipse.equinox.region/src/org/eclipse/equinox/internal/region/BundleIdBasedRegion.java
index c42dcdf7ea1..df0f8ef28ef 100644
--- a/bundles/org.eclipse.equinox.region/src/org/eclipse/equinox/internal/region/BundleIdBasedRegion.java
+++ b/bundles/org.eclipse.equinox.region/src/org/eclipse/equinox/internal/region/BundleIdBasedRegion.java
@@ -28,9 +28,9 @@
* {@link BundleIdBasedRegion} is an implementation of {@link Region} which
* keeps a track of the bundles in the region by recording their bundle
* identifiers.
- *
- *
- * Concurrent Semantics
+ * {@literal @}Reference(target = "(type=bundle)")
* private IScopeContext scopeContext;
+ * }
+ *
*
+ *
+ * Concurrent Semantics + *
* * Threadsafe. */ diff --git a/bundles/org.eclipse.equinox.region/src/org/eclipse/equinox/internal/region/StandardRegionDigraph.java b/bundles/org.eclipse.equinox.region/src/org/eclipse/equinox/internal/region/StandardRegionDigraph.java index dcf7c2f49a1..aa0dbc7f1fc 100644 --- a/bundles/org.eclipse.equinox.region/src/org/eclipse/equinox/internal/region/StandardRegionDigraph.java +++ b/bundles/org.eclipse.equinox.region/src/org/eclipse/equinox/internal/region/StandardRegionDigraph.java @@ -26,9 +26,9 @@ /** * {@link StandardRegionDigraph} is the default implementation of * {@link RegionDigraph}. - * - * - * Concurrent Semantics+ * Concurrent Semantics + *
* * Thread safe. */ diff --git a/bundles/org.eclipse.equinox.region/src/org/eclipse/equinox/internal/region/StandardRegionDigraphPersistence.java b/bundles/org.eclipse.equinox.region/src/org/eclipse/equinox/internal/region/StandardRegionDigraphPersistence.java index d840a9526c2..a5de7f1dea7 100644 --- a/bundles/org.eclipse.equinox.region/src/org/eclipse/equinox/internal/region/StandardRegionDigraphPersistence.java +++ b/bundles/org.eclipse.equinox.region/src/org/eclipse/equinox/internal/region/StandardRegionDigraphPersistence.java @@ -23,9 +23,9 @@ /** * * Class used for reading and writing a region digraph to persistent storage. - * - * - * Concurrent Semantics+ * Concurrent Semantics + *
* Thread safe. */ public final class StandardRegionDigraphPersistence implements RegionDigraphPersistence { diff --git a/bundles/org.eclipse.equinox.region/src/org/eclipse/equinox/internal/region/hook/RegionBundleEventHook.java b/bundles/org.eclipse.equinox.region/src/org/eclipse/equinox/internal/region/hook/RegionBundleEventHook.java index 307bbb91b03..2d582efb230 100644 --- a/bundles/org.eclipse.equinox.region/src/org/eclipse/equinox/internal/region/hook/RegionBundleEventHook.java +++ b/bundles/org.eclipse.equinox.region/src/org/eclipse/equinox/internal/region/hook/RegionBundleEventHook.java @@ -27,7 +27,7 @@ * The current implementation delegates to {@link RegionBundleFindHook}. This is * likely to perform adequately because of the low frequency of bundle events * and the typically small number of bundle listeners. - * + * * * Concurrent Semantics+ * Concurrent Semantics + *
* Thread safe. */ public final class RegionBundleFindHook implements FindHook { diff --git a/bundles/org.eclipse.equinox.region/src/org/eclipse/equinox/internal/region/hook/RegionResolverHook.java b/bundles/org.eclipse.equinox.region/src/org/eclipse/equinox/internal/region/hook/RegionResolverHook.java index c42c41c2d2b..5fbb21a2914 100644 --- a/bundles/org.eclipse.equinox.region/src/org/eclipse/equinox/internal/region/hook/RegionResolverHook.java +++ b/bundles/org.eclipse.equinox.region/src/org/eclipse/equinox/internal/region/hook/RegionResolverHook.java @@ -25,9 +25,9 @@ /** * {@link RegionResolverHook} manages the visibility of bundles across regions * according to the {@link RegionDigraph}. - * - * - * Concurrent Semantics+ * Concurrent Semantics + *
* Thread safe. */ public final class RegionResolverHook implements ResolverHook { diff --git a/bundles/org.eclipse.equinox.region/src/org/eclipse/equinox/internal/region/hook/RegionResolverHookFactory.java b/bundles/org.eclipse.equinox.region/src/org/eclipse/equinox/internal/region/hook/RegionResolverHookFactory.java index 466e8b2c78c..a6dceb505ce 100644 --- a/bundles/org.eclipse.equinox.region/src/org/eclipse/equinox/internal/region/hook/RegionResolverHookFactory.java +++ b/bundles/org.eclipse.equinox.region/src/org/eclipse/equinox/internal/region/hook/RegionResolverHookFactory.java @@ -14,10 +14,8 @@ package org.eclipse.equinox.internal.region.hook; -import org.eclipse.equinox.region.RegionDigraph; - import java.util.Collection; - +import org.eclipse.equinox.region.RegionDigraph; import org.osgi.framework.hooks.resolver.ResolverHook; import org.osgi.framework.hooks.resolver.ResolverHookFactory; import org.osgi.framework.wiring.BundleRevision; @@ -25,9 +23,9 @@ /** * {@link RegionResolverHook} constructs an instance of * {@link RegionResolverHook} for a particular resolution operation. - * - * - * Concurrent Semantics+ * Concurrent Semantics + *
* * Thread safe. */ diff --git a/bundles/org.eclipse.equinox.region/src/org/eclipse/equinox/internal/region/hook/RegionServiceEventHook.java b/bundles/org.eclipse.equinox.region/src/org/eclipse/equinox/internal/region/hook/RegionServiceEventHook.java index eda90766dd7..e1d66b4af37 100644 --- a/bundles/org.eclipse.equinox.region/src/org/eclipse/equinox/internal/region/hook/RegionServiceEventHook.java +++ b/bundles/org.eclipse.equinox.region/src/org/eclipse/equinox/internal/region/hook/RegionServiceEventHook.java @@ -27,7 +27,7 @@ * The current implementation avoids traversing the graph multiple times from * the same region. This is necessary to optimize the case where many bundles * with service listeners are contained in the same region. - * + * * * Concurrent Semantics+ * Concurrent Semantics + *
* Thread safe. */ public final class RegionServiceFindHook implements FindHook { diff --git a/bundles/org.eclipse.equinox.region/src/org/eclipse/equinox/internal/region/management/StandardManageableRegion.java b/bundles/org.eclipse.equinox.region/src/org/eclipse/equinox/internal/region/management/StandardManageableRegion.java index cb31d1047b9..367d439fe16 100644 --- a/bundles/org.eclipse.equinox.region/src/org/eclipse/equinox/internal/region/management/StandardManageableRegion.java +++ b/bundles/org.eclipse.equinox.region/src/org/eclipse/equinox/internal/region/management/StandardManageableRegion.java @@ -14,22 +14,19 @@ package org.eclipse.equinox.internal.region.management; +import java.util.*; import org.eclipse.equinox.region.Region; import org.eclipse.equinox.region.RegionDigraph; import org.eclipse.equinox.region.RegionDigraph.FilteredRegion; import org.eclipse.equinox.region.management.ManageableRegion; import org.eclipse.equinox.region.management.ManageableRegionDigraph; -import java.util.ArrayList; -import java.util.List; -import java.util.Set; - /** * {@link StandardManageableRegion} is the default implementation of * {@link ManageableRegion}. - * - * - * Concurrent Semantics+ * Concurrent Semantics + *
* Thread safe. */ public class StandardManageableRegion implements ManageableRegion { diff --git a/bundles/org.eclipse.equinox.region/src/org/eclipse/equinox/internal/region/management/StandardManageableRegionDigraph.java b/bundles/org.eclipse.equinox.region/src/org/eclipse/equinox/internal/region/management/StandardManageableRegionDigraph.java index 2b7f741e51b..d2758a4703c 100644 --- a/bundles/org.eclipse.equinox.region/src/org/eclipse/equinox/internal/region/management/StandardManageableRegionDigraph.java +++ b/bundles/org.eclipse.equinox.region/src/org/eclipse/equinox/internal/region/management/StandardManageableRegionDigraph.java @@ -28,9 +28,9 @@ /** * {@link StandardManageableRegionDigraph} is a {@link ManageableRegionDigraph} * that delegates to the {@link RegionDigraph}. - * - * - * Concurrent Semantics+ * Concurrent Semantics + *
* Thread safe. */ public final class StandardManageableRegionDigraph implements ManageableRegionDigraph { diff --git a/bundles/org.eclipse.equinox.region/src/org/eclipse/equinox/region/Region.java b/bundles/org.eclipse.equinox.region/src/org/eclipse/equinox/region/Region.java index e538cf74a73..7a584679dbb 100644 --- a/bundles/org.eclipse.equinox.region/src/org/eclipse/equinox/region/Region.java +++ b/bundles/org.eclipse.equinox.region/src/org/eclipse/equinox/region/Region.java @@ -26,10 +26,10 @@ * from other regions to which it is connected. However a bundle running in a * region is not protected from discovering bundles in other regions, e.g. by * following wires using Wire Admin or similar services, so this is why regions - * are only weakly isolated from each other. - * + * are only weakly isolated from each other.
- * The region digraph extends
+ * Concurrent Semantics
+ *
* Note that the returned digraph is disconnected from the OSGi runtime. Any
* modifications made to the returned digraph will not affect the OSGi runtime
* behavior of the bundles installed in the running framework.
- * Iterable and so a foreach
+ * The region digraph extends {@code Iterable
+ *
+ *
* After the digraph has been written, the output stream is flushed. The output * stream remains open after this method returns. + *
* * @param digraph a digraph to be written. * @param output an output stream to write a digraph to. diff --git a/bundles/org.eclipse.equinox.region/src/org/eclipse/equinox/region/RegionDigraphVisitor.java b/bundles/org.eclipse.equinox.region/src/org/eclipse/equinox/region/RegionDigraphVisitor.java index 509fddb9ef0..46cdd26c04b 100644 --- a/bundles/org.eclipse.equinox.region/src/org/eclipse/equinox/region/RegionDigraphVisitor.java +++ b/bundles/org.eclipse.equinox.region/src/org/eclipse/equinox/region/RegionDigraphVisitor.java @@ -17,9 +17,10 @@ /** * {@link RegionDigraphVisitor} is used to traverse a subgraph of a * {@link RegionDigraph}. - * * - * Concurrent Semantics+ * Concurrent Semantics + *
* * Implementations of this interface must be thread safe. */ diff --git a/bundles/org.eclipse.equinox.region/src/org/eclipse/equinox/region/RegionFilter.java b/bundles/org.eclipse.equinox.region/src/org/eclipse/equinox/region/RegionFilter.java index 179c698c717..d24322bb7db 100644 --- a/bundles/org.eclipse.equinox.region/src/org/eclipse/equinox/region/RegionFilter.java +++ b/bundles/org.eclipse.equinox.region/src/org/eclipse/equinox/region/RegionFilter.java @@ -26,9 +26,9 @@ * which are visible across the connection. A region filter is constant; its * sharing policy cannot be changed after construction. Instances of region * filters can be created with a {@link RegionFilterBuilder}. - * - * - * Concurrent Semantics+ * Concurrent Semantics + *
* * Implementations must be thread safe. * diff --git a/bundles/org.eclipse.equinox.region/src/org/eclipse/equinox/region/RegionFilterBuilder.java b/bundles/org.eclipse.equinox.region/src/org/eclipse/equinox/region/RegionFilterBuilder.java index 0e6c367d10c..4716e95e2dc 100644 --- a/bundles/org.eclipse.equinox.region/src/org/eclipse/equinox/region/RegionFilterBuilder.java +++ b/bundles/org.eclipse.equinox.region/src/org/eclipse/equinox/region/RegionFilterBuilder.java @@ -20,13 +20,13 @@ * A builder for creating {@link RegionFilter} instances. A builder instance can * be obtained from the {@link RegionDigraph#createRegionFilterBuilder()} * method. - * + ** Name spaces are used to configure the filters with a builder. A name space is * a string which is used to separate the names of various kinds of OSGi * resource whose names could otherwise collide. It can be either an OSGi * standard value such as {@link RegionFilter#VISIBLE_PACKAGE_NAMESPACE * osgi.wiring.package} or a user defined value. - *
+ * * Concurrent Semantics
*
- * Concurrent Semantics
+ * Concurrent Semantics
+ *
+ * Concurrent Semantics + *
* Thread safe. */ @MXBean diff --git a/bundles/org.eclipse.equinox.registry/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.registry/META-INF/MANIFEST.MF index e7ba987b09b..6a82ec787d8 100644 --- a/bundles/org.eclipse.equinox.registry/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.equinox.registry/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.equinox.registry;singleton:=true -Bundle-Version: 3.12.200.qualifier +Bundle-Version: 3.12.300.qualifier Bundle-Localization: plugin Export-Package: org.eclipse.core.internal.adapter;x-internal:=true, org.eclipse.core.internal.registry;x-friends:="org.eclipse.core.runtime", diff --git a/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/osgi/EquinoxRegistryStrategy.java b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/osgi/EquinoxRegistryStrategy.java index eba2f54fb1f..42eac338863 100644 --- a/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/osgi/EquinoxRegistryStrategy.java +++ b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/osgi/EquinoxRegistryStrategy.java @@ -26,14 +26,12 @@ /** * The registry strategy used by the Equinox extension registry. Adds to the * OSGi registry: - **
*
+ * {@code
* [UserPreferences1] -> [Options1] +
* \
* [secure preferences1] <- 1 : 1 -> URL1
@@ -51,6 +52,7 @@
* [secure preferences2] <- 1 : 1 -> URL2
* /
* [UserPreferences4] -> [Options4] +
+ * }
*
*
* The user-facing nodes are actually a (node + options for this container).
diff --git a/bundles/org.eclipse.equinox.useradmin/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.useradmin/META-INF/MANIFEST.MF
index 30a8c037984..aa31b82550e 100644
--- a/bundles/org.eclipse.equinox.useradmin/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.equinox.useradmin/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Vendor: %bundleVendor
-Bundle-Version: 1.3.100.qualifier
+Bundle-Version: 1.3.200.qualifier
Bundle-Activator: org.eclipse.equinox.internal.useradmin.Activator
Bundle-SymbolicName: org.eclipse.equinox.useradmin
Import-Service: org.osgi.service.log.LogService
diff --git a/bundles/org.eclipse.equinox.useradmin/src/org/eclipse/equinox/internal/useradmin/Authorization.java b/bundles/org.eclipse.equinox.useradmin/src/org/eclipse/equinox/internal/useradmin/Authorization.java
index 194181d5444..55caddb0750 100644
--- a/bundles/org.eclipse.equinox.useradmin/src/org/eclipse/equinox/internal/useradmin/Authorization.java
+++ b/bundles/org.eclipse.equinox.useradmin/src/org/eclipse/equinox/internal/useradmin/Authorization.java
@@ -23,15 +23,17 @@
* with roles. Before granting access to a restricted resource or operation, a
* bundle will check if the Authorization object passed to it possesses the
* required role, by calling its hasRole method.
+ *
* * Authorization contexts are instantiated by calling * {@link UserAdmin#getAuthorization} - *
- * Trusting Authorization objects. + *
+ ** There are no restrictions regarding the creation of Authorization objects. * Hence, a service must only accept Authorization objects from bundles that has * been authorized to use the service using code based (or Java 2) permissions. + *
** In some cases it is useful to use ServicePermissions to do the code based * access control. A service basing user access control on Authorization objects @@ -39,14 +41,16 @@ * ServicePermission to get the service in question. This is the most convenient * way. The framework will do the code based permission check when the calling * bundle attempts to get the service from the service registry. + *
** Example: A servlet using a service on a user's behalf. The bundle with the * servlet must be given the ServicePermission to get the Service. + *
** However, in some cases the code based permission checks need to be more * fine-grained. A service might allow all bundles to get it, but require * certain code based permissions for some of its methods. - *
+ *
* Example: A servlet using a service on a user's behalf, where some service * functionality is open to anyone, and some is restricted by code based * permissions. When a restricted method is called (e.g., one handing over an diff --git a/bundles/org.eclipse.osgi.services/META-INF/MANIFEST.MF b/bundles/org.eclipse.osgi.services/META-INF/MANIFEST.MF index 0b1be1a5798..5e9a7d2ed8e 100644 --- a/bundles/org.eclipse.osgi.services/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.osgi.services/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %osgiServices Bundle-SymbolicName: org.eclipse.osgi.services;deprecated:="Deprecated in favour of the original jars published by the OSGi working-group." -Bundle-Version: 3.12.100.qualifier +Bundle-Version: 3.12.200.qualifier Bundle-Description: %osgiServicesDes Bundle-Localization: plugin Bundle-Vendor: %eclipse.org diff --git a/bundles/org.eclipse.osgi.services/build.properties b/bundles/org.eclipse.osgi.services/build.properties index 4f774726ccc..23f6809a700 100644 --- a/bundles/org.eclipse.osgi.services/build.properties +++ b/bundles/org.eclipse.osgi.services/build.properties @@ -21,3 +21,4 @@ src.includes = about.html,\ source.. = src/ output.. = bin/ +pom.model.property.failOnJavadocErrors = false diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/debug/FrameworkDebugOptions.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/debug/FrameworkDebugOptions.java index 3cb4a60c121..c299e323086 100644 --- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/debug/FrameworkDebugOptions.java +++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/debug/FrameworkDebugOptions.java @@ -67,7 +67,7 @@ public class FrameworkDebugOptions private Properties disabledOptions = null; /** * A cache of all of the bundlesDebugTrace in the format
- * - *+ *
*
* - *Property Value Type *Comparison Type @@ -121,7 +121,7 @@ *String *String comparison *+ * * diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/hookregistry/HookRegistry.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/hookregistry/HookRegistry.java index d35e8f7856e..1be3f59208f 100644 --- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/hookregistry/HookRegistry.java +++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/hookregistry/HookRegistry.java @@ -103,25 +103,21 @@ public HookRegistry(EquinoxContainer container) { /** * Initializes the hook configurators. The following steps are used to * initialize the hook configurators. - *Integer, Long, Float, Double, Byte, Short, BigInteger, BigDecimal *numerical comparison *- * 1. Get a list of hook configurators from all hook configurators properties + *
+ *
*/ public void initialize() { List- Get a list of hook configurators from all hook configurators properties * files on the classpath, add this list to the overall list of hook - * configurators, remove duplicates. - *
+ *- * 2. Get a list of hook configurators from the + * configurators, remove duplicates.
- Get a list of hook configurators from the * ("osgi.hook.configurators.include") system property and add this - * list to the overall list of hook configurators, remove duplicates. - *
+ *- * 3. Get a list of hook configurators from the + * list to the overall list of hook configurators, remove duplicates.
- Get a list of hook configurators from the * ("osgi.hook.configurators.exclude") system property and remove this - * list from the overall list of hook configurators. - *
+ *- * 4. Load each hook configurator class, create a new instance, then call the - * {@link HookConfigurator#addHooks(HookRegistry)} method - *
- * 5. Set this HookRegistry object to read only to prevent any other hooks from - * being added. - *
+ * list from the overall list of hook configurators.
- Load each hook configurator class, create a new instance, then call the + * {@link HookConfigurator#addHooks(HookRegistry)} method
+ *- Set this HookRegistry object to read only to prevent any other hooks from + * being added.
+ *configurators = new ArrayList<>(5); diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/hookregistry/StorageHookFactory.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/hookregistry/StorageHookFactory.java index dd471ace210..99ffb6dcd3e 100644 --- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/hookregistry/StorageHookFactory.java +++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/hookregistry/StorageHookFactory.java @@ -33,7 +33,6 @@ * A StorageHookFactory hooks into the persistent storage loading and saving of * bundle {@link Generation generations}. A factory creates StorageHook * instances that get associated with each Generation object installed. - * * * @see Generation#getStorageHook(Class) * @param
the save context type diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/url/MultiplexingFactory.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/url/MultiplexingFactory.java index fafd5a36453..d73531c18c2 100644 --- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/url/MultiplexingFactory.java +++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/url/MultiplexingFactory.java @@ -41,8 +41,9 @@ public abstract class MultiplexingFactory { /** * As a short-term (hopefully) solution we use a special class which is defined * using the Unsafe class from the VM. This class is an implementation of - * Collectionsimply to provide a method add(AccessibleObject) - * which turns around and calls AccessibleObject.setAccessible(true). + * {@code Collection } simply to provide a method + * add(AccessibleObject) which turns around and calls + * AccessibleObject.setAccessible(true). * * The reason this is needed is to hack into the VM to get deep reflective * access to the java.net package for the various hacks we have to do to diff --git a/bundles/org.eclipse.osgi/pom.xml b/bundles/org.eclipse.osgi/pom.xml index 3de60bde129..83bcf872c3e 100644 --- a/bundles/org.eclipse.osgi/pom.xml +++ b/bundles/org.eclipse.osgi/pom.xml @@ -24,6 +24,7 @@
true +false diff --git a/features/org.eclipse.equinox.compendium.sdk/feature.xml b/features/org.eclipse.equinox.compendium.sdk/feature.xml index a186b7a70c7..c867e9dad18 100644 --- a/features/org.eclipse.equinox.compendium.sdk/feature.xml +++ b/features/org.eclipse.equinox.compendium.sdk/feature.xml @@ -2,7 +2,7 @@ diff --git a/pom.xml b/pom.xml index 45163cb6bd7..a975551fb4c 100644 --- a/pom.xml +++ b/pom.xml @@ -30,6 +30,7 @@ ../../../equinox.binaries require +true