# HG changeset patch # User darcy # Date 1382073734 25200 # Node ID e740104a04f19e05a7fcfa64a27b79e3c7887f73 # Parent e6dfe841a88fe9a576f92f5ce6a742fc8e207dea 8026840: Fix new doclint issues in javax.naming Reviewed-by: mchung diff -r e6dfe841a88f -r e740104a04f1 jdk/src/share/classes/javax/naming/CompositeName.java --- a/jdk/src/share/classes/javax/naming/CompositeName.java Thu Oct 17 19:47:47 2013 -0700 +++ b/jdk/src/share/classes/javax/naming/CompositeName.java Thu Oct 17 22:22:14 2013 -0700 @@ -41,7 +41,7 @@ * This range may be written as [0,N). * The most significant component is at index 0. * An empty composite name has no components. - *
+ * *
+ * *
+ *
{"x", "", "y"} |
+ * *
String Names | @@ -188,7 +188,7 @@
---|
+ * *
+ * *
+ * *
+ * *
+ * *
+ * *
+ * *
+ * *
* JNDI applications need a way to communicate various preferences diff -r e6dfe841a88f -r e740104a04f1 jdk/src/share/classes/javax/naming/InitialContext.java --- a/jdk/src/share/classes/javax/naming/InitialContext.java Thu Oct 17 19:47:47 2013 -0700 +++ b/jdk/src/share/classes/javax/naming/InitialContext.java Thu Oct 17 22:22:14 2013 -0700 @@ -361,7 +361,7 @@ * follows. * Define a new method that uses this method to get an initial * context of the desired subclass. - *
+ ** When providing implementations for the new methods in the subclass, * use this newly defined method to get the initial context. - ** protected XXXContext getURLOrDefaultInitXXXCtx(Name name) * throws NamingException { * Context answer = getURLOrDefaultInitCtx(name); @@ -377,7 +377,7 @@ *+ ** public Object XXXMethod1(Name name, ...) { * throws NamingException { * return getURLOrDefaultInitXXXCtx(name).XXXMethod1(name, ...); diff -r e6dfe841a88f -r e740104a04f1 jdk/src/share/classes/javax/naming/ReferralException.java --- a/jdk/src/share/classes/javax/naming/ReferralException.java Thu Oct 17 19:47:47 2013 -0700 +++ b/jdk/src/share/classes/javax/naming/ReferralException.java Thu Oct 17 22:22:14 2013 -0700 @@ -156,7 +156,7 @@ *getReferralContext
to allow the processing of * other referrals to continue. * The following code fragment shows a typical usage pattern. - *+ ** } catch (ReferralException e) { * if (!shallIFollow(e.getReferralInfo())) { * if (!e.skipReferral()) { @@ -177,7 +177,7 @@ *getReferralContext
to allow the current * referral to be retried. * The following code fragment shows a typical usage pattern. - *+ ** } catch (ReferralException e) { * while (true) { * try { diff -r e6dfe841a88f -r e740104a04f1 jdk/src/share/classes/javax/naming/directory/DirContext.java --- a/jdk/src/share/classes/javax/naming/directory/DirContext.java Thu Oct 17 19:47:47 2013 -0700 +++ b/jdk/src/share/classes/javax/naming/directory/DirContext.java Thu Oct 17 22:22:14 2013 -0700 @@ -31,7 +31,7 @@ * The directory service interface, containing * methods for examining and updating attributes * associated with objects, and for searching the directory. - *+ * *
Names
* Each name passed as an argument to a DirContext method is relative * to that context. The empty name is used to name the context itself. @@ -50,7 +50,7 @@ * See Context for a discussion on the interpretation of the * name argument to the Context methods. These same rules * apply to the name argument to the DirContext methods. - *+ * *
Attribute Models
* There are two basic models of what attributes should be * associated with. First, attributes may be directly associated with a @@ -80,7 +80,7 @@ * JNDI clients are safest when they do not make assumptions about * whether an object's attributes are stored as part of the object, or stored * within the parent object and associated with the object's name. - *+ * *
Attribute Type Names
* In the getAttributes() and search() methods, * you can supply the attributes to return by supplying a list of @@ -112,7 +112,7 @@ *- description;lang-fr * * - *
+ * *
Operational Attributes
** Some directories have the notion of "operational attributes" which are @@ -126,7 +126,7 @@ * The attributes returned do not include operational attributes. * In order to retrieve operational attributes, you must name them explicitly. * - *
+ * *
Named Context
** There are certain methods in which the name must resolve to a context @@ -137,7 +137,7 @@ *
NotContextException
is thrown. * Aside from these methods, there is no requirement that the * named object be a DirContext. - *+ * *
Parameters
** An Attributes, SearchControls, or array object @@ -149,7 +149,7 @@ * An Attributes object returned by any method is owned by * the caller. The caller may subsequently modify it; the service * provider will not. - *
+ * *
Exceptions
** All the methods in this interface can throw a NamingException or diff -r e6dfe841a88f -r e740104a04f1 jdk/src/share/classes/javax/naming/event/EventContext.java --- a/jdk/src/share/classes/javax/naming/event/EventContext.java Thu Oct 17 19:47:47 2013 -0700 +++ b/jdk/src/share/classes/javax/naming/event/EventContext.java Thu Oct 17 22:22:14 2013 -0700 @@ -33,7 +33,7 @@ /** * Contains methods for registering/deregistering listeners to be notified of * events fired when objects named in a context changes. - *
+ * *
Target
* The name parameter in the addNamingListener() methods is referred * to as the target. The target, along with the scope, identify @@ -58,7 +58,7 @@ * An application can use the method targetMustExist() to check * whether a EventContext supports registration * of nonexistent targets. - *+ * *
Event Source
* The EventContext instance on which you invoke the * registration methods is the event source of the events that are diff -r e6dfe841a88f -r e740104a04f1 jdk/src/share/classes/javax/naming/ldap/LdapContext.java --- a/jdk/src/share/classes/javax/naming/ldap/LdapContext.java Thu Oct 17 19:47:47 2013 -0700 +++ b/jdk/src/share/classes/javax/naming/ldap/LdapContext.java Thu Oct 17 22:22:14 2013 -0700 @@ -338,7 +338,7 @@ * parameter, a system property, or one or more resource files. ** The value of this constant is "java.naming.factory.control". - *
+ * * @see ControlFactory * @see javax.naming.Context#addToEnvironment * @see javax.naming.Context#removeFromEnvironment diff -r e6dfe841a88f -r e740104a04f1 jdk/src/share/classes/javax/naming/ldap/Rdn.java --- a/jdk/src/share/classes/javax/naming/ldap/Rdn.java Thu Oct 17 19:47:47 2013 -0700 +++ b/jdk/src/share/classes/javax/naming/ldap/Rdn.java Thu Oct 17 22:22:14 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -315,7 +315,6 @@ * @return A negative integer, zero, or a positive integer as this Rdn * is less than, equal to, or greater than the given Object. * @exception ClassCastException if obj is null or not a Rdn. - *
*/ public int compareTo(Object obj) { if (!(obj instanceof Rdn)) {