diff options
author | Tom Tromey <tromey@redhat.com> | 2005-12-02 22:48:53 +0000 |
---|---|---|
committer | Tom Tromey <tromey@redhat.com> | 2005-12-02 22:48:53 +0000 |
commit | 06529f82cb874ac92ff42cd31964dfceca1ddcba (patch) | |
tree | 2a19d1a09e9fbe47d7cdbf597e77a4f03eb5211a | |
parent | db50f4bc4a8fe3ef54840fca0bad8f761576b4f8 (diff) | |
download | classpath-06529f82cb874ac92ff42cd31964dfceca1ddcba.tar.gz |
* javax/sound/sampled/Port.java (Info): Genericized.
* javax/sound/sampled/Line.java (Info): Genericized.
(getLineClass): Likewise.
* javax/sound/sampled/DataLine.java (Info): Genericized.
* javax/sound/sampled/AudioFormat.java (AudioFormat): Genericized.
(properties): Likewise.
* javax/sound/sampled/AudioFileFormat.java (AudioFileFormat):
Genericized.
(properties): Likewise.
-rw-r--r-- | ChangeLog | 12 | ||||
-rw-r--r-- | javax/sound/sampled/AudioFileFormat.java | 4 | ||||
-rw-r--r-- | javax/sound/sampled/AudioFormat.java | 4 | ||||
-rw-r--r-- | javax/sound/sampled/DataLine.java | 6 | ||||
-rw-r--r-- | javax/sound/sampled/Line.java | 4 | ||||
-rw-r--r-- | javax/sound/sampled/Port.java | 2 |
6 files changed, 22 insertions, 10 deletions
@@ -1,5 +1,17 @@ 2005-12-02 Tom Tromey <tromey@redhat.com> + * javax/sound/sampled/Port.java (Info): Genericized. + * javax/sound/sampled/Line.java (Info): Genericized. + (getLineClass): Likewise. + * javax/sound/sampled/DataLine.java (Info): Genericized. + * javax/sound/sampled/AudioFormat.java (AudioFormat): Genericized. + (properties): Likewise. + * javax/sound/sampled/AudioFileFormat.java (AudioFileFormat): + Genericized. + (properties): Likewise. + +2005-12-02 Tom Tromey <tromey@redhat.com> + * javax/naming/directory/InitialDirContext.java (search): Genericized. * javax/naming/directory/BasicAttributes.java (getAll): Genericized. (getIDs): Likewise. diff --git a/javax/sound/sampled/AudioFileFormat.java b/javax/sound/sampled/AudioFileFormat.java index 81bbe4ecf..37c2df465 100644 --- a/javax/sound/sampled/AudioFileFormat.java +++ b/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/javax/sound/sampled/AudioFormat.java b/javax/sound/sampled/AudioFormat.java index 5199d71c3..a474ff9a5 100644 --- a/javax/sound/sampled/AudioFormat.java +++ b/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/javax/sound/sampled/DataLine.java b/javax/sound/sampled/DataLine.java index f755958fe..aa99a046c 100644 --- a/javax/sound/sampled/DataLine.java +++ b/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/javax/sound/sampled/Line.java b/javax/sound/sampled/Line.java index 69bb9084f..536752a1c 100644 --- a/javax/sound/sampled/Line.java +++ b/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/javax/sound/sampled/Port.java b/javax/sound/sampled/Port.java index 7b3daafd3..f30a249b4 100644 --- a/javax/sound/sampled/Port.java +++ b/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; |