Java warnings cleanup for javax.sound.* and gnu.javax.sound.*

2012-10-09  Andrew John Hughes  <gnu_andrew@member.fsf.org>

	* gnu/javax/sound/midi/dssi/DSSIMidiDeviceProvider.java:
	(DSSIInfo.copyright): Added field.
	(DSSIInfo(String,String,String,String,String,String,long)):
	Extended constructor to store copyright.
	(examineLibrary(String)): Add type parameter.
	Fix call to new DSSIInfo constructor.
	(static): Add type parameters.
	* gnu/javax/sound/midi/dssi/DSSISynthesizer.java:
	(instruments): Add type parameter.
	(resources): Likewise.
	(getResources()): Remove redundant cast.
	(getInstruments()): Likewise.
	(getInstrument(Patch)): Add type parameter and remove
	redundant cast.
	(soundbanks): Add type parameter.
	(getAvailableInstruments()): Add type parameters and
	remove redundant casts.
	* gnu/javax/sound/midi/file/MidiFileReader.java:
	(getSequence(InputStream)): Don't store length as not used.
	* gnu/javax/sound/midi/file/MidiFileWriter.java:
	(computeTrackLength(Track,MidiDataOutputStream)): Drop unused
	count variable.
	* gnu/javax/sound/sampled/WAV/WAVReader.java:
	(getAudioFileFormat(InputStream)): Drop unused blockAlign variable.
	* gnu/javax/sound/sampled/gstreamer/GStreamerMixer.java:
	(getLine(Line.Info)): Add type parameter to Class.
	* javax/sound/midi/MidiSystem.java:
	(getMidiDeviceInfo()): Add type parameters.  Remove unnecessary cast.
	(getMidiDevice(MidiDevice.Info)): Add type parameter.
	(getSoundbank(InputStream)): Add type parameters and remove
	unnecessary casts.
	(getSoundbank(URL)): Likewise.
	(getSoundbank(File)): Likewise.
	(getMidiFileFormat(InputStream)): Likewise.
	(getMidiFileFormat(URL)): Likewise.
	(getMidiFileFormat(File)): Likewise.
	(getSequence(InputStream)): Likewise.
	(getSequence(URL)): Likewise.
	(getSequence(File)): Likewise.
	(getMidiFileTypes()): Likewise.
	(isFileTypeSupported(int)): Likewise.
	(getMidiFileTypes(Sequence)): Likewise.
	(isFileTypeSupported(int,Sequence)): Likewise.
	(write(Sequence,int,OutputStream)): Likewise.
	(write(Sequence,int,File)): Likewise.
	* javax/sound/midi/SoundbankResource.java:
	(dataClass): Add type parameter.
	* javax/sound/midi/Track.java:
	(events): Add type parameter.
	(eventSet): Likewise.
	(add(MidiEvent)): Remove redundant cast.
	(get(int)): Likewise.
	(ticks()): Likewise.
	* javax/sound/sampled/AudioSystem.java:
	(getAudioFileFormat(File)): Add type parameters and
	remove unnecessary casts.
	(getAudioFileFormat(InputStream)): Likewise.
	(getAudioFileFormat(URL)): Likewise.
	(getAudioFileTypes()): Likewise.
	(getAudioFileTypes(AudioInputStream)): Likewise.
	(getAudioInputStream(AudioFormat.Encoding,AudioInputStream)):
	Likewise.
	(getAudioInputStream(AudioFormat,AudioInputStream)): Likewise.
	(getAudioInputStream(File)): Likewise.
	(getAudioInputStream(InputStream)): Likewise.
	(getAudioInputStream(URL)): Likewise.
	(getMixer(Mixer.Info)): Likewise.
	(getMixerInfo()): Likewise.
	(getTargetEncodings(AudioFormat.Encoding)): Likewise.
	(getTargetEncodings(AudioFormat)): Likewise.
	(getTargetFormats(AudioFormat.Encoding,AudioFormat)): Likewise.
	(isConversionSupported(AudioFormat.Encoding,AudioFormat)): Likewise.
	(isConversionSupported(AudioFormat,AudioFormat)): Likewise.
	(write(AudioInputStream,AudioFileFormat.Type,File)): Likewise.
	(write(AudioInputStream,AudioFileFormat.Type,OutputStream)): Likewise.
	* javax/sound/sampled/Line.java:
	(klass): Add type parameter.
	* m4/ac_prog_javac.m4:
	(ECJ_OPTS): Turn of unused private field warnings for now,
	as some may be used from native code.

Signed-off-by: Andrew John Hughes <gnu_andrew@member.fsf.org>

13 files changed, 211 insertions, 114 deletions

