96dd155e2c
2005-02-17 Michael Koch <konqueror@gmx.de> * gnu/java/awt/peer/gtk/GThreadNativeMethodRunner.java, gnu/java/awt/peer/gtk/GdkFontPeer.java, gnu/java/awt/peer/gtk/GdkGlyphVector.java, gnu/java/awt/peer/gtk/GdkGraphics.java, gnu/java/awt/peer/gtk/GdkGraphics2D.java, gnu/java/awt/peer/gtk/GdkGraphicsConfiguration.java, gnu/java/awt/peer/gtk/GdkGraphicsEnvironment.java, gnu/java/awt/peer/gtk/GdkPixbufDecoder.java, gnu/java/awt/peer/gtk/GdkRobotPeer.java, gnu/java/awt/peer/gtk/GdkScreenGraphicsDevice.java, gnu/java/awt/peer/gtk/GdkTextLayout.java, gnu/java/awt/peer/gtk/GtkCheckboxMenuItemPeer.java, gnu/java/awt/peer/gtk/GtkChoicePeer.java, gnu/java/awt/peer/gtk/GtkClipboard.java, gnu/java/awt/peer/gtk/GtkComponentPeer.java, gnu/java/awt/peer/gtk/GtkFileDialogPeer.java, gnu/java/awt/peer/gtk/GtkFontPeer.java, gnu/java/awt/peer/gtk/GtkLabelPeer.java, gnu/java/awt/peer/gtk/GtkMenuBarPeer.java, gnu/java/awt/peer/gtk/GtkMenuItemPeer.java, gnu/java/awt/peer/gtk/GtkMenuPeer.java, gnu/java/awt/peer/gtk/GtkScrollPanePeer.java, gnu/java/awt/peer/gtk/GtkScrollbarPeer.java, gnu/java/awt/peer/gtk/GtkToolkit.java, gnu/java/awt/peer/gtk/GtkWindowPeer.java, java/applet/Applet.java, java/awt/AWTError.java, java/awt/AWTEvent.java, java/awt/AWTEventMulticaster.java, java/awt/AWTException.java, java/awt/AWTKeyStroke.java, java/awt/AWTPermission.java, java/awt/ActiveEvent.java, java/awt/Adjustable.java, java/awt/AlphaComposite.java, java/awt/AttributeValue.java, java/awt/BorderLayout.java, java/awt/BufferCapabilities.java, java/awt/Button.java, java/awt/Canvas.java, java/awt/CheckboxGroup.java, java/awt/CheckboxMenuItem.java, java/awt/Color.java, java/awt/ColorPaintContext.java, java/awt/Component.java, java/awt/ComponentOrientation.java, java/awt/Composite.java, java/awt/CompositeContext.java, java/awt/Container.java, java/awt/ContainerOrderFocusTraversalPolicy.java, java/awt/DefaultFocusTraversalPolicy.java, java/awt/Dialog.java, java/awt/Dimension.java, java/awt/DisplayMode.java, java/awt/EventQueue.java, java/awt/FileDialog.java, java/awt/FontFormatException.java, java/awt/Graphics.java, java/awt/Graphics2D.java, java/awt/GraphicsConfigTemplate.java, java/awt/GraphicsConfiguration.java, java/awt/GraphicsDevice.java, java/awt/GridBagLayout.java, java/awt/GridBagLayoutInfo.java, java/awt/GridLayout.java, java/awt/HeadlessException.java, java/awt/IllegalComponentStateException.java, java/awt/Image.java, java/awt/Insets.java, java/awt/ItemSelectable.java, java/awt/JobAttributes.java, java/awt/KeyEventDispatcher.java, java/awt/KeyEventPostProcessor.java, java/awt/KeyboardFocusManager.java, java/awt/Label.java, java/awt/LayoutManager.java, java/awt/MenuBar.java, java/awt/MenuComponent.java, java/awt/MenuContainer.java, java/awt/PageAttributes.java, java/awt/Paint.java, java/awt/PaintContext.java, java/awt/Panel.java, java/awt/Point.java, java/awt/Polygon.java, java/awt/PrintGraphics.java, java/awt/PrintJob.java, java/awt/Rectangle.java, java/awt/RenderingHints.java, java/awt/Shape.java, java/awt/Stroke.java, java/awt/SystemColor.java, java/awt/Toolkit.java, java/awt/Transparency.java, java/awt/Window.java, java/awt/color/CMMException.java, java/awt/color/ColorSpace.java, java/awt/color/ICC_ColorSpace.java, java/awt/color/ICC_Profile.java, java/awt/color/ProfileDataException.java, java/awt/datatransfer/FlavorTable.java, java/awt/datatransfer/MimeTypeParseException.java, java/awt/datatransfer/Transferable.java, java/awt/datatransfer/UnsupportedFlavorException.java, java/awt/dnd/Autoscroll.java, java/awt/dnd/DnDConstants.java, java/awt/dnd/DragGestureListener.java, java/awt/dnd/DragSourceAdapter.java, java/awt/dnd/DragSourceDropEvent.java, java/awt/dnd/DragSourceListener.java, java/awt/dnd/DragSourceMotionListener.java, java/awt/dnd/DropTargetAdapter.java, java/awt/dnd/DropTargetContext.java, java/awt/dnd/DropTargetListener.java, java/awt/dnd/InvalidDnDOperationException.java, java/awt/dnd/MouseDragGestureRecognizer.java, java/awt/dnd/peer/DropTargetContextPeer.java, java/awt/event/AWTEventListener.java, java/awt/event/AWTEventListenerProxy.java, java/awt/event/ActionEvent.java, java/awt/event/AdjustmentEvent.java, java/awt/event/AdjustmentListener.java, java/awt/event/ComponentAdapter.java, java/awt/event/ComponentEvent.java, java/awt/event/ComponentListener.java, java/awt/event/ContainerAdapter.java, java/awt/event/ContainerEvent.java, java/awt/event/ContainerListener.java, java/awt/event/FocusAdapter.java, java/awt/event/FocusEvent.java, java/awt/event/FocusListener.java, java/awt/event/InputEvent.java, java/awt/event/InputMethodEvent.java, java/awt/event/InputMethodListener.java, java/awt/event/InvocationEvent.java, java/awt/event/ItemEvent.java, java/awt/event/ItemListener.java, java/awt/event/KeyAdapter.java, java/awt/event/KeyEvent.java, java/awt/event/KeyListener.java, java/awt/event/MouseAdapter.java, java/awt/event/MouseEvent.java, java/awt/event/MouseListener.java, java/awt/event/MouseMotionAdapter.java, java/awt/event/MouseMotionListener.java, java/awt/event/MouseWheelEvent.java, java/awt/event/MouseWheelListener.java, java/awt/event/PaintEvent.java, java/awt/event/TextEvent.java, java/awt/event/TextListener.java, java/awt/event/WindowAdapter.java, java/awt/event/WindowEvent.java, java/awt/event/WindowFocusListener.java, java/awt/event/WindowListener.java, java/awt/event/WindowStateListener.java, java/awt/font/TextHitInfo.java, java/awt/geom/CubicCurve2D.java, java/awt/geom/Dimension2D.java, java/awt/geom/Ellipse2D.java, java/awt/geom/IllegalPathStateException.java, java/awt/geom/Line2D.java, java/awt/geom/NoninvertibleTransformException.java, java/awt/geom/PathIterator.java, java/awt/geom/Point2D.java, java/awt/geom/QuadCurve2D.java, java/awt/geom/RectangularShape.java, java/awt/geom/RoundRectangle2D.java, java/awt/im/InputContext.java, java/awt/im/InputMethodHighlight.java, java/awt/im/InputMethodRequests.java, java/awt/im/InputSubset.java, java/awt/im/spi/InputMethod.java, java/awt/im/spi/InputMethodDescriptor.java, java/awt/image/BandCombineOp.java, java/awt/image/BandedSampleModel.java, java/awt/image/ByteLookupTable.java, java/awt/image/ComponentSampleModel.java, java/awt/image/DataBuffer.java, java/awt/image/DataBufferByte.java, java/awt/image/DataBufferDouble.java, java/awt/image/DataBufferFloat.java, java/awt/image/DataBufferInt.java, java/awt/image/DataBufferShort.java, java/awt/image/DataBufferUShort.java, java/awt/image/ImagingOpException.java, java/awt/image/Kernel.java, java/awt/image/LookupTable.java, java/awt/image/MultiPixelPackedSampleModel.java, java/awt/image/PackedColorModel.java, java/awt/image/PixelInterleavedSampleModel.java, java/awt/image/RGBImageFilter.java, java/awt/image/Raster.java, java/awt/image/RasterFormatException.java, java/awt/image/SampleModel.java, java/awt/image/ShortLookupTable.java, java/awt/image/SinglePixelPackedSampleModel.java, java/awt/image/WritableRaster.java, java/awt/print/PrinterAbortException.java, java/awt/print/PrinterException.java, java/awt/print/PrinterIOException.java, java/beans/AppletInitializer.java, java/beans/ExceptionListener.java, java/beans/PropertyChangeEvent.java, java/beans/PropertyChangeListenerProxy.java, java/beans/PropertyChangeSupport.java, java/beans/PropertyDescriptor.java, java/beans/VetoableChangeListenerProxy.java, java/beans/VetoableChangeSupport.java, java/io/BufferedReader.java, java/io/ByteArrayInputStream.java, java/io/ByteArrayOutputStream.java, java/io/CharArrayReader.java, java/io/CharArrayWriter.java, java/io/CharConversionException.java, java/io/DataInput.java, java/io/DataInputStream.java, java/io/DataOutput.java, java/io/DataOutputStream.java, java/io/EOFException.java, java/io/FileInputStream.java, java/io/FileNotFoundException.java, java/io/FileOutputStream.java, java/io/FilenameFilter.java, java/io/FilterInputStream.java, java/io/FilterOutputStream.java, java/io/FilterReader.java, java/io/FilterWriter.java, java/io/IOException.java, java/io/InputStream.java, java/io/InterruptedIOException.java, java/io/LineNumberInputStream.java, java/io/LineNumberReader.java, java/io/ObjectInputStream.java, java/io/ObjectStreamException.java, java/io/OptionalDataException.java, java/io/OutputStream.java, java/io/OutputStreamWriter.java, java/io/PrintStream.java, java/io/PrintWriter.java, java/io/PushbackInputStream.java, java/io/PushbackReader.java, java/io/RandomAccessFile.java, java/io/Reader.java, java/io/SequenceInputStream.java, java/io/Serializable.java, java/io/StreamCorruptedException.java, java/io/StreamTokenizer.java, java/io/StringBufferInputStream.java, java/io/StringWriter.java, java/io/SyncFailedException.java, java/io/UTFDataFormatException.java, java/io/UnsupportedEncodingException.java, java/io/WriteAbortedException.java, java/io/Writer.java, java/lang/AbstractMethodError.java, java/lang/ArithmeticException.java, java/lang/ArrayIndexOutOfBoundsException.java, java/lang/ArrayStoreException.java, java/lang/AssertionError.java, java/lang/Boolean.java, java/lang/Byte.java, java/lang/Class.java, java/lang/ClassCastException.java, java/lang/ClassCircularityError.java, java/lang/ClassLoader.java, java/lang/ClassNotFoundException.java, java/lang/CloneNotSupportedException.java, java/lang/Cloneable.java, java/lang/Comparable.java, java/lang/Compiler.java, java/lang/Double.java, java/lang/Error.java, java/lang/Exception.java, java/lang/ExceptionInInitializerError.java, java/lang/Float.java, java/lang/IllegalAccessError.java, java/lang/IllegalAccessException.java, java/lang/IllegalArgumentException.java, java/lang/IllegalMonitorStateException.java, java/lang/IllegalStateException.java, java/lang/IllegalThreadStateException.java, java/lang/IncompatibleClassChangeError.java, java/lang/IndexOutOfBoundsException.java, java/lang/InheritableThreadLocal.java, java/lang/InstantiationError.java, java/lang/InstantiationException.java, java/lang/Integer.java, java/lang/InternalError.java, java/lang/InterruptedException.java, java/lang/LinkageError.java, java/lang/Long.java, java/lang/NegativeArraySizeException.java, java/lang/NoClassDefFoundError.java, java/lang/NoSuchFieldError.java, java/lang/NoSuchFieldException.java, java/lang/NoSuchMethodError.java, java/lang/NoSuchMethodException.java, java/lang/NullPointerException.java, java/lang/Number.java, java/lang/NumberFormatException.java, java/lang/OutOfMemoryError.java, java/lang/Process.java, java/lang/Runnable.java, java/lang/Runtime.java, java/lang/RuntimeException.java, java/lang/RuntimePermission.java, java/lang/SecurityException.java, java/lang/SecurityManager.java, java/lang/Short.java, java/lang/StackOverflowError.java, java/lang/StackTraceElement.java, java/lang/StringBuffer.java, java/lang/StringIndexOutOfBoundsException.java, java/lang/ThreadDeath.java, java/lang/ThreadGroup.java, java/lang/Throwable.java, java/lang/UnsatisfiedLinkError.java, java/lang/UnsupportedOperationException.java, java/lang/VerifyError.java, java/lang/VirtualMachineError.java, java/lang/reflect/AccessibleObject.java, java/lang/reflect/Array.java, java/lang/reflect/InvocationTargetException.java, java/lang/reflect/Member.java, java/lang/reflect/Modifier.java, java/lang/reflect/Proxy.java, java/lang/reflect/ReflectPermission.java, java/lang/reflect/UndeclaredThrowableException.java, java/math/BigInteger.java, java/net/NetworkInterface.java, java/nio/ByteBufferHelper.java, java/nio/ByteBufferImpl.java, java/nio/DirectByteBufferImpl.java, java/nio/DoubleBufferImpl.java, java/nio/FloatBufferImpl.java, java/nio/IntBufferImpl.java, java/nio/LongBufferImpl.java, java/nio/ShortBufferImpl.java, java/nio/channels/Channel.java, java/nio/channels/IllegalBlockingModeException.java, java/nio/charset/spi/CharsetProvider.java, java/security/AccessControlException.java, java/security/BasicPermission.java, java/security/DigestException.java, java/security/DigestInputStream.java, java/security/DigestOutputStream.java, java/security/GeneralSecurityException.java, java/security/Guard.java, java/security/GuardedObject.java, java/security/InvalidAlgorithmParameterException.java, java/security/InvalidKeyException.java, java/security/InvalidParameterException.java, java/security/Key.java, java/security/KeyException.java, java/security/KeyManagementException.java, java/security/KeyStoreException.java, java/security/MessageDigestSpi.java, java/security/NoSuchAlgorithmException.java, java/security/NoSuchProviderException.java, java/security/Permission.java, java/security/PermissionCollection.java, java/security/Permissions.java, java/security/Principal.java, java/security/PrivateKey.java, java/security/PrivilegedActionException.java, java/security/ProviderException.java, java/security/PublicKey.java, java/security/SecureRandom.java, java/security/SecureRandomSpi.java, java/security/SignatureException.java, java/security/SignatureSpi.java, java/security/SignedObject.java, java/security/Signer.java, java/security/UnrecoverableKeyException.java, java/security/UnresolvedPermission.java, java/security/acl/AclNotFoundException.java, java/security/acl/LastOwnerException.java, java/security/acl/NotOwnerException.java, java/security/cert/CertPath.java, java/security/cert/CertPathBuilderException.java, java/security/cert/CertPathValidatorException.java, java/security/cert/CertStoreException.java, java/text/BreakIterator.java, java/text/ChoiceFormat.java, java/text/CollationElementIterator.java, java/text/CollationKey.java, java/text/Collator.java, java/text/DateFormat.java, java/text/DateFormatSymbols.java, java/text/DecimalFormat.java, java/text/DecimalFormatSymbols.java, java/text/FieldPosition.java, java/text/Format.java, java/text/NumberFormat.java, java/text/ParseException.java, java/text/ParsePosition.java, java/text/StringCharacterIterator.java, java/util/AbstractCollection.java, java/util/AbstractList.java, java/util/AbstractMap.java, java/util/AbstractSequentialList.java, java/util/AbstractSet.java, java/util/ArrayList.java, java/util/Arrays.java, java/util/BitSet.java, java/util/Collection.java, java/util/Collections.java, java/util/Comparator.java, java/util/ConcurrentModificationException.java, java/util/Currency.java, java/util/Date.java, java/util/EmptyStackException.java, java/util/Enumeration.java, java/util/EventListener.java, java/util/EventListenerProxy.java, java/util/EventObject.java, java/util/HashMap.java, java/util/HashSet.java, java/util/Hashtable.java, java/util/IdentityHashMap.java, java/util/Iterator.java, java/util/LinkedHashSet.java, java/util/LinkedList.java, java/util/List.java, java/util/ListIterator.java, java/util/ListResourceBundle.java, java/util/Map.java, java/util/MissingResourceException.java, java/util/NoSuchElementException.java, java/util/Observable.java, java/util/Observer.java, java/util/Properties.java, java/util/PropertyPermissionCollection.java, java/util/RandomAccess.java, java/util/Set.java, java/util/SortedMap.java, java/util/SortedSet.java, java/util/Stack.java, java/util/StringTokenizer.java, java/util/TooManyListenersException.java, java/util/TreeMap.java, java/util/TreeSet.java, java/util/Vector.java, java/util/logging/FileHandler.java, java/util/logging/Level.java, java/util/prefs/BackingStoreException.java, java/util/prefs/InvalidPreferencesFormatException.java, java/util/prefs/Preferences.java, javax/accessibility/Accessible.java, javax/accessibility/AccessibleAction.java, javax/accessibility/AccessibleBundle.java, javax/accessibility/AccessibleComponent.java, javax/accessibility/AccessibleContext.java, javax/accessibility/AccessibleEditableText.java, javax/accessibility/AccessibleExtendedComponent.java, javax/accessibility/AccessibleExtendedTable.java, javax/accessibility/AccessibleHyperlink.java, javax/accessibility/AccessibleHypertext.java, javax/accessibility/AccessibleIcon.java, javax/accessibility/AccessibleKeyBinding.java, javax/accessibility/AccessibleRelation.java, javax/accessibility/AccessibleRelationSet.java, javax/accessibility/AccessibleResourceBundle.java, javax/accessibility/AccessibleRole.java, javax/accessibility/AccessibleSelection.java, javax/accessibility/AccessibleState.java, javax/accessibility/AccessibleStateSet.java, javax/accessibility/AccessibleTable.java, javax/accessibility/AccessibleTableModelChange.java, javax/accessibility/AccessibleText.java, javax/accessibility/AccessibleValue.java, javax/imageio/IIOException.java, javax/imageio/ImageIO.java, javax/imageio/spi/IIOServiceProvider.java, javax/imageio/spi/ImageInputStreamSpi.java, javax/imageio/spi/ImageOutputStreamSpi.java, javax/imageio/spi/ImageReaderWriterSpi.java, javax/imageio/spi/ImageTranscoderSpi.java, javax/imageio/spi/RegisterableService.java, javax/imageio/spi/ServiceRegistry.java, javax/imageio/stream/IIOByteBuffer.java, javax/imageio/stream/ImageInputStream.java, javax/imageio/stream/ImageOutputStream.java, javax/naming/Binding.java, javax/naming/CannotProceedException.java, javax/naming/CompositeName.java, javax/naming/CompoundName.java, javax/naming/LinkException.java, javax/naming/LinkRef.java, javax/naming/NameClassPair.java, javax/naming/Reference.java, javax/naming/ReferralException.java, javax/naming/directory/Attribute.java, javax/naming/directory/AttributeModificationException.java, javax/naming/directory/Attributes.java, javax/naming/directory/DirContext.java, javax/naming/directory/ModificationItem.java, javax/naming/directory/SearchControls.java, javax/naming/directory/SearchResult.java, javax/naming/event/EventContext.java, javax/naming/event/EventDirContext.java, javax/naming/event/NamespaceChangeListener.java, javax/naming/event/NamingExceptionEvent.java, javax/naming/event/NamingListener.java, javax/naming/event/ObjectChangeListener.java, javax/naming/ldap/Control.java, javax/naming/ldap/ExtendedResponse.java, javax/naming/ldap/HasControls.java, javax/naming/ldap/LdapContext.java, javax/naming/ldap/UnsolicitedNotification.java, javax/naming/ldap/UnsolicitedNotificationEvent.java, javax/naming/ldap/UnsolicitedNotificationListener.java, javax/naming/spi/DirectoryManager.java, javax/naming/spi/ResolveResult.java, javax/naming/spi/Resolver.java, javax/security/auth/callback/Callback.java, javax/security/auth/callback/CallbackHandler.java, javax/security/auth/callback/ChoiceCallback.java, javax/security/auth/callback/ConfirmationCallback.java, javax/security/auth/callback/LanguageCallback.java, javax/security/auth/callback/NameCallback.java, javax/security/auth/callback/PasswordCallback.java, javax/security/auth/callback/TextInputCallback.java, javax/security/auth/callback/TextOutputCallback.java, javax/security/auth/callback/UnsupportedCallbackException.java, javax/security/sasl/Sasl.java, javax/security/sasl/SaslServerFactory.java, javax/swing/DefaultBoundedRangeModel.java, javax/swing/JComponent.java, javax/swing/JList.java, javax/swing/JProgressBar.java, javax/swing/JRadioButton.java, javax/swing/JTextArea.java, javax/swing/JTextField.java, javax/swing/JToggleButton.java, javax/swing/JTree.java, javax/swing/SpinnerListModel.java, javax/swing/event/EventListenerList.java, javax/swing/text/JTextComponent.java, javax/swing/text/StringContent.java, javax/swing/text/Utilities.java, javax/swing/undo/UndoManager.java, javax/swing/undo/UndoableEditSupport.java, javax/transaction/HeuristicCommitException.java, javax/transaction/HeuristicMixedException.java, javax/transaction/HeuristicRollbackException.java, javax/transaction/InvalidTransactionException.java, javax/transaction/NotSupportedException.java, javax/transaction/RollbackException.java, javax/transaction/Status.java, javax/transaction/Synchronization.java, javax/transaction/SystemException.java, javax/transaction/Transaction.java, javax/transaction/TransactionManager.java, javax/transaction/TransactionRequiredException.java, javax/transaction/TransactionRolledbackException.java, javax/transaction/UserTransaction.java, javax/transaction/xa/XAException.java, javax/transaction/xa/XAResource.java, javax/transaction/xa/Xid.java, javax/xml/XMLConstants.java, javax/xml/datatype/DatatypeConfigurationException.java, javax/xml/datatype/DatatypeConstants.java, javax/xml/datatype/DatatypeFactory.java, javax/xml/datatype/Duration.java, javax/xml/datatype/XMLGregorianCalendar.java, javax/xml/namespace/NamespaceContext.java, javax/xml/namespace/QName.java, javax/xml/parsers/DocumentBuilder.java, javax/xml/parsers/DocumentBuilderFactory.java, javax/xml/parsers/FactoryConfigurationError.java, javax/xml/parsers/ParserConfigurationException.java, javax/xml/parsers/SAXParser.java, javax/xml/parsers/SAXParserFactory.java, javax/xml/transform/ErrorListener.java, javax/xml/transform/OutputKeys.java, javax/xml/transform/Result.java, javax/xml/transform/Source.java, javax/xml/transform/SourceLocator.java, javax/xml/transform/Templates.java, javax/xml/transform/Transformer.java, javax/xml/transform/TransformerConfigurationException.java, javax/xml/transform/TransformerException.java, javax/xml/transform/TransformerFactory.java, javax/xml/transform/TransformerFactoryConfigurationError.java, javax/xml/transform/URIResolver.java, javax/xml/transform/dom/DOMLocator.java, javax/xml/transform/dom/DOMResult.java, javax/xml/transform/dom/DOMSource.java, javax/xml/transform/sax/SAXResult.java, javax/xml/transform/sax/SAXSource.java, javax/xml/transform/sax/SAXTransformerFactory.java, javax/xml/transform/sax/TemplatesHandler.java, javax/xml/transform/sax/TransformerHandler.java, javax/xml/transform/stream/StreamResult.java, javax/xml/transform/stream/StreamSource.java, javax/xml/validation/Schema.java, javax/xml/validation/SchemaFactory.java, javax/xml/validation/TypeInfoProvider.java, javax/xml/validation/Validator.java, javax/xml/validation/ValidatorHandler.java, javax/xml/xpath/XPathConstants.java, javax/xml/xpath/XPathException.java, javax/xml/xpath/XPathExpression.java, javax/xml/xpath/XPathExpressionException.java, javax/xml/xpath/XPathFactory.java, javax/xml/xpath/XPathFactoryConfigurationException.java, javax/xml/xpath/XPathFunction.java, javax/xml/xpath/XPathFunctionException.java, javax/xml/xpath/XPathFunctionResolver.java: Fixed usage of @author tag, reworked import statements, removed CVS tags, changed the modifier order and fixed HTML usage in javadocs. From-SVN: r95152
804 lines
29 KiB
Java
804 lines
29 KiB
Java
/* DataInputStream.java -- FilteredInputStream that implements DataInput
|
|
Copyright (C) 1998, 1999, 2000, 2001, 2003 Free Software Foundation
|
|
|
|
This file is part of GNU Classpath.
|
|
|
|
GNU Classpath is free software; you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation; either version 2, or (at your option)
|
|
any later version.
|
|
|
|
GNU Classpath is distributed in the hope that it will be useful, but
|
|
WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with GNU Classpath; see the file COPYING. If not, write to the
|
|
Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
|
|
02111-1307 USA.
|
|
|
|
Linking this library statically or dynamically with other modules is
|
|
making a combined work based on this library. Thus, the terms and
|
|
conditions of the GNU General Public License cover the whole
|
|
combination.
|
|
|
|
As a special exception, the copyright holders of this library give you
|
|
permission to link this library with independent modules to produce an
|
|
executable, regardless of the license terms of these independent
|
|
modules, and to copy and distribute the resulting executable under
|
|
terms of your choice, provided that you also meet, for each linked
|
|
independent module, the terms and conditions of the license of that
|
|
module. An independent module is a module which is not derived from
|
|
or based on this library. If you modify this library, you may extend
|
|
this exception to your version of the library, but you are not
|
|
obligated to do so. If you do not wish to do so, delete this
|
|
exception statement from your version. */
|
|
|
|
package java.io;
|
|
|
|
/* Written using "Java Class Libraries", 2nd edition, ISBN 0-201-31002-3
|
|
* "The Java Language Specification", ISBN 0-201-63451-1
|
|
* plus online API docs for JDK 1.2 beta from http://www.javasoft.com.
|
|
* Status: Believed complete and correct.
|
|
*/
|
|
|
|
/**
|
|
* This subclass of <code>FilteredInputStream</code> implements the
|
|
* <code>DataInput</code> interface that provides method for reading primitive
|
|
* Java data types from a stream.
|
|
*
|
|
* @see DataInput
|
|
*
|
|
* @author Warren Levy (warrenl@cygnus.com)
|
|
* @author Aaron M. Renn (arenn@urbanophile.com)
|
|
* @date October 20, 1998.
|
|
*/
|
|
public class DataInputStream extends FilterInputStream implements DataInput
|
|
{
|
|
// readLine() hack to ensure that an '\r' not followed by an '\n' is
|
|
// handled correctly. If set, readLine() will ignore the first char it sees
|
|
// if that char is a '\n'
|
|
boolean ignoreInitialNewline = false;
|
|
|
|
// Byte buffer, used to make primitive read calls more efficient.
|
|
byte[] buf = new byte [8];
|
|
|
|
/**
|
|
* This constructor initializes a new <code>DataInputStream</code>
|
|
* to read from the specified subordinate stream.
|
|
*
|
|
* @param in The subordinate <code>InputStream</code> to read from
|
|
*/
|
|
public DataInputStream (InputStream in)
|
|
{
|
|
super (in);
|
|
}
|
|
|
|
/**
|
|
* This method reads bytes from the underlying stream into the specified
|
|
* byte array buffer. It will attempt to fill the buffer completely, but
|
|
* may return a short count if there is insufficient data remaining to be
|
|
* read to fill the buffer.
|
|
*
|
|
* @param b The buffer into which bytes will be read.
|
|
*
|
|
* @return The actual number of bytes read, or -1 if end of stream reached
|
|
* before reading any bytes.
|
|
*
|
|
* @exception IOException If an error occurs.
|
|
*/
|
|
public final int read (byte[] b) throws IOException
|
|
{
|
|
return in.read (b, 0, b.length);
|
|
}
|
|
|
|
/**
|
|
* This method reads bytes from the underlying stream into the specified
|
|
* byte array buffer. It will attempt to read <code>len</code> bytes and
|
|
* will start storing them at position <code>off</code> into the buffer.
|
|
* This method can return a short count if there is insufficient data
|
|
* remaining to be read to complete the desired read length.
|
|
*
|
|
* @param b The buffer into which bytes will be read.
|
|
* @param off The offset into the buffer to start storing bytes.
|
|
* @param len The requested number of bytes to read.
|
|
*
|
|
* @return The actual number of bytes read, or -1 if end of stream reached
|
|
* before reading any bytes.
|
|
*
|
|
* @exception IOException If an error occurs.
|
|
*/
|
|
public final int read (byte[] b, int off, int len) throws IOException
|
|
{
|
|
return in.read (b, off, len);
|
|
}
|
|
|
|
/**
|
|
* This method reads a Java boolean value from an input stream. It does
|
|
* so by reading a single byte of data. If that byte is zero, then the
|
|
* value returned is <code>false</code>. If the byte is non-zero, then
|
|
* the value returned is <code>true</code>.
|
|
* <p>
|
|
* This method can read a <code>boolean</code> written by an object
|
|
* implementing the <code>writeBoolean()</code> method in the
|
|
* <code>DataOutput</code> interface.
|
|
*
|
|
* @return The <code>boolean</code> value read
|
|
*
|
|
* @exception EOFException If end of file is reached before reading
|
|
* the boolean
|
|
* @exception IOException If any other error occurs
|
|
*
|
|
* @see DataOutput#writeBoolean
|
|
*/
|
|
public final boolean readBoolean () throws IOException
|
|
{
|
|
return convertToBoolean (in.read ());
|
|
}
|
|
|
|
/**
|
|
* This method reads a Java byte value from an input stream. The value
|
|
* is in the range of -128 to 127.
|
|
* <p>
|
|
* This method can read a <code>byte</code> written by an object
|
|
* implementing the <code>writeByte()</code> method in the
|
|
* <code>DataOutput</code> interface.
|
|
*
|
|
* @return The <code>byte</code> value read
|
|
*
|
|
* @exception EOFException If end of file is reached before reading the byte
|
|
* @exception IOException If any other error occurs
|
|
*
|
|
* @see DataOutput#writeByte
|
|
*/
|
|
public final byte readByte () throws IOException
|
|
{
|
|
return convertToByte (in.read ());
|
|
}
|
|
|
|
/**
|
|
* This method reads a Java <code>char</code> value from an input stream.
|
|
* It operates by reading two bytes from the stream and converting them to
|
|
* a single 16-bit Java <code>char</code>. The two bytes are stored most
|
|
* significant byte first (i.e., "big endian") regardless of the native
|
|
* host byte ordering.
|
|
* <p>
|
|
* As an example, if <code>byte1</code> and <code>byte2</code>
|
|
* represent the first and second byte read from the stream
|
|
* respectively, they will be transformed to a <code>char</code> in
|
|
* the following manner:
|
|
* <p>
|
|
* <code>(char)(((byte1 & 0xFF) << 8) | (byte2 & 0xFF)</code>
|
|
* <p>
|
|
* This method can read a <code>char</code> written by an object
|
|
* implementing the <code>writeChar()</code> method in the
|
|
* <code>DataOutput</code> interface.
|
|
*
|
|
* @return The <code>char</code> value read
|
|
*
|
|
* @exception EOFException If end of file is reached before reading the char
|
|
* @exception IOException If any other error occurs
|
|
*
|
|
* @see DataOutput#writeChar
|
|
*/
|
|
public final char readChar () throws IOException
|
|
{
|
|
readFully (buf, 0, 2);
|
|
return convertToChar (buf);
|
|
}
|
|
|
|
/**
|
|
* This method reads a Java double value from an input stream. It operates
|
|
* by first reading a <code>long</code> value from the stream by calling the
|
|
* <code>readLong()</code> method in this interface, then converts
|
|
* that <code>long</code> to a <code>double</code> using the
|
|
* <code>longBitsToDouble</code> method in the class
|
|
* <code>java.lang.Double</code>
|
|
* <p>
|
|
* This method can read a <code>double</code> written by an object
|
|
* implementing the <code>writeDouble()</code> method in the
|
|
* <code>DataOutput</code> interface.
|
|
*
|
|
* @return The <code>double</code> value read
|
|
*
|
|
* @exception EOFException If end of file is reached before reading
|
|
* the double
|
|
* @exception IOException If any other error occurs
|
|
*
|
|
* @see DataOutput#writeDouble
|
|
* @see java.lang.Double#longBitsToDouble
|
|
*/
|
|
public final double readDouble () throws IOException
|
|
{
|
|
return Double.longBitsToDouble (readLong ());
|
|
}
|
|
|
|
/**
|
|
* This method reads a Java float value from an input stream. It
|
|
* operates by first reading an <code>int</code> value from the
|
|
* stream by calling the <code>readInt()</code> method in this
|
|
* interface, then converts that <code>int</code> to a
|
|
* <code>float</code> using the <code>intBitsToFloat</code> method
|
|
* in the class <code>java.lang.Float</code>
|
|
* <p>
|
|
* This method can read a <code>float</code> written by an object
|
|
* implementing the <code>writeFloat()</code> method in the
|
|
* <code>DataOutput</code> interface.
|
|
*
|
|
* @return The <code>float</code> value read
|
|
*
|
|
* @exception EOFException If end of file is reached before reading the float
|
|
* @exception IOException If any other error occurs
|
|
*
|
|
* @see DataOutput#writeFloat
|
|
* @see java.lang.Float#intBitsToFloat
|
|
*/
|
|
public final float readFloat () throws IOException
|
|
{
|
|
return Float.intBitsToFloat (readInt ());
|
|
}
|
|
|
|
/**
|
|
* This method reads raw bytes into the passed array until the array is
|
|
* full. Note that this method blocks until the data is available and
|
|
* throws an exception if there is not enough data left in the stream to
|
|
* fill the buffer. Note also that zero length buffers are permitted.
|
|
* In this case, the method will return immediately without reading any
|
|
* bytes from the stream.
|
|
*
|
|
* @param b The buffer into which to read the data
|
|
*
|
|
* @exception EOFException If end of file is reached before filling the
|
|
* buffer
|
|
* @exception IOException If any other error occurs
|
|
*/
|
|
public final void readFully (byte[] b) throws IOException
|
|
{
|
|
readFully (b, 0, b.length);
|
|
}
|
|
|
|
/**
|
|
* This method reads raw bytes into the passed array <code>buf</code>
|
|
* starting
|
|
* <code>offset</code> bytes into the buffer. The number of bytes read
|
|
* will be
|
|
* exactly <code>len</code>. Note that this method blocks until the data is
|
|
* available and throws an exception if there is not enough data left in
|
|
* the stream to read <code>len</code> bytes. Note also that zero length
|
|
* buffers are permitted. In this case, the method will return immediately
|
|
* without reading any bytes from the stream.
|
|
*
|
|
* @param buf The buffer into which to read the data
|
|
* @param offset The offset into the buffer to start storing data
|
|
* @param len The number of bytes to read into the buffer
|
|
*
|
|
* @exception EOFException If end of file is reached before filling the
|
|
* buffer
|
|
* @exception IOException If any other error occurs
|
|
*/
|
|
public final void readFully (byte[] buf, int offset, int len) throws IOException
|
|
{
|
|
if (len < 0)
|
|
throw new IndexOutOfBoundsException("Negative length: " + len);
|
|
|
|
while (len > 0)
|
|
{
|
|
// in.read will block until some data is available.
|
|
int numread = in.read (buf, offset, len);
|
|
if (numread < 0)
|
|
throw new EOFException ();
|
|
len -= numread;
|
|
offset += numread;
|
|
}
|
|
}
|
|
|
|
/**
|
|
* This method reads a Java <code>int</code> value from an input stream
|
|
* It operates by reading four bytes from the stream and converting them to
|
|
* a single Java <code>int</code>. The bytes are stored most
|
|
* significant byte first (i.e., "big endian") regardless of the native
|
|
* host byte ordering.
|
|
* <p>
|
|
* As an example, if <code>byte1</code> through <code>byte4</code> represent
|
|
* the first four bytes read from the stream, they will be
|
|
* transformed to an <code>int</code> in the following manner:
|
|
* <p>
|
|
* <code>(int)(((byte1 & 0xFF) << 24) + ((byte2 & 0xFF) << 16) +
|
|
* ((byte3 & 0xFF)<< 8) + (byte4 & 0xFF)))</code>
|
|
* <p>
|
|
* The value returned is in the range of -2147483648 to 2147483647.
|
|
* <p>
|
|
* This method can read an <code>int</code> written by an object
|
|
* implementing the <code>writeInt()</code> method in the
|
|
* <code>DataOutput</code> interface.
|
|
*
|
|
* @return The <code>int</code> value read
|
|
*
|
|
* @exception EOFException If end of file is reached before reading the int
|
|
* @exception IOException If any other error occurs
|
|
*
|
|
* @see DataOutput#writeInt
|
|
*/
|
|
public final int readInt () throws IOException
|
|
{
|
|
readFully (buf, 0, 4);
|
|
return convertToInt (buf);
|
|
}
|
|
|
|
/**
|
|
* This method reads the next line of text data from an input
|
|
* stream. It operates by reading bytes and converting those bytes
|
|
* to <code>char</code> values by treating the byte read as the low
|
|
* eight bits of the <code>char</code> and using 0 as the high eight
|
|
* bits. Because of this, it does not support the full 16-bit
|
|
* Unicode character set.
|
|
* <p>
|
|
* The reading of bytes ends when either the end of file or a line
|
|
* terminator is encountered. The bytes read are then returned as a
|
|
* <code>String</code> A line terminator is a byte sequence
|
|
* consisting of either <code>\r</code>, <code>\n</code> or
|
|
* <code>\r\n</code>. These termination charaters are discarded and
|
|
* are not returned as part of the string.
|
|
* <p>
|
|
* This method can read data that was written by an object implementing the
|
|
* <code>writeLine()</code> method in <code>DataOutput</code>.
|
|
*
|
|
* @return The line read as a <code>String</code>
|
|
*
|
|
* @exception IOException If an error occurs
|
|
*
|
|
* @see DataOutput
|
|
*
|
|
* @deprecated
|
|
*/
|
|
public final String readLine () throws IOException
|
|
{
|
|
StringBuffer strb = new StringBuffer ();
|
|
|
|
readloop: while (true)
|
|
{
|
|
int c = 0;
|
|
char ch = ' ';
|
|
boolean getnext = true;
|
|
while (getnext)
|
|
{
|
|
getnext = false;
|
|
c = in.read();
|
|
if (c < 0) // got an EOF
|
|
return strb.length () > 0 ? strb.toString () : null;
|
|
ch = (char) c;
|
|
if ((ch &= 0xFF) == '\n')
|
|
// hack to correctly handle '\r\n' sequences
|
|
if (ignoreInitialNewline)
|
|
{
|
|
ignoreInitialNewline = false;
|
|
getnext = true;
|
|
}
|
|
else
|
|
break readloop;
|
|
}
|
|
|
|
if (ch == '\r')
|
|
{
|
|
// FIXME: The following code tries to adjust the stream back one
|
|
// character if the next char read is '\n'. As a last resort,
|
|
// it tries to mark the position before reading but the bottom
|
|
// line is that it is possible that this method will not properly
|
|
// deal with a '\r' '\n' combination thus not fulfilling the
|
|
// DataInput contract for readLine. It's not a particularly
|
|
// safe approach threadwise since it is unsynchronized and
|
|
// since it might mark an input stream behind the users back.
|
|
// Along the same vein it could try the same thing for
|
|
// ByteArrayInputStream and PushbackInputStream, but that is
|
|
// probably overkill since this is deprecated & BufferedInputStream
|
|
// is the most likely type of input stream.
|
|
//
|
|
// The alternative is to somehow push back the next byte if it
|
|
// isn't a '\n' or to have the reading methods of this class
|
|
// keep track of whether the last byte read was '\r' by readLine
|
|
// and then skip the very next byte if it is '\n'. Either way,
|
|
// this would increase the complexity of the non-deprecated methods
|
|
// and since it is undesirable to make non-deprecated methods
|
|
// less efficient, the following seems like the most reasonable
|
|
// approach.
|
|
int next_c = 0;
|
|
char next_ch = ' ';
|
|
if (in instanceof BufferedInputStream)
|
|
{
|
|
next_c = in.read();
|
|
next_ch = (char) (next_c & 0xFF);
|
|
if ((next_ch != '\n') && (next_c >= 0))
|
|
{
|
|
BufferedInputStream bin = (BufferedInputStream) in;
|
|
if (bin.pos > 0)
|
|
bin.pos--;
|
|
}
|
|
}
|
|
else if (markSupported())
|
|
{
|
|
next_c = in.read();
|
|
next_ch = (char) (next_c & 0xFF);
|
|
if ((next_ch != '\n') && (next_c >= 0))
|
|
{
|
|
mark(1);
|
|
if ((in.read() & 0xFF) != '\n')
|
|
reset();
|
|
}
|
|
}
|
|
// In order to catch cases where 'in' isn't a BufferedInputStream
|
|
// and doesn't support mark() (such as reading from a Socket), set
|
|
// a flag that instructs readLine() to ignore the first character
|
|
// it sees _if_ that character is a '\n'.
|
|
else ignoreInitialNewline = true;
|
|
break;
|
|
}
|
|
strb.append(ch);
|
|
}
|
|
|
|
return strb.length() > 0 ? strb.toString() : "";
|
|
}
|
|
|
|
/**
|
|
* This method reads a Java <code>long</code> value from an input stream
|
|
* It operates by reading eight bytes from the stream and converting them to
|
|
* a single Java <code>long</code>. The bytes are stored most
|
|
* significant byte first (i.e., "big endian") regardless of the native
|
|
* host byte ordering.
|
|
* <p>
|
|
* As an example, if <code>byte1</code> through <code>byte8</code> represent
|
|
* the first eight bytes read from the stream, they will be
|
|
* transformed to an <code>long</code> in the following manner:
|
|
* <p>
|
|
* <code>(long)(((byte1 & 0xFF) << 56) + ((byte2 & 0xFF) << 48) +
|
|
* ((byte3 & 0xFF) << 40) + ((byte4 & 0xFF) << 32) +
|
|
* ((byte5 & 0xFF) << 24) + ((byte6 & 0xFF) << 16) +
|
|
* ((byte7 & 0xFF) << 8) + (byte8 & 0xFF)))
|
|
* </code>
|
|
* <p>
|
|
* The value returned is in the range of -9223372036854775808 to
|
|
* 9223372036854775807.
|
|
* <p>
|
|
* This method can read an <code>long</code> written by an object
|
|
* implementing the <code>writeLong()</code> method in the
|
|
* <code>DataOutput</code> interface.
|
|
*
|
|
* @return The <code>long</code> value read
|
|
*
|
|
* @exception EOFException If end of file is reached before reading the long
|
|
* @exception IOException If any other error occurs
|
|
*
|
|
* @see DataOutput#writeLong
|
|
*/
|
|
public final long readLong () throws IOException
|
|
{
|
|
readFully (buf, 0, 8);
|
|
return convertToLong (buf);
|
|
}
|
|
|
|
/**
|
|
* This method reads a signed 16-bit value into a Java in from the
|
|
* stream. It operates by reading two bytes from the stream and
|
|
* converting them to a single 16-bit Java <code>short</code>. The
|
|
* two bytes are stored most significant byte first (i.e., "big
|
|
* endian") regardless of the native host byte ordering.
|
|
* <p>
|
|
* As an example, if <code>byte1</code> and <code>byte2</code>
|
|
* represent the first and second byte read from the stream
|
|
* respectively, they will be transformed to a <code>short</code>. in
|
|
* the following manner:
|
|
* <p>
|
|
* <code>(short)(((byte1 & 0xFF) << 8) | (byte2 & 0xFF))</code>
|
|
* <p>
|
|
* The value returned is in the range of -32768 to 32767.
|
|
* <p>
|
|
* This method can read a <code>short</code> written by an object
|
|
* implementing the <code>writeShort()</code> method in the
|
|
* <code>DataOutput</code> interface.
|
|
*
|
|
* @return The <code>short</code> value read
|
|
*
|
|
* @exception EOFException If end of file is reached before reading the value
|
|
* @exception IOException If any other error occurs
|
|
*
|
|
* @see DataOutput#writeShort
|
|
*/
|
|
public final short readShort () throws IOException
|
|
{
|
|
readFully (buf, 0, 2);
|
|
return convertToShort (buf);
|
|
}
|
|
|
|
/**
|
|
* This method reads 8 unsigned bits into a Java <code>int</code>
|
|
* value from the stream. The value returned is in the range of 0 to
|
|
* 255.
|
|
* <p>
|
|
* This method can read an unsigned byte written by an object
|
|
* implementing the <code>writeUnsignedByte()</code> method in the
|
|
* <code>DataOutput</code> interface.
|
|
*
|
|
* @return The unsigned bytes value read as a Java <code>int</code>.
|
|
*
|
|
* @exception EOFException If end of file is reached before reading the value
|
|
* @exception IOException If any other error occurs
|
|
*
|
|
* @see DataOutput#writeByte
|
|
*/
|
|
public final int readUnsignedByte () throws IOException
|
|
{
|
|
return convertToUnsignedByte (in.read ());
|
|
}
|
|
|
|
/**
|
|
* This method reads 16 unsigned bits into a Java int value from the stream.
|
|
* It operates by reading two bytes from the stream and converting them to
|
|
* a single Java <code>int</code> The two bytes are stored most
|
|
* significant byte first (i.e., "big endian") regardless of the native
|
|
* host byte ordering.
|
|
* <p>
|
|
* As an example, if <code>byte1</code> and <code>byte2</code>
|
|
* represent the first and second byte read from the stream
|
|
* respectively, they will be transformed to an <code>int</code> in
|
|
* the following manner:
|
|
* <p>
|
|
* <code>(int)(((byte1 & 0xFF) << 8) + (byte2 & 0xFF))</code>
|
|
* <p>
|
|
* The value returned is in the range of 0 to 65535.
|
|
* <p>
|
|
* This method can read an unsigned short written by an object
|
|
* implementing the <code>writeUnsignedShort()</code> method in the
|
|
* <code>DataOutput</code> interface.
|
|
*
|
|
* @return The unsigned short value read as a Java <code>int</code>
|
|
*
|
|
* @exception EOFException If end of file is reached before reading the value
|
|
* @exception IOException If any other error occurs
|
|
*
|
|
* @see DataOutput#writeShort
|
|
*/
|
|
public final int readUnsignedShort () throws IOException
|
|
{
|
|
readFully (buf, 0, 2);
|
|
return convertToUnsignedShort (buf);
|
|
}
|
|
|
|
/**
|
|
* This method reads a <code>String</code> from an input stream that
|
|
* is encoded in a modified UTF-8 format. This format has a leading
|
|
* two byte sequence that contains the remaining number of bytes to
|
|
* read. This two byte sequence is read using the
|
|
* <code>readUnsignedShort()</code> method of this interface.
|
|
* <p>
|
|
* After the number of remaining bytes have been determined, these
|
|
* bytes are read an transformed into <code>char</code> values.
|
|
* These <code>char</code> values are encoded in the stream using
|
|
* either a one, two, or three byte format. The particular format
|
|
* in use can be determined by examining the first byte read.
|
|
* <p>
|
|
* If the first byte has a high order bit of 0, then that character
|
|
* consists on only one byte. This character value consists of
|
|
* seven bits that are at positions 0 through 6 of the byte. As an
|
|
* example, if <code>byte1</code> is the byte read from the stream,
|
|
* it would be converted to a <code>char</code> like so:
|
|
* <p>
|
|
* <code>(char)byte1</code>
|
|
* <p>
|
|
* If the first byte has 110 as its high order bits, then the
|
|
* character consists of two bytes. The bits that make up the character
|
|
* value are in positions 0 through 4 of the first byte and bit positions
|
|
* 0 through 5 of the second byte. (The second byte should have
|
|
* 10 as its high order bits). These values are in most significant
|
|
* byte first (i.e., "big endian") order.
|
|
* <p>
|
|
* As an example, if <code>byte1</code> and <code>byte2</code> are
|
|
* the first two bytes read respectively, and the high order bits of
|
|
* them match the patterns which indicate a two byte character
|
|
* encoding, then they would be converted to a Java
|
|
* <code>char</code> like so:
|
|
* <p>
|
|
* <code>(char)(((byte1 & 0x1F) << 6) | (byte2 & 0x3F))</code>
|
|
* <p>
|
|
* If the first byte has a 1110 as its high order bits, then the
|
|
* character consists of three bytes. The bits that make up the character
|
|
* value are in positions 0 through 3 of the first byte and bit positions
|
|
* 0 through 5 of the other two bytes. (The second and third bytes should
|
|
* have 10 as their high order bits). These values are in most
|
|
* significant byte first (i.e., "big endian") order.
|
|
* <p>
|
|
* As an example, if <code>byte1</code> <code>byte2</code> and
|
|
* <code>byte3</code> are the three bytes read, and the high order
|
|
* bits of them match the patterns which indicate a three byte
|
|
* character encoding, then they would be converted to a Java
|
|
* <code>char</code> like so:
|
|
* <p>
|
|
* <code>(char)(((byte1 & 0x0F) << 12) | ((byte2 & 0x3F) << 6) |
|
|
* (byte3 & 0x3F))</code>
|
|
* <p>
|
|
* Note that all characters are encoded in the method that requires
|
|
* the fewest number of bytes with the exception of the character
|
|
* with the value of <code>\u0000</code> which is encoded as two
|
|
* bytes. This is a modification of the UTF standard used to
|
|
* prevent C language style <code>NUL</code> values from appearing
|
|
* in the byte stream.
|
|
* <p>
|
|
* This method can read data that was written by an object implementing the
|
|
* <code>writeUTF()</code> method in <code>DataOutput</code>
|
|
*
|
|
* @return The <code>String</code> read
|
|
*
|
|
* @exception EOFException If end of file is reached before reading
|
|
* the String
|
|
* @exception UTFDataFormatException If the data is not in UTF-8 format
|
|
* @exception IOException If any other error occurs
|
|
*
|
|
* @see DataOutput#writeUTF
|
|
*/
|
|
public final String readUTF () throws IOException
|
|
{
|
|
return readUTF (this);
|
|
}
|
|
|
|
/**
|
|
* This method reads a String encoded in UTF-8 format from the
|
|
* specified <code>DataInput</code> source.
|
|
*
|
|
* @param in The <code>DataInput</code> source to read from
|
|
*
|
|
* @return The String read from the source
|
|
*
|
|
* @exception IOException If an error occurs
|
|
*
|
|
* @see DataInput#readUTF
|
|
*/
|
|
public static final String readUTF(DataInput in) throws IOException
|
|
{
|
|
final int UTFlen = in.readUnsignedShort ();
|
|
byte[] buf = new byte [UTFlen];
|
|
|
|
// This blocks until the entire string is available rather than
|
|
// doing partial processing on the bytes that are available and then
|
|
// blocking. An advantage of the latter is that Exceptions
|
|
// could be thrown earlier. The former is a bit cleaner.
|
|
in.readFully (buf, 0, UTFlen);
|
|
|
|
return convertFromUTF (buf);
|
|
}
|
|
|
|
/**
|
|
* This method attempts to skip and discard the specified number of bytes
|
|
* in the input stream. It may actually skip fewer bytes than requested.
|
|
* This method will not skip any bytes if passed a negative number of bytes
|
|
* to skip.
|
|
*
|
|
* @param n The requested number of bytes to skip.
|
|
*
|
|
* @return The requested number of bytes to skip.
|
|
*
|
|
* @exception IOException If an error occurs.
|
|
* @specnote The JDK docs claim that this returns the number of bytes
|
|
* actually skipped. The JCL claims that this method can throw an
|
|
* EOFException. Neither of these appear to be true in the JDK 1.3's
|
|
* implementation. This tries to implement the actual JDK behaviour.
|
|
*/
|
|
public final int skipBytes (int n) throws IOException
|
|
{
|
|
if (n <= 0)
|
|
return 0;
|
|
try
|
|
{
|
|
return (int) in.skip (n);
|
|
}
|
|
catch (EOFException x)
|
|
{
|
|
// do nothing.
|
|
}
|
|
return n;
|
|
}
|
|
|
|
static boolean convertToBoolean (int b) throws EOFException
|
|
{
|
|
if (b < 0)
|
|
throw new EOFException ();
|
|
|
|
return (b != 0);
|
|
}
|
|
|
|
static byte convertToByte (int i) throws EOFException
|
|
{
|
|
if (i < 0)
|
|
throw new EOFException ();
|
|
|
|
return (byte) i;
|
|
}
|
|
|
|
static int convertToUnsignedByte (int i) throws EOFException
|
|
{
|
|
if (i < 0)
|
|
throw new EOFException ();
|
|
|
|
return (i & 0xFF);
|
|
}
|
|
|
|
static char convertToChar (byte[] buf)
|
|
{
|
|
return (char) ((buf [0] << 8)
|
|
| (buf [1] & 0xff));
|
|
}
|
|
|
|
static short convertToShort (byte[] buf)
|
|
{
|
|
return (short) ((buf [0] << 8)
|
|
| (buf [1] & 0xff));
|
|
}
|
|
|
|
static int convertToUnsignedShort (byte[] buf)
|
|
{
|
|
return (((buf [0] & 0xff) << 8)
|
|
| (buf [1] & 0xff));
|
|
}
|
|
|
|
static int convertToInt (byte[] buf)
|
|
{
|
|
return (((buf [0] & 0xff) << 24)
|
|
| ((buf [1] & 0xff) << 16)
|
|
| ((buf [2] & 0xff) << 8)
|
|
| (buf [3] & 0xff));
|
|
}
|
|
|
|
static long convertToLong (byte[] buf)
|
|
{
|
|
return (((long)(buf [0] & 0xff) << 56) |
|
|
((long)(buf [1] & 0xff) << 48) |
|
|
((long)(buf [2] & 0xff) << 40) |
|
|
((long)(buf [3] & 0xff) << 32) |
|
|
((long)(buf [4] & 0xff) << 24) |
|
|
((long)(buf [5] & 0xff) << 16) |
|
|
((long)(buf [6] & 0xff) << 8) |
|
|
((long)(buf [7] & 0xff)));
|
|
}
|
|
|
|
// FIXME: This method should be re-thought. I suspect we have multiple
|
|
// UTF-8 decoders floating around. We should use the standard charset
|
|
// converters, maybe and adding a direct call into one of the new
|
|
// NIO converters for a super-fast UTF8 decode.
|
|
static String convertFromUTF (byte[] buf)
|
|
throws EOFException, UTFDataFormatException
|
|
{
|
|
// Give StringBuffer an initial estimated size to avoid
|
|
// enlarge buffer frequently
|
|
StringBuffer strbuf = new StringBuffer (buf.length / 2 + 2);
|
|
|
|
for (int i = 0; i < buf.length; )
|
|
{
|
|
if ((buf [i] & 0x80) == 0) // bit pattern 0xxxxxxx
|
|
strbuf.append ((char) (buf [i++] & 0xFF));
|
|
else if ((buf [i] & 0xE0) == 0xC0) // bit pattern 110xxxxx
|
|
{
|
|
if (i + 1 >= buf.length
|
|
|| (buf [i + 1] & 0xC0) != 0x80)
|
|
throw new UTFDataFormatException ();
|
|
|
|
strbuf.append((char) (((buf [i++] & 0x1F) << 6)
|
|
| (buf [i++] & 0x3F)));
|
|
}
|
|
else if ((buf [i] & 0xF0) == 0xE0) // bit pattern 1110xxxx
|
|
{
|
|
if (i + 2 >= buf.length
|
|
|| (buf [i + 1] & 0xC0) != 0x80
|
|
|| (buf [i + 2] & 0xC0) != 0x80)
|
|
throw new UTFDataFormatException ();
|
|
|
|
strbuf.append ((char) (((buf [i++] & 0x0F) << 12)
|
|
| ((buf [i++] & 0x3F) << 6)
|
|
| (buf [i++] & 0x3F)));
|
|
}
|
|
else // must be ((buf [i] & 0xF0) == 0xF0 || (buf [i] & 0xC0) == 0x80)
|
|
throw new UTFDataFormatException (); // bit patterns 1111xxxx or
|
|
// 10xxxxxx
|
|
}
|
|
|
|
return strbuf.toString ();
|
|
}
|
|
}
|