[cp-patches] [generics] Patch: FYI: genericize javax.sound.midi

[Tom Tromey]

I'm checking this in on the generics branch.

This genericizes javax.sound.midi.

Tom

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

        * javax/sound/midi/Instrument.java (Instrument): Genericized argument
        type.
        * javax/sound/midi/SoundbankResource.java (SoundbankResource):
        Genericized argument type.
        (getDataClass): Genericized return type.
        * javax/sound/midi/Sequence.java (tracks): Changed type.
        (init): Updated.
        (getTracks): Updated.
        (getTickLength): Updated.

Index: javax/sound/midi/Instrument.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/sound/midi/Instrument.java,v
retrieving revision 1.1.2.1
diff -u -r1.1.2.1 Instrument.java
--- javax/sound/midi/Instrument.java    2 Nov 2005 00:43:41 -0000       1.1.2.1
+++ javax/sound/midi/Instrument.java    2 Nov 2005 18:31:55 -0000
@@ -59,7 +59,7 @@
    * @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; 
Index: javax/sound/midi/Sequence.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/sound/midi/Sequence.java,v
retrieving revision 1.2.2.1
diff -u -r1.2.2.1 Sequence.java
--- javax/sound/midi/Sequence.java      2 Nov 2005 00:43:41 -0000       1.2.2.1
+++ javax/sound/midi/Sequence.java      2 Nov 2005 18:31:55 -0000
@@ -65,7 +65,7 @@
   /**
    * 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 @@
     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 Track[] getTracks()
   {
-    return (Track[]) tracks.toArray(new Track[tracks.size()]);
+    return tracks.toArray(new Track[tracks.size()]);
   }
   
   /**
@@ -224,10 +224,10 @@
   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;
Index: javax/sound/midi/SoundbankResource.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/sound/midi/SoundbankResource.java,v
retrieving revision 1.2.2.1
diff -u -r1.2.2.1 SoundbankResource.java
--- javax/sound/midi/SoundbankResource.java     2 Nov 2005 00:43:41 -0000       
1.2.2.1
+++ javax/sound/midi/SoundbankResource.java     2 Nov 2005 18:31:55 -0000
@@ -58,7 +58,7 @@
    * @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 @@
    * 
    * @return the class used to represent the audio data for this resource
    */
-  public Class getDataClass()
+  public Class<?> getDataClass()
   {
     return dataClass;
   }