diff options
| author | Tom Tromey <tromey@gcc.gnu.org> | 2007-01-09 19:58:05 +0000 |
|---|---|---|
| committer | Tom Tromey <tromey@gcc.gnu.org> | 2007-01-09 19:58:05 +0000 |
| commit | 97b8365cafc3a344a22d3980b8ed885f5c6d8357 (patch) | |
| tree | 996a5f57d4a68c53473382e45cb22f574cb3e4db /libjava/classpath/javax/sound/sampled/AudioFormat.java | |
| parent | c648dedbde727ca3f883bb5fd773aa4af70d3369 (diff) | |
| download | gcc-97b8365cafc3a344a22d3980b8ed885f5c6d8357.tar.gz | |
Merged gcj-eclipse branch to trunk.
From-SVN: r120621
Diffstat (limited to 'libjava/classpath/javax/sound/sampled/AudioFormat.java')
| -rw-r--r-- | libjava/classpath/javax/sound/sampled/AudioFormat.java | 4 |
1 files changed, 2 insertions, 2 deletions
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; } |