diff options
Diffstat (limited to 'libjava/classpath/javax/sound')
8 files changed, 18 insertions, 18 deletions
diff --git a/libjava/classpath/javax/sound/midi/Instrument.java b/libjava/classpath/javax/sound/midi/Instrument.java index 3402e8289c9..f2821db6484 100644 --- a/libjava/classpath/javax/sound/midi/Instrument.java +++ b/libjava/classpath/javax/sound/midi/Instrument.java @@ -59,7 +59,7 @@ public abstract class Instrument extends SoundbankResource * @param dataClass the class used to represent sample data for this instrument */ protected Instrument(Soundbank soundbank, Patch patch, - String name, Class dataClass) + String name, Class<?> dataClass) { super(soundbank, name, dataClass); this.patch = patch; diff --git a/libjava/classpath/javax/sound/midi/Sequence.java b/libjava/classpath/javax/sound/midi/Sequence.java index 1a43d207ce6..2ea201cb2a4 100644 --- a/libjava/classpath/javax/sound/midi/Sequence.java +++ b/libjava/classpath/javax/sound/midi/Sequence.java @@ -65,7 +65,7 @@ public class Sequence /** * The MIDI tracks used by this sequence. */ - protected Vector tracks; + protected Vector<Track> tracks; /** * Tempo-based timing. Resolution is specified in ticks per beat. @@ -107,7 +107,7 @@ public class Sequence this.divisionType = divisionType; this.resolution = resolution; - tracks = new Vector(numTracks); + tracks = new Vector<Track>(numTracks); while (numTracks > 0) tracks.set(--numTracks, new Track()); } @@ -189,7 +189,7 @@ public class Sequence */ public Track[] getTracks() { - return (Track[]) tracks.toArray(new Track[tracks.size()]); + return tracks.toArray(new Track[tracks.size()]); } /** @@ -224,10 +224,10 @@ public class Sequence public long getTickLength() { long length = 0; - Iterator itr = tracks.iterator(); + Iterator<Track> itr = tracks.iterator(); while (itr.hasNext()) { - Track track = (Track) itr.next(); + Track track = itr.next(); long trackTicks = track.ticks(); if (trackTicks > length) length = trackTicks; diff --git a/libjava/classpath/javax/sound/midi/SoundbankResource.java b/libjava/classpath/javax/sound/midi/SoundbankResource.java index 435017e4cf2..93f42e48e1d 100644 --- a/libjava/classpath/javax/sound/midi/SoundbankResource.java +++ b/libjava/classpath/javax/sound/midi/SoundbankResource.java @@ -58,7 +58,7 @@ public abstract class SoundbankResource * @param name the name of the resource * @param dataClass the class used to represent the audio data */ - protected SoundbankResource(Soundbank soundbank, String name, Class dataClass) + protected SoundbankResource(Soundbank soundbank, String name, Class<?> dataClass) { this.soundbank = soundbank; this.name = name; @@ -90,7 +90,7 @@ public abstract class SoundbankResource * * @return the class used to represent the audio data for this resource */ - public Class getDataClass() + public Class<?> getDataClass() { return dataClass; } diff --git a/libjava/classpath/javax/sound/sampled/AudioFileFormat.java b/libjava/classpath/javax/sound/sampled/AudioFileFormat.java index 81bbe4ecf10..37c2df4652c 100644 --- a/libjava/classpath/javax/sound/sampled/AudioFileFormat.java +++ b/libjava/classpath/javax/sound/sampled/AudioFileFormat.java @@ -153,7 +153,7 @@ public class AudioFileFormat * @param properties the properties */ public AudioFileFormat(Type type, AudioFormat fmt, int frameLen, - Map properties) + Map<String, Object> properties) { this.byteLength = AudioSystem.NOT_SPECIFIED; this.format = fmt; @@ -226,7 +226,7 @@ public class AudioFileFormat * Return the properties associated with this format, as a Map. * The returned Map is unmodifiable. */ - public Map properties() + public Map<String, Object> properties() { return properties; } diff --git a/libjava/classpath/javax/sound/sampled/AudioFormat.java b/libjava/classpath/javax/sound/sampled/AudioFormat.java index 5199d71c3a3..a474ff9a5c4 100644 --- a/libjava/classpath/javax/sound/sampled/AudioFormat.java +++ b/libjava/classpath/javax/sound/sampled/AudioFormat.java @@ -177,7 +177,7 @@ public class AudioFormat */ public AudioFormat(Encoding encoding, float sampleRate, int sampleSizeInBits, int channels, int frameSize, float frameRate, - boolean bigEndian, Map properties) + boolean bigEndian, Map<String, Object> properties) { this.encoding = encoding; this.sampleRate = sampleRate; @@ -319,7 +319,7 @@ public class AudioFormat * Return a read-only Map holding the properties associated with * this format. */ - public Map properties() + public Map<String, Object> properties() { return properties; } diff --git a/libjava/classpath/javax/sound/sampled/DataLine.java b/libjava/classpath/javax/sound/sampled/DataLine.java index f755958fe87..aa99a046ce4 100644 --- a/libjava/classpath/javax/sound/sampled/DataLine.java +++ b/libjava/classpath/javax/sound/sampled/DataLine.java @@ -64,7 +64,7 @@ public interface DataLine extends Line * @param klass the class of the line * @param fmt the supported format */ - public Info(Class klass, AudioFormat fmt) + public Info(Class<?> klass, AudioFormat fmt) { super(klass); this.minBufferSize = AudioSystem.NOT_SPECIFIED; @@ -80,7 +80,7 @@ public interface DataLine extends Line * @param minSize the minimum buffer size * @param maxSize the maximum buffer size */ - public Info(Class klass, AudioFormat[] fmts, int minSize, int maxSize) + public Info(Class<?> klass, AudioFormat[] fmts, int minSize, int maxSize) { super(klass); this.minBufferSize = minSize; @@ -96,7 +96,7 @@ public interface DataLine extends Line * @param fmt the supported format * @param size the buffer size */ - public Info(Class klass, AudioFormat fmt, int size) + public Info(Class<?> klass, AudioFormat fmt, int size) { super(klass); this.minBufferSize = size; diff --git a/libjava/classpath/javax/sound/sampled/Line.java b/libjava/classpath/javax/sound/sampled/Line.java index 69bb9084f10..536752a1cc1 100644 --- a/libjava/classpath/javax/sound/sampled/Line.java +++ b/libjava/classpath/javax/sound/sampled/Line.java @@ -57,7 +57,7 @@ public interface Line * for instance TargetDataLine.class. * @param klass the class of the line */ - public Info(Class klass) + public Info(Class<?> klass) { this.klass = klass; } @@ -65,7 +65,7 @@ public interface Line /** * Return the line's class. */ - public Class getLineClass() + public Class<?> getLineClass() { return klass; } diff --git a/libjava/classpath/javax/sound/sampled/Port.java b/libjava/classpath/javax/sound/sampled/Port.java index fb39e6c07ee..fc0bf71d9da 100644 --- a/libjava/classpath/javax/sound/sampled/Port.java +++ b/libjava/classpath/javax/sound/sampled/Port.java @@ -89,7 +89,7 @@ public interface Port extends Line * @param name the name of the line * @param isSource true if this is an input source */ - public Info(Class klass, String name, boolean isSource) + public Info(Class<?> klass, String name, boolean isSource) { super(klass); this.name = name; |