diff --git a/bundles/org.eclipse.equinox.console.ssh/src/org/eclipse/equinox/console/ssh/UserAdminCommand.java b/bundles/org.eclipse.equinox.console.ssh/src/org/eclipse/equinox/console/ssh/UserAdminCommand.java index 765650e7980..3ce99c3990a 100644 --- a/bundles/org.eclipse.equinox.console.ssh/src/org/eclipse/equinox/console/ssh/UserAdminCommand.java +++ b/bundles/org.eclipse.equinox.console.ssh/src/org/eclipse/equinox/console/ssh/UserAdminCommand.java @@ -42,9 +42,9 @@ public class UserAdminCommand { /** * Command for adding a user * - * @param args command line arguments in the format -username + * @param args command line arguments in the format {@code -username * -password -roles + * (optional)>} */ @Descriptor("Add user with password and roles") public void addUser( @@ -89,8 +89,8 @@ public void addUser( /** * Command for setting or changing the password of a user. * - * @param args command-line arguments in the format -username - * -password + * @param args command-line arguments in the format {@code -username + * -password } */ @Descriptor("Set or change password") public void setPassword(@Descriptor("-username \r\n-password ") String[] args) @@ -256,8 +256,8 @@ public void setPassword(final CommandSession session, /** * Command to add roles to a user * - * @param args command line arguments in the format -username - * \r\n-roles + * @param args command line arguments in the format {@code -username + * \r\n-roles } */ @Descriptor("Add roles to user") public void addRoles( @@ -294,8 +294,8 @@ public void addRoles( /** * Command to remove roles for a particular user * - * @param args command line arguments in the format -username - * \r\n-roles + * @param args command line arguments in the format {@code -username + * \r\n-roles } */ @Descriptor("Remove user roles") public void removeRoles( diff --git a/bundles/org.eclipse.equinox.console.ssh/src/org/eclipse/equinox/console/storage/SecureUserStore.java b/bundles/org.eclipse.equinox.console.ssh/src/org/eclipse/equinox/console/storage/SecureUserStore.java index 488c9ab1066..b24d1d13451 100644 --- a/bundles/org.eclipse.equinox.console.ssh/src/org/eclipse/equinox/console/storage/SecureUserStore.java +++ b/bundles/org.eclipse.equinox.console.ssh/src/org/eclipse/equinox/console/storage/SecureUserStore.java @@ -30,8 +30,8 @@ /** * This class implements a storage for users, passwords and roles. The data is * stored in a properties-like file in the format - * /ssh//password= and - * /ssh//roles= + * {@code /ssh//password=} and + * {@code /ssh//roles=} */ public class SecureUserStore { diff --git a/bundles/org.eclipse.equinox.console/src/org/eclipse/equinox/console/commands/EquinoxCommandProvider.java b/bundles/org.eclipse.equinox.console/src/org/eclipse/equinox/console/commands/EquinoxCommandProvider.java index 67a68f6a5cd..a34b2bacef4 100644 --- a/bundles/org.eclipse.equinox.console/src/org/eclipse/equinox/console/commands/EquinoxCommandProvider.java +++ b/bundles/org.eclipse.equinox.console/src/org/eclipse/equinox/console/commands/EquinoxCommandProvider.java @@ -96,36 +96,36 @@ *
  • gc - perform a garbage collection
    • *
  • init - uninstall all bundles
    • *
  • launch - start the Service Management Framework
    • - *
  • setprop = - set the OSGI property
    • + *
  • setprop {@code =} - set the OSGI property
    • *
  • shutdown - shutdown the Service Management Framework
    • * *

    * ---Controlliing Bundles--- *

    *
      - *
    • install {s[tart]} - install and optionally start bundle from the + *
    • install {@code } {s[tart]} - install and optionally start bundle from the * given URL
      • - *
    • refresh (|) - refresh the packages of the specified + *
    • refresh ({@code |}) - refresh the packages of the specified * bundles
      • - *
    • start (|) - start the specified bundle(s)
      • - *
    • stop (|) - stop the specified bundle(s)
      • - *
    • uninstall (|) - uninstall the specified bundle(s)
      • - *
    • update (||<*>) - update the specified bundle(s)
      • + *
    • start ({@code |}) - start the specified bundle(s)
      • + *
    • stop ({@code |}) - stop the specified bundle(s)
      • + *
    • uninstall ({@code |}) - uninstall the specified bundle(s)
      • + *
    • update ({@code ||<*>}) - update the specified bundle(s)
      • *
    *

    * ---Displaying Status--- *

    *
      - *
    • bundle (|) - display details for the specified + *
    • bundle ({@code |}) - display details for the specified * bundle(s)
      • *
    • bundles - display details for all installed bundles
      • - *
    • headers (|) - print bundle headers
      • - *
    • packages {||} - display imported/exported package + *
    • headers ({@code |}) - print bundle headers
      • + *
    • packages {{@code ||}} - display imported/exported package * details
      • *
    • props - display System properties
      • *
    • services {filter} - display registered service details. Examples for - * [filter]: (objectClass=com.xyz.Person); - * (&(objectClass=com.xyz.Person)(|(sn=Jensen)(cn=Babs J*))); passing only + * [filter]: {@code (objectClass=com.xyz.Person); + * (&(objectClass=com.xyz.Person)(|(sn=Jensen)(cn=Babs J*)));} passing only * com.xyz.Person is a shortcut for (objectClass=com.xyz.Person). The filter * syntax specification is available at http://www.ietf.org/rfc/rfc1960.txt
      • *
    • ss - display installed bundles (short status)
      • @@ -136,25 +136,25 @@ * ---Extras--- *

      *
        - *
      • exec - execute a command in a separate process and wait
        • - *
      • fork - execute a command in a separate process
        • - *
      • getprop - Displays the system properties with the given name, or + *
      • exec {@code } - execute a command in a separate process and wait
        • + *
      • fork {@code } - execute a command in a separate process
        • + *
      • getprop {@code } - Displays the system properties with the given name, or * all of them.
        • - *
      • requiredBundles [] - lists required bundles having the specified + *
      • requiredBundles [{@code }] - lists required bundles having the specified * symbolic name or all if no bsn is specified
        • - *
      • classSpaces [] - lists required bundles having the specified + *
      • classSpaces [{@code }] - lists required bundles having the specified * symbolic name or all if no bsn is specified
        • *
      *

      * ---Controlling StartLevel--- *

      *
        - *
      • sl {(|)} - display the start level for the specified + *
      • sl {({@code |})} - display the start level for the specified * bundle, or for the framework if no bundle specified
        • - *
      • setfwsl - set the framework start level
        • - *
      • setbsl (|) - set the start level for the + *
      • setfwsl {@code } - set the framework start level
        • + *
      • setbsl {@code (|)} - set the start level for the * bundle(s)
        • - *
      • setibsl - set the initial bundle start level
        • + *
      • setibsl {@code } - set the initial bundle start level
        • *
      *

      * ---Eclipse Runtime commands--- @@ -1873,7 +1873,7 @@ private void getRequiredBundlePackages(BundleWire requiredWire, Set impo * an int * * @param value A string containing a potential startlevel - * @return The start level or an int <0 if it was invalid + * @return The start level or an int <0 if it was invalid */ protected int getStartLevelFromToken(String value) { int retval = -1; diff --git a/bundles/org.eclipse.equinox.console/src/org/eclipse/equinox/console/commands/HelpCommand.java b/bundles/org.eclipse.equinox.console/src/org/eclipse/equinox/console/commands/HelpCommand.java index 5dc6fc6400b..5152b9a26c5 100644 --- a/bundles/org.eclipse.equinox.console/src/org/eclipse/equinox/console/commands/HelpCommand.java +++ b/bundles/org.eclipse.equinox.console/src/org/eclipse/equinox/console/commands/HelpCommand.java @@ -98,7 +98,7 @@ public void startService() { * Provides help for the available commands. Prints the names, descriptions and * parameters of all registered commands. * - * If -scope is passed to the command, help is printed only for + * If -scope {@code } is passed to the command, help is printed only for * the commands with the specified scope. * * If a command name is passed as argument to the help command, then the help diff --git a/bundles/org.eclipse.equinox.console/src/org/eclipse/equinox/console/commands/Util.java b/bundles/org.eclipse.equinox.console/src/org/eclipse/equinox/console/commands/Util.java index 753fc581afc..0b2c50677f6 100644 --- a/bundles/org.eclipse.equinox.console/src/org/eclipse/equinox/console/commands/Util.java +++ b/bundles/org.eclipse.equinox.console/src/org/eclipse/equinox/console/commands/Util.java @@ -21,7 +21,6 @@ public class Util { /** * Performs a quicksort of the given objects by their string representation in * ascending order. - *

      * * @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. + *

      * * @param array the array of objects to sort * @param start the start index to begin sorting * @param stop the end index to stop sorting * - * @exception ArrayIndexOutOfBoundsException when 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.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
      + *

      + * Concurrent Semantics + *

      * Thread safe. */ public final class BundleIdBasedRegion implements Region { diff --git a/bundles/org.eclipse.equinox.region/src/org/eclipse/equinox/internal/region/RegionLifecycleListener.java b/bundles/org.eclipse.equinox.region/src/org/eclipse/equinox/internal/region/RegionLifecycleListener.java index 633dbbe5026..95ff757195b 100644 --- a/bundles/org.eclipse.equinox.region/src/org/eclipse/equinox/internal/region/RegionLifecycleListener.java +++ b/bundles/org.eclipse.equinox.region/src/org/eclipse/equinox/internal/region/RegionLifecycleListener.java @@ -19,9 +19,9 @@ /** * {@link RegionLifecycleListener} is a service interface to listen for regions * being added to and deleted from the region digraph. - *

      + *

      * Note that this is an internal interface and is not intended for external use. - *

      + *

      * * Concurrent Semantics
      * Implementations of this interface must be thread safe. diff --git a/bundles/org.eclipse.equinox.region/src/org/eclipse/equinox/internal/region/RegionManager.java b/bundles/org.eclipse.equinox.region/src/org/eclipse/equinox/internal/region/RegionManager.java index 4bd77139521..c9f6ae483ff 100644 --- a/bundles/org.eclipse.equinox.region/src/org/eclipse/equinox/internal/region/RegionManager.java +++ b/bundles/org.eclipse.equinox.region/src/org/eclipse/equinox/internal/region/RegionManager.java @@ -26,9 +26,9 @@ /** * Creates and manages the {@link RegionDigraph} associated with the running * framework. - *

      - * - * Concurrent Semantics
      + *

      + * 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
      * Thread safe. diff --git a/bundles/org.eclipse.equinox.region/src/org/eclipse/equinox/internal/region/hook/RegionBundleFindHook.java b/bundles/org.eclipse.equinox.region/src/org/eclipse/equinox/internal/region/hook/RegionBundleFindHook.java index d58b331bdab..a8fcd68f954 100644 --- a/bundles/org.eclipse.equinox.region/src/org/eclipse/equinox/internal/region/hook/RegionBundleFindHook.java +++ b/bundles/org.eclipse.equinox.region/src/org/eclipse/equinox/internal/region/hook/RegionBundleFindHook.java @@ -23,9 +23,9 @@ /** * {@link RegionBundleFindHook} manages the visibility of bundles across regions * according to the {@link RegionDigraph}. - *

      - * - * 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
      * Thread safe. diff --git a/bundles/org.eclipse.equinox.region/src/org/eclipse/equinox/internal/region/hook/RegionServiceFindHook.java b/bundles/org.eclipse.equinox.region/src/org/eclipse/equinox/internal/region/hook/RegionServiceFindHook.java index 753c9689be6..78495189ecc 100644 --- a/bundles/org.eclipse.equinox.region/src/org/eclipse/equinox/internal/region/hook/RegionServiceFindHook.java +++ b/bundles/org.eclipse.equinox.region/src/org/eclipse/equinox/internal/region/hook/RegionServiceFindHook.java @@ -22,9 +22,9 @@ /** * {@link RegionServiceFindHook} manages the visibility of services across * regions according to the {@link RegionDigraph}. - *

      - * - * 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.
      + *
      * - * Concurrent Semantics
      + * Concurrent Semantics
      * * Implementations must be thread safe. * diff --git a/bundles/org.eclipse.equinox.region/src/org/eclipse/equinox/region/RegionDigraph.java b/bundles/org.eclipse.equinox.region/src/org/eclipse/equinox/region/RegionDigraph.java index 3b9a8424bba..71ec8344a54 100644 --- a/bundles/org.eclipse.equinox.region/src/org/eclipse/equinox/region/RegionDigraph.java +++ b/bundles/org.eclipse.equinox.region/src/org/eclipse/equinox/region/RegionDigraph.java @@ -36,7 +36,7 @@ * known as simple digraphs. So the digraph is a simple, labelled * digraph. *

      - * The region digraph extends Iterable and so a foreach + * The region digraph extends {@code Iterable} and so a foreach * statement may be used to iterate over (a snapshot of) the regions in the * digraph, e.g. * diff --git a/bundles/org.eclipse.equinox.region/src/org/eclipse/equinox/region/RegionDigraphPersistence.java b/bundles/org.eclipse.equinox.region/src/org/eclipse/equinox/region/RegionDigraphPersistence.java index e3bbb2cb4af..3274c550565 100644 --- a/bundles/org.eclipse.equinox.region/src/org/eclipse/equinox/region/RegionDigraphPersistence.java +++ b/bundles/org.eclipse.equinox.region/src/org/eclipse/equinox/region/RegionDigraphPersistence.java @@ -19,8 +19,10 @@ /** * A region digraph persistence is used to persist the state of a * {@link RegionDigraph}. - *

      - * Concurrent Semantics
      + * + *

      + * Concurrent Semantics + *

      * * Implementations of this interface must be thread safe. * @@ -32,11 +34,11 @@ public interface RegionDigraphPersistence { * Creates a new digraph and reads the content of the digraph from the provided * input. The provided input must have been persisted using the * {@link #save(RegionDigraph, OutputStream)} method. - *

      + *

      * 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. - *

      + *

      * The specified stream remains open after this method returns. * * @param input an input stream to read a digraph from. @@ -50,9 +52,10 @@ public interface RegionDigraphPersistence { /** * Writes the specified {@link RegionDigraph} to the provided output in a form * suitable for using the {@link #load(InputStream)} method. - *

      + *

      * 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
      * * Implementations of this interface must be thread safe. diff --git a/bundles/org.eclipse.equinox.region/src/org/eclipse/equinox/region/management/ManageableRegion.java b/bundles/org.eclipse.equinox.region/src/org/eclipse/equinox/region/management/ManageableRegion.java index f447ec2638f..61937cb28d5 100644 --- a/bundles/org.eclipse.equinox.region/src/org/eclipse/equinox/region/management/ManageableRegion.java +++ b/bundles/org.eclipse.equinox.region/src/org/eclipse/equinox/region/management/ManageableRegion.java @@ -14,15 +14,15 @@ package org.eclipse.equinox.region.management; -import org.eclipse.equinox.region.Region; - import javax.management.MXBean; +import org.eclipse.equinox.region.Region; /** * A {@link ManageableRegion} is a JMX representation of a {@link Region}. - *

      + *

      * - * Concurrent Semantics
      + * Concurrent Semantics + *

      * Thread safe. */ @MXBean @@ -36,7 +36,7 @@ public interface ManageableRegion { String getName(); /** - * Returns the {@ManageableRegion}s that this region depends upon. + * Returns the {@link ManageableRegion}s that this region depends upon. * * @return an array of {@link ManageableRegion}s */ diff --git a/bundles/org.eclipse.equinox.region/src/org/eclipse/equinox/region/management/ManageableRegionDigraph.java b/bundles/org.eclipse.equinox.region/src/org/eclipse/equinox/region/management/ManageableRegionDigraph.java index 9bc852633e3..d517ae050b1 100644 --- a/bundles/org.eclipse.equinox.region/src/org/eclipse/equinox/region/management/ManageableRegionDigraph.java +++ b/bundles/org.eclipse.equinox.region/src/org/eclipse/equinox/region/management/ManageableRegionDigraph.java @@ -14,16 +14,15 @@ package org.eclipse.equinox.region.management; -import org.eclipse.equinox.region.RegionDigraph; - import javax.management.MXBean; +import org.eclipse.equinox.region.RegionDigraph; /** * {@link ManageableRegionDigraph} is a JMX representation of the * {@link RegionDigraph}. - *

      - * - * Concurrent Semantics
      + *

      + * Concurrent Semantics + *

      * Thread safe. */ @MXBean diff --git a/bundles/org.eclipse.equinox.security/src/org/eclipse/equinox/internal/security/storage/JavaEncryption.java b/bundles/org.eclipse.equinox.security/src/org/eclipse/equinox/internal/security/storage/JavaEncryption.java index 8fa166aeaf1..2bbc99a0bba 100644 --- a/bundles/org.eclipse.equinox.security/src/org/eclipse/equinox/internal/security/storage/JavaEncryption.java +++ b/bundles/org.eclipse.equinox.security/src/org/eclipse/equinox/internal/security/storage/JavaEncryption.java @@ -217,7 +217,7 @@ private void handle(Exception e, int internalCode) throws StorageException { // Algorithm detection /** - * Result: Map: cipher -> keyFactory + * Result: {@code Map: cipher -> keyFactory} */ public HashMap detect() { IUICallbacks callback = CallbacksProvider.getDefault().getCallback(); diff --git a/bundles/org.eclipse.equinox.security/src/org/eclipse/equinox/internal/security/storage/SecurePreferencesContainer.java b/bundles/org.eclipse.equinox.security/src/org/eclipse/equinox/internal/security/storage/SecurePreferencesContainer.java index 90dedaf789d..c33f6b67bee 100644 --- a/bundles/org.eclipse.equinox.security/src/org/eclipse/equinox/internal/security/storage/SecurePreferencesContainer.java +++ b/bundles/org.eclipse.equinox.security/src/org/eclipse/equinox/internal/security/storage/SecurePreferencesContainer.java @@ -40,6 +40,7 @@ * When we'll have 2 actual "back end" secure preferences tree with data: * * 
      + * {@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.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