diff --git a/ChangeLog b/ChangeLog
index 007528938..7fa41e8fb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,86 @@
+2012-10-09  Andrew John Hughes  <gnu_andrew@member.fsf.org>
+
+	* gnu/javax/sound/midi/dssi/DSSIMidiDeviceProvider.java:
+	(DSSIInfo.copyright): Added field.
+	(DSSIInfo(String,String,String,String,String,String,long)):
+	Extended constructor to store copyright.
+	(examineLibrary(String)): Add type parameter.
+	Fix call to new DSSIInfo constructor.
+	(static): Add type parameters.
+	* gnu/javax/sound/midi/dssi/DSSISynthesizer.java:
+	(instruments): Add type parameter.
+	(resources): Likewise.
+	(getResources()): Remove redundant cast.
+	(getInstruments()): Likewise.
+	(getInstrument(Patch)): Add type parameter and remove
+	redundant cast.
+	(soundbanks): Add type parameter.
+	(getAvailableInstruments()): Add type parameters and
+	remove redundant casts.
+	* gnu/javax/sound/midi/file/MidiFileReader.java:
+	(getSequence(InputStream)): Don't store length as not used.
+	* gnu/javax/sound/midi/file/MidiFileWriter.java:
+	(computeTrackLength(Track,MidiDataOutputStream)): Drop unused
+	count variable.
+	* gnu/javax/sound/sampled/WAV/WAVReader.java:
+	(getAudioFileFormat(InputStream)): Drop unused blockAlign variable.
+	* gnu/javax/sound/sampled/gstreamer/GStreamerMixer.java:
+	(getLine(Line.Info)): Add type parameter to Class.
+	* javax/sound/midi/MidiSystem.java:
+	(getMidiDeviceInfo()): Add type parameters.  Remove unnecessary cast.
+	(getMidiDevice(MidiDevice.Info)): Add type parameter.
+	(getSoundbank(InputStream)): Add type parameters and remove
+	unnecessary casts.
+	(getSoundbank(URL)): Likewise.
+	(getSoundbank(File)): Likewise.
+	(getMidiFileFormat(InputStream)): Likewise.
+	(getMidiFileFormat(URL)): Likewise.
+	(getMidiFileFormat(File)): Likewise.
+	(getSequence(InputStream)): Likewise.
+	(getSequence(URL)): Likewise.
+	(getSequence(File)): Likewise.
+	(getMidiFileTypes()): Likewise.
+	(isFileTypeSupported(int)): Likewise.
+	(getMidiFileTypes(Sequence)): Likewise.
+	(isFileTypeSupported(int,Sequence)): Likewise.
+	(write(Sequence,int,OutputStream)): Likewise.
+	(write(Sequence,int,File)): Likewise.
+	* javax/sound/midi/SoundbankResource.java:
+	(dataClass): Add type parameter.
+	* javax/sound/midi/Track.java:
+	(events): Add type parameter.
+	(eventSet): Likewise.
+	(add(MidiEvent)): Remove redundant cast.
+	(get(int)): Likewise.
+	(ticks()): Likewise.
+	* javax/sound/sampled/AudioSystem.java:
+	(getAudioFileFormat(File)): Add type parameters and
+	remove unnecessary casts.
+	(getAudioFileFormat(InputStream)): Likewise.
+	(getAudioFileFormat(URL)): Likewise.
+	(getAudioFileTypes()): Likewise.
+	(getAudioFileTypes(AudioInputStream)): Likewise.
+	(getAudioInputStream(AudioFormat.Encoding,AudioInputStream)):
+	Likewise.
+	(getAudioInputStream(AudioFormat,AudioInputStream)): Likewise.
+	(getAudioInputStream(File)): Likewise.
+	(getAudioInputStream(InputStream)): Likewise.
+	(getAudioInputStream(URL)): Likewise.
+	(getMixer(Mixer.Info)): Likewise.
+	(getMixerInfo()): Likewise.
+	(getTargetEncodings(AudioFormat.Encoding)): Likewise.
+	(getTargetEncodings(AudioFormat)): Likewise.
+	(getTargetFormats(AudioFormat.Encoding,AudioFormat)): Likewise.
+	(isConversionSupported(AudioFormat.Encoding,AudioFormat)): Likewise.
+	(isConversionSupported(AudioFormat,AudioFormat)): Likewise.
+	(write(AudioInputStream,AudioFileFormat.Type,File)): Likewise.
+	(write(AudioInputStream,AudioFileFormat.Type,OutputStream)): Likewise.
+	* javax/sound/sampled/Line.java:
+	(klass): Add type parameter.
+	* m4/ac_prog_javac.m4:
+	(ECJ_OPTS): Turn of unused private field warnings for now,
+	as some may be used from native code.
+
 2012-09-26  Andrew John Hughes  <gnu_andrew@member.fsf.org>
 
 	PR classpath/42134
diff --git a/gnu/javax/sound/midi/dssi/DSSIMidiDeviceProvider.java b/gnu/javax/sound/midi/dssi/DSSIMidiDeviceProvider.java
index 605c6dfb7..ca7b046f2 100644
--- a/gnu/javax/sound/midi/dssi/DSSIMidiDeviceProvider.java
+++ b/gnu/javax/sound/midi/dssi/DSSIMidiDeviceProvider.java
@@ -1,5 +1,5 @@
 /* DSSIMidiDeviceProvider.java -- DSSI Device Provider
-   Copyright (C) 2005 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2012 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -69,13 +69,16 @@ public class DSSIMidiDeviceProvider extends MidiDeviceProvider
    */
   private static class DSSIInfo extends Info
   {
+    String copyright;
     String soname;
     long index;
 
-    public DSSIInfo(String name, String vendor, String description,
-                    String version, String soname, long index)
+    public DSSIInfo(String name, String vendor, String label,
+                    String copyright, String version,
+                    String soname, long index)
     {
-      super(name, vendor, description, version);
+      super(name, vendor, label, version);
+      this.copyright = copyright;
       this.soname = soname;
       this.index = index;
     }
@@ -89,9 +92,9 @@ public class DSSIMidiDeviceProvider extends MidiDeviceProvider
   static native String getDSSIVendor_(long handle);
   static native String getDSSILabel_(long handle);
 
-  private static List examineLibrary(String soname)
+  private static List<DSSIInfo> examineLibrary(String soname)
   {
-     List list = new ArrayList();
+     List<DSSIInfo> list = new ArrayList<DSSIInfo>();
      long index = 0;
      long handle;
 
@@ -107,7 +110,7 @@ public class DSSIMidiDeviceProvider extends MidiDeviceProvider
        String copyright = getDSSICopyright_(handle);
        String label = getDSSIName_(handle);
        String vendor = getDSSIVendor_(handle);
-       list.add(new DSSIInfo(name, vendor, label,
+       list.add(new DSSIInfo(name, vendor, label, copyright,
                              "DSSI-1", soname, index));
        index++;
      } while (true);
@@ -133,10 +136,10 @@ public class DSSIMidiDeviceProvider extends MidiDeviceProvider
                                         return n.endsWith(".so");
                                       }
                                     });
