<html>
<head>
<meta content="text/html; charset=ISO-8859-1"
http-equiv="Content-Type">
</head>
<body bgcolor="#FFFFFF" text="#000000">
<div class="moz-cite-prefix">Hi. Joe.<br>
It seems to me "Enumeration e" in
<meta http-equiv="content-type" content="text/html;
charset=ISO-8859-1">
AudioStreamSequence can be removed too.<br>
<br>
On 5/15/14 10:08 AM, Joe Darcy wrote:<br>
</div>
<blockquote cite="mid:537459D9.3000900@oracle.com" type="cite">Hello,
<br>
<br>
Please review this fix for
<br>
<br>
JDK-8042871: Fix raw and unchecked warnings in sun.audio
<br>
<a class="moz-txt-link-freetext" href="http://cr.openjdk.java.net/~darcy/8042871.0/">http://cr.openjdk.java.net/~darcy/8042871.0/</a>
<br>
<br>
Patch below.
<br>
<br>
Thanks,
<br>
<br>
-Joe
<br>
<br>
--- old/src/share/classes/sun/audio/AudioDevice.java 2014-05-14
23:04:08.000000000 -0700
<br>
+++ new/src/share/classes/sun/audio/AudioDevice.java 2014-05-14
23:04:07.000000000 -0700
<br>
@@ -58,10 +58,7 @@
<br>
<br>
private boolean DEBUG = false /*true*/ ;
<br>
<br>
- /** Hashtable of audio clips / input streams. */
<br>
- private Hashtable clipStreams;
<br>
-
<br>
- private Vector infos;
<br>
+ private Vector<Info> infos;
<br>
<br>
/** Are we currently playing audio? */
<br>
private boolean playing = false;
<br>
@@ -81,9 +78,7 @@
<br>
* Create an AudioDevice instance.
<br>
*/
<br>
private AudioDevice() {
<br>
-
<br>
- clipStreams = new Hashtable();
<br>
- infos = new Vector();
<br>
+ infos = new Vector<>();
<br>
}
<br>
<br>
<br>
@@ -161,7 +156,7 @@
<br>
<br>
// is this already playing? if so, then just return
<br>
for(int i=0; i<infos.size(); i++) {
<br>
- info = (AudioDevice.Info)infos.elementAt(i);
<br>
+ info = infos.elementAt(i);
<br>
if( info.in == in ) {
<br>
<br>
return;
<br>
@@ -290,7 +285,7 @@
<br>
<br>
for(int i=0; i<infos.size(); i++) {
<br>
<br>
- info = (AudioDevice.Info)infos.elementAt(i);
<br>
+ info = infos.elementAt(i);
<br>
<br>
if( info.in == in ) {
<br>
<br>
@@ -355,7 +350,7 @@
<br>
<br>
for(int i=0; i<infos.size(); i++) {
<br>
<br>
- info = (AudioDevice.Info)infos.elementAt(i);
<br>
+ info = infos.elementAt(i);
<br>
<br>
if( info.sequencer != null ) {
<br>
<br>
@@ -375,8 +370,7 @@
<br>
System.err.println("Audio Device: Streams all
closed.");
<br>
}
<br>
// Empty the hash table.
<br>
- clipStreams = new Hashtable();
<br>
- infos = new Vector();
<br>
+ infos = new Vector<>();
<br>
}
<br>
<br>
/**
<br>
--- old/src/share/classes/sun/audio/AudioPlayer.java 2014-05-14
23:04:08.000000000 -0700
<br>
+++ new/src/share/classes/sun/audio/AudioPlayer.java 2014-05-14
23:04:08.000000000 -0700
<br>
@@ -92,18 +92,16 @@
<br>
private static AudioPlayer getAudioPlayer() {
<br>
<br>
if(DEBUG) { System.out.println(">
AudioPlayer.getAudioPlayer()"); }
<br>
- AudioPlayer audioPlayer;
<br>
- PrivilegedAction action = new PrivilegedAction() {
<br>
- public Object run() {
<br>
- Thread t = new AudioPlayer();
<br>
+ PrivilegedAction<AudioPlayer> action = new
PrivilegedAction<AudioPlayer>() {
<br>
+ public AudioPlayer run() {
<br>
+ AudioPlayer t = new AudioPlayer();
<br>
t.setPriority(MAX_PRIORITY);
<br>
t.setDaemon(true);
<br>
t.start();
<br>
return t;
<br>
}
<br>
};
<br>
- audioPlayer = (AudioPlayer)
AccessController.doPrivileged(action);
<br>
- return audioPlayer;
<br>
+ return AccessController.doPrivileged(action);
<br>
}
<br>
<br>
/**
<br>
--- old/src/share/classes/sun/audio/AudioStreamSequence.java
2014-05-14 23:04:09.000000000 -0700
<br>
+++ new/src/share/classes/sun/audio/AudioStreamSequence.java
2014-05-14 23:04:09.000000000 -0700
<br>
@@ -45,14 +45,14 @@
<br>
*/
<br>
public final class AudioStreamSequence extends
SequenceInputStream {
<br>
<br>
- Enumeration e;
<br>
+ Enumeration<? extends InputStream> e;
<br>
InputStream in;
<br>
<br>
/**
<br>
* Create an AudioStreamSequence given an
<br>
* enumeration of streams.
<br>
*/
<br>
- public AudioStreamSequence(Enumeration e) {
<br>
+ public AudioStreamSequence(Enumeration<? extends
InputStream> e) {
<br>
super(e);
<br>
}
<br>
<br>
<br>
<br>
</blockquote>
<br>
<br>
<pre class="moz-signature" cols="72">--
Best regards, Sergey. </pre>
</body>
</html>