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
582 lines
18 KiB
Java
582 lines
18 KiB
Java
/* BufferedReader.java
|
|
Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
|
|
Free Software Foundation, Inc.
|
|
|
|
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, plus online
|
|
* API docs for JDK 1.2 beta from http://www.javasoft.com.
|
|
* Status: Believed complete and correct.
|
|
*/
|
|
|
|
/**
|
|
* This subclass of <code>FilterReader</code> buffers input from an
|
|
* underlying implementation to provide a possibly more efficient read
|
|
* mechanism. It maintains the buffer and buffer state in instance
|
|
* variables that are available to subclasses. The default buffer size
|
|
* of 8192 chars can be overridden by the creator of the stream.
|
|
* <p>
|
|
* This class also implements mark/reset functionality. It is capable
|
|
* of remembering any number of input chars, to the limits of
|
|
* system memory or the size of <code>Integer.MAX_VALUE</code>
|
|
*
|
|
* @author Per Bothner (bothner@cygnus.com)
|
|
* @author Aaron M. Renn (arenn@urbanophile.com)
|
|
*/
|
|
public class BufferedReader extends Reader
|
|
{
|
|
Reader in;
|
|
char[] buffer;
|
|
/* Index of current read position. Must be >= 0 and <= limit. */
|
|
/* There is a special case where pos may be equal to limit+1; this
|
|
* is used as an indicator that a readLine was done with a '\r' was
|
|
* the very last char in the buffer. Since we don't want to read-ahead
|
|
* and potentially block, we set pos this way to indicate the situation
|
|
* and deal with it later. Doing it this way rather than having a
|
|
* separate boolean field to indicate the condition has the advantage
|
|
* that it is self-clearing on things like mark/reset.
|
|
*/
|
|
int pos;
|
|
/* Limit of valid data in buffer. Must be >= pos and <= buffer.length. */
|
|
/* This can be < pos in the one special case described above. */
|
|
int limit;
|
|
|
|
/* The value -1 means there is no mark, or the mark has been invalidated.
|
|
Otherwise, markPos is the index in the buffer of the marked position.
|
|
Must be >= 0 and <= pos.
|
|
Note we do not explicitly store the read-limit.
|
|
The implicit read-limit is (buffer.length - markPos), which is
|
|
guaranteed to be >= the read-limit requested in the call to mark. */
|
|
int markPos = -1;
|
|
|
|
// The JCL book specifies the default buffer size as 8K characters.
|
|
// This is package-private because it is used by LineNumberReader.
|
|
static final int DEFAULT_BUFFER_SIZE = 8192;
|
|
|
|
/**
|
|
* The line buffer for <code>readLine</code>.
|
|
*/
|
|
private StringBuffer sbuf = null;
|
|
|
|
/**
|
|
* Create a new <code>BufferedReader</code> that will read from the
|
|
* specified subordinate stream with a default buffer size of 8192 chars.
|
|
*
|
|
* @param in The subordinate stream to read from
|
|
*/
|
|
public BufferedReader(Reader in)
|
|
{
|
|
this(in, DEFAULT_BUFFER_SIZE);
|
|
}
|
|
|
|
/**
|
|
* Create a new <code>BufferedReader</code> that will read from the
|
|
* specified subordinate stream with a buffer size that is specified by the
|
|
* caller.
|
|
*
|
|
* @param in The subordinate stream to read from
|
|
* @param size The buffer size to use
|
|
*
|
|
* @exception IllegalArgumentException if size <= 0
|
|
*/
|
|
public BufferedReader(Reader in, int size)
|
|
{
|
|
super(in.lock);
|
|
if (size <= 0)
|
|
throw new IllegalArgumentException("Illegal buffer size: " + size);
|
|
this.in = in;
|
|
buffer = new char[size];
|
|
}
|
|
|
|
/**
|
|
* This method closes the underlying stream and frees any associated
|
|
* resources.
|
|
*
|
|
* @exception IOException If an error occurs
|
|
*/
|
|
public void close() throws IOException
|
|
{
|
|
synchronized (lock)
|
|
{
|
|
if (in != null)
|
|
in.close();
|
|
in = null;
|
|
buffer = null;
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Returns <code>true</code> to indicate that this class supports mark/reset
|
|
* functionality.
|
|
*
|
|
* @return <code>true</code>
|
|
*/
|
|
public boolean markSupported()
|
|
{
|
|
return true;
|
|
}
|
|
|
|
/**
|
|
* Mark a position in the input to which the stream can be
|
|
* "reset" by calling the <code>reset()</code> method. The parameter
|
|
* <code>readLimit</code> is the number of chars that can be read from the
|
|
* stream after setting the mark before the mark becomes invalid. For
|
|
* example, if <code>mark()</code> is called with a read limit of 10, then
|
|
* when 11 chars of data are read from the stream before the
|
|
* <code>reset()</code> method is called, then the mark is invalid and the
|
|
* stream object instance is not required to remember the mark.
|
|
* <p>
|
|
* Note that the number of chars that can be remembered by this method
|
|
* can be greater than the size of the internal read buffer. It is also
|
|
* not dependent on the subordinate stream supporting mark/reset
|
|
* functionality.
|
|
*
|
|
* @param readLimit The number of chars that can be read before the mark
|
|
* becomes invalid
|
|
*
|
|
* @exception IOException If an error occurs
|
|
* @exception IllegalArgumentException if readLimit is negative.
|
|
*/
|
|
public void mark(int readLimit) throws IOException
|
|
{
|
|
if (readLimit < 0)
|
|
throw new IllegalArgumentException("Read-ahead limit is negative");
|
|
|
|
synchronized (lock)
|
|
{
|
|
checkStatus();
|
|
// In this method we need to be aware of the special case where
|
|
// pos + 1 == limit. This indicates that a '\r' was the last char
|
|
// in the buffer during a readLine. We'll want to maintain that
|
|
// condition after we shift things around and if a larger buffer is
|
|
// needed to track readLimit, we'll have to make it one element
|
|
// larger to ensure we don't invalidate the mark too early, if the
|
|
// char following the '\r' is NOT a '\n'. This is ok because, per
|
|
// the spec, we are not required to invalidate when passing readLimit.
|
|
//
|
|
// Note that if 'pos > limit', then doing 'limit -= pos' will cause
|
|
// limit to be negative. This is the only way limit will be < 0.
|
|
|
|
if (pos + readLimit > limit)
|
|
{
|
|
char[] old_buffer = buffer;
|
|
int extraBuffSpace = 0;
|
|
if (pos > limit)
|
|
extraBuffSpace = 1;
|
|
if (readLimit + extraBuffSpace > limit)
|
|
buffer = new char[readLimit + extraBuffSpace];
|
|
limit -= pos;
|
|
if (limit >= 0)
|
|
{
|
|
System.arraycopy(old_buffer, pos, buffer, 0, limit);
|
|
pos = 0;
|
|
}
|
|
}
|
|
|
|
if (limit < 0)
|
|
{
|
|
// Maintain the relationship of 'pos > limit'.
|
|
pos = 1;
|
|
limit = markPos = 0;
|
|
}
|
|
else
|
|
markPos = pos;
|
|
// Now pos + readLimit <= buffer.length. thus if we need to read
|
|
// beyond buffer.length, then we are allowed to invalidate markPos.
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Reset the stream to the point where the <code>mark()</code> method
|
|
* was called. Any chars that were read after the mark point was set will
|
|
* be re-read during subsequent reads.
|
|
* <p>
|
|
* This method will throw an IOException if the number of chars read from
|
|
* the stream since the call to <code>mark()</code> exceeds the mark limit
|
|
* passed when establishing the mark.
|
|
*
|
|
* @exception IOException If an error occurs;
|
|
*/
|
|
public void reset() throws IOException
|
|
{
|
|
synchronized (lock)
|
|
{
|
|
checkStatus();
|
|
if (markPos < 0)
|
|
throw new IOException("mark never set or invalidated");
|
|
|
|
// Need to handle the extremely unlikely case where a readLine was
|
|
// done with a '\r' as the last char in the buffer; which was then
|
|
// immediately followed by a mark and a reset with NO intervening
|
|
// read of any sort. In that case, setting pos to markPos would
|
|
// lose that info and a subsequent read would thus not skip a '\n'
|
|
// (if one exists). The value of limit in this rare case is zero.
|
|
// We can assume that if limit is zero for other reasons, then
|
|
// pos is already set to zero and doesn't need to be readjusted.
|
|
if (limit > 0)
|
|
pos = markPos;
|
|
}
|
|
}
|
|
|
|
/**
|
|
* This method determines whether or not a stream is ready to be read. If
|
|
* this method returns <code>false</code> then this stream could (but is
|
|
* not guaranteed to) block on the next read attempt.
|
|
*
|
|
* @return <code>true</code> if this stream is ready to be read,
|
|
* <code>false</code> otherwise
|
|
*
|
|
* @exception IOException If an error occurs
|
|
*/
|
|
public boolean ready() throws IOException
|
|
{
|
|
synchronized (lock)
|
|
{
|
|
checkStatus();
|
|
return pos < limit || in.ready();
|
|
}
|
|
}
|
|
|
|
/**
|
|
* This method read chars from a stream and stores them into a caller
|
|
* supplied buffer. It starts storing the data at index
|
|
* <code>offset</code> into
|
|
* the buffer and attempts to read <code>len</code> chars. This method can
|
|
* return before reading the number of chars requested. The actual number
|
|
* of chars read is returned as an int. A -1 is returned to indicate the
|
|
* end of the stream.
|
|
* <p>
|
|
* This method will block until some data can be read.
|
|
*
|
|
* @param buf The array into which the chars read should be stored
|
|
* @param offset The offset into the array to start storing chars
|
|
* @param count The requested number of chars to read
|
|
*
|
|
* @return The actual number of chars read, or -1 if end of stream.
|
|
*
|
|
* @exception IOException If an error occurs.
|
|
* @exception IndexOutOfBoundsException If offset and count are not
|
|
* valid regarding buf.
|
|
*/
|
|
public int read(char[] buf, int offset, int count) throws IOException
|
|
{
|
|
if (offset < 0 || offset + count > buf.length || count < 0)
|
|
throw new IndexOutOfBoundsException();
|
|
|
|
synchronized (lock)
|
|
{
|
|
checkStatus();
|
|
// Once again, we need to handle the special case of a readLine
|
|
// that has a '\r' at the end of the buffer. In this case, we'll
|
|
// need to skip a '\n' if it is the next char to be read.
|
|
// This special case is indicated by 'pos > limit'.
|
|
boolean retAtEndOfBuffer = false;
|
|
|
|
int avail = limit - pos;
|
|
if (count > avail)
|
|
{
|
|
if (avail > 0)
|
|
count = avail;
|
|
else // pos >= limit
|
|
{
|
|
if (limit == buffer.length)
|
|
markPos = -1; // read too far - invalidate the mark.
|
|
if (pos > limit)
|
|
{
|
|
// Set a boolean and make pos == limit to simplify things.
|
|
retAtEndOfBuffer = true;
|
|
--pos;
|
|
}
|
|
if (markPos < 0)
|
|
{
|
|
// Optimization: can read directly into buf.
|
|
if (count >= buffer.length && !retAtEndOfBuffer)
|
|
return in.read(buf, offset, count);
|
|
pos = limit = 0;
|
|
}
|
|
avail = in.read(buffer, limit, buffer.length - limit);
|
|
if (retAtEndOfBuffer && avail > 0 && buffer[limit] == '\n')
|
|
{
|
|
--avail;
|
|
limit++;
|
|
}
|
|
if (avail < count)
|
|
{
|
|
if (avail <= 0)
|
|
return avail;
|
|
count = avail;
|
|
}
|
|
limit += avail;
|
|
}
|
|
}
|
|
System.arraycopy(buffer, pos, buf, offset, count);
|
|
pos += count;
|
|
return count;
|
|
}
|
|
}
|
|
|
|
/* Read more data into the buffer. Update pos and limit appropriately.
|
|
Assumes pos==limit initially. May invalidate the mark if read too much.
|
|
Return number of chars read (never 0), or -1 on eof. */
|
|
private int fill() throws IOException
|
|
{
|
|
checkStatus();
|
|
// Handle the special case of a readLine that has a '\r' at the end of
|
|
// the buffer. In this case, we'll need to skip a '\n' if it is the
|
|
// next char to be read. This special case is indicated by 'pos > limit'.
|
|
boolean retAtEndOfBuffer = false;
|
|
if (pos > limit)
|
|
{
|
|
retAtEndOfBuffer = true;
|
|
--pos;
|
|
}
|
|
|
|
if (markPos >= 0 && limit == buffer.length)
|
|
markPos = -1;
|
|
if (markPos < 0)
|
|
pos = limit = 0;
|
|
int count = in.read(buffer, limit, buffer.length - limit);
|
|
if (count > 0)
|
|
limit += count;
|
|
|
|
if (retAtEndOfBuffer && buffer[pos] == '\n')
|
|
{
|
|
--count;
|
|
// If the mark was set to the location of the \n, then we
|
|
// must change it to fully pretend that the \n does not
|
|
// exist.
|
|
if (markPos == pos)
|
|
++markPos;
|
|
++pos;
|
|
}
|
|
|
|
return count;
|
|
}
|
|
|
|
public int read() throws IOException
|
|
{
|
|
synchronized (lock)
|
|
{
|
|
checkStatus();
|
|
if (pos >= limit && fill () <= 0)
|
|
return -1;
|
|
return buffer[pos++];
|
|
}
|
|
}
|
|
|
|
/* Return the end of the line starting at this.pos and ending at limit.
|
|
* The index returns is *before* any line terminators, or limit
|
|
* if no line terminators were found.
|
|
*/
|
|
private int lineEnd(int limit)
|
|
{
|
|
int i = pos;
|
|
for (; i < limit; i++)
|
|
{
|
|
char ch = buffer[i];
|
|
if (ch == '\n' || ch == '\r')
|
|
break;
|
|
}
|
|
return i;
|
|
}
|
|
|
|
/**
|
|
* This method reads a single line of text from the input stream, returning
|
|
* it as a <code>String</code>. A line is terminated by "\n", a "\r", or
|
|
* an "\r\n" sequence. The system dependent line separator is not used.
|
|
* The line termination characters are not returned in the resulting
|
|
* <code>String</code>.
|
|
*
|
|
* @return The line of text read, or <code>null</code> if end of stream.
|
|
*
|
|
* @exception IOException If an error occurs
|
|
*/
|
|
public String readLine() throws IOException
|
|
{
|
|
checkStatus();
|
|
// Handle the special case where a previous readLine (with no intervening
|
|
// reads/skips) had a '\r' at the end of the buffer.
|
|
// In this case, we'll need to skip a '\n' if it's the next char to be read.
|
|
// This special case is indicated by 'pos > limit'.
|
|
if (pos > limit)
|
|
{
|
|
int ch = read();
|
|
if (ch < 0)
|
|
return null;
|
|
if (ch != '\n')
|
|
--pos;
|
|
}
|
|
int i = lineEnd(limit);
|
|
if (i < limit)
|
|
{
|
|
String str = String.valueOf(buffer, pos, i - pos);
|
|
pos = i + 1;
|
|
// If the last char in the buffer is a '\r', we must remember
|
|
// to check if the next char to be read after the buffer is refilled
|
|
// is a '\n'. If so, skip it. To indicate this condition, we set pos
|
|
// to be limit + 1, which normally is never possible.
|
|
if (buffer[i] == '\r')
|
|
if (pos == limit || buffer[pos] == '\n')
|
|
pos++;
|
|
return str;
|
|
}
|
|
if (sbuf == null)
|
|
sbuf = new StringBuffer(200);
|
|
else
|
|
sbuf.setLength(0);
|
|
sbuf.append(buffer, pos, i - pos);
|
|
pos = i;
|
|
// We only want to return null when no characters were read before
|
|
// EOF. So we must keep track of this separately. Otherwise we
|
|
// would treat an empty `sbuf' as an EOF condition, which is wrong
|
|
// when there is just a newline.
|
|
boolean eof = false;
|
|
for (;;)
|
|
{
|
|
// readLine should block. So we must not return until a -1 is reached.
|
|
if (pos >= limit)
|
|
{
|
|
// here count == 0 isn't sufficient to give a failure.
|
|
int count = fill();
|
|
if (count < 0)
|
|
{
|
|
eof = true;
|
|
break;
|
|
}
|
|
continue;
|
|
}
|
|
int ch = buffer[pos++];
|
|
if (ch == '\n' || ch == '\r')
|
|
{
|
|
// Check here if a '\r' was the last char in the buffer; if so,
|
|
// mark it as in the comment above to indicate future reads
|
|
// should skip a newline that is the next char read after
|
|
// refilling the buffer.
|
|
if (ch == '\r')
|
|
if (pos == limit || buffer[pos] == '\n')
|
|
pos++;
|
|
break;
|
|
}
|
|
i = lineEnd(limit);
|
|
sbuf.append(buffer, pos - 1, i - (pos - 1));
|
|
pos = i;
|
|
}
|
|
return (sbuf.length() == 0 && eof) ? null : sbuf.toString();
|
|
}
|
|
|
|
/**
|
|
* This method skips the specified number of chars in the stream. It
|
|
* returns the actual number of chars skipped, which may be less than the
|
|
* requested amount.
|
|
* <p>
|
|
* This method first discards chars in the buffer, then calls the
|
|
* <code>skip</code> method on the underlying stream to skip the
|
|
* remaining chars.
|
|
*
|
|
* @param count The requested number of chars to skip
|
|
*
|
|
* @return The actual number of chars skipped.
|
|
*
|
|
* @exception IOException If an error occurs.
|
|
* @exception IllegalArgumentException If count is negative.
|
|
*/
|
|
public long skip(long count) throws IOException
|
|
{
|
|
synchronized (lock)
|
|
{
|
|
checkStatus();
|
|
if (count < 0)
|
|
throw new IllegalArgumentException("skip value is negative");
|
|
if (count == 0)
|
|
return 0;
|
|
// Yet again, we need to handle the special case of a readLine
|
|
// that has a '\r' at the end of the buffer. In this case, we need
|
|
// to ignore a '\n' if it is the next char to be read.
|
|
// This special case is indicated by 'pos > limit' (i.e. avail < 0).
|
|
// To simplify things, if we're dealing with the special case for
|
|
// readLine, just read the next char (since the fill method will
|
|
// skip the '\n' for us). By doing this, we'll have to back up pos.
|
|
// That's easier than trying to keep track of whether we've skipped
|
|
// one element or not.
|
|
if (pos > limit)
|
|
{
|
|
if (read() < 0)
|
|
return 0;
|
|
else
|
|
--pos;
|
|
}
|
|
|
|
int avail = limit - pos;
|
|
|
|
if (count < avail)
|
|
{
|
|
pos += count;
|
|
return count;
|
|
}
|
|
|
|
pos = limit;
|
|
long todo = count - avail;
|
|
if (todo > buffer.length)
|
|
{
|
|
markPos = -1;
|
|
todo -= in.skip(todo);
|
|
}
|
|
else
|
|
{
|
|
while (todo > 0)
|
|
{
|
|
avail = fill();
|
|
if (avail <= 0)
|
|
break;
|
|
if (avail > todo)
|
|
avail = (int) todo;
|
|
pos += avail;
|
|
todo -= avail;
|
|
}
|
|
}
|
|
return count - todo;
|
|
}
|
|
}
|
|
|
|
private void checkStatus() throws IOException
|
|
{
|
|
if (in == null)
|
|
throw new IOException("Stream closed");
|
|
}
|
|
}
|