Menu
▾
▴
[Jnode-svn-commits] SF.net SVN: jnode:[5787] classlib6/core/src/openjdk
|
From: <ls...@us...> - 2011-02-20 20:14:51
|
Revision: 5787
http://jnode.svn.sourceforge.net/jnode/?rev=5787&view=rev
Author: lsantha
Date: 2011-02-20 20:14:41 +0000 (Sun, 20 Feb 2011)
Log Message:
-----------
Integrating OpenJDK 6 b21.
Modified Paths:
--------------
classlib6/core/src/openjdk/com/com/sun/media/sound/AbstractDataLine.java
classlib6/core/src/openjdk/com/com/sun/media/sound/AbstractLine.java
classlib6/core/src/openjdk/com/com/sun/media/sound/AbstractMidiDevice.java
classlib6/core/src/openjdk/com/com/sun/media/sound/AbstractMidiDeviceProvider.java
classlib6/core/src/openjdk/com/com/sun/media/sound/AbstractMixer.java
classlib6/core/src/openjdk/com/com/sun/media/sound/AiffFileFormat.java
classlib6/core/src/openjdk/com/com/sun/media/sound/AiffFileReader.java
classlib6/core/src/openjdk/com/com/sun/media/sound/AiffFileWriter.java
classlib6/core/src/openjdk/com/com/sun/media/sound/AlawCodec.java
classlib6/core/src/openjdk/com/com/sun/media/sound/AuFileFormat.java
classlib6/core/src/openjdk/com/com/sun/media/sound/AuFileReader.java
classlib6/core/src/openjdk/com/com/sun/media/sound/AuFileWriter.java
classlib6/core/src/openjdk/com/com/sun/media/sound/AudioFileSoundbankReader.java
classlib6/core/src/openjdk/com/com/sun/media/sound/AudioFloatConverter.java
classlib6/core/src/openjdk/com/com/sun/media/sound/AudioFloatFormatConverter.java
classlib6/core/src/openjdk/com/com/sun/media/sound/AudioFloatInputStream.java
classlib6/core/src/openjdk/com/com/sun/media/sound/AudioSynthesizer.java
classlib6/core/src/openjdk/com/com/sun/media/sound/AudioSynthesizerPropertyInfo.java
classlib6/core/src/openjdk/com/com/sun/media/sound/AutoClosingClip.java
classlib6/core/src/openjdk/com/com/sun/media/sound/AutoConnectSequencer.java
classlib6/core/src/openjdk/com/com/sun/media/sound/DLSInfo.java
classlib6/core/src/openjdk/com/com/sun/media/sound/DLSInstrument.java
classlib6/core/src/openjdk/com/com/sun/media/sound/DLSModulator.java
classlib6/core/src/openjdk/com/com/sun/media/sound/DLSRegion.java
classlib6/core/src/openjdk/com/com/sun/media/sound/DLSSample.java
classlib6/core/src/openjdk/com/com/sun/media/sound/DLSSampleLoop.java
classlib6/core/src/openjdk/com/com/sun/media/sound/DLSSampleOptions.java
classlib6/core/src/openjdk/com/com/sun/media/sound/DLSSoundbank.java
classlib6/core/src/openjdk/com/com/sun/media/sound/DLSSoundbankReader.java
classlib6/core/src/openjdk/com/com/sun/media/sound/DataPusher.java
classlib6/core/src/openjdk/com/com/sun/media/sound/DirectAudioDevice.java
classlib6/core/src/openjdk/com/com/sun/media/sound/DirectAudioDeviceProvider.java
classlib6/core/src/openjdk/com/com/sun/media/sound/EmergencySoundbank.java
classlib6/core/src/openjdk/com/com/sun/media/sound/EventDispatcher.java
classlib6/core/src/openjdk/com/com/sun/media/sound/FFT.java
classlib6/core/src/openjdk/com/com/sun/media/sound/FastShortMessage.java
classlib6/core/src/openjdk/com/com/sun/media/sound/FastSysexMessage.java
classlib6/core/src/openjdk/com/com/sun/media/sound/InvalidDataException.java
classlib6/core/src/openjdk/com/com/sun/media/sound/InvalidFormatException.java
classlib6/core/src/openjdk/com/com/sun/media/sound/JARSoundbankReader.java
classlib6/core/src/openjdk/com/com/sun/media/sound/JDK13Services.java
classlib6/core/src/openjdk/com/com/sun/media/sound/JSSecurityManager.java
classlib6/core/src/openjdk/com/com/sun/media/sound/JavaSoundAudioClip.java
classlib6/core/src/openjdk/com/com/sun/media/sound/MidiInDevice.java
classlib6/core/src/openjdk/com/com/sun/media/sound/MidiInDeviceProvider.java
classlib6/core/src/openjdk/com/com/sun/media/sound/MidiOutDevice.java
classlib6/core/src/openjdk/com/com/sun/media/sound/MidiOutDeviceProvider.java
classlib6/core/src/openjdk/com/com/sun/media/sound/MidiUtils.java
classlib6/core/src/openjdk/com/com/sun/media/sound/ModelAbstractChannelMixer.java
classlib6/core/src/openjdk/com/com/sun/media/sound/ModelAbstractOscillator.java
classlib6/core/src/openjdk/com/com/sun/media/sound/ModelByteBuffer.java
classlib6/core/src/openjdk/com/com/sun/media/sound/ModelByteBufferWavetable.java
classlib6/core/src/openjdk/com/com/sun/media/sound/ModelChannelMixer.java
classlib6/core/src/openjdk/com/com/sun/media/sound/ModelConnectionBlock.java
classlib6/core/src/openjdk/com/com/sun/media/sound/ModelDestination.java
classlib6/core/src/openjdk/com/com/sun/media/sound/ModelDirectedPlayer.java
classlib6/core/src/openjdk/com/com/sun/media/sound/ModelDirector.java
classlib6/core/src/openjdk/com/com/sun/media/sound/ModelIdentifier.java
classlib6/core/src/openjdk/com/com/sun/media/sound/ModelInstrument.java
classlib6/core/src/openjdk/com/com/sun/media/sound/ModelInstrumentComparator.java
classlib6/core/src/openjdk/com/com/sun/media/sound/ModelMappedInstrument.java
classlib6/core/src/openjdk/com/com/sun/media/sound/ModelOscillator.java
classlib6/core/src/openjdk/com/com/sun/media/sound/ModelOscillatorStream.java
classlib6/core/src/openjdk/com/com/sun/media/sound/ModelPatch.java
classlib6/core/src/openjdk/com/com/sun/media/sound/ModelPerformer.java
classlib6/core/src/openjdk/com/com/sun/media/sound/ModelSource.java
classlib6/core/src/openjdk/com/com/sun/media/sound/ModelStandardDirector.java
classlib6/core/src/openjdk/com/com/sun/media/sound/ModelStandardTransform.java
classlib6/core/src/openjdk/com/com/sun/media/sound/ModelTransform.java
classlib6/core/src/openjdk/com/com/sun/media/sound/ModelWavetable.java
classlib6/core/src/openjdk/com/com/sun/media/sound/PCMtoPCMCodec.java
classlib6/core/src/openjdk/com/com/sun/media/sound/Platform.java
classlib6/core/src/openjdk/com/com/sun/media/sound/PortMixer.java
classlib6/core/src/openjdk/com/com/sun/media/sound/PortMixerProvider.java
classlib6/core/src/openjdk/com/com/sun/media/sound/Printer.java
classlib6/core/src/openjdk/com/com/sun/media/sound/RIFFInvalidDataException.java
classlib6/core/src/openjdk/com/com/sun/media/sound/RIFFInvalidFormatException.java
classlib6/core/src/openjdk/com/com/sun/media/sound/RIFFReader.java
classlib6/core/src/openjdk/com/com/sun/media/sound/RIFFWriter.java
classlib6/core/src/openjdk/com/com/sun/media/sound/RealTimeSequencer.java
classlib6/core/src/openjdk/com/com/sun/media/sound/RealTimeSequencerProvider.java
classlib6/core/src/openjdk/com/com/sun/media/sound/ReferenceCountingDevice.java
classlib6/core/src/openjdk/com/com/sun/media/sound/SF2GlobalRegion.java
classlib6/core/src/openjdk/com/com/sun/media/sound/SF2Instrument.java
classlib6/core/src/openjdk/com/com/sun/media/sound/SF2InstrumentRegion.java
classlib6/core/src/openjdk/com/com/sun/media/sound/SF2Layer.java
classlib6/core/src/openjdk/com/com/sun/media/sound/SF2LayerRegion.java
classlib6/core/src/openjdk/com/com/sun/media/sound/SF2Modulator.java
classlib6/core/src/openjdk/com/com/sun/media/sound/SF2Region.java
classlib6/core/src/openjdk/com/com/sun/media/sound/SF2Sample.java
classlib6/core/src/openjdk/com/com/sun/media/sound/SF2Soundbank.java
classlib6/core/src/openjdk/com/com/sun/media/sound/SF2SoundbankReader.java
classlib6/core/src/openjdk/com/com/sun/media/sound/SimpleInstrument.java
classlib6/core/src/openjdk/com/com/sun/media/sound/SimpleSoundbank.java
classlib6/core/src/openjdk/com/com/sun/media/sound/SoftAbstractResampler.java
classlib6/core/src/openjdk/com/com/sun/media/sound/SoftAudioBuffer.java
classlib6/core/src/openjdk/com/com/sun/media/sound/SoftAudioProcessor.java
classlib6/core/src/openjdk/com/com/sun/media/sound/SoftAudioPusher.java
classlib6/core/src/openjdk/com/com/sun/media/sound/SoftChannel.java
classlib6/core/src/openjdk/com/com/sun/media/sound/SoftChannelProxy.java
classlib6/core/src/openjdk/com/com/sun/media/sound/SoftChorus.java
classlib6/core/src/openjdk/com/com/sun/media/sound/SoftControl.java
classlib6/core/src/openjdk/com/com/sun/media/sound/SoftCubicResampler.java
classlib6/core/src/openjdk/com/com/sun/media/sound/SoftEnvelopeGenerator.java
classlib6/core/src/openjdk/com/com/sun/media/sound/SoftFilter.java
classlib6/core/src/openjdk/com/com/sun/media/sound/SoftInstrument.java
classlib6/core/src/openjdk/com/com/sun/media/sound/SoftJitterCorrector.java
classlib6/core/src/openjdk/com/com/sun/media/sound/SoftLanczosResampler.java
classlib6/core/src/openjdk/com/com/sun/media/sound/SoftLimiter.java
classlib6/core/src/openjdk/com/com/sun/media/sound/SoftLinearResampler.java
classlib6/core/src/openjdk/com/com/sun/media/sound/SoftLinearResampler2.java
classlib6/core/src/openjdk/com/com/sun/media/sound/SoftLowFrequencyOscillator.java
classlib6/core/src/openjdk/com/com/sun/media/sound/SoftMainMixer.java
classlib6/core/src/openjdk/com/com/sun/media/sound/SoftMidiAudioFileReader.java
classlib6/core/src/openjdk/com/com/sun/media/sound/SoftMixingClip.java
classlib6/core/src/openjdk/com/com/sun/media/sound/SoftMixingDataLine.java
classlib6/core/src/openjdk/com/com/sun/media/sound/SoftMixingMainMixer.java
classlib6/core/src/openjdk/com/com/sun/media/sound/SoftMixingMixer.java
classlib6/core/src/openjdk/com/com/sun/media/sound/SoftMixingMixerProvider.java
classlib6/core/src/openjdk/com/com/sun/media/sound/SoftMixingSourceDataLine.java
classlib6/core/src/openjdk/com/com/sun/media/sound/SoftPerformer.java
classlib6/core/src/openjdk/com/com/sun/media/sound/SoftPointResampler.java
classlib6/core/src/openjdk/com/com/sun/media/sound/SoftProcess.java
classlib6/core/src/openjdk/com/com/sun/media/sound/SoftProvider.java
classlib6/core/src/openjdk/com/com/sun/media/sound/SoftReceiver.java
classlib6/core/src/openjdk/com/com/sun/media/sound/SoftResampler.java
classlib6/core/src/openjdk/com/com/sun/media/sound/SoftResamplerStreamer.java
classlib6/core/src/openjdk/com/com/sun/media/sound/SoftReverb.java
classlib6/core/src/openjdk/com/com/sun/media/sound/SoftShortMessage.java
classlib6/core/src/openjdk/com/com/sun/media/sound/SoftSincResampler.java
classlib6/core/src/openjdk/com/com/sun/media/sound/SoftSynthesizer.java
classlib6/core/src/openjdk/com/com/sun/media/sound/SoftTuning.java
classlib6/core/src/openjdk/com/com/sun/media/sound/SoftVoice.java
classlib6/core/src/openjdk/com/com/sun/media/sound/StandardMidiFileReader.java
classlib6/core/src/openjdk/com/com/sun/media/sound/StandardMidiFileWriter.java
classlib6/core/src/openjdk/com/com/sun/media/sound/SunCodec.java
classlib6/core/src/openjdk/com/com/sun/media/sound/SunFileReader.java
classlib6/core/src/openjdk/com/com/sun/media/sound/SunFileWriter.java
classlib6/core/src/openjdk/com/com/sun/media/sound/Toolkit.java
classlib6/core/src/openjdk/com/com/sun/media/sound/UlawCodec.java
classlib6/core/src/openjdk/com/com/sun/media/sound/WaveExtensibleFileReader.java
classlib6/core/src/openjdk/com/com/sun/media/sound/WaveFileFormat.java
classlib6/core/src/openjdk/com/com/sun/media/sound/WaveFileReader.java
classlib6/core/src/openjdk/com/com/sun/media/sound/WaveFileWriter.java
classlib6/core/src/openjdk/com/com/sun/media/sound/WaveFloatFileReader.java
classlib6/core/src/openjdk/com/com/sun/media/sound/WaveFloatFileWriter.java
classlib6/core/src/openjdk/corba/sun/rmi/rmic/BatchEnvironment.java
classlib6/core/src/openjdk/sun/sun/net/httpserver/AuthFilter.java
classlib6/core/src/openjdk/sun/sun/net/httpserver/ChunkedOutputStream.java
classlib6/core/src/openjdk/sun/sun/net/httpserver/ExchangeImpl.java
classlib6/core/src/openjdk/sun/sun/net/httpserver/FixedLengthInputStream.java
classlib6/core/src/openjdk/sun/sun/net/httpserver/LeftOverInputStream.java
classlib6/core/src/openjdk/sun/sun/net/httpserver/Request.java
classlib6/core/src/openjdk/sun/sun/net/httpserver/SelectorCache.java
classlib6/core/src/openjdk/sun/sun/net/httpserver/ServerImpl.java
classlib6/core/src/openjdk/sun/sun/net/httpserver/UndefLengthOutputStream.java
classlib6/core/src/openjdk/sun/sun/net/www/protocol/http/AuthCache.java
classlib6/core/src/openjdk/sun/sun/net/www/protocol/http/AuthCacheImpl.java
classlib6/core/src/openjdk/sun/sun/net/www/protocol/http/AuthCacheValue.java
classlib6/core/src/openjdk/sun/sun/net/www/protocol/http/AuthenticationHeader.java
classlib6/core/src/openjdk/sun/sun/net/www/protocol/http/AuthenticationInfo.java
classlib6/core/src/openjdk/sun/sun/net/www/protocol/http/BasicAuthentication.java
classlib6/core/src/openjdk/sun/sun/net/www/protocol/http/DigestAuthentication.java
classlib6/core/src/openjdk/sun/sun/net/www/protocol/http/Handler.java
classlib6/core/src/openjdk/sun/sun/net/www/protocol/http/HttpAuthenticator.java
classlib6/core/src/openjdk/sun/sun/net/www/protocol/https/AbstractDelegateHttpsURLConnection.java
classlib6/core/src/openjdk/sun/sun/net/www/protocol/https/DelegateHttpsURLConnection.java
classlib6/core/src/openjdk/sun/sun/net/www/protocol/https/Handler.java
classlib6/core/src/openjdk/sun/sun/net/www/protocol/https/HttpsURLConnectionImpl.java
classlib6/core/src/openjdk/sun/sun/nio/cs/AbstractCharsetProvider.java
classlib6/core/src/openjdk/sun/sun/nio/cs/FastCharsetProvider.java
classlib6/core/src/openjdk/sun/sun/nio/cs/HistoricallyNamedCharset.java
classlib6/core/src/openjdk/sun/sun/nio/cs/IBM437.java
classlib6/core/src/openjdk/sun/sun/nio/cs/IBM737.java
classlib6/core/src/openjdk/sun/sun/nio/cs/IBM775.java
classlib6/core/src/openjdk/sun/sun/nio/cs/IBM850.java
classlib6/core/src/openjdk/sun/sun/nio/cs/IBM852.java
classlib6/core/src/openjdk/sun/sun/nio/cs/IBM855.java
classlib6/core/src/openjdk/sun/sun/nio/cs/IBM857.java
classlib6/core/src/openjdk/sun/sun/nio/cs/IBM858.java
classlib6/core/src/openjdk/sun/sun/nio/cs/IBM862.java
classlib6/core/src/openjdk/sun/sun/nio/cs/IBM866.java
classlib6/core/src/openjdk/sun/sun/nio/cs/IBM874.java
classlib6/core/src/openjdk/sun/sun/nio/cs/ISO_8859_1.java
classlib6/core/src/openjdk/sun/sun/nio/cs/ISO_8859_13.java
classlib6/core/src/openjdk/sun/sun/nio/cs/ISO_8859_15.java
classlib6/core/src/openjdk/sun/sun/nio/cs/ISO_8859_2.java
classlib6/core/src/openjdk/sun/sun/nio/cs/ISO_8859_4.java
classlib6/core/src/openjdk/sun/sun/nio/cs/ISO_8859_5.java
classlib6/core/src/openjdk/sun/sun/nio/cs/ISO_8859_7.java
classlib6/core/src/openjdk/sun/sun/nio/cs/ISO_8859_9.java
classlib6/core/src/openjdk/sun/sun/nio/cs/KOI8_R.java
classlib6/core/src/openjdk/sun/sun/nio/cs/KOI8_U.java
classlib6/core/src/openjdk/sun/sun/nio/cs/MS1250.java
classlib6/core/src/openjdk/sun/sun/nio/cs/MS1251.java
classlib6/core/src/openjdk/sun/sun/nio/cs/MS1252.java
classlib6/core/src/openjdk/sun/sun/nio/cs/MS1253.java
classlib6/core/src/openjdk/sun/sun/nio/cs/MS1254.java
classlib6/core/src/openjdk/sun/sun/nio/cs/MS1257.java
classlib6/core/src/openjdk/sun/sun/nio/cs/SingleByteDecoder.java
classlib6/core/src/openjdk/sun/sun/nio/cs/SingleByteEncoder.java
classlib6/core/src/openjdk/sun/sun/nio/cs/StreamDecoder.java
classlib6/core/src/openjdk/sun/sun/nio/cs/StreamEncoder.java
classlib6/core/src/openjdk/sun/sun/nio/cs/Surrogate.java
classlib6/core/src/openjdk/sun/sun/nio/cs/ThreadLocalCoders.java
classlib6/core/src/openjdk/sun/sun/nio/cs/US_ASCII.java
classlib6/core/src/openjdk/sun/sun/nio/cs/UTF_16.java
classlib6/core/src/openjdk/sun/sun/nio/cs/UTF_16BE.java
classlib6/core/src/openjdk/sun/sun/nio/cs/UTF_16LE.java
classlib6/core/src/openjdk/sun/sun/nio/cs/UTF_8.java
classlib6/core/src/openjdk/sun/sun/nio/cs/UnicodeDecoder.java
classlib6/core/src/openjdk/sun/sun/nio/cs/UnicodeEncoder.java
Added Paths:
-----------
classlib6/core/src/openjdk/com/com/sun/media/sound/MidiDeviceReceiver.java
classlib6/core/src/openjdk/com/com/sun/media/sound/ModelStandardIndexedDirector.java
Modified: classlib6/core/src/openjdk/com/com/sun/media/sound/AbstractDataLine.java
===================================================================
--- classlib6/core/src/openjdk/com/com/sun/media/sound/AbstractDataLine.java 2011-02-20 13:34:37 UTC (rev 5786)
+++ classlib6/core/src/openjdk/com/com/sun/media/sound/AbstractDataLine.java 2011-02-20 20:14:41 UTC (rev 5787)
@@ -1,12 +1,12 @@
/*
- * Copyright 1999-2007 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright (c) 1999, 2007, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Sun designates this
+ * published by the Free Software Foundation. Oracle designates this
* particular file as subject to the "Classpath" exception as provided
- * by Sun in the LICENSE file that accompanied this code.
+ * by Oracle in the LICENSE file that accompanied this code.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -18,9 +18,9 @@
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
*/
package com.sun.media.sound;
Modified: classlib6/core/src/openjdk/com/com/sun/media/sound/AbstractLine.java
===================================================================
--- classlib6/core/src/openjdk/com/com/sun/media/sound/AbstractLine.java 2011-02-20 13:34:37 UTC (rev 5786)
+++ classlib6/core/src/openjdk/com/com/sun/media/sound/AbstractLine.java 2011-02-20 20:14:41 UTC (rev 5787)
@@ -1,12 +1,12 @@
/*
- * Copyright 1999-2007 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright (c) 1999, 2007, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Sun designates this
+ * published by the Free Software Foundation. Oracle designates this
* particular file as subject to the "Classpath" exception as provided
- * by Sun in the LICENSE file that accompanied this code.
+ * by Oracle in the LICENSE file that accompanied this code.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -18,9 +18,9 @@
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
*/
package com.sun.media.sound;
Modified: classlib6/core/src/openjdk/com/com/sun/media/sound/AbstractMidiDevice.java
===================================================================
--- classlib6/core/src/openjdk/com/com/sun/media/sound/AbstractMidiDevice.java 2011-02-20 13:34:37 UTC (rev 5786)
+++ classlib6/core/src/openjdk/com/com/sun/media/sound/AbstractMidiDevice.java 2011-02-20 20:14:41 UTC (rev 5787)
@@ -1,12 +1,12 @@
/*
- * Copyright 1999-2007 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright (c) 1999, 2007, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Sun designates this
+ * published by the Free Software Foundation. Oracle designates this
* particular file as subject to the "Classpath" exception as provided
- * by Sun in the LICENSE file that accompanied this code.
+ * by Oracle in the LICENSE file that accompanied this code.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -18,9 +18,9 @@
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
*/
package com.sun.media.sound;
Modified: classlib6/core/src/openjdk/com/com/sun/media/sound/AbstractMidiDeviceProvider.java
===================================================================
--- classlib6/core/src/openjdk/com/com/sun/media/sound/AbstractMidiDeviceProvider.java 2011-02-20 13:34:37 UTC (rev 5786)
+++ classlib6/core/src/openjdk/com/com/sun/media/sound/AbstractMidiDeviceProvider.java 2011-02-20 20:14:41 UTC (rev 5787)
@@ -1,12 +1,12 @@
/*
- * Copyright 2002-2007 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright (c) 2002, 2007, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Sun designates this
+ * published by the Free Software Foundation. Oracle designates this
* particular file as subject to the "Classpath" exception as provided
- * by Sun in the LICENSE file that accompanied this code.
+ * by Oracle in the LICENSE file that accompanied this code.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -18,9 +18,9 @@
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
*/
package com.sun.media.sound;
Modified: classlib6/core/src/openjdk/com/com/sun/media/sound/AbstractMixer.java
===================================================================
--- classlib6/core/src/openjdk/com/com/sun/media/sound/AbstractMixer.java 2011-02-20 13:34:37 UTC (rev 5786)
+++ classlib6/core/src/openjdk/com/com/sun/media/sound/AbstractMixer.java 2011-02-20 20:14:41 UTC (rev 5787)
@@ -1,12 +1,12 @@
/*
- * Copyright 1999-2007 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright (c) 1999, 2007, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Sun designates this
+ * published by the Free Software Foundation. Oracle designates this
* particular file as subject to the "Classpath" exception as provided
- * by Sun in the LICENSE file that accompanied this code.
+ * by Oracle in the LICENSE file that accompanied this code.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -18,9 +18,9 @@
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
*/
package com.sun.media.sound;
Modified: classlib6/core/src/openjdk/com/com/sun/media/sound/AiffFileFormat.java
===================================================================
--- classlib6/core/src/openjdk/com/com/sun/media/sound/AiffFileFormat.java 2011-02-20 13:34:37 UTC (rev 5786)
+++ classlib6/core/src/openjdk/com/com/sun/media/sound/AiffFileFormat.java 2011-02-20 20:14:41 UTC (rev 5787)
@@ -1,12 +1,12 @@
/*
- * Copyright 1999-2007 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright (c) 1999, 2007, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Sun designates this
+ * published by the Free Software Foundation. Oracle designates this
* particular file as subject to the "Classpath" exception as provided
- * by Sun in the LICENSE file that accompanied this code.
+ * by Oracle in the LICENSE file that accompanied this code.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -18,9 +18,9 @@
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
*/
package com.sun.media.sound;
Modified: classlib6/core/src/openjdk/com/com/sun/media/sound/AiffFileReader.java
===================================================================
--- classlib6/core/src/openjdk/com/com/sun/media/sound/AiffFileReader.java 2011-02-20 13:34:37 UTC (rev 5786)
+++ classlib6/core/src/openjdk/com/com/sun/media/sound/AiffFileReader.java 2011-02-20 20:14:41 UTC (rev 5787)
@@ -1,12 +1,12 @@
/*
- * Copyright 1999-2007 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright (c) 1999, 2007, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Sun designates this
+ * published by the Free Software Foundation. Oracle designates this
* particular file as subject to the "Classpath" exception as provided
- * by Sun in the LICENSE file that accompanied this code.
+ * by Oracle in the LICENSE file that accompanied this code.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -18,9 +18,9 @@
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
*/
package com.sun.media.sound;
Modified: classlib6/core/src/openjdk/com/com/sun/media/sound/AiffFileWriter.java
===================================================================
--- classlib6/core/src/openjdk/com/com/sun/media/sound/AiffFileWriter.java 2011-02-20 13:34:37 UTC (rev 5786)
+++ classlib6/core/src/openjdk/com/com/sun/media/sound/AiffFileWriter.java 2011-02-20 20:14:41 UTC (rev 5787)
@@ -1,12 +1,12 @@
/*
- * Copyright 1999-2007 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright (c) 1999, 2007, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Sun designates this
+ * published by the Free Software Foundation. Oracle designates this
* particular file as subject to the "Classpath" exception as provided
- * by Sun in the LICENSE file that accompanied this code.
+ * by Oracle in the LICENSE file that accompanied this code.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -18,9 +18,9 @@
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
*/
package com.sun.media.sound;
Modified: classlib6/core/src/openjdk/com/com/sun/media/sound/AlawCodec.java
===================================================================
--- classlib6/core/src/openjdk/com/com/sun/media/sound/AlawCodec.java 2011-02-20 13:34:37 UTC (rev 5786)
+++ classlib6/core/src/openjdk/com/com/sun/media/sound/AlawCodec.java 2011-02-20 20:14:41 UTC (rev 5787)
@@ -1,12 +1,12 @@
/*
- * Copyright 1999-2007 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright (c) 1999, 2007, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Sun designates this
+ * published by the Free Software Foundation. Oracle designates this
* particular file as subject to the "Classpath" exception as provided
- * by Sun in the LICENSE file that accompanied this code.
+ * by Oracle in the LICENSE file that accompanied this code.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -18,9 +18,9 @@
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
*/
package com.sun.media.sound;
Modified: classlib6/core/src/openjdk/com/com/sun/media/sound/AuFileFormat.java
===================================================================
--- classlib6/core/src/openjdk/com/com/sun/media/sound/AuFileFormat.java 2011-02-20 13:34:37 UTC (rev 5786)
+++ classlib6/core/src/openjdk/com/com/sun/media/sound/AuFileFormat.java 2011-02-20 20:14:41 UTC (rev 5787)
@@ -1,12 +1,12 @@
/*
- * Copyright 1999-2007 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright (c) 1999, 2007, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Sun designates this
+ * published by the Free Software Foundation. Oracle designates this
* particular file as subject to the "Classpath" exception as provided
- * by Sun in the LICENSE file that accompanied this code.
+ * by Oracle in the LICENSE file that accompanied this code.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -18,9 +18,9 @@
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
*/
package com.sun.media.sound;
Modified: classlib6/core/src/openjdk/com/com/sun/media/sound/AuFileReader.java
===================================================================
--- classlib6/core/src/openjdk/com/com/sun/media/sound/AuFileReader.java 2011-02-20 13:34:37 UTC (rev 5786)
+++ classlib6/core/src/openjdk/com/com/sun/media/sound/AuFileReader.java 2011-02-20 20:14:41 UTC (rev 5787)
@@ -1,12 +1,12 @@
/*
- * Copyright 1999-2007 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright (c) 1999, 2007, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Sun designates this
+ * published by the Free Software Foundation. Oracle designates this
* particular file as subject to the "Classpath" exception as provided
- * by Sun in the LICENSE file that accompanied this code.
+ * by Oracle in the LICENSE file that accompanied this code.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -18,9 +18,9 @@
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
*/
package com.sun.media.sound;
Modified: classlib6/core/src/openjdk/com/com/sun/media/sound/AuFileWriter.java
===================================================================
--- classlib6/core/src/openjdk/com/com/sun/media/sound/AuFileWriter.java 2011-02-20 13:34:37 UTC (rev 5786)
+++ classlib6/core/src/openjdk/com/com/sun/media/sound/AuFileWriter.java 2011-02-20 20:14:41 UTC (rev 5787)
@@ -1,12 +1,12 @@
/*
- * Copyright 1999-2007 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright (c) 1999, 2007, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Sun designates this
+ * published by the Free Software Foundation. Oracle designates this
* particular file as subject to the "Classpath" exception as provided
- * by Sun in the LICENSE file that accompanied this code.
+ * by Oracle in the LICENSE file that accompanied this code.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -18,9 +18,9 @@
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
*/
package com.sun.media.sound;
Modified: classlib6/core/src/openjdk/com/com/sun/media/sound/AudioFileSoundbankReader.java
===================================================================
--- classlib6/core/src/openjdk/com/com/sun/media/sound/AudioFileSoundbankReader.java 2011-02-20 13:34:37 UTC (rev 5786)
+++ classlib6/core/src/openjdk/com/com/sun/media/sound/AudioFileSoundbankReader.java 2011-02-20 20:14:41 UTC (rev 5787)
@@ -1,12 +1,12 @@
/*
- * Copyright 2007 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Sun designates this
+ * published by the Free Software Foundation. Oracle designates this
* particular file as subject to the "Classpath" exception as provided
- * by Sun in the LICENSE file that accompanied this code.
+ * by Oracle in the LICENSE file that accompanied this code.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -18,9 +18,9 @@
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
*/
package com.sun.media.sound;
Modified: classlib6/core/src/openjdk/com/com/sun/media/sound/AudioFloatConverter.java
===================================================================
--- classlib6/core/src/openjdk/com/com/sun/media/sound/AudioFloatConverter.java 2011-02-20 13:34:37 UTC (rev 5786)
+++ classlib6/core/src/openjdk/com/com/sun/media/sound/AudioFloatConverter.java 2011-02-20 20:14:41 UTC (rev 5787)
@@ -1,12 +1,12 @@
/*
- * Copyright 2007 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Sun designates this
+ * published by the Free Software Foundation. Oracle designates this
* particular file as subject to the "Classpath" exception as provided
- * by Sun in the LICENSE file that accompanied this code.
+ * by Oracle in the LICENSE file that accompanied this code.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -18,9 +18,9 @@
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
*/
package com.sun.media.sound;
Modified: classlib6/core/src/openjdk/com/com/sun/media/sound/AudioFloatFormatConverter.java
===================================================================
--- classlib6/core/src/openjdk/com/com/sun/media/sound/AudioFloatFormatConverter.java 2011-02-20 13:34:37 UTC (rev 5786)
+++ classlib6/core/src/openjdk/com/com/sun/media/sound/AudioFloatFormatConverter.java 2011-02-20 20:14:41 UTC (rev 5787)
@@ -1,12 +1,12 @@
/*
- * Copyright 2008 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Sun designates this
+ * published by the Free Software Foundation. Oracle designates this
* particular file as subject to the "Classpath" exception as provided
- * by Sun in the LICENSE file that accompanied this code.
+ * by Oracle in the LICENSE file that accompanied this code.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -18,9 +18,9 @@
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
*/
package com.sun.media.sound;
@@ -175,7 +175,6 @@
for (int c = 0; c < targetChannels; c++) {
for (int i = 0, ix = off + c; i < len2; i++, ix += cs) {
b[ix] = conversion_buffer[i];
- ;
}
}
} else if (targetChannels == 1) {
@@ -186,7 +185,6 @@
for (int c = 1; c < sourceChannels; c++) {
for (int i = c, ix = off; i < len2; i += cs, ix++) {
b[ix] += conversion_buffer[i];
- ;
}
}
float vol = 1f / ((float) sourceChannels);
@@ -390,6 +388,7 @@
return -1;
if (len < 0)
return 0;
+ int offlen = off + len;
int remain = len / nrofchannels;
int destPos = 0;
int in_end = ibuffer_len;
@@ -423,7 +422,7 @@
for (int c = 0; c < nrofchannels; c++) {
int ix = 0;
float[] buff = cbuffer[c];
- for (int i = c; i < b.length; i += nrofchannels) {
+ for (int i = c + off; i < offlen; i += nrofchannels) {
b[i] = buff[ix++];
}
}
@@ -447,7 +446,7 @@
}
public long skip(long len) throws IOException {
- if (len > 0)
+ if (len < 0)
return 0;
if (skipbuffer == null)
skipbuffer = new float[1024 * targetFormat.getFrameSize()];
Modified: classlib6/core/src/openjdk/com/com/sun/media/sound/AudioFloatInputStream.java
===================================================================
--- classlib6/core/src/openjdk/com/com/sun/media/sound/AudioFloatInputStream.java 2011-02-20 13:34:37 UTC (rev 5786)
+++ classlib6/core/src/openjdk/com/com/sun/media/sound/AudioFloatInputStream.java 2011-02-20 20:14:41 UTC (rev 5787)
@@ -1,12 +1,12 @@
/*
- * Copyright 2007 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Sun designates this
+ * published by the Free Software Foundation. Oracle designates this
* particular file as subject to the "Classpath" exception as provided
- * by Sun in the LICENSE file that accompanied this code.
+ * by Oracle in the LICENSE file that accompanied this code.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -18,9 +18,9 @@
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
*/
package com.sun.media.sound;
Modified: classlib6/core/src/openjdk/com/com/sun/media/sound/AudioSynthesizer.java
===================================================================
--- classlib6/core/src/openjdk/com/com/sun/media/sound/AudioSynthesizer.java 2011-02-20 13:34:37 UTC (rev 5786)
+++ classlib6/core/src/openjdk/com/com/sun/media/sound/AudioSynthesizer.java 2011-02-20 20:14:41 UTC (rev 5787)
@@ -1,12 +1,12 @@
/*
- * Copyright 2007 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Sun designates this
+ * published by the Free Software Foundation. Oracle designates this
* particular file as subject to the "Classpath" exception as provided
- * by Sun in the LICENSE file that accompanied this code.
+ * by Oracle in the LICENSE file that accompanied this code.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -18,9 +18,9 @@
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
*/
package com.sun.media.sound;
Modified: classlib6/core/src/openjdk/com/com/sun/media/sound/AudioSynthesizerPropertyInfo.java
===================================================================
--- classlib6/core/src/openjdk/com/com/sun/media/sound/AudioSynthesizerPropertyInfo.java 2011-02-20 13:34:37 UTC (rev 5786)
+++ classlib6/core/src/openjdk/com/com/sun/media/sound/AudioSynthesizerPropertyInfo.java 2011-02-20 20:14:41 UTC (rev 5787)
@@ -1,12 +1,12 @@
/*
- * Copyright 2007 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Sun designates this
+ * published by the Free Software Foundation. Oracle designates this
* particular file as subject to the "Classpath" exception as provided
- * by Sun in the LICENSE file that accompanied this code.
+ * by Oracle in the LICENSE file that accompanied this code.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -18,9 +18,9 @@
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
*/
package com.sun.media.sound;
@@ -42,12 +42,15 @@
*/
public AudioSynthesizerPropertyInfo(String name, Object value) {
this.name = name;
- this.value = value;
if (value instanceof Class)
valueClass = (Class)value;
- else if (value != null)
+ else
+ {
+ this.value = value;
+ if (value != null)
valueClass = value.getClass();
}
+ }
/**
* The name of the property.
*/
Modified: classlib6/core/src/openjdk/com/com/sun/media/sound/AutoClosingClip.java
===================================================================
--- classlib6/core/src/openjdk/com/com/sun/media/sound/AutoClosingClip.java 2011-02-20 13:34:37 UTC (rev 5786)
+++ classlib6/core/src/openjdk/com/com/sun/media/sound/AutoClosingClip.java 2011-02-20 20:14:41 UTC (rev 5787)
@@ -1,12 +1,12 @@
/*
- * Copyright 2002-2007 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright (c) 2002, 2007, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Sun designates this
+ * published by the Free Software Foundation. Oracle designates this
* particular file as subject to the "Classpath" exception as provided
- * by Sun in the LICENSE file that accompanied this code.
+ * by Oracle in the LICENSE file that accompanied this code.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -18,9 +18,9 @@
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
*/
package com.sun.media.sound;
Modified: classlib6/core/src/openjdk/com/com/sun/media/sound/AutoConnectSequencer.java
===================================================================
--- classlib6/core/src/openjdk/com/com/sun/media/sound/AutoConnectSequencer.java 2011-02-20 13:34:37 UTC (rev 5786)
+++ classlib6/core/src/openjdk/com/com/sun/media/sound/AutoConnectSequencer.java 2011-02-20 20:14:41 UTC (rev 5787)
@@ -1,12 +1,12 @@
/*
- * Copyright 2003-2007 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright (c) 2003, 2007, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Sun designates this
+ * published by the Free Software Foundation. Oracle designates this
* particular file as subject to the "Classpath" exception as provided
- * by Sun in the LICENSE file that accompanied this code.
+ * by Oracle in the LICENSE file that accompanied this code.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -18,9 +18,9 @@
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
*/
package com.sun.media.sound;
Modified: classlib6/core/src/openjdk/com/com/sun/media/sound/DLSInfo.java
===================================================================
--- classlib6/core/src/openjdk/com/com/sun/media/sound/DLSInfo.java 2011-02-20 13:34:37 UTC (rev 5786)
+++ classlib6/core/src/openjdk/com/com/sun/media/sound/DLSInfo.java 2011-02-20 20:14:41 UTC (rev 5787)
@@ -1,12 +1,12 @@
/*
- * Copyright 2007 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Sun designates this
+ * published by the Free Software Foundation. Oracle designates this
* particular file as subject to the "Classpath" exception as provided
- * by Sun in the LICENSE file that accompanied this code.
+ * by Oracle in the LICENSE file that accompanied this code.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -18,9 +18,9 @@
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
*/
package com.sun.media.sound;
Modified: classlib6/core/src/openjdk/com/com/sun/media/sound/DLSInstrument.java
===================================================================
--- classlib6/core/src/openjdk/com/com/sun/media/sound/DLSInstrument.java 2011-02-20 13:34:37 UTC (rev 5786)
+++ classlib6/core/src/openjdk/com/com/sun/media/sound/DLSInstrument.java 2011-02-20 20:14:41 UTC (rev 5787)
@@ -1,12 +1,12 @@
/*
- * Copyright 2007 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Sun designates this
+ * published by the Free Software Foundation. Oracle designates this
* particular file as subject to the "Classpath" exception as provided
- * by Sun in the LICENSE file that accompanied this code.
+ * by Oracle in the LICENSE file that accompanied this code.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -18,9 +18,9 @@
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
*/
package com.sun.media.sound;
Modified: classlib6/core/src/openjdk/com/com/sun/media/sound/DLSModulator.java
===================================================================
--- classlib6/core/src/openjdk/com/com/sun/media/sound/DLSModulator.java 2011-02-20 13:34:37 UTC (rev 5786)
+++ classlib6/core/src/openjdk/com/com/sun/media/sound/DLSModulator.java 2011-02-20 20:14:41 UTC (rev 5787)
@@ -1,12 +1,12 @@
/*
- * Copyright 2007 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Sun designates this
+ * published by the Free Software Foundation. Oracle designates this
* particular file as subject to the "Classpath" exception as provided
- * by Sun in the LICENSE file that accompanied this code.
+ * by Oracle in the LICENSE file that accompanied this code.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -18,9 +18,9 @@
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
*/
package com.sun.media.sound;
Modified: classlib6/core/src/openjdk/com/com/sun/media/sound/DLSRegion.java
===================================================================
--- classlib6/core/src/openjdk/com/com/sun/media/sound/DLSRegion.java 2011-02-20 13:34:37 UTC (rev 5786)
+++ classlib6/core/src/openjdk/com/com/sun/media/sound/DLSRegion.java 2011-02-20 20:14:41 UTC (rev 5787)
@@ -1,12 +1,12 @@
/*
- * Copyright 2007 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Sun designates this
+ * published by the Free Software Foundation. Oracle designates this
* particular file as subject to the "Classpath" exception as provided
- * by Sun in the LICENSE file that accompanied this code.
+ * by Oracle in the LICENSE file that accompanied this code.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -18,9 +18,9 @@
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston...
[truncated message content] |
