src/java.desktop/share/classes/com/sun/media/sound/FastShortMessage.java

*** 23,36 ****
   * questions.
   */
  
  package com.sun.media.sound;
  
! import javax.sound.midi.*;
  
  /**
!  * an optimized ShortMessage that does not need an array
   *
   * @author Florian Bomers
   */
  final class FastShortMessage extends ShortMessage {
      private int packedMsg;
--- 23,37 ----
   * questions.
   */
  
  package com.sun.media.sound;
  
! import javax.sound.midi.InvalidMidiDataException;
! import javax.sound.midi.ShortMessage;
  
  /**
!  * an optimized ShortMessage that does not need an array.
   *
   * @author Florian Bomers
   */
  final class FastShortMessage extends ShortMessage {
      private int packedMsg;
*** 49,58 ****
--- 50,60 ----
  
      int getPackedMsg() {
          return packedMsg;
      }
  
+     @Override
      public byte[] getMessage() {
          int length = 0;
          try {
              // fix for bug 4851018: MidiMessage.getLength and .getData return wrong values
              // fix for bug 4890405: Reading MidiMessage byte array fails in 1.4.2
*** 71,136 ****
              }
          }
          return returnedArray;
      }
  
      public int getLength() {
          try {
              return getDataLength(packedMsg & 0xFF) + 1;
          } catch (InvalidMidiDataException imde) {
              // should never happen
          }
          return 0;
      }
  
      public void setMessage(int status) throws InvalidMidiDataException {
          // check for valid values
          int dataLength = getDataLength(status); // can throw InvalidMidiDataException
          if (dataLength != 0) {
              super.setMessage(status); // throws Exception
          }
          packedMsg = (packedMsg & 0xFFFF00) | (status & 0xFF);
      }
  
! 
      public void setMessage(int status, int data1, int data2) throws InvalidMidiDataException {
          getDataLength(status); // can throw InvalidMidiDataException
          packedMsg = (status & 0xFF) | ((data1 & 0xFF) << 8) | ((data2 & 0xFF) << 16);
      }
  
! 
      public void setMessage(int command, int channel, int data1, int data2) throws InvalidMidiDataException {
          getDataLength(command); // can throw InvalidMidiDataException
          packedMsg = (command & 0xF0) | (channel & 0x0F) | ((data1 & 0xFF) << 8) | ((data2 & 0xFF) << 16);
      }
  
! 
      public int getChannel() {
          return packedMsg & 0x0F;
      }
  
      public int getCommand() {
          return packedMsg & 0xF0;
      }
  
      public int getData1() {
          return (packedMsg & 0xFF00) >> 8;
      }
  
      public int getData2() {
          return (packedMsg & 0xFF0000) >> 16;
      }
  
      public int getStatus() {
          return packedMsg & 0xFF;
      }
  
      /**
       * Creates a new object of the same class and with the same contents
       * as this object.
       * @return a clone of this instance.
       */
      public Object clone() {
          try {
              return new FastShortMessage(packedMsg);
          } catch (InvalidMidiDataException imde) {
              // should never happen
--- 73,145 ----
              }
          }
          return returnedArray;
      }
  
+     @Override
      public int getLength() {
          try {
              return getDataLength(packedMsg & 0xFF) + 1;
          } catch (InvalidMidiDataException imde) {
              // should never happen
          }
          return 0;
      }
  
+     @Override
      public void setMessage(int status) throws InvalidMidiDataException {
          // check for valid values
          int dataLength = getDataLength(status); // can throw InvalidMidiDataException
          if (dataLength != 0) {
              super.setMessage(status); // throws Exception
          }
          packedMsg = (packedMsg & 0xFFFF00) | (status & 0xFF);
      }
  
!     @Override
      public void setMessage(int status, int data1, int data2) throws InvalidMidiDataException {
          getDataLength(status); // can throw InvalidMidiDataException
          packedMsg = (status & 0xFF) | ((data1 & 0xFF) << 8) | ((data2 & 0xFF) << 16);
      }
  
!     @Override
      public void setMessage(int command, int channel, int data1, int data2) throws InvalidMidiDataException {
          getDataLength(command); // can throw InvalidMidiDataException
          packedMsg = (command & 0xF0) | (channel & 0x0F) | ((data1 & 0xFF) << 8) | ((data2 & 0xFF) << 16);
      }
  
!     @Override
      public int getChannel() {
          return packedMsg & 0x0F;
      }
  
+     @Override
      public int getCommand() {
          return packedMsg & 0xF0;
      }
  
+     @Override
      public int getData1() {
          return (packedMsg & 0xFF00) >> 8;
      }
  
+     @Override
      public int getData2() {
          return (packedMsg & 0xFF0000) >> 16;
      }
  
+     @Override
      public int getStatus() {
          return packedMsg & 0xFF;
      }
  
      /**
       * Creates a new object of the same class and with the same contents
       * as this object.
       * @return a clone of this instance.
       */
+     @Override
      public Object clone() {
          try {
              return new FastShortMessage(packedMsg);
          } catch (InvalidMidiDataException imde) {
              // should never happen