diff options
| author | Mark Wielaard <mark@gcc.gnu.org> | 2006-08-14 23:12:35 +0000 |
|---|---|---|
| committer | Mark Wielaard <mark@gcc.gnu.org> | 2006-08-14 23:12:35 +0000 |
| commit | ac1ed908de999523efc36f38e69bca1aadfe0808 (patch) | |
| tree | 97037d2c09c8384d80531f67ec36a01205df6bdb /libjava/classpath/javax/sound/midi | |
| parent | abab460491408e05ea93fb85e1975296a87df504 (diff) | |
| download | gcc-ac1ed908de999523efc36f38e69bca1aadfe0808.zip gcc-ac1ed908de999523efc36f38e69bca1aadfe0808.tar.gz gcc-ac1ed908de999523efc36f38e69bca1aadfe0808.tar.bz2 | |
Imported GNU Classpath 0.92
2006-08-14 Mark Wielaard <mark@klomp.org>
Imported GNU Classpath 0.92
* HACKING: Add more importing hints. Update automake version
requirement.
* configure.ac (gconf-peer): New enable AC argument.
Add --disable-gconf-peer and --enable-default-preferences-peer
to classpath configure when gconf is disabled.
* scripts/makemake.tcl: Set gnu/java/util/prefs/gconf and
gnu/java/awt/dnd/peer/gtk to bc. Classify
gnu/java/security/Configuration.java as generated source file.
* gnu/java/lang/management/VMGarbageCollectorMXBeanImpl.java,
gnu/java/lang/management/VMMemoryPoolMXBeanImpl.java,
gnu/java/lang/management/VMClassLoadingMXBeanImpl.java,
gnu/java/lang/management/VMRuntimeMXBeanImpl.java,
gnu/java/lang/management/VMMemoryManagerMXBeanImpl.java,
gnu/java/lang/management/VMThreadMXBeanImpl.java,
gnu/java/lang/management/VMMemoryMXBeanImpl.java,
gnu/java/lang/management/VMCompilationMXBeanImpl.java: New VM stub
classes.
* java/lang/management/VMManagementFactory.java: Likewise.
* java/net/VMURLConnection.java: Likewise.
* gnu/java/nio/VMChannel.java: Likewise.
* java/lang/Thread.java (getState): Add stub implementation.
* java/lang/Class.java (isEnum): Likewise.
* java/lang/Class.h (isEnum): Likewise.
* gnu/awt/xlib/XToolkit.java (getClasspathTextLayoutPeer): Removed.
* javax/naming/spi/NamingManager.java: New override for StackWalker
functionality.
* configure, sources.am, Makefile.in, gcj/Makefile.in,
include/Makefile.in, testsuite/Makefile.in: Regenerated.
From-SVN: r116139
Diffstat (limited to 'libjava/classpath/javax/sound/midi')
| -rw-r--r-- | libjava/classpath/javax/sound/midi/SysexMessage.java | 4 | ||||
| -rw-r--r-- | libjava/classpath/javax/sound/midi/Track.java | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/libjava/classpath/javax/sound/midi/SysexMessage.java b/libjava/classpath/javax/sound/midi/SysexMessage.java index 6471a3e..3744e2f 100644 --- a/libjava/classpath/javax/sound/midi/SysexMessage.java +++ b/libjava/classpath/javax/sound/midi/SysexMessage.java @@ -86,7 +86,7 @@ public class SysexMessage extends MidiMessage throws InvalidMidiDataException { if (data[0] != SYSTEM_EXCLUSIVE - || data[0] != SPECIAL_SYSTEM_EXCLUSIVE) + && data[0] != SPECIAL_SYSTEM_EXCLUSIVE) throw new InvalidMidiDataException("Sysex message starts with 0x" + Integer.toHexString(data[0]) + " instead of 0xF0 or 0xF7"); @@ -105,7 +105,7 @@ public class SysexMessage extends MidiMessage throws InvalidMidiDataException { if (status != SYSTEM_EXCLUSIVE - || status != SPECIAL_SYSTEM_EXCLUSIVE) + && status != SPECIAL_SYSTEM_EXCLUSIVE) throw new InvalidMidiDataException("Sysex message starts with 0x" + Integer.toHexString(status) + " instead of 0xF0 or 0xF7"); diff --git a/libjava/classpath/javax/sound/midi/Track.java b/libjava/classpath/javax/sound/midi/Track.java index d06c8cc..eed5d4c 100644 --- a/libjava/classpath/javax/sound/midi/Track.java +++ b/libjava/classpath/javax/sound/midi/Track.java @@ -54,10 +54,10 @@ public class Track /** * The list of MidiEvents for this track. */ - Vector events; + Vector events = new Vector(); // A HashSet to speed processing - private HashSet eventSet; + private HashSet eventSet = new HashSet(); // This is only instantiable within this package. Track() |