[cp-patches] [generics] Patch: FYI: generics -vs- javax.sound.sampled

[Tom Tromey]

I'm checking this in on the generics branch.

javax.sound.sampled was merged to the generics branch after my last
round of genericization.  This patch fixes it up.

Tom

2005-12-02  Tom Tromey  <address@hidden>

        * 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.

Index: javax/sound/sampled/AudioFileFormat.java
===================================================================
RCS file: 
/cvsroot/classpath/classpath/javax/sound/sampled/AudioFileFormat.java,v
retrieving revision 1.1.2.1
diff -u -r1.1.2.1 AudioFileFormat.java
--- javax/sound/sampled/AudioFileFormat.java    27 Nov 2005 21:00:37 -0000      
1.1.2.1
+++ javax/sound/sampled/AudioFileFormat.java    2 Dec 2005 22:38:48 -0000
@@ -153,7 +153,7 @@
    * @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 @@
    * 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;
   }
Index: javax/sound/sampled/AudioFormat.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/sound/sampled/AudioFormat.java,v
retrieving revision 1.1.2.1
diff -u -r1.1.2.1 AudioFormat.java
--- javax/sound/sampled/AudioFormat.java        27 Nov 2005 21:00:37 -0000      
1.1.2.1
+++ javax/sound/sampled/AudioFormat.java        2 Dec 2005 22:38:48 -0000
@@ -177,7 +177,7 @@
    */
   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 @@
    * Return a read-only Map holding the properties associated with 
    * this format.
    */
-  public Map properties()
+  public Map<String, Object> properties()
   {
     return properties;
   }
Index: javax/sound/sampled/DataLine.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/sound/sampled/DataLine.java,v
retrieving revision 1.1.2.1
diff -u -r1.1.2.1 DataLine.java
--- javax/sound/sampled/DataLine.java   27 Nov 2005 21:00:37 -0000      1.1.2.1
+++ javax/sound/sampled/DataLine.java   2 Dec 2005 22:38:48 -0000
@@ -64,7 +64,7 @@
      * @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 @@
      * @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 @@
      * @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;
Index: javax/sound/sampled/Line.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/sound/sampled/Line.java,v
retrieving revision 1.2.2.1
diff -u -r1.2.2.1 Line.java
--- javax/sound/sampled/Line.java       27 Nov 2005 21:00:37 -0000      1.2.2.1
+++ javax/sound/sampled/Line.java       2 Dec 2005 22:38:48 -0000
@@ -57,7 +57,7 @@
      * 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 @@
     /**
      * Return the line's class.
      */
-    public Class getLineClass()
+    public Class<?> getLineClass()
     {
       return klass;
     }
Index: javax/sound/sampled/Port.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/sound/sampled/Port.java,v
retrieving revision 1.1.2.1
diff -u -r1.1.2.1 Port.java
--- javax/sound/sampled/Port.java       27 Nov 2005 21:00:37 -0000      1.1.2.1
+++ javax/sound/sampled/Port.java       2 Dec 2005 22:38:48 -0000
@@ -89,7 +89,7 @@
      * @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;