[cp-patches] Patch: MidiFileFormat tweak

[Anthony Green]

I'm checking in the following trivial patch based on the JAPI output
from last night.  There are a few other things to clean up.  I'll get to
them later today or tomorrow.

AG


2005-09-27  Anthony Green  <address@hidden>

        * javax/sound/midi/MidiFileFormat.java (bytes, microseconds):
        Rename to byteLength and microsecondLength respectively.


Index: javax/sound/midi/MidiFileFormat.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/sound/midi/MidiFileFormat.java,v
retrieving revision 1.2
diff -u -r1.2 MidiFileFormat.java
--- javax/sound/midi/MidiFileFormat.java        26 Sep 2005 17:24:00 -0000      
1.2
+++ javax/sound/midi/MidiFileFormat.java        27 Sep 2005 15:22:16 -0000
@@ -74,12 +74,12 @@
   /**
    * The size of the MIDI file in bytes. 
    */
-  protected int bytes = UNKNOWN_LENGTH;
+  protected int byteLength = UNKNOWN_LENGTH;
   
   /**
    * The length of the MIDI file in microseconds. 
    */
-  protected long microseconds = UNKNOWN_LENGTH;
+  protected long microsecondLength = UNKNOWN_LENGTH;
   
   /**
    * A special value indicating an unknown quantity.
@@ -101,8 +101,8 @@
     this.type = type;
     this.divisionType = divisionType;
     this.resolution = resolution;
-    this.bytes = bytes;
-    this.microseconds = microseconds;
+    this.byteLength = bytes;
+    this.microsecondLength = microseconds;
   }
   
   /**
@@ -143,7 +143,7 @@
    */
   public int getByteLength()
   {
-    return bytes;
+    return byteLength;
   }
 
   /**
@@ -153,6 +153,6 @@
    */
   public long getMicrosecondLength()
   {
-    return microseconds;
+    return microsecondLength;
   }
 }