diff options
Diffstat (limited to 'libjava/classpath/javax/sound/midi')
9 files changed, 24 insertions, 64 deletions
diff --git a/libjava/classpath/javax/sound/midi/InvalidMidiDataException.java b/libjava/classpath/javax/sound/midi/InvalidMidiDataException.java index d7f770757a4..9f5690069d5 100644 --- a/libjava/classpath/javax/sound/midi/InvalidMidiDataException.java +++ b/libjava/classpath/javax/sound/midi/InvalidMidiDataException.java @@ -66,25 +66,4 @@ public class InvalidMidiDataException extends Exception { super(s); } - - /** - * Create an InvalidMidiDataException object. - * - * @param s the exception message string - * @param cause the root cause of the exception - */ - public InvalidMidiDataException(String s, Throwable cause) - { - super(s, cause); - } - - /** - * Create an InvalidMidiDataException object. - * - * @param cause the root cause of the exception - */ - public InvalidMidiDataException(Throwable cause) - { - super(cause); - } } diff --git a/libjava/classpath/javax/sound/midi/MetaMessage.java b/libjava/classpath/javax/sound/midi/MetaMessage.java index 2ca93accd77..f7c4fb4246a 100644 --- a/libjava/classpath/javax/sound/midi/MetaMessage.java +++ b/libjava/classpath/javax/sound/midi/MetaMessage.java @@ -76,7 +76,7 @@ public class MetaMessage extends MidiMessage * Create a MetaMessage object. * @param data a complete system exclusive message */ - public MetaMessage(byte[] data) + protected MetaMessage(byte[] data) { super(data); int index = 2; diff --git a/libjava/classpath/javax/sound/midi/MidiDevice.java b/libjava/classpath/javax/sound/midi/MidiDevice.java index 6f43c25481d..387cceac2d8 100644 --- a/libjava/classpath/javax/sound/midi/MidiDevice.java +++ b/libjava/classpath/javax/sound/midi/MidiDevice.java @@ -134,7 +134,7 @@ public interface MidiDevice * @param description the device description * @param version the device version string */ - public Info(String name, String vendor, String description, String version) + protected Info(String name, String vendor, String description, String version) { this.name = name; this.vendor = vendor; @@ -150,7 +150,7 @@ public interface MidiDevice * @return true if this is the same object * @see java.lang.Object#equals(java.lang.Object) */ - public boolean equals(Object obj) + public final boolean equals(Object obj) { return super.equals(obj); } @@ -161,7 +161,7 @@ public interface MidiDevice * @return the hash code for this object * @see java.lang.Object#hashCode() */ - public int hashCode() + public final int hashCode() { return super.hashCode(); } @@ -171,7 +171,7 @@ public interface MidiDevice * * @return the device name */ - public String getName() + public final String getName() { return name; } @@ -181,7 +181,7 @@ public interface MidiDevice * * @return the device vendor */ - public String getVendor() + public final String getVendor() { return vendor; } @@ -191,7 +191,7 @@ public interface MidiDevice * * @return the device description */ - public String getDescription() + public final String getDescription() { return description; } @@ -201,7 +201,7 @@ public interface MidiDevice * * @return the device version */ - public String getVersion() + public final String getVersion() { return version; } @@ -212,7 +212,7 @@ public interface MidiDevice * @return the device name * @see java.lang.Object#toString() */ - public String toString() + public final String toString() { return name; } diff --git a/libjava/classpath/javax/sound/midi/MidiSystem.java b/libjava/classpath/javax/sound/midi/MidiSystem.java index 8ea12eb7002..627dd95e950 100644 --- a/libjava/classpath/javax/sound/midi/MidiSystem.java +++ b/libjava/classpath/javax/sound/midi/MidiSystem.java @@ -64,6 +64,11 @@ import javax.sound.midi.spi.SoundbankReader; */ public class MidiSystem { + private MidiSystem() + { + // Not instantiable. + } + /** * Get an array of all available MIDI devices. * diff --git a/libjava/classpath/javax/sound/midi/MidiUnavailableException.java b/libjava/classpath/javax/sound/midi/MidiUnavailableException.java index d4b85e810aa..a992c16a789 100644 --- a/libjava/classpath/javax/sound/midi/MidiUnavailableException.java +++ b/libjava/classpath/javax/sound/midi/MidiUnavailableException.java @@ -66,25 +66,4 @@ public class MidiUnavailableException extends Exception { super(s); } - - /** - * Create an MidiUnavailableException object. - * - * @param s the exception message string - * @param cause the root cause of the exception - */ - public MidiUnavailableException(String s, Throwable cause) - { - super(s, cause); - } - - /** - * Create an MidiUnavailableException object. - * - * @param cause the root cause of the exception - */ - public MidiUnavailableException(Throwable cause) - { - super(cause); - } } diff --git a/libjava/classpath/javax/sound/midi/Sequencer.java b/libjava/classpath/javax/sound/midi/Sequencer.java index 894d876e91f..24ee2505c56 100644 --- a/libjava/classpath/javax/sound/midi/Sequencer.java +++ b/libjava/classpath/javax/sound/midi/Sequencer.java @@ -385,7 +385,7 @@ public interface Sequencer extends MidiDevice /** * SyncMode objects use the Object hashCode. */ - public int hashCode() + public final int hashCode() { return super.hashCode(); } diff --git a/libjava/classpath/javax/sound/midi/ShortMessage.java b/libjava/classpath/javax/sound/midi/ShortMessage.java index 43c0e25fe72..ef01d11683e 100644 --- a/libjava/classpath/javax/sound/midi/ShortMessage.java +++ b/libjava/classpath/javax/sound/midi/ShortMessage.java @@ -48,11 +48,6 @@ package javax.sound.midi; public class ShortMessage extends MidiMessage { /** - * Status byte for System Exclusive message. - */ - public static final int SYSTEM_EXCLUSIVE = 0xF0; - - /** * Status byte for Time Code message. */ public static final int MIDI_TIME_CODE = 0xF1; @@ -170,7 +165,7 @@ public class ShortMessage extends MidiMessage * * @param data the message data */ - public ShortMessage(byte[] data) + protected ShortMessage(byte[] data) { super(data); } @@ -263,9 +258,6 @@ public class ShortMessage extends MidiMessage case 0xF5: // FIXME: unofficial bus select. Not in spec?? return 1; - case SYSTEM_EXCLUSIVE: - return 0; // FIXME: is this correct? - case TUNE_REQUEST: case END_OF_EXCLUSIVE: case TIMING_CLOCK: diff --git a/libjava/classpath/javax/sound/midi/SysexMessage.java b/libjava/classpath/javax/sound/midi/SysexMessage.java index 7ab60f4b6af..6471a3eb217 100644 --- a/libjava/classpath/javax/sound/midi/SysexMessage.java +++ b/libjava/classpath/javax/sound/midi/SysexMessage.java @@ -69,7 +69,7 @@ public class SysexMessage extends MidiMessage * Create a SysexMessage object. * @param data a complete system exclusive message */ - public SysexMessage(byte[] data) + protected SysexMessage(byte[] data) { super(data); } diff --git a/libjava/classpath/javax/sound/midi/Track.java b/libjava/classpath/javax/sound/midi/Track.java index da7ef2ef3b9..d06c8cc1dfb 100644 --- a/libjava/classpath/javax/sound/midi/Track.java +++ b/libjava/classpath/javax/sound/midi/Track.java @@ -54,11 +54,16 @@ public class Track /** * The list of MidiEvents for this track. */ - protected Vector events; + Vector events; // A HashSet to speed processing private HashSet eventSet; - + + // This is only instantiable within this package. + Track() + { + } + /** * Add a new event to this track. Specific events may only be added once. * The event will be inserted into the appropriate spot in the event list |