-    List ilist = new ArrayList();
+    List<DSSIInfo> ilist = new ArrayList<DSSIInfo>();
     for (int i = 0; i < sofiles.length; i++)
       ilist.addAll(examineLibrary(new File(dssidir, sofiles[i]).getAbsolutePath()));
-    infos = (DSSIInfo[]) ilist.toArray(new DSSIInfo[ilist.size()]);
+    infos = ilist.toArray(new DSSIInfo[ilist.size()]);
   }
 
   public DSSIMidiDeviceProvider()
diff --git a/gnu/javax/sound/midi/dssi/DSSISynthesizer.java b/gnu/javax/sound/midi/dssi/DSSISynthesizer.java
index 9472ee4ad..1ae1fe87a 100644
--- a/gnu/javax/sound/midi/dssi/DSSISynthesizer.java
+++ b/gnu/javax/sound/midi/dssi/DSSISynthesizer.java
@@ -1,5 +1,5 @@
 /* DSSISynthesizer.java -- DSSI Synthesizer Provider
-   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2006, 2012 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -97,8 +97,8 @@ public class DSSISynthesizer implements Synthesizer
   {
     private String name;
     private String description;
-    private List instruments = new ArrayList();
-    private List resources = new ArrayList();
+    private List<Instrument> instruments = new ArrayList<Instrument>();
+    private List<SoundbankResource> resources = new ArrayList<SoundbankResource>();
     private String vendor;
     private String version;
 
@@ -147,27 +147,25 @@ public class DSSISynthesizer implements Synthesizer
      */
     public SoundbankResource[] getResources()
     {
-      return (SoundbankResource[])
-        resources.toArray(new SoundbankResource[resources.size()]);
+      return resources.toArray(new SoundbankResource[resources.size()]);
     }
 
     /* @see javax.sound.midi.Soundbank#getInstruments()
      */
     public Instrument[] getInstruments()
     {
-      return (Instrument[])
-        instruments.toArray(new Instrument[instruments.size()]);
+      return instruments.toArray(new Instrument[instruments.size()]);
     }
 
     /* @see javax.sound.midi.Soundbank#getInstrument(javax.sound.midi.Patch)
      */
     public Instrument getInstrument(Patch patch)
     {
-      Iterator itr = instruments.iterator();
+      Iterator<Instrument> itr = instruments.iterator();
 
       while (itr.hasNext())
       {
-        Instrument i = (Instrument) itr.next();
+        Instrument i = itr.next();
         if (i.getPatch().equals(patch))
           return i;
       }
@@ -490,7 +488,7 @@ public class DSSISynthesizer implements Synthesizer
   MidiChannel channels[] = new MidiChannel[16];
 
   // The list of known soundbanks, and the default one.
-  List soundbanks = new ArrayList();
+  List<Soundbank> soundbanks = new ArrayList<Soundbank>();
   DSSISoundbank defaultSoundbank;
 
   /**
@@ -616,17 +614,16 @@ public class DSSISynthesizer implements Synthesizer
    */
   public Instrument[] getAvailableInstruments()
   {
-    List instruments = new ArrayList();
-    Iterator itr = soundbanks.iterator();
+    List<Instrument> instruments = new ArrayList<Instrument>();
+    Iterator<Soundbank> itr = soundbanks.iterator();
     while (itr.hasNext())
     {
-      Soundbank sb = (Soundbank) itr.next();
+      Soundbank sb = itr.next();
       Instrument ins[] = sb.getInstruments();
       for (int i = 0; i < ins.length; i++)
         instruments.add(ins[i]);
     }
-    return (Instrument[])
-      instruments.toArray(new Instrument[instruments.size()]);
+    return instruments.toArray(new Instrument[instruments.size()]);
   }
 
   /* (non-Javadoc)
diff --git a/gnu/javax/sound/midi/file/MidiFileReader.java b/gnu/javax/sound/midi/file/MidiFileReader.java
index fb2a472fa..06f29af0f 100644
--- a/gnu/javax/sound/midi/file/MidiFileReader.java
+++ b/gnu/javax/sound/midi/file/MidiFileReader.java
@@ -1,5 +1,5 @@
 /* MidiFileReader.java -- Read MIDI files.
-   Copyright (C) 2006 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2012 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -198,7 +198,7 @@ public class MidiFileReader extends javax.sound.midi.spi.MidiFileReader
         int Mtrk = din.readInt();
         if (Mtrk != 0x4d54726b)
           throw new InvalidMidiDataException("Invalid MIDI track header.");
-        int length = din.readInt();
+        din.readInt(); // length
 
         int runningStatus = -1;
         int click = 0;
diff --git a/gnu/javax/sound/midi/file/MidiFileWriter.java b/gnu/javax/sound/midi/file/MidiFileWriter.java
index 5170fc1e7..f3194cb1e 100644
--- a/gnu/javax/sound/midi/file/MidiFileWriter.java
+++ b/gnu/javax/sound/midi/file/MidiFileWriter.java
@@ -1,5 +1,5 @@
 /* MidiFileWriter.java -- Write MIDI files.
-   Copyright (C) 2006 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2012 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -118,7 +118,7 @@ public class MidiFileWriter
    */
   private int computeTrackLength(Track track, MidiDataOutputStream dos)
   {
-    int count = 0, length = 0, i = 0, eventCount = track.size();
+    int length = 0, i = 0, eventCount = track.size();
     long ptick = 0;
     while (i < eventCount)
       {
diff --git a/gnu/javax/sound/sampled/WAV/WAVReader.java b/gnu/javax/sound/sampled/WAV/WAVReader.java
index 5cd6efe5e..f03bc4790 100644
--- a/gnu/javax/sound/sampled/WAV/WAVReader.java
+++ b/gnu/javax/sound/sampled/WAV/WAVReader.java
@@ -1,5 +1,5 @@
 /* WAVReader.java -- Read WAV files.
-   Copyright (C) 2006 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2012 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -128,7 +128,7 @@ public class WAVReader extends AudioFileReader
     boolean foundFmt = false;
     boolean foundData = false;
 
-    short compressionCode = 0, numberChannels = 0, blockAlign = 0, bitsPerSample = 0;
+    short compressionCode = 0, numberChannels = 0, bitsPerSample = 0;
     long sampleRate = 0, bytesPerSecond = 0;
     long chunkLength = 0;
 
@@ -144,7 +144,7 @@ public class WAVReader extends AudioFileReader
             numberChannels = readUnsignedShortLE(din);
             sampleRate = readUnsignedIntLE(din);
             bytesPerSecond = readUnsignedIntLE(din);
-            blockAlign = readUnsignedShortLE(din);
+            readUnsignedShortLE(din); // blockAlign
             bitsPerSample = readUnsignedShortLE(din);
             din.skip(chunkLength - 16);
             break;
diff --git a/gnu/javax/sound/sampled/gstreamer/GStreamerMixer.java b/gnu/javax/sound/sampled/gstreamer/GStreamerMixer.java
index 1910ea655..b2ca7cd4b 100644
--- a/gnu/javax/sound/sampled/gstreamer/GStreamerMixer.java
+++ b/gnu/javax/sound/sampled/gstreamer/GStreamerMixer.java
@@ -1,5 +1,5 @@
 /* GStreamerMixer.java -- Mixer implementation.
- Copyright (C) 2007 Free Software Foundation, Inc.
+ Copyright (C) 2007, 2012 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -92,7 +92,7 @@ public class GStreamerMixer
     // and see if there is one matching the given line
     // if the format comes from the gstreamer backend
     // gstreamer will be able to deal with it
-    Class clazz = info.getLineClass();
+    Class<?> clazz = info.getLineClass();
     DataLine.Info _info = (DataLine.Info) info;
 
     if (clazz == SourceDataLine.class)
diff --git a/javax/sound/midi/MidiSystem.java b/javax/sound/midi/MidiSystem.java
index b273b98e5..0e3680563 100644
--- a/javax/sound/midi/MidiSystem.java
+++ b/javax/sound/midi/MidiSystem.java
@@ -1,5 +1,5 @@
 /* MidiSystem.java -- Access system MIDI resources
-   Copyright (C) 2005 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2012 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -76,9 +76,9 @@ public class MidiSystem
    */
   public static MidiDevice.Info[] getMidiDeviceInfo()
   {
-    Iterator deviceProviders =
+    Iterator<MidiDeviceProvider> deviceProviders =
         ServiceFactory.lookupProviders(MidiDeviceProvider.class);
-    List infoList = new ArrayList();
+    List<MidiDevice.Info> infoList = new ArrayList<MidiDevice.Info>();
 
     while (deviceProviders.hasNext())
     {
@@ -88,8 +88,7 @@ public class MidiSystem
         infoList.add(infos[--i]);
     }
 
-    return (MidiDevice.Info[])
-        infoList.toArray(new MidiDevice.Info[infoList.size()]);
+    return infoList.toArray(new MidiDevice.Info[infoList.size()]);
   }
 
   /**
@@ -103,7 +102,7 @@ public class MidiSystem
   public static MidiDevice getMidiDevice(MidiDevice.Info info)
     throws MidiUnavailableException
   {
-    Iterator deviceProviders =
+    Iterator<MidiDeviceProvider> deviceProviders =
         ServiceFactory.lookupProviders(MidiDeviceProvider.class);
 
     if (! deviceProviders.hasNext())
@@ -216,10 +215,11 @@ public class MidiSystem
   public static Soundbank getSoundbank(InputStream stream)
     throws InvalidMidiDataException, IOException
   {
-    Iterator readers = ServiceFactory.lookupProviders(SoundbankReader.class);
+    Iterator<SoundbankReader> readers =
+      ServiceFactory.lookupProviders(SoundbankReader.class);
     while (readers.hasNext())
     {
-      SoundbankReader sr = (SoundbankReader) readers.next();
+      SoundbankReader sr = readers.next();
       Soundbank sb = sr.getSoundbank(stream);
       if (sb != null)
         return sb;
@@ -238,10 +238,11 @@ public class MidiSystem
   public static Soundbank getSoundbank(URL url)
     throws InvalidMidiDataException, IOException
   {
-    Iterator readers = ServiceFactory.lookupProviders(SoundbankReader.class);
+    Iterator<SoundbankReader> readers =
+      ServiceFactory.lookupProviders(SoundbankReader.class);
     while (readers.hasNext())
     {
-      SoundbankReader sr = (SoundbankReader) readers.next();
+      SoundbankReader sr = readers.next();
       Soundbank sb = sr.getSoundbank(url);
       if (sb != null)
         return sb;
@@ -260,7 +261,8 @@ public class MidiSystem
   public static Soundbank getSoundbank(File file)
     throws InvalidMidiDataException, IOException
   {
-    Iterator readers = ServiceFactory.lookupProviders(SoundbankReader.class);
+    Iterator<SoundbankReader> readers =
+      ServiceFactory.lookupProviders(SoundbankReader.class);
     while (readers.hasNext())
     {
       SoundbankReader sr = (SoundbankReader) readers.next();
@@ -283,10 +285,11 @@ public class MidiSystem
   public static MidiFileFormat getMidiFileFormat(InputStream stream)
     throws InvalidMidiDataException, IOException
   {
-    Iterator readers = ServiceFactory.lookupProviders(MidiFileReader.class);
+    Iterator<MidiFileReader> readers =
+      ServiceFactory.lookupProviders(MidiFileReader.class);
     while (readers.hasNext())
     {
-      MidiFileReader sr = (MidiFileReader) readers.next();
+      MidiFileReader sr = readers.next();
       MidiFileFormat sb = sr.getMidiFileFormat(stream);
       if (sb != null)
         return sb;
@@ -305,10 +308,11 @@ public class MidiSystem
   public static MidiFileFormat getMidiFileFormat(URL url)
     throws InvalidMidiDataException, IOException
   {
-    Iterator readers = ServiceFactory.lookupProviders(MidiFileReader.class);
+    Iterator<MidiFileReader> readers =
+      ServiceFactory.lookupProviders(MidiFileReader.class);
     while (readers.hasNext())
     {
-      MidiFileReader sr = (MidiFileReader) readers.next();
+      MidiFileReader sr = readers.next();
       MidiFileFormat sb = sr.getMidiFileFormat(url);
       if (sb != null)
         return sb;
@@ -327,10 +331,11 @@ public class MidiSystem
   public static MidiFileFormat getMidiFileFormat(File file)
     throws InvalidMidiDataException, IOException
   {
-    Iterator readers = ServiceFactory.lookupProviders(MidiFileReader.class);
+    Iterator<MidiFileReader> readers =
+      ServiceFactory.lookupProviders(MidiFileReader.class);
     while (readers.hasNext())
     {
-      MidiFileReader sr = (MidiFileReader) readers.next();
+      MidiFileReader sr = readers.next();
       MidiFileFormat sb = sr.getMidiFileFormat(file);
       if (sb != null)
         return sb;
@@ -350,10 +355,11 @@ public class MidiSystem
   public static Sequence getSequence(InputStream stream)
     throws InvalidMidiDataException, IOException
   {
-    Iterator readers = ServiceFactory.lookupProviders(MidiFileReader.class);
+    Iterator<MidiFileReader> readers =
+      ServiceFactory.lookupProviders(MidiFileReader.class);
     while (readers.hasNext())
     {
-      MidiFileReader sr = (MidiFileReader) readers.next();
+      MidiFileReader sr = readers.next();
       Sequence sq = sr.getSequence(stream);
       if (sq != null)
         return sq;
@@ -372,10 +378,11 @@ public class MidiSystem
   public static Sequence getSequence(URL url)
     throws InvalidMidiDataException, IOException
   {
-    Iterator readers = ServiceFactory.lookupProviders(MidiFileReader.class);
+    Iterator<MidiFileReader> readers =
+      ServiceFactory.lookupProviders(MidiFileReader.class);
     while (readers.hasNext())
     {
-      MidiFileReader sr = (MidiFileReader) readers.next();
+      MidiFileReader sr = readers.next();
       Sequence sq = sr.getSequence(url);
       if (sq != null)
         return sq;
@@ -394,10 +401,11 @@ public class MidiSystem
   public static Sequence getSequence(File file)
     throws InvalidMidiDataException, IOException
   {
-    Iterator readers = ServiceFactory.lookupProviders(MidiFileReader.class);
+    Iterator<MidiFileReader> readers =
+      ServiceFactory.lookupProviders(MidiFileReader.class);
     while (readers.hasNext())
     {
-      MidiFileReader sr = (MidiFileReader) readers.next();
+      MidiFileReader sr = readers.next();
       Sequence sq = sr.getSequence(file);
       if (sq != null)
         return sq;
@@ -417,10 +425,11 @@ public class MidiSystem
     boolean supported[] = new boolean[3];
     // The number of supported formats.
     int count = 0;
-    Iterator writers = ServiceFactory.lookupProviders(MidiFileWriter.class);
+    Iterator<MidiFileWriter> writers =
+      ServiceFactory.lookupProviders(MidiFileWriter.class);
     while (writers.hasNext())
     {
-      MidiFileWriter fw = (MidiFileWriter) writers.next();
+      MidiFileWriter fw = writers.next();
       int types[] = fw.getMidiFileTypes();
       for (int i = types.length; i > 0;)
       {
@@ -449,10 +458,10 @@ public class MidiSystem
    */
   public static boolean isFileTypeSupported(int fileType)
   {
-    Iterator writers = ServiceFactory.lookupProviders(MidiFileWriter.class);
+    Iterator<MidiFileWriter> writers = ServiceFactory.lookupProviders(MidiFileWriter.class);
     while (writers.hasNext())
     {
-      MidiFileWriter fw = (MidiFileWriter) writers.next();
+      MidiFileWriter fw = writers.next();
 
       if (fw.isFileTypeSupported(fileType))
         return true;
@@ -473,7 +482,7 @@ public class MidiSystem
     boolean supported[] = new boolean[3];
     // The number of supported formats.
     int count = 0;
-    Iterator writers = ServiceFactory.lookupProviders(MidiFileWriter.class);
+    Iterator<MidiFileWriter> writers = ServiceFactory.lookupProviders(MidiFileWriter.class);
     while (writers.hasNext())
     {
       MidiFileWriter fw = (MidiFileWriter) writers.next();
@@ -507,7 +516,7 @@ public class MidiSystem
    */
   public static boolean isFileTypeSupported(int fileType, Sequence sequence)
   {
-    Iterator writers = ServiceFactory.lookupProviders(MidiFileWriter.class);
+    Iterator<MidiFileWriter> writers = ServiceFactory.lookupProviders(MidiFileWriter.class);
     while (writers.hasNext())
     {
       MidiFileWriter fw = (MidiFileWriter) writers.next();
@@ -531,7 +540,7 @@ public class MidiSystem
   public static int write(Sequence in, int fileType, OutputStream out)
     throws IOException
   {
-    Iterator writers = ServiceFactory.lookupProviders(MidiFileWriter.class);
+    Iterator<MidiFileWriter> writers = ServiceFactory.lookupProviders(MidiFileWriter.class);
     while (writers.hasNext())
     {
       MidiFileWriter fw = (MidiFileWriter) writers.next();
@@ -556,7 +565,7 @@ public class MidiSystem
   public static int write(Sequence in, int fileType, File out)
     throws IOException
   {
-    Iterator writers = ServiceFactory.lookupProviders(MidiFileWriter.class);
+    Iterator<MidiFileWriter> writers = ServiceFactory.lookupProviders(MidiFileWriter.class);
     while (writers.hasNext())
     {
       MidiFileWriter fw = (MidiFileWriter) writers.next();
diff --git a/javax/sound/midi/SoundbankResource.java b/javax/sound/midi/SoundbankResource.java
index 0b4675b10..6c3a4f28b 100644
--- a/javax/sound/midi/SoundbankResource.java
+++ b/javax/sound/midi/SoundbankResource.java
@@ -1,5 +1,5 @@
 /* SoundbankResource.java -- An audio resource from a sound bank
-   Copyright (C) 2005 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2012 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -49,7 +49,7 @@ public abstract class SoundbankResource
 {
   private final Soundbank soundbank;
   private final String name;
-  private final Class dataClass;
+  private final Class<?> dataClass;
 
   /**
    * Create a SoundbankResource object.
diff --git a/javax/sound/midi/Track.java b/javax/sound/midi/Track.java
index 550d2e1c4..9c392577f 100644
--- a/javax/sound/midi/Track.java
+++ b/javax/sound/midi/Track.java
@@ -1,5 +1,5 @@
 /* Track.java -- A track of MIDI events
-   Copyright (C) 2005 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2012 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -54,10 +54,10 @@ public class Track
   /**
    * The list of MidiEvents for this track.
    */
-  Vector events = new Vector();
+  Vector<MidiEvent> events = new Vector<MidiEvent>();
 
   // A HashSet to speed processing
-  private HashSet eventSet = new HashSet();
+  private HashSet<MidiEvent> eventSet = new HashSet<MidiEvent>();
 
   // This is only instantiable within this package.
   Track()
@@ -83,7 +83,7 @@ public class Track
 
       long targetTick = event.getTick();
       int i = events.size() - 1;
-      while (i >= 0 && (((MidiEvent)events.get(i)).getTick() > targetTick))
+      while (i >= 0 && (events.get(i).getTick() > targetTick))
         i--;
       events.add(i+1, event);
       return true;
@@ -127,7 +127,7 @@ public class Track
     {
       try
       {
-        return (MidiEvent) events.get(index);
+        return events.get(index);
       }
       catch (IndexOutOfBoundsException e)
       {
@@ -158,7 +158,7 @@ public class Track
     synchronized (events)
     {
       int size = events.size();
-      return ((MidiEvent) events.get(size - 1)).getTick();
+      return events.get(size - 1).getTick();
     }
   }
  }
diff --git a/javax/sound/sampled/AudioSystem.java b/javax/sound/sampled/AudioSystem.java
index 01133c91d..599952154 100644
--- a/javax/sound/sampled/AudioSystem.java
+++ b/javax/sound/sampled/AudioSystem.java
@@ -1,5 +1,5 @@
 /* Main interface to audio system
-   Copyright (C) 2005 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2012 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -84,10 +84,10 @@ public class AudioSystem
   public static AudioFileFormat getAudioFileFormat(File f)
     throws UnsupportedAudioFileException, IOException
   {
-    Iterator i = ServiceFactory.lookupProviders(AudioFileReader.class);
+    Iterator<AudioFileReader> i = ServiceFactory.lookupProviders(AudioFileReader.class);
     while (i.hasNext())
       {
-        AudioFileReader reader = (AudioFileReader) i.next();
+        AudioFileReader reader = i.next();
         try
           {
             return reader.getAudioFileFormat(f);
@@ -111,10 +111,10 @@ public class AudioSystem
   public static AudioFileFormat getAudioFileFormat(InputStream is)
     throws UnsupportedAudioFileException, IOException
   {
-    Iterator i = ServiceFactory.lookupProviders(AudioFileReader.class);
+    Iterator<AudioFileReader> i = ServiceFactory.lookupProviders(AudioFileReader.class);
     while (i.hasNext())
       {
-        AudioFileReader reader = (AudioFileReader) i.next();
+        AudioFileReader reader = i.next();
         try
           {
             return reader.getAudioFileFormat(is);
@@ -138,10 +138,10 @@ public class AudioSystem
   public static AudioFileFormat getAudioFileFormat(URL url)
     throws UnsupportedAudioFileException, IOException
   {
-    Iterator i = ServiceFactory.lookupProviders(AudioFileReader.class);
+    Iterator<AudioFileReader> i = ServiceFactory.lookupProviders(AudioFileReader.class);
     while (i.hasNext())
       {
-        AudioFileReader reader = (AudioFileReader) i.next();
+        AudioFileReader reader = i.next();
         try
           {
             return reader.getAudioFileFormat(url);
@@ -162,10 +162,10 @@ public class AudioSystem
   {
     HashSet<AudioFileFormat.Type> result
       = new HashSet<AudioFileFormat.Type>();
-    Iterator i = ServiceFactory.lookupProviders(AudioFileWriter.class);
+    Iterator<AudioFileWriter> i = ServiceFactory.lookupProviders(AudioFileWriter.class);
     while (i.hasNext())
       {
-        AudioFileWriter writer = (AudioFileWriter) i.next();
+        AudioFileWriter writer = i.next();
         AudioFileFormat.Type[] types = writer.getAudioFileTypes();
         for (int j = 0; j < types.length; ++j)
           result.add(types[j]);
@@ -183,10 +183,10 @@ public class AudioSystem
   {
     HashSet<AudioFileFormat.Type> result
       = new HashSet<AudioFileFormat.Type>();
-    Iterator i = ServiceFactory.lookupProviders(AudioFileWriter.class);
+    Iterator<AudioFileWriter> i = ServiceFactory.lookupProviders(AudioFileWriter.class);
     while (i.hasNext())
       {
-        AudioFileWriter writer = (AudioFileWriter) i.next();
+        AudioFileWriter writer = i.next();
         AudioFileFormat.Type[] types = writer.getAudioFileTypes(ais);
         for (int j = 0; j < types.length; ++j)
           result.add(types[j]);
@@ -206,10 +206,11 @@ public class AudioSystem
   public static AudioInputStream getAudioInputStream(AudioFormat.Encoding targ,
                                                      AudioInputStream ais)
   {
-    Iterator i = ServiceFactory.lookupProviders(FormatConversionProvider.class);
+    Iterator<FormatConversionProvider> i =
+      ServiceFactory.lookupProviders(FormatConversionProvider.class);
     while (i.hasNext())
       {
-        FormatConversionProvider prov = (FormatConversionProvider) i.next();
+        FormatConversionProvider prov = i.next();
         if (! prov.isConversionSupported(targ, ais.getFormat()))
           continue;
         return prov.getAudioInputStream(targ, ais);
@@ -229,10 +230,11 @@ public class AudioSystem
   public static AudioInputStream getAudioInputStream(AudioFormat targ,
                                                      AudioInputStream ais)
   {
-    Iterator i = ServiceFactory.lookupProviders(FormatConversionProvider.class);
+    Iterator<FormatConversionProvider> i =
+      ServiceFactory.lookupProviders(FormatConversionProvider.class);
     while (i.hasNext())
       {
-        FormatConversionProvider prov = (FormatConversionProvider) i.next();
+        FormatConversionProvider prov = i.next();
         if (! prov.isConversionSupported(targ, ais.getFormat()))
           continue;
         return prov.getAudioInputStream(targ, ais);
@@ -251,10 +253,10 @@ public class AudioSystem
   public static AudioInputStream getAudioInputStream(File f)
     throws UnsupportedAudioFileException, IOException
   {
-    Iterator i = ServiceFactory.lookupProviders(AudioFileReader.class);
+    Iterator<AudioFileReader> i = ServiceFactory.lookupProviders(AudioFileReader.class);
     while (i.hasNext())
       {
-        AudioFileReader reader = (AudioFileReader) i.next();
+        AudioFileReader reader = i.next();
         try
           {
             return reader.getAudioInputStream(f);
@@ -278,10 +280,10 @@ public class AudioSystem
   public static AudioInputStream getAudioInputStream(InputStream is)
     throws UnsupportedAudioFileException, IOException
   {
-    Iterator i = ServiceFactory.lookupProviders(AudioFileReader.class);
+    Iterator<AudioFileReader> i = ServiceFactory.lookupProviders(AudioFileReader.class);
     while (i.hasNext())
       {
-        AudioFileReader reader = (AudioFileReader) i.next();
+        AudioFileReader reader = i.next();
         try
           {
             return reader.getAudioInputStream(is);
@@ -305,10 +307,10 @@ public class AudioSystem
   public static AudioInputStream getAudioInputStream(URL url)
     throws UnsupportedAudioFileException, IOException
   {
-    Iterator i = ServiceFactory.lookupProviders(AudioFileReader.class);
+    Iterator<AudioFileReader> i = ServiceFactory.lookupProviders(AudioFileReader.class);
     while (i.hasNext())
       {
-        AudioFileReader reader = (AudioFileReader) i.next();
+        AudioFileReader reader = i.next();
         try
           {
             return reader.getAudioInputStream(url);
@@ -401,10 +403,10 @@ public class AudioSystem
    */
   public static Mixer getMixer(Mixer.Info info)
   {
-    Iterator i = ServiceFactory.lookupProviders(MixerProvider.class);
+    Iterator<MixerProvider> i = ServiceFactory.lookupProviders(MixerProvider.class);
     while (i.hasNext())
       {
-        MixerProvider prov = (MixerProvider) i.next();
+        MixerProvider prov = i.next();
         if (prov.isMixerSupported(info))
           return prov.getMixer(info);
       }
@@ -417,10 +419,10 @@ public class AudioSystem
   public static Mixer.Info[] getMixerInfo()
   {
     HashSet<Mixer.Info> result = new HashSet<Mixer.Info>();
-    Iterator i = ServiceFactory.lookupProviders(MixerProvider.class);
+    Iterator<MixerProvider> i = ServiceFactory.lookupProviders(MixerProvider.class);
     while (i.hasNext())
       {
-        MixerProvider prov = (MixerProvider) i.next();
+        MixerProvider prov = i.next();
         Mixer.Info[] is = prov.getMixerInfo();
         for (int j = 0; j < is.length; ++j)
           result.add(is[j]);
@@ -536,10 +538,11 @@ public class AudioSystem
   {
     HashSet<AudioFormat.Encoding> result
       = new HashSet<AudioFormat.Encoding>();
-    Iterator i = ServiceFactory.lookupProviders(FormatConversionProvider.class);
+    Iterator<FormatConversionProvider> i =
+      ServiceFactory.lookupProviders(FormatConversionProvider.class);
     while (i.hasNext())
       {
-        FormatConversionProvider prov = (FormatConversionProvider) i.next();
+        FormatConversionProvider prov = i.next();
         if (! prov.isSourceEncodingSupported(source))
           continue;
         AudioFormat.Encoding[] es = prov.getTargetEncodings();
@@ -558,10 +561,11 @@ public class AudioSystem
   {
     HashSet<AudioFormat.Encoding> result
       = new HashSet<AudioFormat.Encoding>();
-    Iterator i = ServiceFactory.lookupProviders(FormatConversionProvider.class);
+    Iterator<FormatConversionProvider> i =
+      ServiceFactory.lookupProviders(FormatConversionProvider.class);
     while (i.hasNext())
       {
-        FormatConversionProvider prov = (FormatConversionProvider) i.next();
+        FormatConversionProvider prov = i.next();
         AudioFormat.Encoding[] es = prov.getTargetEncodings(source);
         for (int j = 0; j < es.length; ++j)
           result.add(es[j]);
@@ -579,10 +583,11 @@ public class AudioSystem
                                                AudioFormat sourceFmt)
   {
     HashSet<AudioFormat> result = new HashSet<AudioFormat>();
-    Iterator i = ServiceFactory.lookupProviders(FormatConversionProvider.class);
+    Iterator<FormatConversionProvider> i =
+      ServiceFactory.lookupProviders(FormatConversionProvider.class);
     while (i.hasNext())
       {
-        FormatConversionProvider prov = (FormatConversionProvider) i.next();
+        FormatConversionProvider prov = i.next();
         AudioFormat[] es = prov.getTargetFormats(encoding, sourceFmt);
         for (int j = 0; j < es.length; ++j)
           result.add(es[j]);
@@ -618,11 +623,11 @@ public class AudioSystem
   public static boolean isConversionSupported(AudioFormat.Encoding targ,
                                               AudioFormat source)
   {
-    Iterator i
+    Iterator<FormatConversionProvider> i
       = ServiceFactory.lookupProviders(FormatConversionProvider.class);
     while (i.hasNext())
       {
-        FormatConversionProvider prov = (FormatConversionProvider) i.next();
+        FormatConversionProvider prov = i.next();
         if (prov.isConversionSupported(targ, source))
           return true;
       }
@@ -638,11 +643,11 @@ public class AudioSystem
   public static boolean isConversionSupported(AudioFormat targ,
                                               AudioFormat source)
   {
-    Iterator i
+    Iterator<FormatConversionProvider> i
       = ServiceFactory.lookupProviders(FormatConversionProvider.class);
     while (i.hasNext())
       {
-        FormatConversionProvider prov = (FormatConversionProvider) i.next();
+        FormatConversionProvider prov = i.next();
         if (prov.isConversionSupported(targ, source))
           return true;
       }
@@ -714,10 +719,10 @@ public class AudioSystem
                           File out)
     throws IOException
   {
-    Iterator i = ServiceFactory.lookupProviders(AudioFileWriter.class);
+    Iterator<AudioFileWriter> i = ServiceFactory.lookupProviders(AudioFileWriter.class);
     while (i.hasNext())
       {
-        AudioFileWriter w = (AudioFileWriter) i.next();
+        AudioFileWriter w = i.next();
         if (w.isFileTypeSupported(type, ais))
           return w.write(ais, type, out);
       }
@@ -739,10 +744,10 @@ public class AudioSystem
                           OutputStream os)
     throws IOException
   {
-    Iterator i = ServiceFactory.lookupProviders(AudioFileWriter.class);
+    Iterator<AudioFileWriter> i = ServiceFactory.lookupProviders(AudioFileWriter.class);
     while (i.hasNext())
       {
-        AudioFileWriter w = (AudioFileWriter) i.next();
+        AudioFileWriter w = i.next();
         if (w.isFileTypeSupported(type, ais))
           return w.write(ais, type, os);
       }
diff --git a/javax/sound/sampled/Line.java b/javax/sound/sampled/Line.java
index 75c7a8452..1e08f1a8b 100644
--- a/javax/sound/sampled/Line.java
+++ b/javax/sound/sampled/Line.java
@@ -1,5 +1,5 @@
 /* An input or output line
-   Copyright (C) 2005 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2012 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -51,7 +51,7 @@ public interface Line
    */
   class Info
   {
-    private Class klass;
+    private Class<?> klass;
 
     /**
      * Create a new Info object.  The argument is the class of the line,
diff --git a/m4/ac_prog_javac.m4 b/m4/ac_prog_javac.m4
index 1057f88e1..76c98de56 100644
--- a/m4/ac_prog_javac.m4
+++ b/m4/ac_prog_javac.m4
@@ -36,7 +36,7 @@ dnl Modified to remove jikes by Andrew John Hughes on 2008-02-11
 
 AC_DEFUN_ONCE([AC_PROG_JAVAC],[
 AC_REQUIRE([AC_EXEEXT])dnl
-ECJ_OPTS="-warn:-deprecation,serial,unusedImport"
+ECJ_OPTS="-warn:-deprecation,serial,unusedImport,unusedPrivate,resource"
 JAVAC_OPTS="-Xlint:unchecked,cast,divzero,empty,finally,overrides"
 GCJ_OPTS="-g"
 if test "x$JAVAPREFIX" = x; then