--- a/jdk/src/share/classes/javax/management/Query.java Tue Nov 12 09:44:39 2013 -0800
+++ b/jdk/src/share/classes/javax/management/Query.java Tue Nov 12 14:03:28 2013 -0500
@@ -127,9 +127,9 @@
* @param q2 Another query expression.
*
* @return The conjunction of the two arguments. The returned object
- * will be serialized as an instance of the non-public class {@link
+ * will be serialized as an instance of the non-public class
* <a href="../../serialized-form.html#javax.management.AndQueryExp">
- * javax.management.AndQueryExp</a>}.
+ * javax.management.AndQueryExp</a>.
*/
public static QueryExp and(QueryExp q1, QueryExp q2) {
return new AndQueryExp(q1, q2);
@@ -143,9 +143,9 @@
* @param q2 Another query expression.
*
* @return The disjunction of the two arguments. The returned object
- * will be serialized as an instance of the non-public class {@link
+ * will be serialized as an instance of the non-public class
* <a href="../../serialized-form.html#javax.management.OrQueryExp">
- * javax.management.OrQueryExp</a>}.
+ * javax.management.OrQueryExp</a>.
*/
public static QueryExp or(QueryExp q1, QueryExp q2) {
return new OrQueryExp(q1, q2);
@@ -160,9 +160,9 @@
*
* @return A "greater than" constraint on the arguments. The
* returned object will be serialized as an instance of the
- * non-public class {@link <a
- * href="../../serialized-form.html#javax.management.BinaryRelQueryExp">
- * javax.management.BinaryRelQueryExp</a>} with a {@code relOp} equal
+ * non-public class
+ * <a href="../../serialized-form.html#javax.management.BinaryRelQueryExp">
+ * javax.management.BinaryRelQueryExp</a> with a {@code relOp} equal
* to {@link #GT}.
*/
public static QueryExp gt(ValueExp v1, ValueExp v2) {
@@ -178,9 +178,9 @@
*
* @return A "greater than or equal to" constraint on the
* arguments. The returned object will be serialized as an
- * instance of the non-public class {@link <a
- * href="../../serialized-form.html#javax.management.BinaryRelQueryExp">
- * javax.management.BinaryRelQueryExp</a>} with a {@code relOp} equal
+ * instance of the non-public class
+ * <a href="../../serialized-form.html#javax.management.BinaryRelQueryExp">
+ * javax.management.BinaryRelQueryExp</a> with a {@code relOp} equal
* to {@link #GE}.
*/
public static QueryExp geq(ValueExp v1, ValueExp v2) {
@@ -196,9 +196,9 @@
*
* @return A "less than or equal to" constraint on the arguments.
* The returned object will be serialized as an instance of the
- * non-public class {@link <a
- * href="../../serialized-form.html#javax.management.BinaryRelQueryExp">
- * javax.management.BinaryRelQueryExp</a>} with a {@code relOp} equal
+ * non-public class
+ * <a href="../../serialized-form.html#javax.management.BinaryRelQueryExp">
+ * javax.management.BinaryRelQueryExp</a> with a {@code relOp} equal
* to {@link #LE}.
*/
public static QueryExp leq(ValueExp v1, ValueExp v2) {
@@ -214,9 +214,9 @@
*
* @return A "less than" constraint on the arguments. The
* returned object will be serialized as an instance of the
- * non-public class {@link <a
- * href="../../serialized-form.html#javax.management.BinaryRelQueryExp">
- * javax.management.BinaryRelQueryExp</a>} with a {@code relOp} equal
+ * non-public class
+ * <a href="../../serialized-form.html#javax.management.BinaryRelQueryExp">
+ * javax.management.BinaryRelQueryExp</a> with a {@code relOp} equal
* to {@link #LT}.
*/
public static QueryExp lt(ValueExp v1, ValueExp v2) {
@@ -232,9 +232,9 @@
*
* @return A "equal to" constraint on the arguments. The
* returned object will be serialized as an instance of the
- * non-public class {@link <a
- * href="../../serialized-form.html#javax.management.BinaryRelQueryExp">
- * javax.management.BinaryRelQueryExp</a>} with a {@code relOp} equal
+ * non-public class
+ * <a href="../../serialized-form.html#javax.management.BinaryRelQueryExp">
+ * javax.management.BinaryRelQueryExp</a> with a {@code relOp} equal
* to {@link #EQ}.
*/
public static QueryExp eq(ValueExp v1, ValueExp v2) {
@@ -251,9 +251,9 @@
*
* @return The constraint that v1 lies between v2 and v3. The
* returned object will be serialized as an instance of the
- * non-public class {@link <a
- * href="../../serialized-form.html#javax.management.BetweenQueryExp">
- * javax.management.BetweenQueryExp</a>}.
+ * non-public class
+ * <a href="../../serialized-form.html#javax.management.BetweenQueryExp">
+ * javax.management.BetweenQueryExp</a>.
*/
public static QueryExp between(ValueExp v1, ValueExp v2, ValueExp v3) {
return new BetweenQueryExp(v1, v2, v3);
@@ -279,9 +279,9 @@
*
* @return A query expression that represents the matching
* constraint on the string argument. The returned object will
- * be serialized as an instance of the non-public class {@link <a
- * href="../../serialized-form.html#javax.management.MatchQueryExp">
- * javax.management.MatchQueryExp</a>}.
+ * be serialized as an instance of the non-public class
+ * <a href="../../serialized-form.html#javax.management.MatchQueryExp">
+ * javax.management.MatchQueryExp</a>.
*/
public static QueryExp match(AttributeValueExp a, StringValueExp s) {
return new MatchQueryExp(a, s);
@@ -319,9 +319,9 @@
*
* @return An attribute expression for the attribute named name.
* The returned object will be serialized as an instance of the
- * non-public class {@link <a
- * href="../../serialized-form.html#javax.management.QualifiedAttributeValueExp">
- * javax.management.QualifiedAttributeValueExp</a>}.
+ * non-public class
+ * <a href="../../serialized-form.html#javax.management.QualifiedAttributeValueExp">
+ * javax.management.QualifiedAttributeValueExp</a>.
*/
public static AttributeValueExp attr(String className, String name) {
return new QualifiedAttributeValueExp(className, name);
@@ -338,9 +338,8 @@
*
* @return A class attribute expression. The returned object
* will be serialized as an instance of the non-public class
- * {@link <a
- * href="../../serialized-form.html#javax.management.ClassAttributeValueExp">
- * javax.management.ClassAttributeValueExp</a>}.
+ * <a href="../../serialized-form.html#javax.management.ClassAttributeValueExp">
+ * javax.management.ClassAttributeValueExp</a>.
*/
public static AttributeValueExp classattr() {
return new ClassAttributeValueExp();
@@ -352,9 +351,9 @@
* @param queryExp The constraint to negate.
*
* @return A negated constraint. The returned object will be
- * serialized as an instance of the non-public class {@link <a
- * href="../../serialized-form.html#javax.management.NotQueryExp">
- * javax.management.NotQueryExp</a>}.
+ * serialized as an instance of the non-public class
+ * <a href="../../serialized-form.html#javax.management.NotQueryExp">
+ * javax.management.NotQueryExp</a>.
*/
public static QueryExp not(QueryExp queryExp) {
return new NotQueryExp(queryExp);
@@ -368,9 +367,9 @@
*
* @return A QueryExp that represents the constraint. The
* returned object will be serialized as an instance of the
- * non-public class {@link <a
- * href="../../serialized-form.html#javax.management.InQueryExp">
- * javax.management.InQueryExp</a>}.
+ * non-public class
+ * <a href="../../serialized-form.html#javax.management.InQueryExp">
+ * javax.management.InQueryExp</a>.
*/
public static QueryExp in(ValueExp val, ValueExp valueList[]) {
return new InQueryExp(val, valueList);
@@ -395,9 +394,9 @@
*
* @return A ValueExp object containing the argument. The
* returned object will be serialized as an instance of the
- * non-public class {@link <a
- * href="../../serialized-form.html#javax.management.NumericValueExp">
- * javax.management.NumericValueExp</a>}.
+ * non-public class
+ * <a href="../../serialized-form.html#javax.management.NumericValueExp">
+ * javax.management.NumericValueExp</a>.
*/
public static ValueExp value(Number val) {
return new NumericValueExp(val);
@@ -411,9 +410,9 @@
*
* @return A ValueExp object containing the argument. The
* returned object will be serialized as an instance of the
- * non-public class {@link <a
- * href="../../serialized-form.html#javax.management.NumericValueExp">
- * javax.management.NumericValueExp</a>}.
+ * non-public class
+ * <a href="../../serialized-form.html#javax.management.NumericValueExp">
+ * javax.management.NumericValueExp</a>.
*/
public static ValueExp value(int val) {
return new NumericValueExp((long) val);
@@ -427,9 +426,9 @@
*
* @return A ValueExp object containing the argument. The
* returned object will be serialized as an instance of the
- * non-public class {@link <a
- * href="../../serialized-form.html#javax.management.NumericValueExp">
- * javax.management.NumericValueExp</a>}.
+ * non-public class
+ * <a href="../../serialized-form.html#javax.management.NumericValueExp">
+ * javax.management.NumericValueExp</a>.
*/
public static ValueExp value(long val) {
return new NumericValueExp(val);
@@ -443,9 +442,9 @@
*
* @return A ValueExp object containing the argument. The
* returned object will be serialized as an instance of the
- * non-public class {@link <a
- * href="../../serialized-form.html#javax.management.NumericValueExp">
- * javax.management.NumericValueExp</a>}.
+ * non-public class
+ * <a href="../../serialized-form.html#javax.management.NumericValueExp">
+ * javax.management.NumericValueExp</a>.
*/
public static ValueExp value(float val) {
return new NumericValueExp((double) val);
@@ -459,9 +458,9 @@
*
* @return A ValueExp object containing the argument. The
* returned object will be serialized as an instance of the
- * non-public class {@link <a
- * href="../../serialized-form.html#javax.management.NumericValueExp">
- * javax.management.NumericValueExp</a>}.
+ * non-public class
+ * <a href="../../serialized-form.html#javax.management.NumericValueExp">
+ * javax.management.NumericValueExp</a>.
*/
public static ValueExp value(double val) {
return new NumericValueExp(val);
@@ -475,9 +474,9 @@
*
* @return A ValueExp object containing the argument. The
* returned object will be serialized as an instance of the
- * non-public class {@link <a
- * href="../../serialized-form.html#javax.management.BooleanValueExp">
- * javax.management.BooleanValueExp</a>}.
+ * non-public class
+ * <a href="../../serialized-form.html#javax.management.BooleanValueExp">
+ * javax.management.BooleanValueExp</a>.
*/
public static ValueExp value(boolean val) {
return new BooleanValueExp(val);
@@ -492,9 +491,9 @@
*
* @return A ValueExp representing the sum or concatenation of
* the two arguments. The returned object will be serialized as
- * an instance of the non-public class {@link <a
- * href="../../serialized-form.html#javax.management.BinaryOpValueExp">
- * javax.management.BinaryOpValueExp</a>} with an {@code op} equal to
+ * an instance of the non-public class
+ * <a href="../../serialized-form.html#javax.management.BinaryOpValueExp">
+ * javax.management.BinaryOpValueExp</a> with an {@code op} equal to
* {@link #PLUS}.
*/
public static ValueExp plus(ValueExp value1, ValueExp value2) {
@@ -510,9 +509,9 @@
*
* @return A ValueExp representing the product. The returned
* object will be serialized as an instance of the non-public
- * class {@link <a
- * href="../../serialized-form.html#javax.management.BinaryOpValueExp">
- * javax.management.BinaryOpValueExp</a>} with an {@code op} equal to
+ * class
+ * <a href="../../serialized-form.html#javax.management.BinaryOpValueExp">
+ * javax.management.BinaryOpValueExp</a> with an {@code op} equal to
* {@link #TIMES}.
*/
public static ValueExp times(ValueExp value1,ValueExp value2) {
@@ -528,9 +527,9 @@
*
* @return A ValueExp representing the difference between two
* arguments. The returned object will be serialized as an
- * instance of the non-public class {@link <a
- * href="../../serialized-form.html#javax.management.BinaryOpValueExp">
- * javax.management.BinaryOpValueExp</a>} with an {@code op} equal to
+ * instance of the non-public class
+ * <a href="../../serialized-form.html#javax.management.BinaryOpValueExp">
+ * javax.management.BinaryOpValueExp</a> with an {@code op} equal to
* {@link #MINUS}.
*/
public static ValueExp minus(ValueExp value1, ValueExp value2) {
@@ -546,9 +545,9 @@
*
* @return A ValueExp representing the quotient of two arguments.
* The returned object will be serialized as an instance of the
- * non-public class {@link <a
- * href="../../serialized-form.html#javax.management.BinaryOpValueExp">
- * javax.management.BinaryOpValueExp</a>} with an {@code op} equal to
+ * non-public class
+ * <a href="../../serialized-form.html#javax.management.BinaryOpValueExp">
+ * javax.management.BinaryOpValueExp</a> with an {@code op} equal to
* {@link #DIV}.
*/
public static ValueExp div(ValueExp value1, ValueExp value2) {
@@ -566,9 +565,9 @@
*
* @return The constraint that a matches s. The returned object
* will be serialized as an instance of the non-public class
- * {@link <a
- * href="../../serialized-form.html#javax.management.MatchQueryExp">
- * javax.management.MatchQueryExp</a>}.
+ *
+ * <a href="../../serialized-form.html#javax.management.MatchQueryExp">
+ * javax.management.MatchQueryExp</a>.
*/
public static QueryExp initialSubString(AttributeValueExp a, StringValueExp s) {
return new MatchQueryExp(a,
@@ -585,9 +584,9 @@
*
* @return The constraint that a matches s. The returned object
* will be serialized as an instance of the non-public class
- * {@link <a
- * href="../../serialized-form.html#javax.management.MatchQueryExp">
- * javax.management.MatchQueryExp</a>}.
+ *
+ * <a href="../../serialized-form.html#javax.management.MatchQueryExp">
+ * javax.management.MatchQueryExp</a>.
*/
public static QueryExp anySubString(AttributeValueExp a, StringValueExp s) {
return new MatchQueryExp(a,
@@ -605,9 +604,9 @@
*
* @return The constraint that a matches s. The returned object
* will be serialized as an instance of the non-public class
- * {@link <a
- * href="../../serialized-form.html#javax.management.MatchQueryExp">
- * javax.management.MatchQueryExp</a>}.
+ *
+ * <a href="../../serialized-form.html#javax.management.MatchQueryExp">
+ * javax.management.MatchQueryExp</a>.
*/
public static QueryExp finalSubString(AttributeValueExp a, StringValueExp s) {
return new MatchQueryExp(a,
@@ -630,9 +629,9 @@
* of the class of which selected MBeans should be instances.
* @return a query expression that represents an inheritance
* constraint on an MBean class. The returned object will be
- * serialized as an instance of the non-public class {@link <a
- * href="../../serialized-form.html#javax.management.InstanceOfQueryExp">
- * javax.management.InstanceOfQueryExp</a>}.
+ * serialized as an instance of the non-public class
+ * <a href="../../serialized-form.html#javax.management.InstanceOfQueryExp">
+ * javax.management.InstanceOfQueryExp</a>.
* @since 1.6
*/
public static QueryExp isInstanceOf(StringValueExp classNameValue) {