diff options
author | Andrew John Hughes <gnu_andrew@member.fsf.org> | 2012-10-10 04:08:20 +0100 |
---|---|---|
committer | Andrew John Hughes <gnu_andrew@member.fsf.org> | 2012-10-10 04:08:20 +0100 |
commit | f14da9b4615e437ee9369d64005a395a97eb39e2 (patch) | |
tree | 1dcad2e883c38a75bef8a330b3084a63e1d74563 /gnu/javax/sound/midi/dssi/DSSIMidiDeviceProvider.java | |
parent | 98615fef3b11060138cb6c911420adcfab20e63c (diff) | |
download | classpath-f14da9b4615e437ee9369d64005a395a97eb39e2.tar.gz |
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>
Diffstat (limited to 'gnu/javax/sound/midi/dssi/DSSIMidiDeviceProvider.java')
-rw-r--r-- | gnu/javax/sound/midi/dssi/DSSIMidiDeviceProvider.java | 21 |
1 files changed, 12 insertions, 9 deletions
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() |