diff options
author | Mark Wielaard <mark@gcc.gnu.org> | 2006-05-18 17:29:21 +0000 |
---|---|---|
committer | Mark Wielaard <mark@gcc.gnu.org> | 2006-05-18 17:29:21 +0000 |
commit | 4f9533c7722fa07511a94d005227961f4a4dec23 (patch) | |
tree | 9f9c470de62ee62fba1331a396450d728d2b1fad /libjava/classpath/javax/sound | |
parent | eaec4980e139903ae9b274d1abcf3a13946603a8 (diff) | |
download | gcc-4f9533c7722fa07511a94d005227961f4a4dec23.zip gcc-4f9533c7722fa07511a94d005227961f4a4dec23.tar.gz gcc-4f9533c7722fa07511a94d005227961f4a4dec23.tar.bz2 |
Imported GNU Classpath 0.90
Imported GNU Classpath 0.90
* scripts/makemake.tcl: LocaleData.java moved to gnu/java/locale.
* sources.am: Regenerated.
* gcj/javaprims.h: Regenerated.
* Makefile.in: Regenerated.
* gcj/Makefile.in: Regenerated.
* include/Makefile.in: Regenerated.
* testsuite/Makefile.in: Regenerated.
* gnu/java/lang/VMInstrumentationImpl.java: New override.
* gnu/java/net/local/LocalSocketImpl.java: Likewise.
* gnu/classpath/jdwp/VMMethod.java: Likewise.
* gnu/classpath/jdwp/VMVirtualMachine.java: Update to latest
interface.
* java/lang/Thread.java: Add UncaughtExceptionHandler.
* java/lang/reflect/Method.java: Implements GenericDeclaration and
isSynthetic(),
* java/lang/reflect/Field.java: Likewise.
* java/lang/reflect/Constructor.java
* java/lang/Class.java: Implements Type, GenericDeclaration,
getSimpleName() and getEnclosing*() methods.
* java/lang/Class.h: Add new public methods.
* java/lang/Math.java: Add signum(), ulp() and log10().
* java/lang/natMath.cc (log10): New function.
* java/security/VMSecureRandom.java: New override.
* java/util/logging/Logger.java: Updated to latest classpath
version.
* java/util/logging/LogManager.java: New override.
From-SVN: r113887
Diffstat (limited to 'libjava/classpath/javax/sound')
19 files changed, 51 insertions, 86 deletions
diff --git a/libjava/classpath/javax/sound/midi/InvalidMidiDataException.java b/libjava/classpath/javax/sound/midi/InvalidMidiDataException.java index d7f7707..9f56900 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 2ca93ac..f7c4fb4 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 6f43c25..387ccea 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 8ea12eb..627dd95 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 d4b85e8..a992c16 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 894d876..24ee250 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 43c0e25..ef01d11 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 7ab60f4..6471a3e 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 da7ef2e..d06c8cc 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 diff --git a/libjava/classpath/javax/sound/sampled/AudioSystem.java b/libjava/classpath/javax/sound/sampled/AudioSystem.java index 0b0b754..2f64f92 100644 --- a/libjava/classpath/javax/sound/sampled/AudioSystem.java +++ b/libjava/classpath/javax/sound/sampled/AudioSystem.java @@ -68,6 +68,11 @@ public class AudioSystem */ public static final int NOT_SPECIFIED = -1; + // This class is not instantiable. + private AudioSystem() + { + } + /** * Return the file format of a given File. * @param f the file to check diff --git a/libjava/classpath/javax/sound/sampled/BooleanControl.java b/libjava/classpath/javax/sound/sampled/BooleanControl.java index aae1e23..147a7f8 100644 --- a/libjava/classpath/javax/sound/sampled/BooleanControl.java +++ b/libjava/classpath/javax/sound/sampled/BooleanControl.java @@ -42,7 +42,7 @@ package javax.sound.sampled; * A BooleanControl is a Control which has two states. * @since 1.3 */ -public class BooleanControl extends Control +public abstract class BooleanControl extends Control { /** * A Type specialized to represent a boolean control. diff --git a/libjava/classpath/javax/sound/sampled/CompoundControl.java b/libjava/classpath/javax/sound/sampled/CompoundControl.java index 8664abc..057bdfd 100644 --- a/libjava/classpath/javax/sound/sampled/CompoundControl.java +++ b/libjava/classpath/javax/sound/sampled/CompoundControl.java @@ -42,7 +42,7 @@ package javax.sound.sampled; * A compound control provides control over several other controls. * @since 1.3 */ -public class CompoundControl extends Control +public abstract class CompoundControl extends Control { /** * This describes a single compound control. diff --git a/libjava/classpath/javax/sound/sampled/Control.java b/libjava/classpath/javax/sound/sampled/Control.java index 810c2ed..4759a33 100644 --- a/libjava/classpath/javax/sound/sampled/Control.java +++ b/libjava/classpath/javax/sound/sampled/Control.java @@ -43,7 +43,7 @@ package javax.sound.sampled; * for instance its volume. * @since 1.3 */ -public class Control +public abstract class Control { /** * This describes a single control. @@ -75,7 +75,7 @@ public class Control /** * Return the name of this Type. */ - public String toString() + public final String toString() { return name; } diff --git a/libjava/classpath/javax/sound/sampled/EnumControl.java b/libjava/classpath/javax/sound/sampled/EnumControl.java index 798f3a9..1ddc8a9 100644 --- a/libjava/classpath/javax/sound/sampled/EnumControl.java +++ b/libjava/classpath/javax/sound/sampled/EnumControl.java @@ -43,7 +43,7 @@ package javax.sound.sampled; * values. * @since 1.3 */ -public class EnumControl extends Control +public abstract class EnumControl extends Control { /** * This Type describes an EnumControl. diff --git a/libjava/classpath/javax/sound/sampled/FloatControl.java b/libjava/classpath/javax/sound/sampled/FloatControl.java index 409c90d..bbdb24b 100644 --- a/libjava/classpath/javax/sound/sampled/FloatControl.java +++ b/libjava/classpath/javax/sound/sampled/FloatControl.java @@ -39,7 +39,7 @@ exception statement from your version. */ package javax.sound.sampled; /** @since 1.3 */ -public class FloatControl extends Control +public abstract class FloatControl extends Control { /** * An instance of this class describes a particular floating point control. diff --git a/libjava/classpath/javax/sound/sampled/LineEvent.java b/libjava/classpath/javax/sound/sampled/LineEvent.java index db92593..dd4a9ae 100644 --- a/libjava/classpath/javax/sound/sampled/LineEvent.java +++ b/libjava/classpath/javax/sound/sampled/LineEvent.java @@ -126,7 +126,7 @@ public class LineEvent extends EventObject /** * Return the frame position associated with this event. */ - public long getFramePosition() + public final long getFramePosition() { return framePosition; } @@ -134,7 +134,7 @@ public class LineEvent extends EventObject /** * Return the Line associated with this event. */ - public Line getLine() + public final Line getLine() { return line; } @@ -142,7 +142,7 @@ public class LineEvent extends EventObject /** * Return the Type associated with this event. */ - public Type getType() + public final Type getType() { return type; } diff --git a/libjava/classpath/javax/sound/sampled/Mixer.java b/libjava/classpath/javax/sound/sampled/Mixer.java index b9afba3..ff657cf 100644 --- a/libjava/classpath/javax/sound/sampled/Mixer.java +++ b/libjava/classpath/javax/sound/sampled/Mixer.java @@ -62,7 +62,7 @@ public interface Mixer extends Line * @param desc a descriptive string * @param vers the mixer's version */ - public Info(String name, String vendor, String desc, String vers) + protected Info(String name, String vendor, String desc, String vers) { this.name = name; this.description = desc; @@ -83,7 +83,7 @@ public interface Mixer extends Line /** * Return the name of the mixer. */ - public String getName() + public final String getName() { return name; } @@ -91,7 +91,7 @@ public interface Mixer extends Line /** * Return the mixer's description. */ - public String getDescription() + public final String getDescription() { return description; } @@ -99,7 +99,7 @@ public interface Mixer extends Line /** * Return the mixer's vendor. */ - public String getVendor() + public final String getVendor() { return vendor; } @@ -107,12 +107,12 @@ public interface Mixer extends Line /** * Return the mixer's version. */ - public String getVersion() + public final String getVersion() { return version; } - public String toString() + public final String toString() { return ("name=" + name + "; description=" + description + "; vendor=" + vendor + "; version=" + version); diff --git a/libjava/classpath/javax/sound/sampled/Port.java b/libjava/classpath/javax/sound/sampled/Port.java index 7b3daaf..fb39e6c 100644 --- a/libjava/classpath/javax/sound/sampled/Port.java +++ b/libjava/classpath/javax/sound/sampled/Port.java @@ -127,7 +127,7 @@ public interface Port extends Line return super.matches(other) && equals(other); } - public String toString() + public final String toString() { return super.toString() + "; name=" + name + "; isSource=" + isSource; } diff --git a/libjava/classpath/javax/sound/sampled/ReverbType.java b/libjava/classpath/javax/sound/sampled/ReverbType.java index a089593..c7cced8 100644 --- a/libjava/classpath/javax/sound/sampled/ReverbType.java +++ b/libjava/classpath/javax/sound/sampled/ReverbType.java @@ -84,7 +84,7 @@ public class ReverbType /** * Return the decay time. */ - public int getDecayTime() + public final int getDecayTime() { return decayTime; } @@ -92,7 +92,7 @@ public class ReverbType /** * Return the early reflection delay. */ - public int getEarlyReflectionDelay() + public final int getEarlyReflectionDelay() { return earlyReflectionDelay; } @@ -100,7 +100,7 @@ public class ReverbType /** * Return the early reflection intensity. */ - public float getEarlyReflectionIntensity() + public final float getEarlyReflectionIntensity() { return earlyReflectionIntensity; } @@ -108,7 +108,7 @@ public class ReverbType /** * Return the late reflection delay. */ - public int getLateReflectionDelay() + public final int getLateReflectionDelay() { return lateReflectionDelay; } @@ -116,7 +116,7 @@ public class ReverbType /** * Return the late reflection intensity. */ - public float getLateReflectionIntensity() + public final float getLateReflectionIntensity() { return lateReflectionIntensity; } @@ -133,7 +133,7 @@ public class ReverbType /** * Return a description of this ReverbType. */ - public String toString() + public final String toString() { return ("name=" + name + "; earlyReflectionDelay=" + earlyReflectionDelay + "; earlyReflectionIntensity=" + earlyReflectionIntensity |