--- old/src/java.datatransfer/share/classes/java/awt/datatransfer/MimeType.java 2017-05-23 19:14:16.000000000 -0700 +++ new/src/java.datatransfer/share/classes/java/awt/datatransfer/MimeType.java 2017-05-23 19:14:16.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2017, 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 @@ -26,20 +26,18 @@ package java.awt.datatransfer; import java.io.Externalizable; -import java.io.ObjectOutput; -import java.io.ObjectInput; import java.io.IOException; -import java.util.Enumeration; +import java.io.ObjectInput; +import java.io.ObjectOutput; import java.util.Locale; - /** - * A Multipurpose Internet Mail Extension (MIME) type, as defined - * in RFC 2045 and 2046. - * - * THIS IS *NOT* - REPEAT *NOT* - A PUBLIC CLASS! DataFlavor IS - * THE PUBLIC INTERFACE, AND THIS IS PROVIDED AS A ***PRIVATE*** - * (THAT IS AS IN *NOT* PUBLIC) HELPER CLASS! + * A Multipurpose Internet Mail Extension (MIME) type, as defined in RFC 2045 + * and 2046. + *

+ * THIS IS *NOT* - REPEAT *NOT* - A PUBLIC CLASS! DataFlavor IS THE PUBLIC + * INTERFACE, AND THIS IS PROVIDED AS A ***PRIVATE*** (THAT IS AS IN *NOT* + * PUBLIC) HELPER CLASS! */ class MimeType implements Externalizable, Cloneable { @@ -50,45 +48,45 @@ static final long serialVersionUID = -6568722458793895906L; /** - * Constructor for externalization; this constructor should not be - * called directly by an application, since the result will be an - * uninitialized, immutable MimeType object. + * Constructor for externalization; this constructor should not be called + * directly by an application, since the result will be an uninitialized, + * immutable {@code MimeType} object. */ public MimeType() { } /** - * Builds a MimeType from a String. + * Builds a {@code MimeType} from a {@code String}. * - * @param rawdata text used to initialize the MimeType - * @throws NullPointerException if rawdata is null + * @param rawdata text used to initialize the {@code MimeType} + * @throws NullPointerException if {@code rawdata} is {@code null} */ public MimeType(String rawdata) throws MimeTypeParseException { parse(rawdata); } /** - * Builds a MimeType with the given primary and sub - * type but has an empty parameter list. + * Builds a {@code MimeType} with the given primary and sub type but has an + * empty parameter list. * - * @param primary the primary type of this MimeType - * @param sub the subtype of this MimeType - * @throws NullPointerException if either primary or - * sub is null + * @param primary the primary type of this {@code MimeType} + * @param sub the subtype of this {@code MimeType} + * @throws NullPointerException if either {@code primary} or {@code sub} is + * {@code null} */ public MimeType(String primary, String sub) throws MimeTypeParseException { this(primary, sub, new MimeTypeParameterList()); } /** - * Builds a MimeType with a pre-defined - * and valid (or empty) parameter list. + * Builds a {@code MimeType} with a pre-defined and valid (or empty) + * parameter list. * - * @param primary the primary type of this MimeType - * @param sub the subtype of this MimeType - * @param mtpl the requested parameter list - * @throws NullPointerException if either primary, - * sub or mtpl is null + * @param primary the primary type of this {@code MimeType} + * @param sub the subtype of this {@code MimeType} + * @param mtpl the requested parameter list + * @throws NullPointerException if either {@code primary}, {@code sub} or + * {@code mtpl} is {@code null} */ public MimeType(String primary, String sub, MimeTypeParameterList mtpl) throws MimeTypeParseException { @@ -121,13 +119,12 @@ } // hashCode() /** - * MimeTypes are equal if their primary types, - * subtypes, and parameters are all equal. No default values - * are taken into account. - * @param thatObject the object to be evaluated as a - * MimeType - * @return true if thatObject is - * a MimeType; otherwise returns false + * {@code MimeType}s are equal if their primary types, subtypes, and + * parameters are all equal. No default values are taken into account. + * + * @param thatObject the object to be evaluated as a {@code MimeType} + * @return {@code true} if {@code thatObject} is a {@code MimeType}; + * otherwise returns {@code false} */ public boolean equals(Object thatObject) { if (!(thatObject instanceof MimeType)) { @@ -144,7 +141,7 @@ /** * A routine for parsing the MIME type out of a String. * - * @throws NullPointerException if rawdata is null + * @throws NullPointerException if {@code rawdata} is {@code null} */ private void parse(String rawdata) throws MimeTypeParseException { int slashIndex = rawdata.indexOf('/'); @@ -213,8 +210,8 @@ } /** - * Retrieve the value associated with the given name, or null if there - * is no current association. + * Retrieve the value associated with the given name, or {@code null} if + * there is no current association. */ public String getParameter(String name) { return parameters.get(name); @@ -247,23 +244,21 @@ } /** - * Return a String representation of this object - * without the parameter list. + * Return a String representation of this object without the parameter list. */ public String getBaseType() { return primaryType + "/" + subType; } /** - * Returns true if the primary type and the - * subtype of this object are the same as the specified - * type; otherwise returns false. - * - * @param type the type to compare to this's type - * @return true if the primary type and the - * subtype of this object are the same as the - * specified type; otherwise returns - * false + * Returns {@code true} if the primary type and the subtype of this object + * are the same as the specified {@code type}; otherwise returns + * {@code false}. + * + * @param type the type to compare to {@code this}'s type + * @return {@code true} if the primary type and the subtype of this object + * are the same as the specified {@code type}; otherwise returns + * {@code false} */ public boolean match(MimeType type) { if (type == null) @@ -275,17 +270,15 @@ } /** - * Returns true if the primary type and the - * subtype of this object are the same as the content type - * described in rawdata; otherwise returns - * false. - * - * @param rawdata the raw data to be examined - * @return true if the primary type and the - * subtype of this object are the same as the content type - * described in rawdata; otherwise returns - * false; if rawdata is - * null, returns false + * Returns {@code true} if the primary type and the subtype of this object + * are the same as the content type described in {@code rawdata}; otherwise + * returns {@code false}. + * + * @param rawdata the raw data to be examined + * @return {@code true} if the primary type and the subtype of this object + * are the same as the content type described in {@code rawdata}; + * otherwise returns {@code false}; if {@code rawdata} is + * {@code null}, returns {@code false} */ public boolean match(String rawdata) throws MimeTypeParseException { if (rawdata == null) @@ -294,11 +287,11 @@ } /** - * The object implements the writeExternal method to save its contents - * by calling the methods of DataOutput for its primitive values or - * calling the writeObject method of ObjectOutput for objects, strings - * and arrays. - * @exception IOException Includes any I/O exceptions that may occur + * The object implements the writeExternal method to save its contents by + * calling the methods of DataOutput for its primitive values or calling the + * writeObject method of ObjectOutput for objects, strings and arrays. + * + * @throws IOException Includes any I/O exceptions that may occur */ public void writeExternal(ObjectOutput out) throws IOException { String s = toString(); // contains ASCII chars only @@ -314,13 +307,14 @@ } /** - * The object implements the readExternal method to restore its - * contents by calling the methods of DataInput for primitive - * types and readObject for objects, strings and arrays. The - * readExternal method must read the values in the same sequence - * and with the same types as were written by writeExternal. - * @exception ClassNotFoundException If the class for an object being - * restored cannot be found. + * The object implements the readExternal method to restore its contents by + * calling the methods of DataInput for primitive types and readObject for + * objects, strings and arrays. The readExternal method must read the values + * in the same sequence and with the same types as were written by + * writeExternal. + * + * @throws ClassNotFoundException If the class for an object being restored + * cannot be found */ public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException { @@ -339,9 +333,9 @@ /** * Returns a clone of this object. + * * @return a clone of this object */ - public Object clone() { MimeType newObj = null; try { @@ -368,7 +362,7 @@ /** * Determines whether or not a given string is a legal token. * - * @throws NullPointerException if s is null + * @throws NullPointerException if {@code s} is {@code null} */ private boolean isValidToken(String s) { int len = s.length(); @@ -388,7 +382,5 @@ /** * A string that holds all the special chars. */ - private static final String TSPECIALS = "()<>@,;:\\\"/[]?="; - } // class MimeType