From f14da9b4615e437ee9369d64005a395a97eb39e2 Mon Sep 17 00:00:00 2001 From: Andrew John Hughes Date: Wed, 10 Oct 2012 04:08:20 +0100 Subject: Java warnings cleanup for javax.sound.* and gnu.javax.sound.* 2012-10-09 Andrew John Hughes * 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 --- .../sound/midi/dssi/DSSIMidiDeviceProvider.java | 21 +++++++++-------- gnu/javax/sound/midi/dssi/DSSISynthesizer.java | 27 ++++++++++------------ gnu/javax/sound/midi/file/MidiFileReader.java | 4 ++-- gnu/javax/sound/midi/file/MidiFileWriter.java | 4 ++-- gnu/javax/sound/sampled/WAV/WAVReader.java | 6 ++--- .../sound/sampled/gstreamer/GStreamerMixer.java | 4 ++-- 6 files changed, 33 insertions(+), 33 deletions(-) (limited to 'gnu') 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 examineLibrary(String soname) { - List list = new ArrayList(); + List list = new ArrayList(); 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 ilist = new ArrayList(); 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 instruments = new ArrayList(); + private List resources = new ArrayList(); 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 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 soundbanks = new ArrayList(); DSSISoundbank defaultSoundbank; /** @@ -616,17 +614,16 @@ public class DSSISynthesizer implements Synthesizer */ public Instrument[] getAvailableInstruments() { - List instruments = new ArrayList(); - Iterator itr = soundbanks.iterator(); + List instruments = new ArrayList(); + Iterator 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) -- cgit v1.2.1