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>

1 files changed, 44 insertions, 39 deletions

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);
       }