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 /javax/sound/midi/MidiSystem.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 'javax/sound/midi/MidiSystem.java')
-rw-r--r-- | javax/sound/midi/MidiSystem.java | 71 |
1 files changed, 40 insertions, 31 deletions
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(); |