--- old/src/java.desktop/share/classes/javax/sound/sampled/AudioSystem.java 2017-07-05 16:02:40.000000000 -0700 +++ new/src/java.desktop/share/classes/javax/sound/sampled/AudioSystem.java 2017-07-05 16:02:40.000000000 -0700 @@ -25,7 +25,6 @@ package javax.sound.sampled; -import java.io.EOFException; import java.io.File; import java.io.IOException; import java.io.InputStream; @@ -75,33 +74,28 @@ *
Property Key | - *Interface | - *Affected Method(s) | - *
---|---|---|
Property Key + * | Interface + * | Affected Method(s) * |
{@code javax.sound.sampled.Clip} | - *{@link Clip} | - *{@link #getLine}, {@link #getClip} | - *
{@code javax.sound.sampled.Port} | - *{@link Port} | - *{@link #getLine} | - *
{@code javax.sound.sampled.SourceDataLine} | - *{@link SourceDataLine} | - *{@link #getLine}, {@link #getSourceDataLine} | - *
{@code javax.sound.sampled.TargetDataLine} | - *{@link TargetDataLine} | - *{@link #getLine}, {@link #getTargetDataLine} | - *
{@code javax.sound.sampled.Clip} + * | {@link Clip} + * | {@link #getLine}, {@link #getClip} + * |
{@code javax.sound.sampled.Port} + * | {@link Port} + * | {@link #getLine} + * |
{@code javax.sound.sampled.SourceDataLine} + * | {@link SourceDataLine} + * | {@link #getLine}, {@link #getSourceDataLine} + * |
{@code javax.sound.sampled.TargetDataLine} + * | {@link TargetDataLine} + * | {@link #getLine}, {@link #getTargetDataLine} * |
* For example, the property {@code javax.sound.sampled.Clip} with a value
- * {@code "com.sun.media.sound.MixerProvider#SunClip"}
- * will have the following consequences when {@code getLine} is called
- * requesting a {@code Clip} instance: if the class
- * {@code com.sun.media.sound.MixerProvider} exists in the list of installed
- * mixer providers, the first {@code Clip} from the first mixer with name
- * {@code "SunClip"} will be returned. If it cannot be found, the
- * first {@code Clip} from the first mixer of the specified provider will be
+ * {@code "com.sun.media.sound.MixerProvider#SunClip"} will have the following
+ * consequences when {@code getLine} is called requesting a {@code Clip}
+ * instance: if the class {@code com.sun.media.sound.MixerProvider} exists in
+ * the list of installed mixer providers, the first {@code Clip} from the first
+ * mixer with name {@code "SunClip"} will be returned. If it cannot be found,
+ * the first {@code Clip} from the first mixer of the specified provider will be
* returned, regardless of name. If there is none, the first {@code Clip} from
- * the first {@code Mixer} with name {@code "SunClip"} in the list of
- * all mixers (as returned by {@code getMixerInfo}) will be returned, or, if not
- * found, the first {@code Clip} of the first {@code Mixer} that can be found in
- * the list of all mixers is returned. If that fails, too, an
+ * the first {@code Mixer} with name {@code "SunClip"} in the list of all mixers
+ * (as returned by {@code getMixerInfo}) will be returned, or, if not found, the
+ * first {@code Clip} of the first {@code Mixer} that can be found in the list
+ * of all mixers is returned. If that fails, too, an
* {@code IllegalArgumentException} is thrown.
*
* @author Kara Kytle
@@ -479,7 +472,6 @@
* @param mixerInfo a {@code Mixer.Info} object representing the desired
* mixer, or {@code null} for the system default mixer
* @return a clip object from the specified mixer
- *
* @throws LineUnavailableException if a clip is not available from this
* mixer due to resource restrictions
* @throws SecurityException if a clip is not available from this mixer due
@@ -670,9 +662,9 @@
*
* @param sourceEncoding the encoding for which conversion support is
* queried
- * @return array of encodings. If {@code sourceEncoding}is not supported, an
- * array of length 0 is returned. Otherwise, the array will have a
- * length of at least 1, representing {@code sourceEncoding}
+ * @return array of encodings. If {@code sourceEncoding} is not supported,
+ * an array of length 0 is returned. Otherwise, the array will have
+ * a length of at least 1, representing {@code sourceEncoding}
* (no conversion).
* @throws NullPointerException if {@code sourceEncoding} is {@code null}
*/
@@ -935,15 +927,15 @@
}
/**
- * Obtains the audio file format of the specified URL. The URL must point to
- * valid audio file data.
+ * Obtains the audio file format of the specified {@code URL}. The
+ * {@code URL} must point to valid audio file data.
*
- * @param url the URL from which file format information should be
+ * @param url the {@code URL} from which file format information should be
* extracted
* @return an {@code AudioFileFormat} object describing the audio file
* format
- * @throws UnsupportedAudioFileException if the URL does not point to valid
- * audio file data recognized by the system
+ * @throws UnsupportedAudioFileException if the {@code URL} does not point
+ * to valid audio file data recognized by the system
* @throws IOException if an input/output exception occurs
* @throws NullPointerException if {@code url} is {@code null}
*/
@@ -1021,15 +1013,15 @@
}
/**
- * Obtains an audio input stream from the URL provided. The URL must point
- * to valid audio file data.
+ * Obtains an audio input stream from the {@code URL} provided. The
+ * {@code URL} must point to valid audio file data.
*
- * @param url the URL for which the {@code AudioInputStream} should be
- * constructed
+ * @param url the {@code URL} for which the {@code AudioInputStream} should
+ * be constructed
* @return an {@code AudioInputStream} object based on the audio file data
- * pointed to by the URL
- * @throws UnsupportedAudioFileException if the URL does not point to valid
- * audio file data recognized by the system
+ * pointed to by the {@code URL}
+ * @throws UnsupportedAudioFileException if the {@code URL} does not point
+ * to valid audio file data recognized by the system
* @throws IOException if an I/O exception occurs
* @throws NullPointerException if {@code url} is {@code null}
*/
@@ -1121,8 +1113,8 @@
* Obtains the file types that the system can write from the audio input
* stream specified.
*
- * @param stream the audio input stream for which audio file type
- * support is queried
+ * @param stream the audio input stream for which audio file type support
+ * is queried
* @return array of file types. If no file types are supported, an array of
* length 0 is returned.
* @throws NullPointerException if {@code stream} is {@code null}
@@ -1175,8 +1167,8 @@
* type to the output stream provided. Some file types require that the
* length be written into the file header; such files cannot be written from
* start to finish unless the length is known in advance. An attempt to
- * write a file of such a type will fail with an IOException if the length
- * in the audio file type is {@code AudioSystem.NOT_SPECIFIED}.
+ * write a file of such a type will fail with an {@code IOException} if the
+ * length in the audio file type is {@code AudioSystem.NOT_SPECIFIED}.
*
* @param stream the audio input stream containing audio data to be written
* to the file
@@ -1250,7 +1242,9 @@
// METHODS FOR INTERNAL IMPLEMENTATION USE
/**
- * Obtains the set of MixerProviders on the system.
+ * Obtains the list of MixerProviders currently installed on the system.
+ *
+ * @return the list of MixerProviders currently installed on the system
*/
@SuppressWarnings("unchecked")
private static List