--- old/src/java.naming/share/classes/javax/naming/spi/DirectoryManager.java 2015-08-04 13:15:09.344901168 +0300 +++ new/src/java.naming/share/classes/javax/naming/spi/DirectoryManager.java 2015-08-04 13:15:09.040901162 +0300 @@ -41,18 +41,18 @@ /** - * This class contains methods for supporting DirContext + * This class contains methods for supporting {@code DirContext} * implementations. *

- * This class is an extension of NamingManager. It contains methods + * This class is an extension of {@code NamingManager}. It contains methods * for use by service providers for accessing object factories and * state factories, and for getting continuation contexts for * supporting federation. *

- * DirectoryManager is safe for concurrent access by multiple threads. + * {@code DirectoryManager} is safe for concurrent access by multiple threads. *

* Except as otherwise noted, - * a Name, Attributes, or environment parameter + * a {@code Name}, {@code Attributes}, or environment parameter * passed to any method is owned by the caller. * The implementation will not modify the object or keep a reference * to it, although it may keep a reference to a clone or copy. @@ -73,13 +73,13 @@ DirectoryManager() {} /** - * Creates a context in which to continue a DirContext operation. - * Operates just like NamingManager.getContinuationContext(), - * only the continuation context returned is a DirContext. + * Creates a context in which to continue a {@code DirContext} operation. + * Operates just like {@code NamingManager.getContinuationContext()}, + * only the continuation context returned is a {@code DirContext}. * * @param cpe * The non-null exception that triggered this continuation. - * @return A non-null DirContext object for continuing the operation. + * @return A non-null {@code DirContext} object for continuing the operation. * @exception NamingException If a naming exception occurred. * * @see NamingManager#getContinuationContext(CannotProceedException) @@ -104,37 +104,37 @@ * Creates an instance of an object for the specified object, * attributes, and environment. *

- * This method is the same as NamingManager.getObjectInstance + * This method is the same as {@code NamingManager.getObjectInstance} * except for the following differences: *

- * Service providers that implement the DirContext interface - * should use this method, not NamingManager.getObjectInstance(). + * Service providers that implement the {@code DirContext} interface + * should use this method, not {@code NamingManager.getObjectInstance()}. * * @param refInfo The possibly null object for which to create an object. - * @param name The name of this object relative to nameCtx. + * @param name The name of this object relative to {@code nameCtx}. * Specifying a name is optional; if it is - * omitted, name should be null. - * @param nameCtx The context relative to which the name - * parameter is specified. If null, name is + * omitted, {@code name} should be null. + * @param nameCtx The context relative to which the {@code name} + * parameter is specified. If null, {@code name} is * relative to the default initial context. * @param environment The possibly null environment to * be used in the creation of the object factory and the object. * @param attrs The possibly null attributes associated with refInfo. * This might not be the complete set of attributes for refInfo; * you might be able to read more attributes from the directory. - * @return An object created using refInfo and attrs; or - * refInfo if an object cannot be created by + * @return An object created using {@code refInfo} and {@code attrs}; or + * {@code refInfo} if an object cannot be created by * a factory. * @exception NamingException If a naming exception was encountered * while attempting to get a URL context, or if one of the @@ -144,7 +144,7 @@ * and instantiating the factory and object classes. * A factory should only throw an exception if it does not want * other factories to be used in an attempt to create an object. - * See DirObjectFactory.getObjectInstance(). + * See {@code DirObjectFactory.getObjectInstance()}. * @see NamingManager#getURLContext * @see DirObjectFactory * @see DirObjectFactory#getObjectInstance @@ -246,39 +246,39 @@ * Retrieves the state of an object for binding when given the original * object and its attributes. *

- * This method is like NamingManager.getStateToBind except + * This method is like {@code NamingManager.getStateToBind} except * for the following differences: *

* - * Service providers that implement the DirContext interface - * should use this method, not NamingManager.getStateToBind(). + * Service providers that implement the {@code DirContext} interface + * should use this method, not {@code NamingManager.getStateToBind()}. *

* See NamingManager.getStateToBind() for a description of how * the list of state factories to be tried is determined. *

* The object returned by this method is owned by the caller. * The implementation will not subsequently modify it. - * It will contain either a new Attributes object that is + * It will contain either a new {@code Attributes} object that is * likewise owned by the caller, or a reference to the original - * attrs parameter. + * {@code attrs} parameter. * * @param obj The non-null object for which to get state to bind. - * @param name The name of this object relative to nameCtx, + * @param name The name of this object relative to {@code nameCtx}, * or null if no name is specified. - * @param nameCtx The context relative to which the name - * parameter is specified, or null if name is + * @param nameCtx The context relative to which the {@code name} + * parameter is specified, or null if {@code name} is * relative to the default initial context. * @param environment The possibly null environment to * be used in the creation of the state factory and @@ -288,12 +288,12 @@ * @return A non-null DirStateFactory.Result containing * the object and attributes to be bound. * If no state factory returns a non-null answer, the result will contain - * the object (obj) itself with the original attributes. + * the object ({@code obj}) itself with the original attributes. * @exception NamingException If a naming exception was encountered * while using the factories. * A factory should only throw an exception if it does not want * other factories to be used in an attempt to create an object. - * See DirStateFactory.getStateToBind(). + * See {@code DirStateFactory.getStateToBind()}. * @see DirStateFactory * @see DirStateFactory#getStateToBind * @see NamingManager#getStateToBind