Normalise whitespace in GNU Classpath.

2010-06-03 Andrew John Hughes <ahughes@redhat.com> * examples/gnu/classpath/examples/CORBA/NamingService/Demo.java, * examples/gnu/classpath/examples/CORBA/SimpleCommunication/Demo.java, * examples/gnu/classpath/examples/CORBA/SimpleCommunication/communication/StructureToPass.java, * examples/gnu/classpath/examples/CORBA/SimpleCommunication/communication/StructureToReturn.java, * examples/gnu/classpath/examples/CORBA/SimpleCommunication/communication/TreeNode.java, * examples/gnu/classpath/examples/CORBA/SimpleCommunication/communication/WeThrowThisException.java, * examples/gnu/classpath/examples/CORBA/SimpleCommunication/communication/WeThrowThisExceptionHelper.java, * examples/gnu/classpath/examples/CORBA/SimpleCommunication/communication/_DemoTesterImplBase.java, * examples/gnu/classpath/examples/CORBA/SimpleCommunication/communication/_DemoTesterStub.java, * examples/gnu/classpath/examples/CORBA/swing/x5/CanvasWorld.java, * examples/gnu/classpath/examples/CORBA/swing/x5/ChatConstants.java, * examples/gnu/classpath/examples/CORBA/swing/x5/ClientFrame.java, * examples/gnu/classpath/examples/CORBA/swing/x5/Demo.java, * examples/gnu/classpath/examples/CORBA/swing/x5/GameManager.java, * examples/gnu/classpath/examples/CORBA/swing/x5/GameManagerImpl.java, * examples/gnu/classpath/examples/CORBA/swing/x5/IorReader.java, * examples/gnu/classpath/examples/CORBA/swing/x5/OrbStarter.java, * examples/gnu/classpath/examples/CORBA/swing/x5/Player.java, * examples/gnu/classpath/examples/CORBA/swing/x5/PlayerImpl.java, * examples/gnu/classpath/examples/CORBA/swing/x5/PlayingDesk.java, * examples/gnu/classpath/examples/CORBA/swing/x5/State.java, * examples/gnu/classpath/examples/CORBA/swing/x5/X5Server.java, * examples/gnu/classpath/examples/CORBA/swing/x5/_GameManagerImpl_Tie.java, * examples/gnu/classpath/examples/CORBA/swing/x5/_GameManager_Stub.java, * examples/gnu/classpath/examples/CORBA/swing/x5/_PlayerImpl_Tie.java, * examples/gnu/classpath/examples/CORBA/swing/x5/_Player_Stub.java, * examples/gnu/classpath/examples/awt/AicasGraphicsBenchmark.java, * examples/gnu/classpath/examples/awt/Demo.java, * examples/gnu/classpath/examples/awt/HintingDemo.java, * examples/gnu/classpath/examples/datatransfer/Demo.java, * examples/gnu/classpath/examples/html/Demo.java, * examples/gnu/classpath/examples/java2d/J2dBenchmark.java, * examples/gnu/classpath/examples/java2d/J2dBenchmarkGUI.java, * examples/gnu/classpath/examples/java2d/JNIOverhead.java, * examples/gnu/classpath/examples/jawt/DemoJAWT.java, * examples/gnu/classpath/examples/management/TestClassLoading.java, * examples/gnu/classpath/examples/management/TestCompilation.java, * examples/gnu/classpath/examples/management/TestGarbageCollector.java, * examples/gnu/classpath/examples/management/TestMemory.java, * examples/gnu/classpath/examples/management/TestMemoryManager.java, * examples/gnu/classpath/examples/management/TestMemoryPool.java, * examples/gnu/classpath/examples/management/TestThread.java, * examples/gnu/classpath/examples/midi/Demo.java, * examples/gnu/classpath/examples/print/Demo.java, * examples/gnu/classpath/examples/sound/AudioPlayerSample.java, * examples/gnu/classpath/examples/swing/BrowserEditorKit.java, * examples/gnu/classpath/examples/swing/ButtonDemo.java, * examples/gnu/classpath/examples/swing/ComboBoxDemo.java, * examples/gnu/classpath/examples/swing/Demo.java, * examples/gnu/classpath/examples/swing/DemoFactory.java, * examples/gnu/classpath/examples/swing/DocumentFilterDemo.java, * examples/gnu/classpath/examples/swing/FileChooserDemo.java, * examples/gnu/classpath/examples/swing/HtmlDemo.java, * examples/gnu/classpath/examples/swing/ListDemo.java, * examples/gnu/classpath/examples/swing/MetalThemeEditor.java, * examples/gnu/classpath/examples/swing/NavigationFilterDemo.java, * examples/gnu/classpath/examples/swing/ScrollBarDemo.java, * examples/gnu/classpath/examples/swing/SliderDemo.java, * examples/gnu/classpath/examples/swing/SpinnerDemo.java, * examples/gnu/classpath/examples/swing/TabbedPaneDemo.java, * examples/gnu/classpath/examples/swing/TableDemo.java, * examples/gnu/classpath/examples/swing/TextAreaDemo.java, * examples/gnu/classpath/examples/swing/TextFieldDemo.java, * examples/gnu/classpath/examples/swing/TreeDemo.java, * external/jsr166/java/util/ArrayDeque.java, * external/jsr166/java/util/concurrent/ArrayBlockingQueue.java, * external/jsr166/java/util/concurrent/ConcurrentHashMap.java, * external/jsr166/java/util/concurrent/ConcurrentSkipListMap.java, * external/jsr166/java/util/concurrent/ConcurrentSkipListSet.java, * external/jsr166/java/util/concurrent/CopyOnWriteArraySet.java, * external/jsr166/java/util/concurrent/CyclicBarrier.java, * external/jsr166/java/util/concurrent/DelayQueue.java, * external/jsr166/java/util/concurrent/Executors.java, * external/jsr166/java/util/concurrent/FutureTask.java, * external/jsr166/java/util/concurrent/LinkedBlockingDeque.java, * external/jsr166/java/util/concurrent/LinkedBlockingQueue.java, * external/jsr166/java/util/concurrent/PriorityBlockingQueue.java, * external/jsr166/java/util/concurrent/ScheduledExecutorService.java, * external/jsr166/java/util/concurrent/ScheduledThreadPoolExecutor.java, * external/jsr166/java/util/concurrent/Semaphore.java, * external/jsr166/java/util/concurrent/SynchronousQueue.java, * external/jsr166/java/util/concurrent/ThreadPoolExecutor.java, * external/jsr166/java/util/concurrent/atomic/AtomicInteger.java, * external/jsr166/java/util/concurrent/atomic/AtomicIntegerFieldUpdater.java, * external/jsr166/java/util/concurrent/atomic/AtomicLong.java, * external/jsr166/java/util/concurrent/atomic/AtomicLongFieldUpdater.java, * external/jsr166/java/util/concurrent/atomic/AtomicReferenceFieldUpdater.java, * external/jsr166/java/util/concurrent/locks/AbstractQueuedLongSynchronizer.java, * external/jsr166/java/util/concurrent/locks/AbstractQueuedSynchronizer.java, * external/jsr166/java/util/concurrent/locks/ReentrantReadWriteLock.java, * external/relaxngDatatype/org/relaxng/datatype/Datatype.java, * external/relaxngDatatype/org/relaxng/datatype/DatatypeBuilder.java, * external/relaxngDatatype/org/relaxng/datatype/DatatypeException.java, * external/relaxngDatatype/org/relaxng/datatype/DatatypeLibrary.java, * external/relaxngDatatype/org/relaxng/datatype/DatatypeLibraryFactory.java, * external/relaxngDatatype/org/relaxng/datatype/DatatypeStreamingValidator.java, * external/relaxngDatatype/org/relaxng/datatype/ValidationContext.java, * external/relaxngDatatype/org/relaxng/datatype/helpers/DatatypeLibraryLoader.java, * external/relaxngDatatype/org/relaxng/datatype/helpers/ParameterlessDatatypeBuilder.java, * external/relaxngDatatype/org/relaxng/datatype/helpers/StreamingValidatorImpl.java, * external/sax/org/xml/sax/AttributeList.java, * external/sax/org/xml/sax/Attributes.java, * external/sax/org/xml/sax/ContentHandler.java, * external/sax/org/xml/sax/DTDHandler.java, * external/sax/org/xml/sax/DocumentHandler.java, * external/sax/org/xml/sax/EntityResolver.java, * external/sax/org/xml/sax/ErrorHandler.java, * external/sax/org/xml/sax/HandlerBase.java, * external/sax/org/xml/sax/InputSource.java, * external/sax/org/xml/sax/Locator.java, * external/sax/org/xml/sax/Parser.java, * external/sax/org/xml/sax/SAXException.java, * external/sax/org/xml/sax/SAXNotRecognizedException.java, * external/sax/org/xml/sax/SAXNotSupportedException.java, * external/sax/org/xml/sax/SAXParseException.java, * external/sax/org/xml/sax/XMLReader.java, * external/sax/org/xml/sax/ext/Attributes2.java, * external/sax/org/xml/sax/ext/Attributes2Impl.java, * external/sax/org/xml/sax/ext/DeclHandler.java, * external/sax/org/xml/sax/ext/DefaultHandler2.java, * external/sax/org/xml/sax/ext/EntityResolver2.java, * external/sax/org/xml/sax/ext/LexicalHandler.java, * external/sax/org/xml/sax/ext/Locator2.java, * external/sax/org/xml/sax/ext/Locator2Impl.java, * external/sax/org/xml/sax/helpers/AttributeListImpl.java, * external/sax/org/xml/sax/helpers/AttributesImpl.java, * external/sax/org/xml/sax/helpers/DefaultHandler.java, * external/sax/org/xml/sax/helpers/LocatorImpl.java, * external/sax/org/xml/sax/helpers/NamespaceSupport.java, * external/sax/org/xml/sax/helpers/NewInstance.java, * external/sax/org/xml/sax/helpers/ParserAdapter.java, * external/sax/org/xml/sax/helpers/ParserFactory.java, * external/sax/org/xml/sax/helpers/XMLFilterImpl.java, * external/sax/org/xml/sax/helpers/XMLReaderAdapter.java, * external/sax/org/xml/sax/helpers/XMLReaderFactory.java, * external/w3c_dom/org/w3c/dom/Attr.java, * external/w3c_dom/org/w3c/dom/CDATASection.java, * external/w3c_dom/org/w3c/dom/CharacterData.java, * external/w3c_dom/org/w3c/dom/Comment.java, * external/w3c_dom/org/w3c/dom/DOMConfiguration.java, * external/w3c_dom/org/w3c/dom/DOMError.java, * external/w3c_dom/org/w3c/dom/DOMErrorHandler.java, * external/w3c_dom/org/w3c/dom/DOMException.java, * external/w3c_dom/org/w3c/dom/DOMImplementation.java, * external/w3c_dom/org/w3c/dom/DOMImplementationList.java, * external/w3c_dom/org/w3c/dom/DOMImplementationSource.java, * external/w3c_dom/org/w3c/dom/DOMLocator.java, * external/w3c_dom/org/w3c/dom/DOMStringList.java, * external/w3c_dom/org/w3c/dom/Document.java, * external/w3c_dom/org/w3c/dom/DocumentFragment.java, * external/w3c_dom/org/w3c/dom/DocumentType.java, * external/w3c_dom/org/w3c/dom/Element.java, * external/w3c_dom/org/w3c/dom/Entity.java, * external/w3c_dom/org/w3c/dom/EntityReference.java, * external/w3c_dom/org/w3c/dom/NameList.java, * external/w3c_dom/org/w3c/dom/NamedNodeMap.java, * external/w3c_dom/org/w3c/dom/Node.java, * external/w3c_dom/org/w3c/dom/NodeList.java, * external/w3c_dom/org/w3c/dom/Notation.java, * external/w3c_dom/org/w3c/dom/ProcessingInstruction.java, * external/w3c_dom/org/w3c/dom/Text.java, * external/w3c_dom/org/w3c/dom/TypeInfo.java, * external/w3c_dom/org/w3c/dom/UserDataHandler.java, * external/w3c_dom/org/w3c/dom/bootstrap/DOMImplementationRegistry.java, * external/w3c_dom/org/w3c/dom/css/CSS2Properties.java, * external/w3c_dom/org/w3c/dom/css/CSSCharsetRule.java, * external/w3c_dom/org/w3c/dom/css/CSSFontFaceRule.java, * external/w3c_dom/org/w3c/dom/css/CSSImportRule.java, * external/w3c_dom/org/w3c/dom/css/CSSMediaRule.java, * external/w3c_dom/org/w3c/dom/css/CSSPageRule.java, * external/w3c_dom/org/w3c/dom/css/CSSPrimitiveValue.java, * external/w3c_dom/org/w3c/dom/css/CSSRule.java, * external/w3c_dom/org/w3c/dom/css/CSSRuleList.java, * external/w3c_dom/org/w3c/dom/css/CSSStyleDeclaration.java, * external/w3c_dom/org/w3c/dom/css/CSSStyleRule.java, * external/w3c_dom/org/w3c/dom/css/CSSStyleSheet.java, * external/w3c_dom/org/w3c/dom/css/CSSUnknownRule.java, * external/w3c_dom/org/w3c/dom/css/CSSValue.java, * external/w3c_dom/org/w3c/dom/css/CSSValueList.java, * external/w3c_dom/org/w3c/dom/css/Counter.java, * external/w3c_dom/org/w3c/dom/css/DOMImplementationCSS.java, * external/w3c_dom/org/w3c/dom/css/DocumentCSS.java, * external/w3c_dom/org/w3c/dom/css/ElementCSSInlineStyle.java, * external/w3c_dom/org/w3c/dom/css/RGBColor.java, * external/w3c_dom/org/w3c/dom/css/Rect.java, * external/w3c_dom/org/w3c/dom/css/ViewCSS.java, * external/w3c_dom/org/w3c/dom/events/DocumentEvent.java, * external/w3c_dom/org/w3c/dom/events/Event.java, * external/w3c_dom/org/w3c/dom/events/EventException.java, * external/w3c_dom/org/w3c/dom/events/EventListener.java, * external/w3c_dom/org/w3c/dom/events/EventTarget.java, * external/w3c_dom/org/w3c/dom/events/MouseEvent.java, * external/w3c_dom/org/w3c/dom/events/MutationEvent.java, * external/w3c_dom/org/w3c/dom/events/UIEvent.java, * external/w3c_dom/org/w3c/dom/html2/HTMLAnchorElement.java, * external/w3c_dom/org/w3c/dom/html2/HTMLAppletElement.java, * external/w3c_dom/org/w3c/dom/html2/HTMLAreaElement.java, * external/w3c_dom/org/w3c/dom/html2/HTMLBRElement.java, * external/w3c_dom/org/w3c/dom/html2/HTMLBaseElement.java, * external/w3c_dom/org/w3c/dom/html2/HTMLBaseFontElement.java, * external/w3c_dom/org/w3c/dom/html2/HTMLBodyElement.java, * external/w3c_dom/org/w3c/dom/html2/HTMLButtonElement.java, * external/w3c_dom/org/w3c/dom/html2/HTMLCollection.java, * external/w3c_dom/org/w3c/dom/html2/HTMLDListElement.java, * external/w3c_dom/org/w3c/dom/html2/HTMLDirectoryElement.java, * external/w3c_dom/org/w3c/dom/html2/HTMLDivElement.java, * external/w3c_dom/org/w3c/dom/html2/HTMLDocument.java, * external/w3c_dom/org/w3c/dom/html2/HTMLElement.java, * external/w3c_dom/org/w3c/dom/html2/HTMLFieldSetElement.java, * external/w3c_dom/org/w3c/dom/html2/HTMLFontElement.java, * external/w3c_dom/org/w3c/dom/html2/HTMLFormElement.java, * external/w3c_dom/org/w3c/dom/html2/HTMLFrameElement.java, * external/w3c_dom/org/w3c/dom/html2/HTMLFrameSetElement.java, * external/w3c_dom/org/w3c/dom/html2/HTMLHRElement.java, * external/w3c_dom/org/w3c/dom/html2/HTMLHeadElement.java, * external/w3c_dom/org/w3c/dom/html2/HTMLHeadingElement.java, * external/w3c_dom/org/w3c/dom/html2/HTMLHtmlElement.java, * external/w3c_dom/org/w3c/dom/html2/HTMLIFrameElement.java, * external/w3c_dom/org/w3c/dom/html2/HTMLImageElement.java, * external/w3c_dom/org/w3c/dom/html2/HTMLInputElement.java, * external/w3c_dom/org/w3c/dom/html2/HTMLIsIndexElement.java, * external/w3c_dom/org/w3c/dom/html2/HTMLLIElement.java, * external/w3c_dom/org/w3c/dom/html2/HTMLLabelElement.java, * external/w3c_dom/org/w3c/dom/html2/HTMLLegendElement.java, * external/w3c_dom/org/w3c/dom/html2/HTMLLinkElement.java, * external/w3c_dom/org/w3c/dom/html2/HTMLMapElement.java, * external/w3c_dom/org/w3c/dom/html2/HTMLMenuElement.java, * external/w3c_dom/org/w3c/dom/html2/HTMLMetaElement.java, * external/w3c_dom/org/w3c/dom/html2/HTMLModElement.java, * external/w3c_dom/org/w3c/dom/html2/HTMLOListElement.java, * external/w3c_dom/org/w3c/dom/html2/HTMLObjectElement.java, * external/w3c_dom/org/w3c/dom/html2/HTMLOptGroupElement.java, * external/w3c_dom/org/w3c/dom/html2/HTMLOptionElement.java, * external/w3c_dom/org/w3c/dom/html2/HTMLOptionsCollection.java, * external/w3c_dom/org/w3c/dom/html2/HTMLParagraphElement.java, * external/w3c_dom/org/w3c/dom/html2/HTMLParamElement.java, * external/w3c_dom/org/w3c/dom/html2/HTMLPreElement.java, * external/w3c_dom/org/w3c/dom/html2/HTMLQuoteElement.java, * external/w3c_dom/org/w3c/dom/html2/HTMLScriptElement.java, * external/w3c_dom/org/w3c/dom/html2/HTMLSelectElement.java, * external/w3c_dom/org/w3c/dom/html2/HTMLStyleElement.java, * external/w3c_dom/org/w3c/dom/html2/HTMLTableCaptionElement.java, * external/w3c_dom/org/w3c/dom/html2/HTMLTableCellElement.java, * external/w3c_dom/org/w3c/dom/html2/HTMLTableColElement.java, * external/w3c_dom/org/w3c/dom/html2/HTMLTableElement.java, * external/w3c_dom/org/w3c/dom/html2/HTMLTableRowElement.java, * external/w3c_dom/org/w3c/dom/html2/HTMLTableSectionElement.java, * external/w3c_dom/org/w3c/dom/html2/HTMLTextAreaElement.java, * external/w3c_dom/org/w3c/dom/html2/HTMLTitleElement.java, * external/w3c_dom/org/w3c/dom/html2/HTMLUListElement.java, * external/w3c_dom/org/w3c/dom/ls/DOMImplementationLS.java, * external/w3c_dom/org/w3c/dom/ls/LSException.java, * external/w3c_dom/org/w3c/dom/ls/LSInput.java, * external/w3c_dom/org/w3c/dom/ls/LSLoadEvent.java, * external/w3c_dom/org/w3c/dom/ls/LSOutput.java, * external/w3c_dom/org/w3c/dom/ls/LSParser.java, * external/w3c_dom/org/w3c/dom/ls/LSParserFilter.java, * external/w3c_dom/org/w3c/dom/ls/LSProgressEvent.java, * external/w3c_dom/org/w3c/dom/ls/LSResourceResolver.java, * external/w3c_dom/org/w3c/dom/ls/LSSerializer.java, * external/w3c_dom/org/w3c/dom/ls/LSSerializerFilter.java, * external/w3c_dom/org/w3c/dom/ranges/DocumentRange.java, * external/w3c_dom/org/w3c/dom/ranges/Range.java, * external/w3c_dom/org/w3c/dom/ranges/RangeException.java, * external/w3c_dom/org/w3c/dom/stylesheets/DocumentStyle.java, * external/w3c_dom/org/w3c/dom/stylesheets/LinkStyle.java, * external/w3c_dom/org/w3c/dom/stylesheets/MediaList.java, * external/w3c_dom/org/w3c/dom/stylesheets/StyleSheet.java, * external/w3c_dom/org/w3c/dom/stylesheets/StyleSheetList.java, * external/w3c_dom/org/w3c/dom/traversal/DocumentTraversal.java, * external/w3c_dom/org/w3c/dom/traversal/NodeFilter.java, * external/w3c_dom/org/w3c/dom/traversal/NodeIterator.java, * external/w3c_dom/org/w3c/dom/traversal/TreeWalker.java, * external/w3c_dom/org/w3c/dom/views/AbstractView.java, * external/w3c_dom/org/w3c/dom/views/DocumentView.java, * external/w3c_dom/org/w3c/dom/xpath/XPathEvaluator.java, * external/w3c_dom/org/w3c/dom/xpath/XPathException.java, * external/w3c_dom/org/w3c/dom/xpath/XPathExpression.java, * external/w3c_dom/org/w3c/dom/xpath/XPathNSResolver.java, * external/w3c_dom/org/w3c/dom/xpath/XPathNamespace.java, * external/w3c_dom/org/w3c/dom/xpath/XPathResult.java, * gnu/CORBA/BigDecimalHelper.java, * gnu/CORBA/CDR/AbstractCdrInput.java, * gnu/CORBA/CDR/AbstractCdrOutput.java, * gnu/CORBA/CDR/AbstractDataInput.java, * gnu/CORBA/CDR/AbstractDataOutput.java, * gnu/CORBA/CDR/AligningInput.java, * gnu/CORBA/CDR/AligningOutput.java, * gnu/CORBA/CDR/ArrayValueHelper.java, * gnu/CORBA/CDR/BigEndianInputStream.java, * gnu/CORBA/CDR/BigEndianOutputStream.java, * gnu/CORBA/CDR/BufferedCdrOutput.java, * gnu/CORBA/CDR/BufferredCdrInput.java, * gnu/CORBA/CDR/HeadlessInput.java, * gnu/CORBA/CDR/IDLTypeHelper.java, * gnu/CORBA/CDR/LittleEndianOutputStream.java, * gnu/CORBA/CDR/UnknownExceptionCtxHandler.java, * gnu/CORBA/CDR/VMVio.java, * gnu/CORBA/CDR/Vio.java, * gnu/CORBA/CDR/gnuRuntime.java, * gnu/CORBA/CDR/gnuValueStream.java, * gnu/CORBA/CdrEncapsCodecImpl.java, * gnu/CORBA/CollocatedOrbs.java, * gnu/CORBA/Connected_objects.java, * gnu/CORBA/DefaultSocketFactory.java, * gnu/CORBA/DuplicateNameHolder.java, * gnu/CORBA/DynAn/AbstractAny.java, * gnu/CORBA/DynAn/DivideableAny.java, * gnu/CORBA/DynAn/NameValuePairHolder.java, * gnu/CORBA/DynAn/RecordAny.java, * gnu/CORBA/DynAn/ValueChangeListener.java, * gnu/CORBA/DynAn/gnuDynAny.java, * gnu/CORBA/DynAn/gnuDynAnyFactory.java, * gnu/CORBA/DynAn/gnuDynArray.java, * gnu/CORBA/DynAn/gnuDynEnum.java, * gnu/CORBA/DynAn/gnuDynFixed.java, * gnu/CORBA/DynAn/gnuDynSequence.java, * gnu/CORBA/DynAn/gnuDynUnion.java, * gnu/CORBA/DynAn/gnuDynValue.java, * gnu/CORBA/DynAn/gnuDynValueBox.java, * gnu/CORBA/DynAnySeqHolder.java, * gnu/CORBA/EmptyExceptionHolder.java, * gnu/CORBA/ForwardRequestHelper.java, * gnu/CORBA/GIOP/CharSets_OSF.java, * gnu/CORBA/GIOP/CloseMessage.java, * gnu/CORBA/GIOP/ErrorMessage.java, * gnu/CORBA/GIOP/MessageHeader.java, * gnu/CORBA/GIOP/ServiceContext.java, * gnu/CORBA/GIOP/v1_2/RequestHeader.java, * gnu/CORBA/GeneralHolder.java, * gnu/CORBA/IOR.java, * gnu/CORBA/Interceptor/ClientRequestInterceptors.java, * gnu/CORBA/Interceptor/ForwardRequestHolder.java, * gnu/CORBA/Interceptor/IORInterceptors.java, * gnu/CORBA/Interceptor/Registrator.java, * gnu/CORBA/Interceptor/ServerRequestInterceptors.java, * gnu/CORBA/Interceptor/gnuClientRequestInfo.java, * gnu/CORBA/Interceptor/gnuIcCurrent.java, * gnu/CORBA/Interceptor/gnuIorInfo.java, * gnu/CORBA/Interceptor/gnuServerRequestInfo.java, * gnu/CORBA/IorDelegate.java, * gnu/CORBA/IorObject.java, * gnu/CORBA/Minor.java, * gnu/CORBA/NameDynAnyPairHolder.java, * gnu/CORBA/NameDynAnyPairSeqHolder.java, * gnu/CORBA/NameValuePairHolder.java, * gnu/CORBA/NameValuePairSeqHolder.java, * gnu/CORBA/NamingService/NameParser.java, * gnu/CORBA/NamingService/NamingMap.java, * gnu/CORBA/NamingService/NamingServiceTransient.java, * gnu/CORBA/NamingService/TransientContext.java, * gnu/CORBA/ObjectCreator.java, * gnu/CORBA/OrbFocused.java, * gnu/CORBA/OrbFunctional.java, * gnu/CORBA/OrbRestricted.java, * gnu/CORBA/Poa/AOM.java, * gnu/CORBA/Poa/AccessiblePolicy.java, * gnu/CORBA/Poa/DynamicImpHandler.java, * gnu/CORBA/Poa/ForwardRequestHolder.java, * gnu/CORBA/Poa/ForwardedServant.java, * gnu/CORBA/Poa/InvalidPolicyHolder.java, * gnu/CORBA/Poa/LocalDelegate.java, * gnu/CORBA/Poa/LocalRequest.java, * gnu/CORBA/Poa/LocalServerRequest.java, * gnu/CORBA/Poa/ORB_1_4.java, * gnu/CORBA/Poa/ServantDelegateImpl.java, * gnu/CORBA/Poa/StandardPolicies.java, * gnu/CORBA/Poa/gnuAdapterActivator.java, * gnu/CORBA/Poa/gnuForwardRequest.java, * gnu/CORBA/Poa/gnuIdAssignmentPolicy.java, * gnu/CORBA/Poa/gnuIdUniquenessPolicy.java, * gnu/CORBA/Poa/gnuImplicitActivationPolicy.java, * gnu/CORBA/Poa/gnuLifespanPolicy.java, * gnu/CORBA/Poa/gnuPOA.java, * gnu/CORBA/Poa/gnuPOAManager.java, * gnu/CORBA/Poa/gnuPoaCurrent.java, * gnu/CORBA/Poa/gnuRequestProcessingPolicy.java, * gnu/CORBA/Poa/gnuServantObject.java, * gnu/CORBA/Poa/gnuServantRetentionPolicy.java, * gnu/CORBA/Poa/gnuThreadPolicy.java, * gnu/CORBA/ServiceRequestAdapter.java, * gnu/CORBA/SetOverrideTypeHolder.java, * gnu/CORBA/SimpleDelegate.java, * gnu/CORBA/SocketRepository.java, * gnu/CORBA/StreamHolder.java, * gnu/CORBA/TypeCodeHelper.java, * gnu/CORBA/TypeKindNamer.java, * gnu/CORBA/Version.java, * gnu/CORBA/_PolicyImplBase.java, * gnu/CORBA/gnuAny.java, * gnu/CORBA/gnuCodecFactory.java, * gnu/CORBA/gnuEnvironment.java, * gnu/CORBA/gnuRequest.java, * gnu/CORBA/gnuValueHolder.java, * gnu/CORBA/interfaces/SocketFactory.java, * gnu/CORBA/typecodes/AliasTypeCode.java, * gnu/CORBA/typecodes/ArrayTypeCode.java, * gnu/CORBA/typecodes/FixedTypeCode.java, * gnu/CORBA/typecodes/GeneralTypeCode.java, * gnu/CORBA/typecodes/PrimitiveTypeCode.java, * gnu/CORBA/typecodes/RecordTypeCode.java, * gnu/CORBA/typecodes/RecursiveTypeCode.java, * gnu/CORBA/typecodes/StringTypeCode.java, * gnu/classpath/Pair.java, * gnu/classpath/Pointer.java, * gnu/classpath/Pointer32.java, * gnu/classpath/Pointer64.java, * gnu/classpath/ServiceFactory.java, * gnu/classpath/ServiceProviderLoadingAction.java, * gnu/classpath/SystemProperties.java, * gnu/classpath/debug/Component.java, * gnu/classpath/debug/PreciseFilter.java, * gnu/classpath/debug/SystemLogger.java, * gnu/classpath/debug/TeeInputStream.java, * gnu/classpath/debug/TeeReader.java, * gnu/classpath/jdwp/Jdwp.java, * gnu/classpath/jdwp/JdwpConstants.java, * gnu/classpath/jdwp/event/BreakpointEvent.java, * gnu/classpath/jdwp/event/ClassPrepareEvent.java, * gnu/classpath/jdwp/event/ClassUnloadEvent.java, * gnu/classpath/jdwp/event/Event.java, * gnu/classpath/jdwp/event/EventManager.java, * gnu/classpath/jdwp/event/EventRequest.java, * gnu/classpath/jdwp/event/ExceptionEvent.java, * gnu/classpath/jdwp/event/MethodEntryEvent.java, * gnu/classpath/jdwp/event/MethodExitEvent.java, * gnu/classpath/jdwp/event/SingleStepEvent.java, * gnu/classpath/jdwp/event/ThreadEndEvent.java, * gnu/classpath/jdwp/event/VmDeathEvent.java, * gnu/classpath/jdwp/event/VmInitEvent.java, * gnu/classpath/jdwp/event/filters/ClassExcludeFilter.java, * gnu/classpath/jdwp/event/filters/ClassMatchFilter.java, * gnu/classpath/jdwp/event/filters/ClassOnlyFilter.java, * gnu/classpath/jdwp/event/filters/ExceptionOnlyFilter.java, * gnu/classpath/jdwp/event/filters/FieldOnlyFilter.java, * gnu/classpath/jdwp/event/filters/InstanceOnlyFilter.java, * gnu/classpath/jdwp/event/filters/StepFilter.java, * gnu/classpath/jdwp/event/filters/ThreadOnlyFilter.java, * gnu/classpath/jdwp/exception/InvalidClassException.java, * gnu/classpath/jdwp/exception/InvalidClassLoaderException.java, * gnu/classpath/jdwp/exception/InvalidEventTypeException.java, * gnu/classpath/jdwp/exception/InvalidFieldException.java, * gnu/classpath/jdwp/exception/InvalidFrameException.java, * gnu/classpath/jdwp/exception/InvalidLocationException.java, * gnu/classpath/jdwp/exception/InvalidMethodException.java, * gnu/classpath/jdwp/exception/InvalidObjectException.java, * gnu/classpath/jdwp/exception/InvalidSlotException.java, * gnu/classpath/jdwp/exception/InvalidStringException.java, * gnu/classpath/jdwp/exception/InvalidThreadException.java, * gnu/classpath/jdwp/exception/InvalidThreadGroupException.java, * gnu/classpath/jdwp/exception/NativeMethodException.java, * gnu/classpath/jdwp/exception/NotImplementedException.java, * gnu/classpath/jdwp/id/JdwpId.java, * gnu/classpath/jdwp/id/NullObjectId.java, * gnu/classpath/jdwp/processor/ArrayReferenceCommandSet.java, * gnu/classpath/jdwp/processor/ArrayTypeCommandSet.java, * gnu/classpath/jdwp/processor/ClassLoaderReferenceCommandSet.java, * gnu/classpath/jdwp/processor/ClassObjectReferenceCommandSet.java, * gnu/classpath/jdwp/processor/ClassTypeCommandSet.java, * gnu/classpath/jdwp/processor/CommandSet.java, * gnu/classpath/jdwp/processor/EventRequestCommandSet.java, * gnu/classpath/jdwp/processor/FieldCommandSet.java, * gnu/classpath/jdwp/processor/InterfaceTypeCommandSet.java, * gnu/classpath/jdwp/processor/MethodCommandSet.java, * gnu/classpath/jdwp/processor/ObjectReferenceCommandSet.java, * gnu/classpath/jdwp/processor/PacketProcessor.java, * gnu/classpath/jdwp/processor/ReferenceTypeCommandSet.java, * gnu/classpath/jdwp/processor/StackFrameCommandSet.java, * gnu/classpath/jdwp/processor/StringReferenceCommandSet.java, * gnu/classpath/jdwp/processor/ThreadGroupReferenceCommandSet.java, * gnu/classpath/jdwp/processor/ThreadReferenceCommandSet.java, * gnu/classpath/jdwp/processor/VirtualMachineCommandSet.java, * gnu/classpath/jdwp/transport/JdwpCommandPacket.java, * gnu/classpath/jdwp/transport/JdwpConnection.java, * gnu/classpath/jdwp/transport/JdwpPacket.java, * gnu/classpath/jdwp/transport/JdwpReplyPacket.java, * gnu/classpath/jdwp/transport/SocketTransport.java, * gnu/classpath/jdwp/transport/TransportFactory.java, * gnu/classpath/jdwp/util/JdwpString.java, * gnu/classpath/jdwp/util/LineTable.java, * gnu/classpath/jdwp/util/Location.java, * gnu/classpath/jdwp/util/MethodResult.java, * gnu/classpath/jdwp/util/MonitorInfo.java, * gnu/classpath/jdwp/util/Signature.java, * gnu/classpath/jdwp/util/VariableTable.java, * gnu/classpath/jdwp/value/ArrayValue.java, * gnu/classpath/jdwp/value/BooleanValue.java, * gnu/classpath/jdwp/value/ByteValue.java, * gnu/classpath/jdwp/value/CharValue.java, * gnu/classpath/jdwp/value/DoubleValue.java, * gnu/classpath/jdwp/value/FloatValue.java, * gnu/classpath/jdwp/value/IntValue.java, * gnu/classpath/jdwp/value/LongValue.java, * gnu/classpath/jdwp/value/ObjectValue.java, * gnu/classpath/jdwp/value/ShortValue.java, * gnu/classpath/jdwp/value/StringValue.java, * gnu/classpath/jdwp/value/Value.java, * gnu/classpath/jdwp/value/ValueFactory.java, * gnu/classpath/jdwp/value/VoidValue.java, * gnu/classpath/toolkit/DefaultDaemonThreadFactory.java, * gnu/java/awt/AWTUtilities.java, * gnu/java/awt/BitMaskExtent.java, * gnu/java/awt/BitwiseXORComposite.java, * gnu/java/awt/Buffers.java, * gnu/java/awt/ClasspathGraphicsEnvironment.java, * gnu/java/awt/ClasspathToolkit.java, * gnu/java/awt/ComponentDataBlitOp.java, * gnu/java/awt/EmbeddedWindow.java, * gnu/java/awt/GradientPaintContext.java, * gnu/java/awt/color/CieXyzConverter.java, * gnu/java/awt/color/ClutProfileConverter.java, * gnu/java/awt/color/ColorLookUpTable.java, * gnu/java/awt/color/GrayProfileConverter.java, * gnu/java/awt/color/GrayScaleConverter.java, * gnu/java/awt/color/LinearRGBConverter.java, * gnu/java/awt/color/ProfileHeader.java, * gnu/java/awt/color/RgbProfileConverter.java, * gnu/java/awt/color/SrgbConverter.java, * gnu/java/awt/color/ToneReproductionCurve.java, * gnu/java/awt/dnd/GtkMouseDragGestureRecognizer.java, * gnu/java/awt/dnd/peer/gtk/GtkDragSourceContextPeer.java, * gnu/java/awt/dnd/peer/gtk/GtkDropTargetContextPeer.java, * gnu/java/awt/dnd/peer/gtk/GtkDropTargetPeer.java, * gnu/java/awt/font/FontDelegate.java, * gnu/java/awt/font/FontFactory.java, * gnu/java/awt/font/GNUGlyphVector.java, * gnu/java/awt/font/OpenTypeFontPeer.java, * gnu/java/awt/font/autofit/GlyphHints.java, * gnu/java/awt/font/autofit/Latin.java, * gnu/java/awt/font/autofit/Utils.java, * gnu/java/awt/font/opentype/CharGlyphMap.java, * gnu/java/awt/font/opentype/GlyphNamer.java, * gnu/java/awt/font/opentype/MacResourceFork.java, * gnu/java/awt/font/opentype/NameDecoder.java, * gnu/java/awt/font/opentype/OpenTypeFont.java, * gnu/java/awt/font/opentype/OpenTypeFontFactory.java, * gnu/java/awt/font/opentype/truetype/GlyphLoader.java, * gnu/java/awt/font/opentype/truetype/GlyphLocator.java, * gnu/java/awt/font/opentype/truetype/GlyphMeasurer.java, * gnu/java/awt/font/opentype/truetype/Point.java, * gnu/java/awt/font/opentype/truetype/TrueTypeScaler.java, * gnu/java/awt/font/opentype/truetype/VirtualMachine.java, * gnu/java/awt/font/opentype/truetype/Zone.java, * gnu/java/awt/font/opentype/truetype/ZonePathIterator.java, * gnu/java/awt/image/AsyncImage.java, * gnu/java/awt/image/ImageConverter.java, * gnu/java/awt/image/ImageDecoder.java, * gnu/java/awt/image/XBMDecoder.java, * gnu/java/awt/java2d/AbstractGraphics2D.java, * gnu/java/awt/java2d/AlphaCompositeContext.java, * gnu/java/awt/java2d/CubicSegment.java, * gnu/java/awt/java2d/LineSegment.java, * gnu/java/awt/java2d/PixelCoverage.java, * gnu/java/awt/java2d/QuadSegment.java, * gnu/java/awt/java2d/RasterGraphics.java, * gnu/java/awt/java2d/ScanlineConverter.java, * gnu/java/awt/java2d/ScanlineCoverage.java, * gnu/java/awt/java2d/Segment.java, * gnu/java/awt/java2d/TexturePaintContext.java, * gnu/java/awt/peer/ClasspathDesktopPeer.java, * gnu/java/awt/peer/ClasspathFontPeer.java, * gnu/java/awt/peer/GLightweightPeer.java, * gnu/java/awt/peer/GnomeDesktopPeer.java, * gnu/java/awt/peer/KDEDesktopPeer.java, * gnu/java/awt/peer/gtk/AsyncImage.java, * gnu/java/awt/peer/gtk/BufferedImageGraphics.java, * gnu/java/awt/peer/gtk/CairoGraphics2D.java, * gnu/java/awt/peer/gtk/CairoSurface.java, * gnu/java/awt/peer/gtk/CairoSurfaceGraphics.java, * gnu/java/awt/peer/gtk/ComponentGraphics.java, * gnu/java/awt/peer/gtk/ComponentGraphicsCopy.java, * gnu/java/awt/peer/gtk/FreetypeGlyphVector.java, * gnu/java/awt/peer/gtk/GdkFontPeer.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/GtkButtonPeer.java, * gnu/java/awt/peer/gtk/GtkCheckboxPeer.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/GtkContainerPeer.java, * gnu/java/awt/peer/gtk/GtkCursor.java, * gnu/java/awt/peer/gtk/GtkDialogPeer.java, * gnu/java/awt/peer/gtk/GtkFileDialogPeer.java, * gnu/java/awt/peer/gtk/GtkFramePeer.java, * gnu/java/awt/peer/gtk/GtkGenericPeer.java, * gnu/java/awt/peer/gtk/GtkImage.java, * gnu/java/awt/peer/gtk/GtkImageConsumer.java, * gnu/java/awt/peer/gtk/GtkLabelPeer.java, * gnu/java/awt/peer/gtk/GtkListPeer.java, * gnu/java/awt/peer/gtk/GtkMenuComponentPeer.java, * gnu/java/awt/peer/gtk/GtkMenuPeer.java, * gnu/java/awt/peer/gtk/GtkMouseInfoPeer.java, * gnu/java/awt/peer/gtk/GtkPanelPeer.java, * gnu/java/awt/peer/gtk/GtkPopupMenuPeer.java, * gnu/java/awt/peer/gtk/GtkScrollbarPeer.java, * gnu/java/awt/peer/gtk/GtkSelection.java, * gnu/java/awt/peer/gtk/GtkToolkit.java, * gnu/java/awt/peer/gtk/GtkVolatileImage.java, * gnu/java/awt/peer/gtk/GtkWindowPeer.java, * gnu/java/awt/peer/gtk/VolatileImageGraphics.java, * gnu/java/awt/peer/headless/HeadlessGraphicsEnvironment.java, * gnu/java/awt/peer/qt/MainQtThread.java, * gnu/java/awt/peer/qt/QMatrix.java, * gnu/java/awt/peer/qt/QPainterPath.java, * gnu/java/awt/peer/qt/QPen.java, * gnu/java/awt/peer/qt/QtAudioClip.java, * gnu/java/awt/peer/qt/QtButtonPeer.java, * gnu/java/awt/peer/qt/QtCheckboxPeer.java, * gnu/java/awt/peer/qt/QtChoicePeer.java, * gnu/java/awt/peer/qt/QtComponentGraphics.java, * gnu/java/awt/peer/qt/QtComponentPeer.java, * gnu/java/awt/peer/qt/QtContainerPeer.java, * gnu/java/awt/peer/qt/QtDialogPeer.java, * gnu/java/awt/peer/qt/QtEmbeddedWindowPeer.java, * gnu/java/awt/peer/qt/QtFileDialogPeer.java, * gnu/java/awt/peer/qt/QtFontMetrics.java, * gnu/java/awt/peer/qt/QtFontPeer.java, * gnu/java/awt/peer/qt/QtFramePeer.java, * gnu/java/awt/peer/qt/QtGraphics.java, * gnu/java/awt/peer/qt/QtGraphicsEnvironment.java, * gnu/java/awt/peer/qt/QtImage.java, * gnu/java/awt/peer/qt/QtImageConsumer.java, * gnu/java/awt/peer/qt/QtImageDirectGraphics.java, * gnu/java/awt/peer/qt/QtImageGraphics.java, * gnu/java/awt/peer/qt/QtLabelPeer.java, * gnu/java/awt/peer/qt/QtListPeer.java, * gnu/java/awt/peer/qt/QtMenuBarPeer.java, * gnu/java/awt/peer/qt/QtMenuComponentPeer.java, * gnu/java/awt/peer/qt/QtMenuItemPeer.java, * gnu/java/awt/peer/qt/QtMenuPeer.java, * gnu/java/awt/peer/qt/QtPanelPeer.java, * gnu/java/awt/peer/qt/QtPopupMenuPeer.java, * gnu/java/awt/peer/qt/QtRepaintThread.java, * gnu/java/awt/peer/qt/QtScreenDevice.java, * gnu/java/awt/peer/qt/QtScreenDeviceConfiguration.java, * gnu/java/awt/peer/qt/QtScrollPanePeer.java, * gnu/java/awt/peer/qt/QtScrollbarPeer.java, * gnu/java/awt/peer/qt/QtTextAreaPeer.java, * gnu/java/awt/peer/qt/QtTextFieldPeer.java, * gnu/java/awt/peer/qt/QtToolkit.java, * gnu/java/awt/peer/qt/QtVolatileImage.java, * gnu/java/awt/peer/qt/QtWindowPeer.java, * gnu/java/awt/peer/swing/SwingButtonPeer.java, * gnu/java/awt/peer/swing/SwingCheckboxPeer.java, * gnu/java/awt/peer/swing/SwingComponent.java, * gnu/java/awt/peer/swing/SwingComponentPeer.java, * gnu/java/awt/peer/swing/SwingContainerPeer.java, * gnu/java/awt/peer/swing/SwingLabelPeer.java, * gnu/java/awt/peer/swing/SwingListPeer.java, * gnu/java/awt/peer/swing/SwingMenuItemPeer.java, * gnu/java/awt/peer/swing/SwingMenuPeer.java, * gnu/java/awt/peer/swing/SwingTextAreaPeer.java, * gnu/java/awt/peer/swing/SwingTextFieldPeer.java, * gnu/java/awt/peer/x/GLGraphics.java, * gnu/java/awt/peer/x/KeyboardMapping.java, * gnu/java/awt/peer/x/XEventPump.java, * gnu/java/awt/peer/x/XFontPeer.java, * gnu/java/awt/peer/x/XFramePeer.java, * gnu/java/awt/peer/x/XGraphics2D.java, * gnu/java/awt/peer/x/XGraphicsConfiguration.java, * gnu/java/awt/peer/x/XGraphicsDevice.java, * gnu/java/awt/peer/x/XGraphicsEnvironment.java, * gnu/java/awt/peer/x/XImage.java, * gnu/java/awt/peer/x/XToolkit.java, * gnu/java/awt/peer/x/XWindowPeer.java, * gnu/java/awt/print/JavaPrinterGraphics.java, * gnu/java/awt/print/JavaPrinterJob.java, * gnu/java/awt/print/PostScriptGraphics2D.java, * gnu/java/awt/print/SpooledDocument.java, * gnu/java/beans/BeanInfoEmbryo.java, * gnu/java/beans/DefaultExceptionListener.java, * gnu/java/beans/ExplicitBeanInfo.java, * gnu/java/beans/IntrospectionIncubator.java, * gnu/java/beans/decoder/AbstractContext.java, * gnu/java/beans/decoder/AbstractCreatableObjectContext.java, * gnu/java/beans/decoder/AbstractElementHandler.java, * gnu/java/beans/decoder/AbstractObjectContext.java, * gnu/java/beans/decoder/ArrayContext.java, * gnu/java/beans/decoder/ArrayHandler.java, * gnu/java/beans/decoder/AssemblyException.java, * gnu/java/beans/decoder/BooleanHandler.java, * gnu/java/beans/decoder/ByteHandler.java, * gnu/java/beans/decoder/CharHandler.java, * gnu/java/beans/decoder/ClassHandler.java, * gnu/java/beans/decoder/ConstructorContext.java, * gnu/java/beans/decoder/Context.java, * gnu/java/beans/decoder/DecoderContext.java, * gnu/java/beans/decoder/DoubleHandler.java, * gnu/java/beans/decoder/DummyContext.java, * gnu/java/beans/decoder/DummyHandler.java, * gnu/java/beans/decoder/ElementHandler.java, * gnu/java/beans/decoder/FloatHandler.java, * gnu/java/beans/decoder/GrowableArrayContext.java, * gnu/java/beans/decoder/IndexContext.java, * gnu/java/beans/decoder/IntHandler.java, * gnu/java/beans/decoder/JavaHandler.java, * gnu/java/beans/decoder/LongHandler.java, * gnu/java/beans/decoder/MethodContext.java, * gnu/java/beans/decoder/MethodFinder.java, * gnu/java/beans/decoder/NullHandler.java, * gnu/java/beans/decoder/ObjectContext.java, * gnu/java/beans/decoder/ObjectHandler.java, * gnu/java/beans/decoder/PersistenceParser.java, * gnu/java/beans/decoder/PropertyContext.java, * gnu/java/beans/decoder/ShortHandler.java, * gnu/java/beans/decoder/SimpleHandler.java, * gnu/java/beans/decoder/StaticMethodContext.java, * gnu/java/beans/decoder/StringHandler.java, * gnu/java/beans/decoder/VoidHandler.java, * gnu/java/beans/editors/ColorEditor.java, * gnu/java/beans/editors/FontEditor.java, * gnu/java/beans/editors/NativeBooleanEditor.java, * gnu/java/beans/editors/NativeByteEditor.java, * gnu/java/beans/editors/NativeDoubleEditor.java, * gnu/java/beans/editors/NativeFloatEditor.java, * gnu/java/beans/editors/NativeIntEditor.java, * gnu/java/beans/editors/NativeLongEditor.java, * gnu/java/beans/editors/NativeShortEditor.java, * gnu/java/beans/editors/StringEditor.java, * gnu/java/beans/encoder/ArrayPersistenceDelegate.java, * gnu/java/beans/encoder/ClassPersistenceDelegate.java, * gnu/java/beans/encoder/CollectionPersistenceDelegate.java, * gnu/java/beans/encoder/Context.java, * gnu/java/beans/encoder/GenericScannerState.java, * gnu/java/beans/encoder/IgnoringScannerState.java, * gnu/java/beans/encoder/MapPersistenceDelegate.java, * gnu/java/beans/encoder/ObjectId.java, * gnu/java/beans/encoder/PrimitivePersistenceDelegate.java, * gnu/java/beans/encoder/ReportingScannerState.java, * gnu/java/beans/encoder/Root.java, * gnu/java/beans/encoder/ScanEngine.java, * gnu/java/beans/encoder/ScannerState.java, * gnu/java/beans/encoder/StAXWriter.java, * gnu/java/beans/encoder/Writer.java, * gnu/java/beans/encoder/elements/ArrayInstantiation.java, * gnu/java/beans/encoder/elements/Array_Get.java, * gnu/java/beans/encoder/elements/ClassResolution.java, * gnu/java/beans/encoder/elements/Element.java, * gnu/java/beans/encoder/elements/List_Get.java, * gnu/java/beans/encoder/elements/List_Set.java, * gnu/java/beans/encoder/elements/MethodInvocation.java, * gnu/java/beans/encoder/elements/NullObject.java, * gnu/java/beans/encoder/elements/ObjectInstantiation.java, * gnu/java/beans/encoder/elements/ObjectReference.java, * gnu/java/beans/encoder/elements/PrimitiveInstantiation.java, * gnu/java/beans/encoder/elements/StaticFieldAccess.java, * gnu/java/beans/encoder/elements/StaticMethodInvocation.java, * gnu/java/beans/encoder/elements/StringReference.java, * gnu/java/io/ASN1ParsingException.java, * gnu/java/io/Base64InputStream.java, * gnu/java/io/ClassLoaderObjectInputStream.java, * gnu/java/io/NullOutputStream.java, * gnu/java/io/ObjectIdentityMap2Int.java, * gnu/java/io/ObjectIdentityWrapper.java, * gnu/java/io/PlatformHelper.java, * gnu/java/lang/CPStringBuilder.java, * gnu/java/lang/CharData.java, * gnu/java/lang/InstrumentationImpl.java, * gnu/java/lang/MainThread.java, * gnu/java/lang/management/BeanImpl.java, * gnu/java/lang/management/ClassLoadingMXBeanImpl.java, * gnu/java/lang/management/CompilationMXBeanImpl.java, * gnu/java/lang/management/GarbageCollectorMXBeanImpl.java, * gnu/java/lang/management/MemoryMXBeanImpl.java, * gnu/java/lang/management/MemoryManagerMXBeanImpl.java, * gnu/java/lang/management/MemoryPoolMXBeanImpl.java, * gnu/java/lang/management/OperatingSystemMXBeanImpl.java, * gnu/java/lang/management/RuntimeMXBeanImpl.java, * gnu/java/lang/management/ThreadMXBeanImpl.java, * gnu/java/lang/reflect/TypeSignature.java, * gnu/java/locale/LocaleHelper.java, * gnu/java/math/Fixed.java, * gnu/java/math/GMP.java, * gnu/java/math/MPN.java, * gnu/java/net/CRLFInputStream.java, * gnu/java/net/CRLFOutputStream.java, * gnu/java/net/DefaultContentHandlerFactory.java, * gnu/java/net/DefaultProxySelector.java, * gnu/java/net/EmptyX509TrustManager.java, * gnu/java/net/GetLocalHostAction.java, * gnu/java/net/HeaderFieldHelper.java, * gnu/java/net/IndexListParser.java, * gnu/java/net/LineInputStream.java, * gnu/java/net/PlainDatagramSocketImpl.java, * gnu/java/net/PlainSocketImpl.java, * gnu/java/net/loader/FileResource.java, * gnu/java/net/loader/FileURLLoader.java, * gnu/java/net/loader/JarURLLoader.java, * gnu/java/net/loader/JarURLResource.java, * gnu/java/net/loader/RemoteResource.java, * gnu/java/net/loader/RemoteURLLoader.java, * gnu/java/net/loader/Resource.java, * gnu/java/net/loader/URLLoader.java, * gnu/java/net/protocol/file/Connection.java, * gnu/java/net/protocol/file/Handler.java, * gnu/java/net/protocol/ftp/ActiveModeDTP.java, * gnu/java/net/protocol/ftp/BlockInputStream.java, * gnu/java/net/protocol/ftp/BlockOutputStream.java, * gnu/java/net/protocol/ftp/CompressedInputStream.java, * gnu/java/net/protocol/ftp/CompressedOutputStream.java, * gnu/java/net/protocol/ftp/DTP.java, * gnu/java/net/protocol/ftp/DTPInputStream.java, * gnu/java/net/protocol/ftp/DTPOutputStream.java, * gnu/java/net/protocol/ftp/FTPConnection.java, * gnu/java/net/protocol/ftp/FTPException.java, * gnu/java/net/protocol/ftp/FTPResponse.java, * gnu/java/net/protocol/ftp/FTPURLConnection.java, * gnu/java/net/protocol/ftp/Handler.java, * gnu/java/net/protocol/ftp/PassiveModeDTP.java, * gnu/java/net/protocol/ftp/StreamInputStream.java, * gnu/java/net/protocol/ftp/StreamOutputStream.java, * gnu/java/net/protocol/http/Authenticator.java, * gnu/java/net/protocol/http/ByteArrayRequestBodyWriter.java, * gnu/java/net/protocol/http/ChunkedInputStream.java, * gnu/java/net/protocol/http/Cookie.java, * gnu/java/net/protocol/http/CookieManager.java, * gnu/java/net/protocol/http/Credentials.java, * gnu/java/net/protocol/http/HTTPConnection.java, * gnu/java/net/protocol/http/HTTPDateFormat.java, * gnu/java/net/protocol/http/HTTPURLConnection.java, * gnu/java/net/protocol/http/Handler.java, * gnu/java/net/protocol/http/Headers.java, * gnu/java/net/protocol/http/Request.java, * gnu/java/net/protocol/http/RequestBodyWriter.java, * gnu/java/net/protocol/http/Response.java, * gnu/java/net/protocol/http/ResponseHeaderHandler.java, * gnu/java/net/protocol/http/SimpleCookieManager.java, * gnu/java/net/protocol/https/Handler.java, * gnu/java/net/protocol/jar/Connection.java, * gnu/java/net/protocol/jar/Handler.java, * gnu/java/nio/ChannelInputStream.java, * gnu/java/nio/ChannelOutputStream.java, * gnu/java/nio/ChannelReader.java, * gnu/java/nio/ChannelWriter.java, * gnu/java/nio/DatagramChannelImpl.java, * gnu/java/nio/DatagramChannelSelectionKey.java, * gnu/java/nio/EpollSelectionKeyImpl.java, * gnu/java/nio/EpollSelectorImpl.java, * gnu/java/nio/FileChannelImpl.java, * gnu/java/nio/FileLockImpl.java, * gnu/java/nio/InputStreamChannel.java, * gnu/java/nio/KqueueSelectionKeyImpl.java, * gnu/java/nio/KqueueSelectorImpl.java, * gnu/java/nio/NIODatagramSocket.java, * gnu/java/nio/NIOServerSocket.java, * gnu/java/nio/NIOSocket.java, * gnu/java/nio/NIOSocketImpl.java, * gnu/java/nio/OutputStreamChannel.java, * gnu/java/nio/PipeImpl.java, * gnu/java/nio/SelectionKeyImpl.java, * gnu/java/nio/SelectorImpl.java, * gnu/java/nio/SelectorProviderImpl.java, * gnu/java/nio/ServerSocketChannelImpl.java, * gnu/java/nio/ServerSocketChannelSelectionKey.java, * gnu/java/nio/SocketChannelImpl.java, * gnu/java/nio/SocketChannelSelectionKey.java, * gnu/java/nio/SocketChannelSelectionKeyImpl.java, * gnu/java/nio/VMChannelOwner.java, * gnu/java/nio/charset/ByteCharset.java, * gnu/java/nio/charset/ByteDecodeLoopHelper.java, * gnu/java/nio/charset/ByteEncodeLoopHelper.java, * gnu/java/nio/charset/Cp424.java, * gnu/java/nio/charset/Cp437.java, * gnu/java/nio/charset/Cp737.java, * gnu/java/nio/charset/Cp775.java, * gnu/java/nio/charset/Cp850.java, * gnu/java/nio/charset/Cp852.java, * gnu/java/nio/charset/Cp855.java, * gnu/java/nio/charset/Cp857.java, * gnu/java/nio/charset/Cp860.java, * gnu/java/nio/charset/Cp861.java, * gnu/java/nio/charset/Cp862.java, * gnu/java/nio/charset/Cp863.java, * gnu/java/nio/charset/Cp864.java, * gnu/java/nio/charset/Cp865.java, * gnu/java/nio/charset/Cp866.java, * gnu/java/nio/charset/Cp869.java, * gnu/java/nio/charset/Cp874.java, * gnu/java/nio/charset/EncodingHelper.java, * gnu/java/nio/charset/ISO_8859_1.java, * gnu/java/nio/charset/ISO_8859_13.java, * gnu/java/nio/charset/ISO_8859_15.java, * gnu/java/nio/charset/ISO_8859_2.java, * gnu/java/nio/charset/ISO_8859_3.java, * gnu/java/nio/charset/ISO_8859_4.java, * gnu/java/nio/charset/ISO_8859_5.java, * gnu/java/nio/charset/ISO_8859_6.java, * gnu/java/nio/charset/ISO_8859_7.java, * gnu/java/nio/charset/ISO_8859_8.java, * gnu/java/nio/charset/ISO_8859_9.java, * gnu/java/nio/charset/KOI_8.java, * gnu/java/nio/charset/MS874.java, * gnu/java/nio/charset/MacCentralEurope.java, * gnu/java/nio/charset/MacCroatian.java, * gnu/java/nio/charset/MacCyrillic.java, * gnu/java/nio/charset/MacDingbat.java, * gnu/java/nio/charset/MacGreek.java, * gnu/java/nio/charset/MacIceland.java, * gnu/java/nio/charset/MacRoman.java, * gnu/java/nio/charset/MacRomania.java, * gnu/java/nio/charset/MacSymbol.java, * gnu/java/nio/charset/MacThai.java, * gnu/java/nio/charset/MacTurkish.java, * gnu/java/nio/charset/Provider.java, * gnu/java/nio/charset/US_ASCII.java, * gnu/java/nio/charset/UTF_16.java, * gnu/java/nio/charset/UTF_16BE.java, * gnu/java/nio/charset/UTF_16Decoder.java, * gnu/java/nio/charset/UTF_16Encoder.java, * gnu/java/nio/charset/UTF_16LE.java, * gnu/java/nio/charset/UTF_8.java, * gnu/java/nio/charset/UnicodeLittle.java, * gnu/java/nio/charset/Windows1250.java, * gnu/java/nio/charset/Windows1251.java, * gnu/java/nio/charset/Windows1252.java, * gnu/java/nio/charset/Windows1253.java, * gnu/java/nio/charset/Windows1254.java, * gnu/java/nio/charset/Windows1255.java, * gnu/java/nio/charset/Windows1256.java, * gnu/java/nio/charset/Windows1257.java, * gnu/java/nio/charset/Windows1258.java, * gnu/java/nio/charset/iconv/IconvCharset.java, * gnu/java/nio/charset/iconv/IconvDecoder.java, * gnu/java/nio/charset/iconv/IconvEncoder.java, * gnu/java/nio/charset/iconv/IconvProvider.java, * gnu/java/rmi/RMIMarshalledObjectInputStream.java, * gnu/java/rmi/RMIMarshalledObjectOutputStream.java, * gnu/java/rmi/activation/ActivationSystemTransient.java, * gnu/java/rmi/activation/BidiTable.java, * gnu/java/rmi/activation/DefaultActivationGroup.java, * gnu/java/rmi/activation/DefaultActivationSystem.java, * gnu/java/rmi/dgc/DGCImpl.java, * gnu/java/rmi/dgc/DGCImpl_Skel.java, * gnu/java/rmi/dgc/DGCImpl_Stub.java, * gnu/java/rmi/dgc/LeaseRenewingTask.java, * gnu/java/rmi/registry/RegistryImpl.java, * gnu/java/rmi/registry/RegistryImpl_Skel.java, * gnu/java/rmi/registry/RegistryImpl_Stub.java, * gnu/java/rmi/server/ActivatableRef.java, * gnu/java/rmi/server/ActivatableServerRef.java, * gnu/java/rmi/server/CombinedClassLoader.java, * gnu/java/rmi/server/ConnectionRunnerPool.java, * gnu/java/rmi/server/ProtocolConstants.java, * gnu/java/rmi/server/RMIClassLoaderImpl.java, * gnu/java/rmi/server/RMIDefaultSocketFactory.java, * gnu/java/rmi/server/RMIHashes.java, * gnu/java/rmi/server/RMIIncomingThread.java, * gnu/java/rmi/server/RMIObjectInputStream.java, * gnu/java/rmi/server/RMIObjectOutputStream.java, * gnu/java/rmi/server/UnicastConnection.java, * gnu/java/rmi/server/UnicastConnectionManager.java, * gnu/java/rmi/server/UnicastRef.java, * gnu/java/rmi/server/UnicastRemoteCall.java, * gnu/java/rmi/server/UnicastRemoteStub.java, * gnu/java/rmi/server/UnicastServer.java, * gnu/java/rmi/server/UnicastServerRef.java, * gnu/java/security/Engine.java, * gnu/java/security/OID.java, * gnu/java/security/PolicyFile.java, * gnu/java/security/Properties.java, * gnu/java/security/Registry.java, * gnu/java/security/Requires.java, * gnu/java/security/action/GetPropertyAction.java, * gnu/java/security/action/SetAccessibleAction.java, * gnu/java/security/der/DERValue.java, * gnu/java/security/hash/BaseHash.java, * gnu/java/security/hash/HashFactory.java, * gnu/java/security/hash/Haval.java, * gnu/java/security/hash/IMessageDigest.java, * gnu/java/security/hash/MD2.java, * gnu/java/security/hash/MD4.java, * gnu/java/security/hash/MD5.java, * gnu/java/security/hash/RipeMD128.java, * gnu/java/security/hash/RipeMD160.java, * gnu/java/security/hash/Sha160.java, * gnu/java/security/hash/Sha256.java, * gnu/java/security/hash/Sha384.java, * gnu/java/security/hash/Sha512.java, * gnu/java/security/hash/Tiger.java, * gnu/java/security/hash/Whirlpool.java, * gnu/java/security/jce/hash/HavalSpi.java, * gnu/java/security/jce/hash/MD2Spi.java, * gnu/java/security/jce/hash/MD4Spi.java, * gnu/java/security/jce/hash/MD5Spi.java, * gnu/java/security/jce/hash/MessageDigestAdapter.java, * gnu/java/security/jce/hash/RipeMD128Spi.java, * gnu/java/security/jce/hash/RipeMD160Spi.java, * gnu/java/security/jce/hash/Sha160Spi.java, * gnu/java/security/jce/hash/Sha256Spi.java, * gnu/java/security/jce/hash/Sha384Spi.java, * gnu/java/security/jce/hash/Sha512Spi.java, * gnu/java/security/jce/hash/TigerSpi.java, * gnu/java/security/jce/hash/WhirlpoolSpi.java, * gnu/java/security/jce/prng/HavalRandomSpi.java, * gnu/java/security/jce/prng/MD2RandomSpi.java, * gnu/java/security/jce/prng/MD4RandomSpi.java, * gnu/java/security/jce/prng/MD5RandomSpi.java, * gnu/java/security/jce/prng/RipeMD128RandomSpi.java, * gnu/java/security/jce/prng/RipeMD160RandomSpi.java, * gnu/java/security/jce/prng/SecureRandomAdapter.java, * gnu/java/security/jce/prng/Sha160RandomSpi.java, * gnu/java/security/jce/prng/Sha256RandomSpi.java, * gnu/java/security/jce/prng/Sha384RandomSpi.java, * gnu/java/security/jce/prng/Sha512RandomSpi.java, * gnu/java/security/jce/prng/TigerRandomSpi.java, * gnu/java/security/jce/prng/WhirlpoolRandomSpi.java, * gnu/java/security/jce/sig/DSSKeyFactory.java, * gnu/java/security/jce/sig/DSSKeyPairGeneratorSpi.java, * gnu/java/security/jce/sig/DSSParameters.java, * gnu/java/security/jce/sig/DSSRawSignatureSpi.java, * gnu/java/security/jce/sig/KeyPairGeneratorAdapter.java, * gnu/java/security/jce/sig/RSAPSSRawSignatureSpi.java, * gnu/java/security/jce/sig/SignatureAdapter.java, * gnu/java/security/key/IKeyPairCodec.java, * gnu/java/security/key/IKeyPairGenerator.java, * gnu/java/security/key/KeyPairCodecFactory.java, * gnu/java/security/key/KeyPairGeneratorFactory.java, * gnu/java/security/key/dss/DSSKey.java, * gnu/java/security/key/dss/DSSKeyPairGenerator.java, * gnu/java/security/key/dss/DSSKeyPairPKCS8Codec.java, * gnu/java/security/key/dss/DSSKeyPairRawCodec.java, * gnu/java/security/key/dss/DSSKeyPairX509Codec.java, * gnu/java/security/key/dss/DSSPrivateKey.java, * gnu/java/security/key/dss/DSSPublicKey.java, * gnu/java/security/key/dss/FIPS186.java, * gnu/java/security/key/rsa/GnuRSAKey.java, * gnu/java/security/key/rsa/GnuRSAPrivateKey.java, * gnu/java/security/key/rsa/GnuRSAPublicKey.java, * gnu/java/security/key/rsa/RSAKeyPairGenerator.java, * gnu/java/security/key/rsa/RSAKeyPairPKCS8Codec.java, * gnu/java/security/key/rsa/RSAKeyPairRawCodec.java, * gnu/java/security/key/rsa/RSAKeyPairX509Codec.java, * gnu/java/security/pkcs/PKCS7Data.java, * gnu/java/security/pkcs/PKCS7SignedData.java, * gnu/java/security/pkcs/SignerInfo.java, * gnu/java/security/prng/BasePRNG.java, * gnu/java/security/prng/EntropySource.java, * gnu/java/security/prng/IRandom.java, * gnu/java/security/prng/LimitReachedException.java, * gnu/java/security/prng/MDGenerator.java, * gnu/java/security/prng/PRNGFactory.java, * gnu/java/security/prng/RandomEventListener.java, * gnu/java/security/provider/DefaultPolicy.java, * gnu/java/security/provider/PKIXCertPathValidatorImpl.java, * gnu/java/security/sig/BaseSignature.java, * gnu/java/security/sig/ISignature.java, * gnu/java/security/sig/ISignatureCodec.java, * gnu/java/security/sig/SignatureCodecFactory.java, * gnu/java/security/sig/SignatureFactory.java, * gnu/java/security/sig/dss/DSSSignature.java, * gnu/java/security/sig/dss/DSSSignatureRawCodec.java, * gnu/java/security/sig/dss/DSSSignatureX509Codec.java, * gnu/java/security/sig/rsa/EME_PKCS1_V1_5.java, * gnu/java/security/sig/rsa/EMSA_PKCS1_V1_5.java, * gnu/java/security/sig/rsa/EMSA_PSS.java, * gnu/java/security/sig/rsa/RSA.java, * gnu/java/security/sig/rsa/RSAPKCS1V1_5Signature.java, * gnu/java/security/sig/rsa/RSAPKCS1V1_5SignatureRawCodec.java, * gnu/java/security/sig/rsa/RSAPKCS1V1_5SignatureX509Codec.java, * gnu/java/security/sig/rsa/RSAPSSSignature.java, * gnu/java/security/sig/rsa/RSAPSSSignatureRawCodec.java, * gnu/java/security/sig/rsa/RSASignatureFactory.java, * gnu/java/security/util/ByteArray.java, * gnu/java/security/util/ByteBufferOutputStream.java, * gnu/java/security/util/ExpirableObject.java, * gnu/java/security/util/FormatUtil.java, * gnu/java/security/util/IntegerUtil.java, * gnu/java/security/util/PRNG.java, * gnu/java/security/util/Prime.java, * gnu/java/security/util/Sequence.java, * gnu/java/security/util/SimpleList.java, * gnu/java/security/util/Util.java, * gnu/java/security/x509/X509CRLSelectorImpl.java, * gnu/java/security/x509/X509CertSelectorImpl.java, * gnu/java/security/x509/ext/CertificatePolicies.java, * gnu/java/security/x509/ext/GeneralName.java, * gnu/java/security/x509/ext/GeneralSubtree.java, * gnu/java/security/x509/ext/NameConstraints.java, * gnu/java/text/AttributedFormatBuffer.java, * gnu/java/text/BaseBreakIterator.java, * gnu/java/text/CharacterBreakIterator.java, * gnu/java/text/FormatBuffer.java, * gnu/java/text/FormatCharacterIterator.java, * gnu/java/text/LineBreakIterator.java, * gnu/java/text/SentenceBreakIterator.java, * gnu/java/text/StringFormatBuffer.java, * gnu/java/text/WordBreakIterator.java, * gnu/java/util/Base64.java, * gnu/java/util/DoubleEnumeration.java, * gnu/java/util/EmptyEnumeration.java, * gnu/java/util/WeakIdentityHashMap.java, * gnu/java/util/ZoneInfo.java, * gnu/java/util/jar/JarUtils.java, * gnu/java/util/prefs/FileBasedFactory.java, * gnu/java/util/prefs/FileBasedPreferences.java, * gnu/java/util/prefs/GConfBasedFactory.java, * gnu/java/util/prefs/GConfBasedPreferences.java, * gnu/java/util/prefs/MemoryBasedFactory.java, * gnu/java/util/prefs/MemoryBasedPreferences.java, * gnu/java/util/prefs/NodeReader.java, * gnu/java/util/prefs/NodeWriter.java, * gnu/java/util/prefs/gconf/GConfNativePeer.java, * gnu/java/util/regex/BacktrackStack.java, * gnu/java/util/regex/CharIndexed.java, * gnu/java/util/regex/CharIndexedInputStream.java, * gnu/java/util/regex/RE.java, * gnu/java/util/regex/REFilterInputStream.java, * gnu/java/util/regex/REMatch.java, * gnu/java/util/regex/REMatchEnumeration.java, * gnu/java/util/regex/RESyntax.java, * gnu/java/util/regex/REToken.java, * gnu/java/util/regex/RETokenAny.java, * gnu/java/util/regex/RETokenBackRef.java, * gnu/java/util/regex/RETokenChar.java, * gnu/java/util/regex/RETokenEnd.java, * gnu/java/util/regex/RETokenEndOfPreviousMatch.java, * gnu/java/util/regex/RETokenIndependent.java, * gnu/java/util/regex/RETokenLookAhead.java, * gnu/java/util/regex/RETokenLookBehind.java, * gnu/java/util/regex/RETokenNamedProperty.java, * gnu/java/util/regex/RETokenOneOf.java, * gnu/java/util/regex/RETokenPOSIX.java, * gnu/java/util/regex/RETokenRange.java, * gnu/java/util/regex/RETokenRepeated.java, * gnu/java/util/regex/RETokenStart.java, * gnu/java/util/regex/RETokenWordBoundary.java, * gnu/java/util/regex/UncheckedRE.java, * gnu/javax/activation/viewers/ImageViewer.java, * gnu/javax/activation/viewers/TextEditor.java, * gnu/javax/activation/viewers/TextViewer.java, * gnu/javax/crypto/assembly/Assembly.java, * gnu/javax/crypto/assembly/Cascade.java, * gnu/javax/crypto/assembly/CascadeStage.java, * gnu/javax/crypto/assembly/CascadeTransformer.java, * gnu/javax/crypto/assembly/DeflateTransformer.java, * gnu/javax/crypto/assembly/Direction.java, * gnu/javax/crypto/assembly/LoopbackTransformer.java, * gnu/javax/crypto/assembly/ModeStage.java, * gnu/javax/crypto/assembly/Operation.java, * gnu/javax/crypto/assembly/PaddingTransformer.java, * gnu/javax/crypto/assembly/Stage.java, * gnu/javax/crypto/assembly/Transformer.java, * gnu/javax/crypto/assembly/TransformerException.java, * gnu/javax/crypto/cipher/Anubis.java, * gnu/javax/crypto/cipher/BaseCipher.java, * gnu/javax/crypto/cipher/Blowfish.java, * gnu/javax/crypto/cipher/Cast5.java, * gnu/javax/crypto/cipher/CipherFactory.java, * gnu/javax/crypto/cipher/DES.java, * gnu/javax/crypto/cipher/IBlockCipher.java, * gnu/javax/crypto/cipher/IBlockCipherSpi.java, * gnu/javax/crypto/cipher/Khazad.java, * gnu/javax/crypto/cipher/NullCipher.java, * gnu/javax/crypto/cipher/Rijndael.java, * gnu/javax/crypto/cipher/Serpent.java, * gnu/javax/crypto/cipher/Square.java, * gnu/javax/crypto/cipher/TripleDES.java, * gnu/javax/crypto/cipher/Twofish.java, * gnu/javax/crypto/cipher/WeakKeyException.java, * gnu/javax/crypto/jce/DiffieHellmanImpl.java, * gnu/javax/crypto/jce/GnuCrypto.java, * gnu/javax/crypto/jce/GnuSasl.java, * gnu/javax/crypto/jce/PBKDF2SecretKeyFactory.java, * gnu/javax/crypto/jce/cipher/AESKeyWrapSpi.java, * gnu/javax/crypto/jce/cipher/AESSpi.java, * gnu/javax/crypto/jce/cipher/ARCFourSpi.java, * gnu/javax/crypto/jce/cipher/AnubisSpi.java, * gnu/javax/crypto/jce/cipher/BlowfishSpi.java, * gnu/javax/crypto/jce/cipher/Cast5Spi.java, * gnu/javax/crypto/jce/cipher/CipherAdapter.java, * gnu/javax/crypto/jce/cipher/DESSpi.java, * gnu/javax/crypto/jce/cipher/KeyWrappingAlgorithmAdapter.java, * gnu/javax/crypto/jce/cipher/KhazadSpi.java, * gnu/javax/crypto/jce/cipher/NullCipherSpi.java, * gnu/javax/crypto/jce/cipher/PBES2.java, * gnu/javax/crypto/jce/cipher/RijndaelSpi.java, * gnu/javax/crypto/jce/cipher/SerpentSpi.java, * gnu/javax/crypto/jce/cipher/SquareSpi.java, * gnu/javax/crypto/jce/cipher/TripleDESSpi.java, * gnu/javax/crypto/jce/cipher/TwofishSpi.java, * gnu/javax/crypto/jce/key/AnubisSecretKeyFactoryImpl.java, * gnu/javax/crypto/jce/key/BlowfishSecretKeyFactoryImpl.java, * gnu/javax/crypto/jce/key/Cast5SecretKeyFactoryImpl.java, * gnu/javax/crypto/jce/key/SecretKeyGeneratorImpl.java, * gnu/javax/crypto/jce/keyring/GnuKeyring.java, * gnu/javax/crypto/jce/mac/HMacHavalSpi.java, * gnu/javax/crypto/jce/mac/HMacMD2Spi.java, * gnu/javax/crypto/jce/mac/HMacMD4Spi.java, * gnu/javax/crypto/jce/mac/HMacMD5Spi.java, * gnu/javax/crypto/jce/mac/HMacRipeMD128Spi.java, * gnu/javax/crypto/jce/mac/HMacRipeMD160Spi.java, * gnu/javax/crypto/jce/mac/HMacSHA160Spi.java, * gnu/javax/crypto/jce/mac/HMacSHA256Spi.java, * gnu/javax/crypto/jce/mac/HMacSHA384Spi.java, * gnu/javax/crypto/jce/mac/HMacSHA512Spi.java, * gnu/javax/crypto/jce/mac/HMacTigerSpi.java, * gnu/javax/crypto/jce/mac/HMacWhirlpoolSpi.java, * gnu/javax/crypto/jce/mac/MacAdapter.java, * gnu/javax/crypto/jce/mac/TMMH16Spi.java, * gnu/javax/crypto/jce/mac/UHash32Spi.java, * gnu/javax/crypto/jce/mac/UMac32Spi.java, * gnu/javax/crypto/jce/params/BlockCipherParameters.java, * gnu/javax/crypto/jce/params/DEREncodingException.java, * gnu/javax/crypto/jce/params/DERReader.java, * gnu/javax/crypto/jce/params/DERWriter.java, * gnu/javax/crypto/jce/prng/ARCFourRandomSpi.java, * gnu/javax/crypto/jce/prng/CSPRNGSpi.java, * gnu/javax/crypto/jce/prng/FortunaImpl.java, * gnu/javax/crypto/jce/prng/ICMRandomSpi.java, * gnu/javax/crypto/jce/prng/UMacRandomSpi.java, * gnu/javax/crypto/jce/sig/DHParameters.java, * gnu/javax/crypto/jce/spec/BlockCipherParameterSpec.java, * gnu/javax/crypto/jce/spec/TMMHParameterSpec.java, * gnu/javax/crypto/jce/spec/UMac32ParameterSpec.java, * gnu/javax/crypto/key/BaseKeyAgreementParty.java, * gnu/javax/crypto/key/GnuPBEKey.java, * gnu/javax/crypto/key/GnuSecretKey.java, * gnu/javax/crypto/key/IKeyAgreementParty.java, * gnu/javax/crypto/key/IncomingMessage.java, * gnu/javax/crypto/key/KeyAgreementException.java, * gnu/javax/crypto/key/KeyAgreementFactory.java, * gnu/javax/crypto/key/OutgoingMessage.java, * gnu/javax/crypto/key/dh/DHKeyPairPKCS8Codec.java, * gnu/javax/crypto/key/dh/DHKeyPairRawCodec.java, * gnu/javax/crypto/key/dh/DHKeyPairX509Codec.java, * gnu/javax/crypto/key/dh/DiffieHellmanKeyAgreement.java, * gnu/javax/crypto/key/dh/DiffieHellmanReceiver.java, * gnu/javax/crypto/key/dh/DiffieHellmanSender.java, * gnu/javax/crypto/key/dh/ElGamalKeyAgreement.java, * gnu/javax/crypto/key/dh/ElGamalReceiver.java, * gnu/javax/crypto/key/dh/ElGamalSender.java, * gnu/javax/crypto/key/dh/GnuDHKey.java, * gnu/javax/crypto/key/dh/GnuDHKeyPairGenerator.java, * gnu/javax/crypto/key/dh/GnuDHPrivateKey.java, * gnu/javax/crypto/key/dh/GnuDHPublicKey.java, * gnu/javax/crypto/key/dh/RFC2631.java, * gnu/javax/crypto/key/srp6/SRP6Host.java, * gnu/javax/crypto/key/srp6/SRP6KeyAgreement.java, * gnu/javax/crypto/key/srp6/SRP6SaslClient.java, * gnu/javax/crypto/key/srp6/SRP6SaslServer.java, * gnu/javax/crypto/key/srp6/SRP6TLSClient.java, * gnu/javax/crypto/key/srp6/SRP6TLSServer.java, * gnu/javax/crypto/key/srp6/SRP6User.java, * gnu/javax/crypto/key/srp6/SRPAlgorithm.java, * gnu/javax/crypto/key/srp6/SRPKey.java, * gnu/javax/crypto/key/srp6/SRPKeyPairGenerator.java, * gnu/javax/crypto/key/srp6/SRPKeyPairRawCodec.java, * gnu/javax/crypto/key/srp6/SRPPrivateKey.java, * gnu/javax/crypto/key/srp6/SRPPublicKey.java, * gnu/javax/crypto/keyring/AuthenticatedEntry.java, * gnu/javax/crypto/keyring/BaseKeyring.java, * gnu/javax/crypto/keyring/BinaryDataEntry.java, * gnu/javax/crypto/keyring/CertPathEntry.java, * gnu/javax/crypto/keyring/CertificateEntry.java, * gnu/javax/crypto/keyring/CompressedEntry.java, * gnu/javax/crypto/keyring/EncryptedEntry.java, * gnu/javax/crypto/keyring/Entry.java, * gnu/javax/crypto/keyring/EnvelopeEntry.java, * gnu/javax/crypto/keyring/GnuPrivateKeyring.java, * gnu/javax/crypto/keyring/GnuPublicKeyring.java, * gnu/javax/crypto/keyring/IKeyring.java, * gnu/javax/crypto/keyring/IPrivateKeyring.java, * gnu/javax/crypto/keyring/IPublicKeyring.java, * gnu/javax/crypto/keyring/MalformedKeyringException.java, * gnu/javax/crypto/keyring/MaskableEnvelopeEntry.java, * gnu/javax/crypto/keyring/MeteredInputStream.java, * gnu/javax/crypto/keyring/PasswordAuthenticatedEntry.java, * gnu/javax/crypto/keyring/PasswordEncryptedEntry.java, * gnu/javax/crypto/keyring/PasswordProtectedEntry.java, * gnu/javax/crypto/keyring/PrimitiveEntry.java, * gnu/javax/crypto/keyring/PrivateKeyEntry.java, * gnu/javax/crypto/keyring/Properties.java, * gnu/javax/crypto/keyring/PublicKeyEntry.java, * gnu/javax/crypto/kwa/BaseKeyWrappingAlgorithm.java, * gnu/javax/crypto/kwa/IKeyWrappingAlgorithm.java, * gnu/javax/crypto/kwa/KeyWrappingAlgorithmFactory.java, * gnu/javax/crypto/kwa/TripleDESKeyWrap.java, * gnu/javax/crypto/mac/BaseMac.java, * gnu/javax/crypto/mac/HMac.java, * gnu/javax/crypto/mac/HMacFactory.java, * gnu/javax/crypto/mac/IMac.java, * gnu/javax/crypto/mac/MacFactory.java, * gnu/javax/crypto/mac/MacInputStream.java, * gnu/javax/crypto/mac/MacOutputStream.java, * gnu/javax/crypto/mac/OMAC.java, * gnu/javax/crypto/mac/TMMH16.java, * gnu/javax/crypto/mac/UHash32.java, * gnu/javax/crypto/mac/UMac32.java, * gnu/javax/crypto/mode/BaseMode.java, * gnu/javax/crypto/mode/CBC.java, * gnu/javax/crypto/mode/CFB.java, * gnu/javax/crypto/mode/CTR.java, * gnu/javax/crypto/mode/EAX.java, * gnu/javax/crypto/mode/ECB.java, * gnu/javax/crypto/mode/IAuthenticatedMode.java, * gnu/javax/crypto/mode/ICM.java, * gnu/javax/crypto/mode/IMode.java, * gnu/javax/crypto/mode/ModeFactory.java, * gnu/javax/crypto/mode/OFB.java, * gnu/javax/crypto/pad/BasePad.java, * gnu/javax/crypto/pad/IPad.java, * gnu/javax/crypto/pad/PKCS1_V1_5.java, * gnu/javax/crypto/pad/PKCS7.java, * gnu/javax/crypto/pad/PadFactory.java, * gnu/javax/crypto/pad/TBC.java, * gnu/javax/crypto/pad/WrongPaddingException.java, * gnu/javax/crypto/prng/ARCFour.java, * gnu/javax/crypto/prng/CSPRNG.java, * gnu/javax/crypto/prng/ICMGenerator.java, * gnu/javax/crypto/prng/IPBE.java, * gnu/javax/crypto/prng/PBKDF2.java, * gnu/javax/crypto/prng/PRNGFactory.java, * gnu/javax/crypto/prng/UMacGenerator.java, * gnu/javax/crypto/sasl/AuthInfo.java, * gnu/javax/crypto/sasl/AuthInfoProviderFactory.java, * gnu/javax/crypto/sasl/ClientFactory.java, * gnu/javax/crypto/sasl/ClientMechanism.java, * gnu/javax/crypto/sasl/ConfidentialityException.java, * gnu/javax/crypto/sasl/IAuthInfoProvider.java, * gnu/javax/crypto/sasl/IAuthInfoProviderFactory.java, * gnu/javax/crypto/sasl/IllegalMechanismStateException.java, * gnu/javax/crypto/sasl/InputBuffer.java, * gnu/javax/crypto/sasl/IntegrityException.java, * gnu/javax/crypto/sasl/NoSuchMechanismException.java, * gnu/javax/crypto/sasl/NoSuchUserException.java, * gnu/javax/crypto/sasl/OutputBuffer.java, * gnu/javax/crypto/sasl/SaslEncodingException.java, * gnu/javax/crypto/sasl/SaslInputStream.java, * gnu/javax/crypto/sasl/SaslOutputStream.java, * gnu/javax/crypto/sasl/SaslUtil.java, * gnu/javax/crypto/sasl/ServerFactory.java, * gnu/javax/crypto/sasl/ServerMechanism.java, * gnu/javax/crypto/sasl/UserAlreadyExistsException.java, * gnu/javax/crypto/sasl/anonymous/AnonymousClient.java, * gnu/javax/crypto/sasl/anonymous/AnonymousServer.java, * gnu/javax/crypto/sasl/anonymous/AnonymousUtil.java, * gnu/javax/crypto/sasl/crammd5/CramMD5AuthInfoProvider.java, * gnu/javax/crypto/sasl/crammd5/CramMD5Client.java, * gnu/javax/crypto/sasl/crammd5/CramMD5Registry.java, * gnu/javax/crypto/sasl/crammd5/CramMD5Server.java, * gnu/javax/crypto/sasl/crammd5/CramMD5Util.java, * gnu/javax/crypto/sasl/crammd5/PasswordFile.java, * gnu/javax/crypto/sasl/plain/PasswordFile.java, * gnu/javax/crypto/sasl/plain/PlainAuthInfoProvider.java, * gnu/javax/crypto/sasl/plain/PlainClient.java, * gnu/javax/crypto/sasl/plain/PlainRegistry.java, * gnu/javax/crypto/sasl/plain/PlainServer.java, * gnu/javax/crypto/sasl/srp/CALG.java, * gnu/javax/crypto/sasl/srp/ClientStore.java, * gnu/javax/crypto/sasl/srp/IALG.java, * gnu/javax/crypto/sasl/srp/KDF.java, * gnu/javax/crypto/sasl/srp/PasswordFile.java, * gnu/javax/crypto/sasl/srp/SRP.java, * gnu/javax/crypto/sasl/srp/SRPAuthInfoProvider.java, * gnu/javax/crypto/sasl/srp/SRPClient.java, * gnu/javax/crypto/sasl/srp/SRPRegistry.java, * gnu/javax/crypto/sasl/srp/SRPServer.java, * gnu/javax/crypto/sasl/srp/SecurityContext.java, * gnu/javax/crypto/sasl/srp/ServerStore.java, * gnu/javax/crypto/sasl/srp/StoreEntry.java, * gnu/javax/imageio/IIOInputStream.java, * gnu/javax/imageio/bmp/BMPDecoder.java, * gnu/javax/imageio/bmp/BMPEncoder.java, * gnu/javax/imageio/bmp/BMPException.java, * gnu/javax/imageio/bmp/BMPFileHeader.java, * gnu/javax/imageio/bmp/BMPImageReader.java, * gnu/javax/imageio/bmp/BMPImageReaderSpi.java, * gnu/javax/imageio/bmp/BMPImageWriter.java, * gnu/javax/imageio/bmp/BMPImageWriterSpi.java, * gnu/javax/imageio/bmp/BMPInfoHeader.java, * gnu/javax/imageio/bmp/DecodeBF16.java, * gnu/javax/imageio/bmp/DecodeBF32.java, * gnu/javax/imageio/bmp/DecodeRGB1.java, * gnu/javax/imageio/bmp/DecodeRGB24.java, * gnu/javax/imageio/bmp/DecodeRGB4.java, * gnu/javax/imageio/bmp/DecodeRGB8.java, * gnu/javax/imageio/bmp/DecodeRLE4.java, * gnu/javax/imageio/bmp/DecodeRLE8.java, * gnu/javax/imageio/bmp/EncodeRGB1.java, * gnu/javax/imageio/bmp/EncodeRGB16.java, * gnu/javax/imageio/bmp/EncodeRGB24.java, * gnu/javax/imageio/bmp/EncodeRGB32.java, * gnu/javax/imageio/bmp/EncodeRGB4.java, * gnu/javax/imageio/bmp/EncodeRGB8.java, * gnu/javax/imageio/bmp/EncodeRLE4.java, * gnu/javax/imageio/bmp/EncodeRLE8.java, * gnu/javax/imageio/gif/GIFFile.java, * gnu/javax/imageio/gif/GIFImageReader.java, * gnu/javax/imageio/gif/GIFImageReaderSpi.java, * gnu/javax/imageio/jpeg/DCT.java, * gnu/javax/imageio/jpeg/JPEGComponent.java, * gnu/javax/imageio/jpeg/JPEGDecoder.java, * gnu/javax/imageio/jpeg/JPEGImageInputStream.java, * gnu/javax/imageio/jpeg/JPEGImageReader.java, * gnu/javax/imageio/jpeg/JPEGImageReaderSpi.java, * gnu/javax/imageio/jpeg/JPEGMarker.java, * gnu/javax/imageio/jpeg/ZigZag.java, * gnu/javax/imageio/png/PNGChunk.java, * gnu/javax/imageio/png/PNGData.java, * gnu/javax/imageio/png/PNGDecoder.java, * gnu/javax/imageio/png/PNGEncoder.java, * gnu/javax/imageio/png/PNGException.java, * gnu/javax/imageio/png/PNGFile.java, * gnu/javax/imageio/png/PNGFilter.java, * gnu/javax/imageio/png/PNGGamma.java, * gnu/javax/imageio/png/PNGHeader.java, * gnu/javax/imageio/png/PNGICCProfile.java, * gnu/javax/imageio/png/PNGImageReader.java, * gnu/javax/imageio/png/PNGPalette.java, * gnu/javax/imageio/png/PNGPhys.java, * gnu/javax/imageio/png/PNGTime.java, * gnu/javax/management/ListenerData.java, * gnu/javax/management/Server.java, * gnu/javax/management/Translator.java, * gnu/javax/naming/giop/ContextContinuation.java, * gnu/javax/naming/giop/CorbalocParser.java, * gnu/javax/naming/giop/GiopNamingEnumeration.java, * gnu/javax/naming/giop/GiopNamingServiceFactory.java, * gnu/javax/naming/giop/GiopNamingServiceURLContext.java, * gnu/javax/naming/giop/ListBindingsEnumeration.java, * gnu/javax/naming/giop/ListEnumeration.java, * gnu/javax/naming/ictxImpl/trans/GnuName.java, * gnu/javax/naming/jndi/url/corbaname/corbanameURLContextFactory.java, * gnu/javax/naming/jndi/url/rmi/ContextContinuation.java, * gnu/javax/naming/jndi/url/rmi/ListBindingsEnumeration.java, * gnu/javax/naming/jndi/url/rmi/ListEnumeration.java, * gnu/javax/naming/jndi/url/rmi/RmiContinuation.java, * gnu/javax/naming/jndi/url/rmi/RmiNamingEnumeration.java, * gnu/javax/naming/jndi/url/rmi/rmiURLContext.java, * gnu/javax/naming/jndi/url/rmi/rmiURLContextFactory.java, * gnu/javax/net/ssl/AbstractSessionContext.java, * gnu/javax/net/ssl/PreSharedKeyManager.java, * gnu/javax/net/ssl/PreSharedKeyManagerParameters.java, * gnu/javax/net/ssl/SSLCipherSuite.java, * gnu/javax/net/ssl/SSLRecordHandler.java, * gnu/javax/net/ssl/Session.java, * gnu/javax/net/ssl/SessionStoreException.java, * gnu/javax/net/ssl/provider/AbstractHandshake.java, * gnu/javax/net/ssl/provider/Alert.java, * gnu/javax/net/ssl/provider/AlertException.java, * gnu/javax/net/ssl/provider/Builder.java, * gnu/javax/net/ssl/provider/Certificate.java, * gnu/javax/net/ssl/provider/CertificateBuilder.java, * gnu/javax/net/ssl/provider/CertificateRequest.java, * gnu/javax/net/ssl/provider/CertificateRequestBuilder.java, * gnu/javax/net/ssl/provider/CertificateStatusRequest.java, * gnu/javax/net/ssl/provider/CertificateStatusType.java, * gnu/javax/net/ssl/provider/CertificateURL.java, * gnu/javax/net/ssl/provider/CertificateVerify.java, * gnu/javax/net/ssl/provider/CipherSuite.java, * gnu/javax/net/ssl/provider/CipherSuiteList.java, * gnu/javax/net/ssl/provider/ClientCertificateTypeList.java, * gnu/javax/net/ssl/provider/ClientDHE_PSKParameters.java, * gnu/javax/net/ssl/provider/ClientDiffieHellmanPublic.java, * gnu/javax/net/ssl/provider/ClientHandshake.java, * gnu/javax/net/ssl/provider/ClientHello.java, * gnu/javax/net/ssl/provider/ClientHelloBuilder.java, * gnu/javax/net/ssl/provider/ClientHelloV2.java, * gnu/javax/net/ssl/provider/ClientKeyExchangeBuilder.java, * gnu/javax/net/ssl/provider/ClientPSKParameters.java, * gnu/javax/net/ssl/provider/ClientRSA_PSKParameters.java, * gnu/javax/net/ssl/provider/CompressionMethod.java, * gnu/javax/net/ssl/provider/CompressionMethodList.java, * gnu/javax/net/ssl/provider/Constructed.java, * gnu/javax/net/ssl/provider/Debug.java, * gnu/javax/net/ssl/provider/DelegatedTask.java, * gnu/javax/net/ssl/provider/EmptyExchangeKeys.java, * gnu/javax/net/ssl/provider/EncryptedPreMasterSecret.java, * gnu/javax/net/ssl/provider/ExchangeKeys.java, * gnu/javax/net/ssl/provider/Extension.java, * gnu/javax/net/ssl/provider/ExtensionList.java, * gnu/javax/net/ssl/provider/Handshake.java, * gnu/javax/net/ssl/provider/InputSecurityParameters.java, * gnu/javax/net/ssl/provider/Jessie.java, * gnu/javax/net/ssl/provider/MaxFragmentLength.java, * gnu/javax/net/ssl/provider/OutputSecurityParameters.java, * gnu/javax/net/ssl/provider/PreSharedKeyManagerFactoryImpl.java, * gnu/javax/net/ssl/provider/Random.java, * gnu/javax/net/ssl/provider/SSLContextImpl.java, * gnu/javax/net/ssl/provider/SSLEngineImpl.java, * gnu/javax/net/ssl/provider/SSLRSASignatureImpl.java, * gnu/javax/net/ssl/provider/SSLServerSocketFactoryImpl.java, * gnu/javax/net/ssl/provider/SSLServerSocketImpl.java, * gnu/javax/net/ssl/provider/SSLSocketFactoryImpl.java, * gnu/javax/net/ssl/provider/SSLSocketImpl.java, * gnu/javax/net/ssl/provider/SSLv3HMacMD5Impl.java, * gnu/javax/net/ssl/provider/SSLv3HMacSHAImpl.java, * gnu/javax/net/ssl/provider/ServerDHE_PSKParameters.java, * gnu/javax/net/ssl/provider/ServerDHParams.java, * gnu/javax/net/ssl/provider/ServerHandshake.java, * gnu/javax/net/ssl/provider/ServerHello.java, * gnu/javax/net/ssl/provider/ServerHelloBuilder.java, * gnu/javax/net/ssl/provider/ServerHelloDone.java, * gnu/javax/net/ssl/provider/ServerKeyExchangeBuilder.java, * gnu/javax/net/ssl/provider/ServerNameList.java, * gnu/javax/net/ssl/provider/ServerPSKParameters.java, * gnu/javax/net/ssl/provider/ServerRSA_PSKParameters.java, * gnu/javax/net/ssl/provider/SessionImpl.java, * gnu/javax/net/ssl/provider/Signature.java, * gnu/javax/net/ssl/provider/SignatureAlgorithm.java, * gnu/javax/net/ssl/provider/SimpleSessionContext.java, * gnu/javax/net/ssl/provider/TruncatedHMAC.java, * gnu/javax/net/ssl/provider/TrustedAuthorities.java, * gnu/javax/net/ssl/provider/UnresolvedExtensionValue.java, * gnu/javax/net/ssl/provider/Util.java, * gnu/javax/net/ssl/provider/X500PrincipalList.java, * gnu/javax/net/ssl/provider/X509KeyManagerFactory.java, * gnu/javax/net/ssl/provider/X509TrustManagerFactory.java, * gnu/javax/print/ipp/IppRequest.java, * gnu/javax/rmi/CORBA/CorbaInput.java, * gnu/javax/rmi/CORBA/CorbaOutput.java, * gnu/javax/rmi/CORBA/DefaultWriteObjectTester.java, * gnu/javax/rmi/CORBA/DelegateFactory.java, * gnu/javax/rmi/CORBA/GetDelegateInstanceException.java, * gnu/javax/rmi/CORBA/PortableRemoteObjectDelegateImpl.java, * gnu/javax/rmi/CORBA/RmiUtilities.java, * gnu/javax/rmi/CORBA/StubDelegateImpl.java, * gnu/javax/rmi/CORBA/TieTargetRecord.java, * gnu/javax/rmi/CORBA/UtilDelegateImpl.java, * gnu/javax/rmi/CORBA/ValueHandlerDelegateImpl.java, * gnu/javax/security/auth/callback/AWTCallbackHandler.java, * gnu/javax/security/auth/callback/AbstractCallbackHandler.java, * gnu/javax/security/auth/callback/CertificateCallback.java, * gnu/javax/security/auth/callback/ConsoleCallbackHandler.java, * gnu/javax/security/auth/callback/DefaultCallbackHandler.java, * gnu/javax/security/auth/callback/SwingCallbackHandler.java, * gnu/javax/security/auth/login/ConfigFileParser.java, * gnu/javax/security/auth/login/ConfigFileTokenizer.java, * gnu/javax/security/auth/login/GnuConfiguration.java, * gnu/javax/sound/AudioSecurityManager.java, * gnu/javax/sound/midi/alsa/AlsaInputPortDevice.java, * gnu/javax/sound/midi/alsa/AlsaMidiDeviceProvider.java, * gnu/javax/sound/midi/alsa/AlsaMidiSequencerDevice.java, * gnu/javax/sound/midi/alsa/AlsaOutputPortDevice.java, * gnu/javax/sound/midi/alsa/AlsaPortDevice.java, * gnu/javax/sound/midi/dssi/DSSIMidiDeviceProvider.java, * gnu/javax/sound/midi/dssi/DSSISynthesizer.java, * gnu/javax/sound/midi/file/ExtendedMidiFileFormat.java, * gnu/javax/sound/midi/file/MidiDataInputStream.java, * gnu/javax/sound/midi/file/MidiDataOutputStream.java, * gnu/javax/sound/midi/file/MidiFileReader.java, * gnu/javax/sound/midi/file/MidiFileWriter.java, * gnu/javax/sound/sampled/AU/AUReader.java, * gnu/javax/sound/sampled/WAV/WAVReader.java, * gnu/javax/sound/sampled/gstreamer/GStreamerMixer.java, * gnu/javax/sound/sampled/gstreamer/GStreamerMixerProvider.java, * gnu/javax/sound/sampled/gstreamer/io/GstAudioFileReader.java, * gnu/javax/sound/sampled/gstreamer/io/GstAudioFileReaderNativePeer.java, * gnu/javax/sound/sampled/gstreamer/io/GstInputStream.java, * gnu/javax/sound/sampled/gstreamer/lines/GstDataLine.java, * gnu/javax/sound/sampled/gstreamer/lines/GstNativeDataLine.java, * gnu/javax/sound/sampled/gstreamer/lines/GstPipeline.java, * gnu/javax/sound/sampled/gstreamer/lines/GstSourceDataLine.java, * gnu/javax/swing/plaf/gnu/GNULookAndFeel.java, * gnu/javax/swing/text/html/CharacterAttributeTranslator.java, * gnu/javax/swing/text/html/CombinedAttributes.java, * gnu/javax/swing/text/html/ImageViewIconFactory.java, * gnu/javax/swing/text/html/css/BorderStyle.java, * gnu/javax/swing/text/html/css/CSSParser.java, * gnu/javax/swing/text/html/css/CSSScanner.java, * gnu/javax/swing/text/html/css/Selector.java, * gnu/javax/swing/text/html/parser/GnuParserDelegator.java, * gnu/javax/swing/text/html/parser/HTML_401F.java, * gnu/javax/swing/text/html/parser/SmallHtmlAttributeSet.java, * gnu/javax/swing/text/html/parser/htmlAttributeSet.java, * gnu/javax/swing/text/html/parser/htmlValidator.java, * gnu/javax/swing/text/html/parser/models/list.java, * gnu/javax/swing/text/html/parser/support/Parser.java, * gnu/javax/swing/text/html/parser/support/low/ReaderTokenizer.java, * gnu/javax/swing/text/html/parser/support/textPreProcessor.java, * gnu/javax/swing/tree/GnuPath.java, * gnu/test/Fail.java, * gnu/test/Pass.java, * gnu/test/Test.java, * gnu/test/Unsupported.java, * gnu/xml/aelfred2/JAXPFactory.java, * gnu/xml/aelfred2/SAXDriver.java, * gnu/xml/aelfred2/XmlParser.java, * gnu/xml/aelfred2/XmlReader.java, * gnu/xml/dom/Consumer.java, * gnu/xml/dom/DTDAttributeTypeInfo.java, * gnu/xml/dom/DTDElementTypeInfo.java, * gnu/xml/dom/DomAttr.java, * gnu/xml/dom/DomCDATASection.java, * gnu/xml/dom/DomCharacterData.java, * gnu/xml/dom/DomComment.java, * gnu/xml/dom/DomDOMException.java, * gnu/xml/dom/DomDoctype.java, * gnu/xml/dom/DomDocument.java, * gnu/xml/dom/DomDocumentBuilder.java, * gnu/xml/dom/DomDocumentBuilderFactory.java, * gnu/xml/dom/DomDocumentConfiguration.java, * gnu/xml/dom/DomDocumentFragment.java, * gnu/xml/dom/DomElement.java, * gnu/xml/dom/DomEntity.java, * gnu/xml/dom/DomEntityReference.java, * gnu/xml/dom/DomEvent.java, * gnu/xml/dom/DomExtern.java, * gnu/xml/dom/DomImpl.java, * gnu/xml/dom/DomIterator.java, * gnu/xml/dom/DomNSResolverContext.java, * gnu/xml/dom/DomNamedNodeMap.java, * gnu/xml/dom/DomNode.java, * gnu/xml/dom/DomNodeIterator.java, * gnu/xml/dom/DomNotation.java, * gnu/xml/dom/DomNsNode.java, * gnu/xml/dom/DomProcessingInstruction.java, * gnu/xml/dom/DomText.java, * gnu/xml/dom/DomXPathExpression.java, * gnu/xml/dom/DomXPathNSResolver.java, * gnu/xml/dom/DomXPathResult.java, * gnu/xml/dom/ImplementationList.java, * gnu/xml/dom/ImplementationSource.java, * gnu/xml/dom/JAXPFactory.java, * gnu/xml/dom/html2/DomHTMLAnchorElement.java, * gnu/xml/dom/html2/DomHTMLAppletElement.java, * gnu/xml/dom/html2/DomHTMLAreaElement.java, * gnu/xml/dom/html2/DomHTMLBRElement.java, * gnu/xml/dom/html2/DomHTMLBaseElement.java, * gnu/xml/dom/html2/DomHTMLBaseFontElement.java, * gnu/xml/dom/html2/DomHTMLBodyElement.java, * gnu/xml/dom/html2/DomHTMLButtonElement.java, * gnu/xml/dom/html2/DomHTMLCollection.java, * gnu/xml/dom/html2/DomHTMLDListElement.java, * gnu/xml/dom/html2/DomHTMLDirectoryElement.java, * gnu/xml/dom/html2/DomHTMLDivElement.java, * gnu/xml/dom/html2/DomHTMLDocument.java, * gnu/xml/dom/html2/DomHTMLElement.java, * gnu/xml/dom/html2/DomHTMLEmbedElement.java, * gnu/xml/dom/html2/DomHTMLFieldSetElement.java, * gnu/xml/dom/html2/DomHTMLFontElement.java, * gnu/xml/dom/html2/DomHTMLFormElement.java, * gnu/xml/dom/html2/DomHTMLFrameElement.java, * gnu/xml/dom/html2/DomHTMLFrameSetElement.java, * gnu/xml/dom/html2/DomHTMLHRElement.java, * gnu/xml/dom/html2/DomHTMLHeadElement.java, * gnu/xml/dom/html2/DomHTMLHeadingElement.java, * gnu/xml/dom/html2/DomHTMLHtmlElement.java, * gnu/xml/dom/html2/DomHTMLIFrameElement.java, * gnu/xml/dom/html2/DomHTMLImageElement.java, * gnu/xml/dom/html2/DomHTMLImpl.java, * gnu/xml/dom/html2/DomHTMLInputElement.java, * gnu/xml/dom/html2/DomHTMLIsIndexElement.java, * gnu/xml/dom/html2/DomHTMLLIElement.java, * gnu/xml/dom/html2/DomHTMLLabelElement.java, * gnu/xml/dom/html2/DomHTMLLegendElement.java, * gnu/xml/dom/html2/DomHTMLLinkElement.java, * gnu/xml/dom/html2/DomHTMLMapElement.java, * gnu/xml/dom/html2/DomHTMLMenuElement.java, * gnu/xml/dom/html2/DomHTMLMetaElement.java, * gnu/xml/dom/html2/DomHTMLModElement.java, * gnu/xml/dom/html2/DomHTMLOListElement.java, * gnu/xml/dom/html2/DomHTMLObjectElement.java, * gnu/xml/dom/html2/DomHTMLOptGroupElement.java, * gnu/xml/dom/html2/DomHTMLOptionElement.java, * gnu/xml/dom/html2/DomHTMLParagraphElement.java, * gnu/xml/dom/html2/DomHTMLParamElement.java, * gnu/xml/dom/html2/DomHTMLParser.java, * gnu/xml/dom/html2/DomHTMLPreElement.java, * gnu/xml/dom/html2/DomHTMLQuoteElement.java, * gnu/xml/dom/html2/DomHTMLScriptElement.java, * gnu/xml/dom/html2/DomHTMLSelectElement.java, * gnu/xml/dom/html2/DomHTMLStyleElement.java, * gnu/xml/dom/html2/DomHTMLTableCaptionElement.java, * gnu/xml/dom/html2/DomHTMLTableCellElement.java, * gnu/xml/dom/html2/DomHTMLTableColElement.java, * gnu/xml/dom/html2/DomHTMLTableElement.java, * gnu/xml/dom/html2/DomHTMLTableRowElement.java, * gnu/xml/dom/html2/DomHTMLTableSectionElement.java, * gnu/xml/dom/html2/DomHTMLTextAreaElement.java, * gnu/xml/dom/html2/DomHTMLTitleElement.java, * gnu/xml/dom/html2/DomHTMLUListElement.java, * gnu/xml/dom/ls/DomLSException.java, * gnu/xml/dom/ls/DomLSInput.java, * gnu/xml/dom/ls/DomLSOutput.java, * gnu/xml/dom/ls/DomLSParser.java, * gnu/xml/dom/ls/DomLSSerializer.java, * gnu/xml/dom/ls/FilteredSAXEventSink.java, * gnu/xml/dom/ls/ReaderInputStream.java, * gnu/xml/dom/ls/SAXEventSink.java, * gnu/xml/dom/ls/WriterOutputStream.java, * gnu/xml/libxmlj/dom/GnomeAttr.java, * gnu/xml/libxmlj/dom/GnomeCDATASection.java, * gnu/xml/libxmlj/dom/GnomeCharacterData.java, * gnu/xml/libxmlj/dom/GnomeComment.java, * gnu/xml/libxmlj/dom/GnomeDOMException.java, * gnu/xml/libxmlj/dom/GnomeDOMStringList.java, * gnu/xml/libxmlj/dom/GnomeDocument.java, * gnu/xml/libxmlj/dom/GnomeDocumentBuilder.java, * gnu/xml/libxmlj/dom/GnomeDocumentBuilderFactory.java, * gnu/xml/libxmlj/dom/GnomeDocumentFragment.java, * gnu/xml/libxmlj/dom/GnomeDocumentType.java, * gnu/xml/libxmlj/dom/GnomeElement.java, * gnu/xml/libxmlj/dom/GnomeEntity.java, * gnu/xml/libxmlj/dom/GnomeEntityReference.java, * gnu/xml/libxmlj/dom/GnomeNamedNodeMap.java, * gnu/xml/libxmlj/dom/GnomeNode.java, * gnu/xml/libxmlj/dom/GnomeNodeList.java, * gnu/xml/libxmlj/dom/GnomeNotation.java, * gnu/xml/libxmlj/dom/GnomeProcessingInstruction.java, * gnu/xml/libxmlj/dom/GnomeText.java, * gnu/xml/libxmlj/dom/GnomeTypeInfo.java, * gnu/xml/libxmlj/dom/GnomeXPathExpression.java, * gnu/xml/libxmlj/dom/GnomeXPathNSResolver.java, * gnu/xml/libxmlj/dom/GnomeXPathNodeList.java, * gnu/xml/libxmlj/dom/GnomeXPathResult.java, * gnu/xml/libxmlj/sax/GnomeLocator.java, * gnu/xml/libxmlj/sax/GnomeSAXParser.java, * gnu/xml/libxmlj/sax/GnomeSAXParserFactory.java, * gnu/xml/libxmlj/sax/GnomeXMLReader.java, * gnu/xml/libxmlj/sax/Namespaces.java, * gnu/xml/libxmlj/sax/StringArrayAttributes.java, * gnu/xml/libxmlj/sax/XMLName.java, * gnu/xml/libxmlj/transform/ErrorListenerErrorHandler.java, * gnu/xml/libxmlj/transform/GnomeTransformer.java, * gnu/xml/libxmlj/transform/GnomeTransformerFactory.java, * gnu/xml/libxmlj/transform/URIResolverEntityResolver.java, * gnu/xml/libxmlj/util/EmptyNodeList.java, * gnu/xml/libxmlj/util/NamedInputStream.java, * gnu/xml/libxmlj/util/StandaloneDocumentType.java, * gnu/xml/libxmlj/util/StandaloneLocator.java, * gnu/xml/libxmlj/util/XMLJ.java, * gnu/xml/pipeline/CallFilter.java, * gnu/xml/pipeline/DomConsumer.java, * gnu/xml/pipeline/EventConsumer.java, * gnu/xml/pipeline/EventFilter.java, * gnu/xml/pipeline/LinkFilter.java, * gnu/xml/pipeline/NSFilter.java, * gnu/xml/pipeline/PipelineFactory.java, * gnu/xml/pipeline/TeeConsumer.java, * gnu/xml/pipeline/TextConsumer.java, * gnu/xml/pipeline/ValidationConsumer.java, * gnu/xml/pipeline/WellFormednessFilter.java, * gnu/xml/pipeline/XIncludeFilter.java, * gnu/xml/pipeline/XsltFilter.java, * gnu/xml/stream/AttributeImpl.java, * gnu/xml/stream/BufferedReader.java, * gnu/xml/stream/CRLFReader.java, * gnu/xml/stream/CharactersImpl.java, * gnu/xml/stream/CommentImpl.java, * gnu/xml/stream/DTDImpl.java, * gnu/xml/stream/EndDocumentImpl.java, * gnu/xml/stream/EndElementImpl.java, * gnu/xml/stream/EntityDeclarationImpl.java, * gnu/xml/stream/EntityReferenceImpl.java, * gnu/xml/stream/FilteredEventReader.java, * gnu/xml/stream/FilteredStreamReader.java, * gnu/xml/stream/NamespaceImpl.java, * gnu/xml/stream/NotationDeclarationImpl.java, * gnu/xml/stream/ProcessingInstructionImpl.java, * gnu/xml/stream/SAXParser.java, * gnu/xml/stream/SAXParserFactory.java, * gnu/xml/stream/StartDocumentImpl.java, * gnu/xml/stream/StartElementImpl.java, * gnu/xml/stream/UnicodeReader.java, * gnu/xml/stream/XIncludeFilter.java, * gnu/xml/stream/XMLEventAllocatorImpl.java, * gnu/xml/stream/XMLEventFactoryImpl.java, * gnu/xml/stream/XMLEventImpl.java, * gnu/xml/stream/XMLEventReaderImpl.java, * gnu/xml/stream/XMLEventWriterImpl.java, * gnu/xml/stream/XMLInputFactoryImpl.java, * gnu/xml/stream/XMLOutputFactoryImpl.java, * gnu/xml/stream/XMLParser.java, * gnu/xml/stream/XMLStreamWriterImpl.java, * gnu/xml/transform/AbstractNumberNode.java, * gnu/xml/transform/ApplyImportsNode.java, * gnu/xml/transform/ApplyTemplatesNode.java, * gnu/xml/transform/AttributeNode.java, * gnu/xml/transform/AttributeSet.java, * gnu/xml/transform/Bindings.java, * gnu/xml/transform/CallTemplateNode.java, * gnu/xml/transform/ChooseNode.java, * gnu/xml/transform/CommentNode.java, * gnu/xml/transform/CopyNode.java, * gnu/xml/transform/CopyOfNode.java, * gnu/xml/transform/CurrentFunction.java, * gnu/xml/transform/DOMSourceLocator.java, * gnu/xml/transform/DocumentFunction.java, * gnu/xml/transform/ElementAvailableFunction.java, * gnu/xml/transform/ElementNode.java, * gnu/xml/transform/ErrorListenerErrorHandler.java, * gnu/xml/transform/ForEachNode.java, * gnu/xml/transform/FormatNumberFunction.java, * gnu/xml/transform/FunctionAvailableFunction.java, * gnu/xml/transform/GenerateIdFunction.java, * gnu/xml/transform/IfNode.java, * gnu/xml/transform/Key.java, * gnu/xml/transform/KeyFunction.java, * gnu/xml/transform/LiteralNode.java, * gnu/xml/transform/MessageNode.java, * gnu/xml/transform/NamespaceProxy.java, * gnu/xml/transform/NodeNumberNode.java, * gnu/xml/transform/NumberNode.java, * gnu/xml/transform/OtherwiseNode.java, * gnu/xml/transform/ParameterNode.java, * gnu/xml/transform/ProcessingInstructionNode.java, * gnu/xml/transform/SAXSerializer.java, * gnu/xml/transform/SAXTemplatesHandler.java, * gnu/xml/transform/SAXTransformerHandler.java, * gnu/xml/transform/SortKey.java, * gnu/xml/transform/StreamSerializer.java, * gnu/xml/transform/StrippingInstruction.java, * gnu/xml/transform/Stylesheet.java, * gnu/xml/transform/SystemPropertyFunction.java, * gnu/xml/transform/Template.java, * gnu/xml/transform/TemplateNode.java, * gnu/xml/transform/TemplatesImpl.java, * gnu/xml/transform/TextNode.java, * gnu/xml/transform/TransformerFactoryImpl.java, * gnu/xml/transform/TransformerImpl.java, * gnu/xml/transform/TransformerOutputProperties.java, * gnu/xml/transform/URIResolverEntityResolver.java, * gnu/xml/transform/UnparsedEntityUriFunction.java, * gnu/xml/transform/ValueOfNode.java, * gnu/xml/transform/WhenNode.java, * gnu/xml/transform/WithParam.java, * gnu/xml/transform/XSLComparator.java, * gnu/xml/transform/XSLURIResolver.java, * gnu/xml/util/DoParse.java, * gnu/xml/util/DomParser.java, * gnu/xml/util/Resolver.java, * gnu/xml/util/SAXNullTransformerFactory.java, * gnu/xml/util/XCat.java, * gnu/xml/util/XHTMLWriter.java, * gnu/xml/util/XMLWriter.java, * gnu/xml/validation/datatype/Annotation.java, * gnu/xml/validation/datatype/AnySimpleType.java, * gnu/xml/validation/datatype/AnyType.java, * gnu/xml/validation/datatype/AnyURIType.java, * gnu/xml/validation/datatype/AtomicSimpleType.java, * gnu/xml/validation/datatype/Base64BinaryType.java, * gnu/xml/validation/datatype/BooleanType.java, * gnu/xml/validation/datatype/ByteType.java, * gnu/xml/validation/datatype/DateTimeType.java, * gnu/xml/validation/datatype/DateType.java, * gnu/xml/validation/datatype/DecimalType.java, * gnu/xml/validation/datatype/DoubleType.java, * gnu/xml/validation/datatype/DurationType.java, * gnu/xml/validation/datatype/EntitiesType.java, * gnu/xml/validation/datatype/EntityType.java, * gnu/xml/validation/datatype/EnumerationFacet.java, * gnu/xml/validation/datatype/Facet.java, * gnu/xml/validation/datatype/FloatType.java, * gnu/xml/validation/datatype/FractionDigitsFacet.java, * gnu/xml/validation/datatype/GDayType.java, * gnu/xml/validation/datatype/GMonthDayType.java, * gnu/xml/validation/datatype/GMonthType.java, * gnu/xml/validation/datatype/GYearMonthType.java, * gnu/xml/validation/datatype/GYearType.java, * gnu/xml/validation/datatype/HexBinaryType.java, * gnu/xml/validation/datatype/IDRefType.java, * gnu/xml/validation/datatype/IDRefsType.java, * gnu/xml/validation/datatype/IDType.java, * gnu/xml/validation/datatype/IntType.java, * gnu/xml/validation/datatype/IntegerType.java, * gnu/xml/validation/datatype/LanguageType.java, * gnu/xml/validation/datatype/LengthFacet.java, * gnu/xml/validation/datatype/ListSimpleType.java, * gnu/xml/validation/datatype/LongType.java, * gnu/xml/validation/datatype/MaxExclusiveFacet.java, * gnu/xml/validation/datatype/MaxInclusiveFacet.java, * gnu/xml/validation/datatype/MaxLengthFacet.java, * gnu/xml/validation/datatype/MinExclusiveFacet.java, * gnu/xml/validation/datatype/MinInclusiveFacet.java, * gnu/xml/validation/datatype/MinLengthFacet.java, * gnu/xml/validation/datatype/NCNameType.java, * gnu/xml/validation/datatype/NMTokenType.java, * gnu/xml/validation/datatype/NMTokensType.java, * gnu/xml/validation/datatype/NameType.java, * gnu/xml/validation/datatype/NegativeIntegerType.java, * gnu/xml/validation/datatype/NonNegativeIntegerType.java, * gnu/xml/validation/datatype/NonPositiveIntegerType.java, * gnu/xml/validation/datatype/NormalizedStringType.java, * gnu/xml/validation/datatype/NotationType.java, * gnu/xml/validation/datatype/PatternFacet.java, * gnu/xml/validation/datatype/PositiveIntegerType.java, * gnu/xml/validation/datatype/QNameType.java, * gnu/xml/validation/datatype/ShortType.java, * gnu/xml/validation/datatype/SimpleType.java, * gnu/xml/validation/datatype/StringType.java, * gnu/xml/validation/datatype/TimeType.java, * gnu/xml/validation/datatype/TokenType.java, * gnu/xml/validation/datatype/TotalDigitsFacet.java, * gnu/xml/validation/datatype/Type.java, * gnu/xml/validation/datatype/TypeBuilder.java, * gnu/xml/validation/datatype/TypeLibrary.java, * gnu/xml/validation/datatype/TypeLibraryFactory.java, * gnu/xml/validation/datatype/UnionSimpleType.java, * gnu/xml/validation/datatype/UnsignedByteType.java, * gnu/xml/validation/datatype/UnsignedIntType.java, * gnu/xml/validation/datatype/UnsignedLongType.java, * gnu/xml/validation/datatype/UnsignedShortType.java, * gnu/xml/validation/datatype/WhiteSpaceFacet.java, * gnu/xml/validation/relaxng/AnyNameNameClass.java, * gnu/xml/validation/relaxng/AttributePattern.java, * gnu/xml/validation/relaxng/ChoiceNameClass.java, * gnu/xml/validation/relaxng/ChoicePattern.java, * gnu/xml/validation/relaxng/DataPattern.java, * gnu/xml/validation/relaxng/Define.java, * gnu/xml/validation/relaxng/ElementPattern.java, * gnu/xml/validation/relaxng/EmptyPattern.java, * gnu/xml/validation/relaxng/FullSyntaxBuilder.java, * gnu/xml/validation/relaxng/Grammar.java, * gnu/xml/validation/relaxng/GrammarException.java, * gnu/xml/validation/relaxng/GrammarValidator.java, * gnu/xml/validation/relaxng/GroupPattern.java, * gnu/xml/validation/relaxng/InterleavePattern.java, * gnu/xml/validation/relaxng/ListPattern.java, * gnu/xml/validation/relaxng/NSNameNameClass.java, * gnu/xml/validation/relaxng/NameClass.java, * gnu/xml/validation/relaxng/NameNameClass.java, * gnu/xml/validation/relaxng/NotAllowedPattern.java, * gnu/xml/validation/relaxng/OneOrMorePattern.java, * gnu/xml/validation/relaxng/Param.java, * gnu/xml/validation/relaxng/Pattern.java, * gnu/xml/validation/relaxng/RELAXNGSchemaFactory.java, * gnu/xml/validation/relaxng/RefPattern.java, * gnu/xml/validation/relaxng/TextPattern.java, * gnu/xml/validation/relaxng/ValuePattern.java, * gnu/xml/validation/xmlschema/AnyAttribute.java, * gnu/xml/validation/xmlschema/AttributeDeclaration.java, * gnu/xml/validation/xmlschema/AttributeUse.java, * gnu/xml/validation/xmlschema/ComplexType.java, * gnu/xml/validation/xmlschema/ElementDeclaration.java, * gnu/xml/validation/xmlschema/Particle.java, * gnu/xml/validation/xmlschema/ValidationException.java, * gnu/xml/validation/xmlschema/XMLSchema.java, * gnu/xml/validation/xmlschema/XMLSchemaAttributeTypeInfo.java, * gnu/xml/validation/xmlschema/XMLSchemaBuilder.java, * gnu/xml/validation/xmlschema/XMLSchemaElementTypeInfo.java, * gnu/xml/validation/xmlschema/XMLSchemaSchemaFactory.java, * gnu/xml/validation/xmlschema/XMLSchemaTypeInfo.java, * gnu/xml/validation/xmlschema/XMLSchemaTypeInfoProvider.java, * gnu/xml/validation/xmlschema/XMLSchemaValidator.java, * gnu/xml/validation/xmlschema/XMLSchemaValidatorHandler.java, * gnu/xml/xpath/AndExpr.java, * gnu/xml/xpath/ArithmeticExpr.java, * gnu/xml/xpath/BooleanFunction.java, * gnu/xml/xpath/CeilingFunction.java, * gnu/xml/xpath/ConcatFunction.java, * gnu/xml/xpath/Constant.java, * gnu/xml/xpath/ContainsFunction.java, * gnu/xml/xpath/CountFunction.java, * gnu/xml/xpath/DocumentOrderComparator.java, * gnu/xml/xpath/EqualityExpr.java, * gnu/xml/xpath/Expr.java, * gnu/xml/xpath/FalseFunction.java, * gnu/xml/xpath/FloorFunction.java, * gnu/xml/xpath/Function.java, * gnu/xml/xpath/FunctionCall.java, * gnu/xml/xpath/IdFunction.java, * gnu/xml/xpath/LangFunction.java, * gnu/xml/xpath/LastFunction.java, * gnu/xml/xpath/LocalNameFunction.java, * gnu/xml/xpath/NameFunction.java, * gnu/xml/xpath/NameTest.java, * gnu/xml/xpath/NamespaceTest.java, * gnu/xml/xpath/NamespaceUriFunction.java, * gnu/xml/xpath/NegativeExpr.java, * gnu/xml/xpath/NodeTypeTest.java, * gnu/xml/xpath/NormalizeSpaceFunction.java, * gnu/xml/xpath/NotFunction.java, * gnu/xml/xpath/NumberFunction.java, * gnu/xml/xpath/OrExpr.java, * gnu/xml/xpath/ParenthesizedExpr.java, * gnu/xml/xpath/Path.java, * gnu/xml/xpath/Pattern.java, * gnu/xml/xpath/PositionFunction.java, * gnu/xml/xpath/Predicate.java, * gnu/xml/xpath/RelationalExpr.java, * gnu/xml/xpath/Root.java, * gnu/xml/xpath/RoundFunction.java, * gnu/xml/xpath/Selector.java, * gnu/xml/xpath/StartsWithFunction.java, * gnu/xml/xpath/Steps.java, * gnu/xml/xpath/StringFunction.java, * gnu/xml/xpath/StringLengthFunction.java, * gnu/xml/xpath/SubstringAfterFunction.java, * gnu/xml/xpath/SubstringBeforeFunction.java, * gnu/xml/xpath/SubstringFunction.java, * gnu/xml/xpath/SumFunction.java, * gnu/xml/xpath/Test.java, * gnu/xml/xpath/TranslateFunction.java, * gnu/xml/xpath/TrueFunction.java, * gnu/xml/xpath/UnionExpr.java, * gnu/xml/xpath/VariableReference.java, * gnu/xml/xpath/XPathFactoryImpl.java, * gnu/xml/xpath/XPathImpl.java, * gnu/xml/xpath/XPathParser.java, * gnu/xml/xpath/XPathTokenizer.java, * java/applet/Applet.java, * java/awt/AWTEvent.java, * java/awt/AWTEventMulticaster.java, * java/awt/AWTKeyStroke.java, * java/awt/AlphaComposite.java, * java/awt/BasicStroke.java, * java/awt/BorderLayout.java, * java/awt/BufferCapabilities.java, * java/awt/Button.java, * java/awt/Canvas.java, * java/awt/CardLayout.java, * java/awt/Checkbox.java, * java/awt/CheckboxGroup.java, * java/awt/CheckboxMenuItem.java, * java/awt/Choice.java, * java/awt/Color.java, * java/awt/ColorPaintContext.java, * java/awt/Component.java, * java/awt/Container.java, * java/awt/ContainerOrderFocusTraversalPolicy.java, * java/awt/Cursor.java, * java/awt/DefaultFocusTraversalPolicy.java, * java/awt/DefaultKeyboardFocusManager.java, * java/awt/Desktop.java, * java/awt/Dialog.java, * java/awt/DisplayMode.java, * java/awt/Event.java, * java/awt/EventDispatchThread.java, * java/awt/EventQueue.java, * java/awt/FileDialog.java, * java/awt/FlowLayout.java, * java/awt/FocusTraversalPolicy.java, * java/awt/Font.java, * java/awt/FontMetrics.java, * java/awt/Frame.java, * java/awt/GradientPaint.java, * java/awt/Graphics.java, * java/awt/Graphics2D.java, * java/awt/GraphicsConfiguration.java, * java/awt/GraphicsDevice.java, * java/awt/GridBagConstraints.java, * java/awt/GridBagLayout.java, * java/awt/GridLayout.java, * java/awt/Image.java, * java/awt/Insets.java, * java/awt/JobAttributes.java, * java/awt/KeyboardFocusManager.java, * java/awt/Label.java, * java/awt/LightweightDispatcher.java, * java/awt/List.java, * java/awt/MediaTracker.java, * java/awt/Menu.java, * java/awt/MenuBar.java, * java/awt/MenuComponent.java, * java/awt/MenuItem.java, * java/awt/MenuShortcut.java, * java/awt/MouseInfo.java, * java/awt/PageAttributes.java, * java/awt/Point.java, * java/awt/PointerInfo.java, * java/awt/Polygon.java, * java/awt/PopupMenu.java, * java/awt/Rectangle.java, * java/awt/RenderingHints.java, * java/awt/Robot.java, * java/awt/ScrollPane.java, * java/awt/ScrollPaneAdjustable.java, * java/awt/Scrollbar.java, * java/awt/Shape.java, * java/awt/SystemColor.java, * java/awt/TextArea.java, * java/awt/TextComponent.java, * java/awt/TextField.java, * java/awt/TexturePaint.java, * java/awt/Toolkit.java, * java/awt/Window.java, * java/awt/color/ICC_ColorSpace.java, * java/awt/color/ICC_Profile.java, * java/awt/color/ICC_ProfileGray.java, * java/awt/color/ICC_ProfileRGB.java, * java/awt/datatransfer/Clipboard.java, * java/awt/datatransfer/ClipboardOwner.java, * java/awt/datatransfer/DataFlavor.java, * java/awt/datatransfer/FlavorEvent.java, * java/awt/datatransfer/FlavorListener.java, * java/awt/datatransfer/MimeType.java, * java/awt/datatransfer/StringSelection.java, * java/awt/datatransfer/SystemFlavorMap.java, * java/awt/datatransfer/Transferable.java, * java/awt/datatransfer/UnsupportedFlavorException.java, * java/awt/dnd/Autoscroll.java, * java/awt/dnd/DnDEventMulticaster.java, * java/awt/dnd/DragGestureEvent.java, * java/awt/dnd/DragGestureRecognizer.java, * java/awt/dnd/DragSource.java, * java/awt/dnd/DragSourceContext.java, * java/awt/dnd/DragSourceDropEvent.java, * java/awt/dnd/DragSourceEvent.java, * java/awt/dnd/DropTarget.java, * java/awt/dnd/DropTargetContext.java, * java/awt/dnd/DropTargetDragEvent.java, * java/awt/dnd/DropTargetDropEvent.java, * java/awt/dnd/DropTargetEvent.java, * java/awt/dnd/MouseDragGestureRecognizer.java, * java/awt/dnd/peer/DropTargetContextPeer.java, * java/awt/event/AWTEventListener.java, * java/awt/event/ActionEvent.java, * java/awt/event/ComponentAdapter.java, * java/awt/event/ComponentEvent.java, * java/awt/event/InputEvent.java, * java/awt/event/InputMethodEvent.java, * java/awt/event/InvocationEvent.java, * java/awt/event/KeyEvent.java, * java/awt/event/MouseEvent.java, * java/awt/event/MouseListener.java, * java/awt/event/MouseWheelEvent.java, * java/awt/event/WindowEvent.java, * java/awt/font/FontRenderContext.java, * java/awt/font/GlyphJustificationInfo.java, * java/awt/font/GlyphMetrics.java, * java/awt/font/GlyphVector.java, * java/awt/font/GraphicAttribute.java, * java/awt/font/ImageGraphicAttribute.java, * java/awt/font/LineBreakMeasurer.java, * java/awt/font/LineMetrics.java, * java/awt/font/MultipleMaster.java, * java/awt/font/OpenType.java, * java/awt/font/ShapeGraphicAttribute.java, * java/awt/font/TextAttribute.java, * java/awt/font/TextHitInfo.java, * java/awt/font/TextLayout.java, * java/awt/font/TextMeasurer.java, * java/awt/font/TransformAttribute.java, * java/awt/geom/AffineTransform.java, * java/awt/geom/Arc2D.java, * java/awt/geom/Area.java, * java/awt/geom/CubicCurve2D.java, * java/awt/geom/Ellipse2D.java, * java/awt/geom/FlatteningPathIterator.java, * java/awt/geom/GeneralPath.java, * java/awt/geom/Line2D.java, * java/awt/geom/QuadCurve2D.java, * java/awt/geom/RectangularShape.java, * java/awt/geom/RoundRectangle2D.java, * java/awt/im/InputContext.java, * java/awt/im/spi/InputMethodDescriptor.java, * java/awt/image/AffineTransformOp.java, * java/awt/image/AreaAveragingScaleFilter.java, * java/awt/image/BandCombineOp.java, * java/awt/image/BandedSampleModel.java, * java/awt/image/BufferedImage.java, * java/awt/image/BufferedImageFilter.java, * java/awt/image/BufferedImageOp.java, * java/awt/image/ByteLookupTable.java, * java/awt/image/ColorConvertOp.java, * java/awt/image/ColorModel.java, * java/awt/image/ComponentColorModel.java, * java/awt/image/ComponentSampleModel.java, * java/awt/image/ConvolveOp.java, * java/awt/image/CropImageFilter.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/DirectColorModel.java, * java/awt/image/FilteredImageSource.java, * java/awt/image/ImageConsumer.java, * java/awt/image/ImageFilter.java, * java/awt/image/ImageObserver.java, * java/awt/image/ImageProducer.java, * java/awt/image/IndexColorModel.java, * java/awt/image/Kernel.java, * java/awt/image/LookupOp.java, * java/awt/image/LookupTable.java, * java/awt/image/MemoryImageSource.java, * java/awt/image/MultiPixelPackedSampleModel.java, * java/awt/image/PackedColorModel.java, * java/awt/image/PixelGrabber.java, * java/awt/image/PixelInterleavedSampleModel.java, * java/awt/image/RGBImageFilter.java, * java/awt/image/Raster.java, * java/awt/image/RasterOp.java, * java/awt/image/RenderedImage.java, * java/awt/image/ReplicateScaleFilter.java, * java/awt/image/RescaleOp.java, * java/awt/image/SampleModel.java, * java/awt/image/ShortLookupTable.java, * java/awt/image/SinglePixelPackedSampleModel.java, * java/awt/image/TileObserver.java, * java/awt/image/WritableRaster.java, * java/awt/image/WritableRenderedImage.java, * java/awt/image/renderable/ContextualRenderedImageFactory.java, * java/awt/image/renderable/ParameterBlock.java, * java/awt/image/renderable/RenderContext.java, * java/awt/image/renderable/RenderableImage.java, * java/awt/image/renderable/RenderableImageOp.java, * java/awt/image/renderable/RenderableImageProducer.java, * java/awt/image/renderable/RenderedImageFactory.java, * java/awt/peer/ButtonPeer.java, * java/awt/peer/CanvasPeer.java, * java/awt/peer/CheckboxMenuItemPeer.java, * java/awt/peer/CheckboxPeer.java, * java/awt/peer/ChoicePeer.java, * java/awt/peer/ComponentPeer.java, * java/awt/peer/ContainerPeer.java, * java/awt/peer/DesktopPeer.java, * java/awt/peer/DialogPeer.java, * java/awt/peer/FileDialogPeer.java, * java/awt/peer/FontPeer.java, * java/awt/peer/FramePeer.java, * java/awt/peer/LabelPeer.java, * java/awt/peer/LightweightPeer.java, * java/awt/peer/ListPeer.java, * java/awt/peer/MenuBarPeer.java, * java/awt/peer/MenuComponentPeer.java, * java/awt/peer/MenuItemPeer.java, * java/awt/peer/MenuPeer.java, * java/awt/peer/MouseInfoPeer.java, * java/awt/peer/PanelPeer.java, * java/awt/peer/PopupMenuPeer.java, * java/awt/peer/RobotPeer.java, * java/awt/peer/ScrollPanePeer.java, * java/awt/peer/ScrollbarPeer.java, * java/awt/peer/TextComponentPeer.java, * java/awt/peer/TextFieldPeer.java, * java/awt/peer/WindowPeer.java, * java/awt/print/Book.java, * java/awt/print/PageFormat.java, * java/awt/print/Pageable.java, * java/awt/print/Paper.java, * java/awt/print/PrinterGraphics.java, * java/awt/print/PrinterIOException.java, * java/awt/print/PrinterJob.java, * java/beans/AppletInitializer.java, * java/beans/BeanDescriptor.java, * java/beans/BeanInfo.java, * java/beans/Beans.java, * java/beans/Customizer.java, * java/beans/DefaultPersistenceDelegate.java, * java/beans/DesignMode.java, * java/beans/Encoder.java, * java/beans/EventHandler.java, * java/beans/EventSetDescriptor.java, * java/beans/Expression.java, * java/beans/FeatureDescriptor.java, * java/beans/IndexedPropertyChangeEvent.java, * java/beans/IndexedPropertyDescriptor.java, * java/beans/Introspector.java, * java/beans/MethodDescriptor.java, * java/beans/ParameterDescriptor.java, * java/beans/PersistenceDelegate.java, * java/beans/PropertyChangeSupport.java, * java/beans/PropertyDescriptor.java, * java/beans/PropertyEditor.java, * java/beans/PropertyEditorManager.java, * java/beans/SimpleBeanInfo.java, * java/beans/Statement.java, * java/beans/VetoableChangeSupport.java, * java/beans/Visibility.java, * java/beans/XMLDecoder.java, * java/beans/XMLEncoder.java, * java/beans/beancontext/BeanContext.java, * java/beans/beancontext/BeanContextChild.java, * java/beans/beancontext/BeanContextChildComponentProxy.java, * java/beans/beancontext/BeanContextChildSupport.java, * java/beans/beancontext/BeanContextContainerProxy.java, * java/beans/beancontext/BeanContextEvent.java, * java/beans/beancontext/BeanContextMembershipEvent.java, * java/beans/beancontext/BeanContextMembershipListener.java, * java/beans/beancontext/BeanContextProxy.java, * java/beans/beancontext/BeanContextServiceAvailableEvent.java, * java/beans/beancontext/BeanContextServiceProvider.java, * java/beans/beancontext/BeanContextServiceProviderBeanInfo.java, * java/beans/beancontext/BeanContextServiceRevokedEvent.java, * java/beans/beancontext/BeanContextServiceRevokedListener.java, * java/beans/beancontext/BeanContextServices.java, * java/beans/beancontext/BeanContextServicesListener.java, * java/beans/beancontext/BeanContextServicesSupport.java, * java/beans/beancontext/BeanContextSupport.java, * java/io/BufferedInputStream.java, * java/io/BufferedOutputStream.java, * java/io/BufferedReader.java, * java/io/BufferedWriter.java, * java/io/ByteArrayInputStream.java, * java/io/ByteArrayOutputStream.java, * java/io/CharArrayReader.java, * java/io/CharArrayWriter.java, * java/io/DataInput.java, * java/io/DataInputStream.java, * java/io/DataOutput.java, * java/io/DataOutputStream.java, * java/io/DeleteFileHelper.java, * java/io/EOFException.java, * java/io/Externalizable.java, * java/io/File.java, * java/io/FileDescriptor.java, * java/io/FileFilter.java, * java/io/FileInputStream.java, * java/io/FileOutputStream.java, * java/io/FilePermission.java, * java/io/FileReader.java, * java/io/FileWriter.java, * java/io/FilenameFilter.java, * java/io/FilterInputStream.java, * java/io/FilterOutputStream.java, * java/io/FilterReader.java, * java/io/FilterWriter.java, * java/io/InputStream.java, * java/io/InputStreamReader.java, * java/io/InvalidClassException.java, * java/io/LineNumberInputStream.java, * java/io/LineNumberReader.java, * java/io/ObjectInput.java, * java/io/ObjectInputStream.java, * java/io/ObjectInputValidation.java, * java/io/ObjectOutput.java, * java/io/ObjectOutputStream.java, * java/io/ObjectStreamClass.java, * java/io/ObjectStreamConstants.java, * java/io/ObjectStreamField.java, * java/io/OutputStream.java, * java/io/OutputStreamWriter.java, * java/io/PipedInputStream.java, * java/io/PipedOutputStream.java, * java/io/PipedReader.java, * java/io/PipedWriter.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/SerializablePermission.java, * java/io/StreamTokenizer.java, * java/io/StringBufferInputStream.java, * java/io/StringReader.java, * java/io/StringWriter.java, * java/io/UnsupportedEncodingException.java, * java/io/Writer.java, * java/lang/AbstractStringBuffer.java, * java/lang/Boolean.java, * java/lang/Character.java, * java/lang/Class.java, * java/lang/ClassLoader.java, * java/lang/Comparable.java, * java/lang/Double.java, * java/lang/Enum.java, * java/lang/EnumConstantNotPresentException.java, * java/lang/Float.java, * java/lang/IllegalArgumentException.java, * java/lang/IllegalStateException.java, * java/lang/IndexOutOfBoundsException.java, * java/lang/Integer.java, * java/lang/Long.java, * java/lang/Math.java, * java/lang/NoClassDefFoundError.java, * java/lang/Object.java, * java/lang/Package.java, * java/lang/ProcessBuilder.java, * java/lang/Runtime.java, * java/lang/SecurityException.java, * java/lang/SecurityManager.java, * java/lang/StackTraceElement.java, * java/lang/StrictMath.java, * java/lang/String.java, * java/lang/StringBuffer.java, * java/lang/StringBuilder.java, * java/lang/System.java, * java/lang/Thread.java, * java/lang/ThreadLocal.java, * java/lang/Throwable.java, * java/lang/TypeNotPresentException.java, * java/lang/UnsupportedOperationException.java, * java/lang/annotation/Annotation.java, * java/lang/annotation/AnnotationTypeMismatchException.java, * java/lang/annotation/IncompleteAnnotationException.java, * java/lang/instrument/ClassFileTransformer.java, * java/lang/instrument/Instrumentation.java, * java/lang/management/ClassLoadingMXBean.java, * java/lang/management/CompilationMXBean.java, * java/lang/management/GarbageCollectorMXBean.java, * java/lang/management/ManagementFactory.java, * java/lang/management/ManagementPermission.java, * java/lang/management/MemoryMXBean.java, * java/lang/management/MemoryManagerMXBean.java, * java/lang/management/MemoryNotificationInfo.java, * java/lang/management/MemoryPoolMXBean.java, * java/lang/management/MemoryType.java, * java/lang/management/MemoryUsage.java, * java/lang/management/MonitorInfo.java, * java/lang/management/OperatingSystemMXBean.java, * java/lang/management/RuntimeMXBean.java, * java/lang/management/ThreadInfo.java, * java/lang/management/ThreadMXBean.java, * java/lang/ref/PhantomReference.java, * java/lang/ref/Reference.java, * java/lang/ref/ReferenceQueue.java, * java/lang/ref/SoftReference.java, * java/lang/ref/WeakReference.java, * java/lang/reflect/AccessibleObject.java, * java/lang/reflect/AnnotatedElement.java, * java/lang/reflect/Array.java, * java/lang/reflect/Constructor.java, * java/lang/reflect/Field.java, * java/lang/reflect/GenericArrayType.java, * java/lang/reflect/GenericDeclaration.java, * java/lang/reflect/InvocationHandler.java, * java/lang/reflect/MalformedParameterizedTypeException.java, * java/lang/reflect/Method.java, * java/lang/reflect/Modifier.java, * java/lang/reflect/Proxy.java, * java/lang/reflect/Type.java, * java/lang/reflect/TypeVariable.java, * java/lang/reflect/WildcardType.java, * java/math/BigDecimal.java, * java/math/BigInteger.java, * java/math/MathContext.java, * java/math/RoundingMode.java, * java/net/ContentHandler.java, * java/net/DatagramSocket.java, * java/net/DatagramSocketImpl.java, * java/net/HttpURLConnection.java, * java/net/Inet4Address.java, * java/net/Inet6Address.java, * java/net/InetAddress.java, * java/net/InetSocketAddress.java, * java/net/MimeTypeMapper.java, * java/net/MulticastSocket.java, * java/net/NetworkInterface.java, * java/net/Proxy.java, * java/net/ProxySelector.java, * java/net/ResolverCache.java, * java/net/ServerSocket.java, * java/net/Socket.java, * java/net/SocketPermission.java, * java/net/URI.java, * java/net/URL.java, * java/net/URLClassLoader.java, * java/net/URLConnection.java, * java/net/URLDecoder.java, * java/net/URLEncoder.java, * java/net/URLStreamHandler.java, * java/nio/Buffer.java, * java/nio/BufferOverflowException.java, * java/nio/BufferUnderflowException.java, * java/nio/ByteBuffer.java, * java/nio/ByteBufferHelper.java, * java/nio/ByteBufferImpl.java, * java/nio/ByteOrder.java, * java/nio/CharBuffer.java, * java/nio/CharBufferImpl.java, * java/nio/CharSequenceBuffer.java, * java/nio/CharViewBufferImpl.java, * java/nio/DirectByteBufferImpl.java, * java/nio/DoubleBuffer.java, * java/nio/DoubleBufferImpl.java, * java/nio/DoubleViewBufferImpl.java, * java/nio/FloatBuffer.java, * java/nio/FloatBufferImpl.java, * java/nio/FloatViewBufferImpl.java, * java/nio/IntBuffer.java, * java/nio/IntBufferImpl.java, * java/nio/IntViewBufferImpl.java, * java/nio/InvalidMarkException.java, * java/nio/LongBuffer.java, * java/nio/LongBufferImpl.java, * java/nio/LongViewBufferImpl.java, * java/nio/MappedByteBuffer.java, * java/nio/MappedByteBufferImpl.java, * java/nio/ReadOnlyBufferException.java, * java/nio/ShortBuffer.java, * java/nio/ShortBufferImpl.java, * java/nio/ShortViewBufferImpl.java, * java/nio/channels/FileChannel.java, * java/nio/channels/SocketChannel.java, * java/nio/channels/spi/AbstractInterruptibleChannel.java, * java/nio/channels/spi/AbstractSelectableChannel.java, * java/nio/channels/spi/AbstractSelectionKey.java, * java/nio/channels/spi/AbstractSelector.java, * java/nio/channels/spi/SelectorProvider.java, * java/nio/charset/CharacterCodingException.java, * java/nio/charset/Charset.java, * java/nio/charset/CharsetDecoder.java, * java/nio/charset/CharsetEncoder.java, * java/nio/charset/CoderMalfunctionError.java, * java/nio/charset/CoderResult.java, * java/nio/charset/CodingErrorAction.java, * java/nio/charset/IllegalCharsetNameException.java, * java/nio/charset/MalformedInputException.java, * java/nio/charset/UnmappableCharacterException.java, * java/nio/charset/UnsupportedCharsetException.java, * java/rmi/AccessException.java, * java/rmi/AlreadyBoundException.java, * java/rmi/MarshalledObject.java, * java/rmi/Naming.java, * java/rmi/NoSuchObjectException.java, * java/rmi/NotBoundException.java, * java/rmi/RMISecurityException.java, * java/rmi/RMISecurityManager.java, * java/rmi/Remote.java, * java/rmi/RemoteException.java, * java/rmi/StubNotFoundException.java, * java/rmi/UnknownHostException.java, * java/rmi/activation/Activatable.java, * java/rmi/activation/ActivationDesc.java, * java/rmi/activation/ActivationGroup.java, * java/rmi/activation/ActivationGroupDesc.java, * java/rmi/activation/ActivationGroupID.java, * java/rmi/activation/ActivationID.java, * java/rmi/activation/ActivationInstantiator.java, * java/rmi/activation/ActivationMonitor.java, * java/rmi/activation/ActivationSystem.java, * java/rmi/activation/Activator.java, * java/rmi/activation/UnknownGroupException.java, * java/rmi/dgc/DGC.java, * java/rmi/dgc/Lease.java, * java/rmi/dgc/VMID.java, * java/rmi/registry/LocateRegistry.java, * java/rmi/registry/Registry.java, * java/rmi/registry/RegistryHandler.java, * java/rmi/server/LoaderHandler.java, * java/rmi/server/LogStream.java, * java/rmi/server/ObjID.java, * java/rmi/server/Operation.java, * java/rmi/server/RMIClassLoader.java, * java/rmi/server/RMIClientSocketFactory.java, * java/rmi/server/RMIFailureHandler.java, * java/rmi/server/RMIServerSocketFactory.java, * java/rmi/server/RMISocketFactory.java, * java/rmi/server/RemoteCall.java, * java/rmi/server/RemoteObject.java, * java/rmi/server/RemoteObjectInvocationHandler.java, * java/rmi/server/RemoteRef.java, * java/rmi/server/RemoteServer.java, * java/rmi/server/RemoteStub.java, * java/rmi/server/ServerRef.java, * java/rmi/server/Skeleton.java, * java/rmi/server/UID.java, * java/rmi/server/UnicastRemoteObject.java, * java/rmi/server/Unreferenced.java, * java/security/AccessControlContext.java, * java/security/AccessController.java, * java/security/AlgorithmParameterGenerator.java, * java/security/AlgorithmParameterGeneratorSpi.java, * java/security/AlgorithmParameters.java, * java/security/AlgorithmParametersSpi.java, * java/security/CodeSource.java, * java/security/DigestInputStream.java, * java/security/DigestOutputStream.java, * java/security/GeneralSecurityException.java, * java/security/Identity.java, * java/security/IdentityScope.java, * java/security/KeyFactory.java, * java/security/KeyFactorySpi.java, * java/security/KeyPairGenerator.java, * java/security/KeyPairGeneratorSpi.java, * java/security/KeyStore.java, * java/security/KeyStoreSpi.java, * java/security/MessageDigest.java, * java/security/MessageDigestSpi.java, * java/security/Permission.java, * java/security/Permissions.java, * java/security/Policy.java, * java/security/ProtectionDomain.java, * java/security/Provider.java, * java/security/ProviderException.java, * java/security/SecureClassLoader.java, * java/security/SecureRandom.java, * java/security/SecureRandomSpi.java, * java/security/Security.java, * java/security/Signature.java, * java/security/SignatureSpi.java, * java/security/SignedObject.java, * java/security/Signer.java, * java/security/acl/Acl.java, * java/security/acl/AclEntry.java, * java/security/acl/Group.java, * java/security/acl/Owner.java, * java/security/cert/CRL.java, * java/security/cert/CRLSelector.java, * java/security/cert/CertPathBuilder.java, * java/security/cert/CertPathBuilderResult.java, * java/security/cert/CertPathValidator.java, * java/security/cert/CertPathValidatorResult.java, * java/security/cert/CertPathValidatorSpi.java, * java/security/cert/CertSelector.java, * java/security/cert/CertStore.java, * java/security/cert/CertStoreParameters.java, * java/security/cert/CertStoreSpi.java, * java/security/cert/Certificate.java, * java/security/cert/CertificateFactory.java, * java/security/cert/CertificateFactorySpi.java, * java/security/cert/CollectionCertStoreParameters.java, * java/security/cert/LDAPCertStoreParameters.java, * java/security/cert/PKIXBuilderParameters.java, * java/security/cert/PKIXCertPathBuilderResult.java, * java/security/cert/PKIXCertPathChecker.java, * java/security/cert/PKIXCertPathValidatorResult.java, * java/security/cert/PKIXParameters.java, * java/security/cert/PolicyNode.java, * java/security/cert/PolicyQualifierInfo.java, * java/security/cert/X509CRL.java, * java/security/cert/X509CRLEntry.java, * java/security/cert/X509CertSelector.java, * java/security/cert/X509Certificate.java, * java/security/cert/X509Extension.java, * java/security/spec/AlgorithmParameterSpec.java, * java/security/spec/DSAParameterSpec.java, * java/security/spec/DSAPrivateKeySpec.java, * java/security/spec/DSAPublicKeySpec.java, * java/security/spec/EncodedKeySpec.java, * java/security/spec/InvalidParameterSpecException.java, * java/security/spec/KeySpec.java, * java/security/spec/PKCS8EncodedKeySpec.java, * java/security/spec/PSSParameterSpec.java, * java/security/spec/RSAKeyGenParameterSpec.java, * java/security/spec/RSAMultiPrimePrivateCrtKeySpec.java, * java/security/spec/RSAOtherPrimeInfo.java, * java/security/spec/RSAPrivateCrtKeySpec.java, * java/security/spec/RSAPrivateKeySpec.java, * java/security/spec/RSAPublicKeySpec.java, * java/security/spec/X509EncodedKeySpec.java, * java/sql/Array.java, * java/sql/BatchUpdateException.java, * java/sql/Blob.java, * java/sql/CallableStatement.java, * java/sql/Clob.java, * java/sql/Connection.java, * java/sql/DataTruncation.java, * java/sql/DatabaseMetaData.java, * java/sql/Date.java, * java/sql/Driver.java, * java/sql/DriverManager.java, * java/sql/DriverPropertyInfo.java, * java/sql/ParameterMetaData.java, * java/sql/PreparedStatement.java, * java/sql/Ref.java, * java/sql/ResultSet.java, * java/sql/ResultSetMetaData.java, * java/sql/SQLData.java, * java/sql/SQLException.java, * java/sql/SQLInput.java, * java/sql/SQLOutput.java, * java/sql/SQLPermission.java, * java/sql/SQLWarning.java, * java/sql/Savepoint.java, * java/sql/Statement.java, * java/sql/Struct.java, * java/sql/Time.java, * java/sql/Timestamp.java, * java/sql/Types.java, * java/text/Annotation.java, * java/text/AttributedCharacterIterator.java, * java/text/AttributedString.java, * java/text/AttributedStringIterator.java, * java/text/Bidi.java, * java/text/BreakIterator.java, * java/text/CharacterIterator.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/MessageFormat.java, * java/text/NumberFormat.java, * java/text/ParsePosition.java, * java/text/RuleBasedCollator.java, * java/text/SimpleDateFormat.java, * java/text/StringCharacterIterator.java, * java/text/spi/DateFormatProvider.java, * java/text/spi/NumberFormatProvider.java, * java/util/AbstractCollection.java, * java/util/AbstractList.java, * java/util/AbstractMap.java, * java/util/AbstractSet.java, * java/util/ArrayList.java, * java/util/Arrays.java, * java/util/BitSet.java, * java/util/Calendar.java, * java/util/Collections.java, * java/util/Currency.java, * java/util/Date.java, * java/util/Dictionary.java, * java/util/DuplicateFormatFlagsException.java, * java/util/EnumMap.java, * java/util/EnumSet.java, * java/util/FormatFlagsConversionMismatchException.java, * java/util/Formattable.java, * java/util/FormattableFlags.java, * java/util/Formatter.java, * java/util/FormatterClosedException.java, * java/util/GregorianCalendar.java, * java/util/HashMap.java, * java/util/Hashtable.java, * java/util/IdentityHashMap.java, * java/util/IllegalFormatCodePointException.java, * java/util/IllegalFormatConversionException.java, * java/util/IllegalFormatException.java, * java/util/IllegalFormatFlagsException.java, * java/util/IllegalFormatPrecisionException.java, * java/util/IllegalFormatWidthException.java, * java/util/InputMismatchException.java, * java/util/LinkedHashMap.java, * java/util/LinkedHashSet.java, * java/util/LinkedList.java, * java/util/List.java, * java/util/Locale.java, * java/util/Map.java, * java/util/MissingFormatArgumentException.java, * java/util/MissingFormatWidthException.java, * java/util/PriorityQueue.java, * java/util/Properties.java, * java/util/PropertyPermission.java, * java/util/PropertyPermissionCollection.java, * java/util/Random.java, * java/util/ResourceBundle.java, * java/util/ServiceConfigurationError.java, * java/util/ServiceLoader.java, * java/util/SimpleTimeZone.java, * java/util/StringTokenizer.java, * java/util/TimeZone.java, * java/util/Timer.java, * java/util/TreeMap.java, * java/util/TreeSet.java, * java/util/UUID.java, * java/util/UnknownFormatConversionException.java, * java/util/UnknownFormatFlagsException.java, * java/util/Vector.java, * java/util/WeakHashMap.java, * java/util/concurrent/CopyOnWriteArrayList.java, * java/util/jar/Attributes.java, * java/util/jar/JarEntry.java, * java/util/jar/JarFile.java, * java/util/jar/JarInputStream.java, * java/util/jar/JarOutputStream.java, * java/util/jar/Manifest.java, * java/util/logging/ConsoleHandler.java, * java/util/logging/ErrorManager.java, * java/util/logging/FileHandler.java, * java/util/logging/Formatter.java, * java/util/logging/Handler.java, * java/util/logging/Level.java, * java/util/logging/LogManager.java, * java/util/logging/LogRecord.java, * java/util/logging/Logger.java, * java/util/logging/LoggingMXBean.java, * java/util/logging/LoggingPermission.java, * java/util/logging/MemoryHandler.java, * java/util/logging/SocketHandler.java, * java/util/logging/StreamHandler.java, * java/util/logging/XMLFormatter.java, * java/util/prefs/AbstractPreferences.java, * java/util/prefs/NodeChangeEvent.java, * java/util/prefs/NodeChangeListener.java, * java/util/prefs/PreferenceChangeEvent.java, * java/util/prefs/PreferenceChangeListener.java, * java/util/prefs/Preferences.java, * java/util/prefs/PreferencesFactory.java, * java/util/regex/MatchResult.java, * java/util/regex/Pattern.java, * java/util/regex/PatternSyntaxException.java, * java/util/spi/LocaleNameProvider.java, * java/util/spi/TimeZoneNameProvider.java, * java/util/zip/Adler32.java, * java/util/zip/CRC32.java, * java/util/zip/CheckedInputStream.java, * java/util/zip/CheckedOutputStream.java, * java/util/zip/Deflater.java, * java/util/zip/DeflaterEngine.java, * java/util/zip/DeflaterHuffman.java, * java/util/zip/DeflaterOutputStream.java, * java/util/zip/DeflaterPending.java, * java/util/zip/GZIPInputStream.java, * java/util/zip/GZIPOutputStream.java, * java/util/zip/Inflater.java, * java/util/zip/InflaterDynHeader.java, * java/util/zip/InflaterHuffmanTree.java, * java/util/zip/InflaterInputStream.java, * java/util/zip/OutputWindow.java, * java/util/zip/PendingBuffer.java, * java/util/zip/StreamManipulator.java, * java/util/zip/ZipConstants.java, * java/util/zip/ZipEntry.java, * java/util/zip/ZipFile.java, * java/util/zip/ZipInputStream.java, * java/util/zip/ZipOutputStream.java, * javax/accessibility/AccessibleExtendedText.java, * javax/accessibility/AccessibleRelation.java, * javax/accessibility/AccessibleRole.java, * javax/accessibility/AccessibleState.java, * javax/activation/ActivationDataFlavor.java, * javax/activation/CommandInfo.java, * javax/activation/CommandMap.java, * javax/activation/CommandObject.java, * javax/activation/DataContentHandler.java, * javax/activation/DataContentHandlerFactory.java, * javax/activation/DataHandler.java, * javax/activation/DataHandlerDataSource.java, * javax/activation/DataSource.java, * javax/activation/DataSourceDataContentHandler.java, * javax/activation/FileDataSource.java, * javax/activation/FileTypeMap.java, * javax/activation/MailcapCommandMap.java, * javax/activation/MimeType.java, * javax/activation/MimeTypeParameterList.java, * javax/activation/MimeTypeParseException.java, * javax/activation/MimetypesFileTypeMap.java, * javax/activation/ObjectDataContentHandler.java, * javax/activation/URLDataSource.java, * javax/activation/UnsupportedDataTypeException.java, * javax/crypto/Cipher.java, * javax/crypto/CipherOutputStream.java, * javax/crypto/ExemptionMechanism.java, * javax/crypto/KeyAgreement.java, * javax/crypto/KeyGenerator.java, * javax/crypto/Mac.java, * javax/crypto/MacSpi.java, * javax/crypto/SecretKeyFactory.java, * javax/crypto/spec/PBEKeySpec.java, * javax/imageio/IIOImage.java, * javax/imageio/IIOParam.java, * javax/imageio/IIOParamController.java, * javax/imageio/ImageIO.java, * javax/imageio/ImageReadParam.java, * javax/imageio/ImageReader.java, * javax/imageio/ImageTranscoder.java, * javax/imageio/ImageTypeSpecifier.java, * javax/imageio/ImageWriteParam.java, * javax/imageio/ImageWriter.java, * javax/imageio/event/IIOReadProgressListener.java, * javax/imageio/event/IIOReadUpdateListener.java, * javax/imageio/event/IIOWriteProgressListener.java, * javax/imageio/metadata/IIOInvalidTreeException.java, * javax/imageio/metadata/IIOMetadata.java, * javax/imageio/metadata/IIOMetadataFormatImpl.java, * javax/imageio/metadata/IIOMetadataNode.java, * javax/imageio/plugins/bmp/BMPImageWriteParam.java, * javax/imageio/plugins/jpeg/JPEGHuffmanTable.java, * javax/imageio/spi/IIORegistry.java, * javax/imageio/spi/ImageReaderSpi.java, * javax/imageio/spi/ImageWriterSpi.java, * javax/imageio/spi/RegisterableService.java, * javax/imageio/spi/ServiceRegistry.java, * javax/imageio/stream/FileCacheImageInputStream.java, * javax/imageio/stream/FileCacheImageOutputStream.java, * javax/imageio/stream/FileImageInputStream.java, * javax/imageio/stream/FileImageOutputStream.java, * javax/imageio/stream/ImageInputStream.java, * javax/imageio/stream/ImageInputStreamImpl.java, * javax/imageio/stream/ImageOutputStreamImpl.java, * javax/imageio/stream/MemoryCacheImageInputStream.java, * javax/imageio/stream/MemoryCacheImageOutputStream.java, * javax/management/Attribute.java, * javax/management/AttributeChangeNotification.java, * javax/management/AttributeChangeNotificationFilter.java, * javax/management/AttributeList.java, * javax/management/AttributeNotFoundException.java, * javax/management/AttributeValueExp.java, * javax/management/BadAttributeValueExpException.java, * javax/management/BadBinaryOpValueExpException.java, * javax/management/BadStringOperationException.java, * javax/management/DefaultLoaderRepository.java, * javax/management/Descriptor.java, * javax/management/DynamicMBean.java, * javax/management/InstanceAlreadyExistsException.java, * javax/management/InstanceNotFoundException.java, * javax/management/IntrospectionException.java, * javax/management/InvalidApplicationException.java, * javax/management/InvalidAttributeValueException.java, * javax/management/JMException.java, * javax/management/JMRuntimeException.java, * javax/management/JMX.java, * javax/management/ListenerNotFoundException.java, * javax/management/MBeanAttributeInfo.java, * javax/management/MBeanConstructorInfo.java, * javax/management/MBeanException.java, * javax/management/MBeanFeatureInfo.java, * javax/management/MBeanInfo.java, * javax/management/MBeanNotificationInfo.java, * javax/management/MBeanOperationInfo.java, * javax/management/MBeanParameterInfo.java, * javax/management/MBeanPermission.java, * javax/management/MBeanRegistrationException.java, * javax/management/MBeanServer.java, * javax/management/MBeanServerBuilder.java, * javax/management/MBeanServerConnection.java, * javax/management/MBeanServerDelegate.java, * javax/management/MBeanServerFactory.java, * javax/management/MBeanServerInvocationHandler.java, * javax/management/MBeanServerNotification.java, * javax/management/MBeanServerPermission.java, * javax/management/MBeanTrustPermission.java, * javax/management/MalformedObjectNameException.java, * javax/management/NotCompliantMBeanException.java, * javax/management/Notification.java, * javax/management/NotificationBroadcaster.java, * javax/management/NotificationBroadcasterSupport.java, * javax/management/NotificationEmitter.java, * javax/management/NotificationFilter.java, * javax/management/NotificationFilterSupport.java, * javax/management/NotificationListener.java, * javax/management/ObjectInstance.java, * javax/management/ObjectName.java, * javax/management/OperationsException.java, * javax/management/PersistentMBean.java, * javax/management/Query.java, * javax/management/QueryEval.java, * javax/management/QueryExp.java, * javax/management/ReflectionException.java, * javax/management/RuntimeErrorException.java, * javax/management/RuntimeMBeanException.java, * javax/management/RuntimeOperationsException.java, * javax/management/ServiceNotFoundException.java, * javax/management/StandardMBean.java, * javax/management/StringValueExp.java, * javax/management/ValueExp.java, * javax/management/loading/ClassLoaderRepository.java, * javax/management/openmbean/ArrayType.java, * javax/management/openmbean/CompositeData.java, * javax/management/openmbean/CompositeDataInvocationHandler.java, * javax/management/openmbean/CompositeDataSupport.java, * javax/management/openmbean/CompositeType.java, * javax/management/openmbean/InvalidKeyException.java, * javax/management/openmbean/InvalidOpenTypeException.java, * javax/management/openmbean/KeyAlreadyExistsException.java, * javax/management/openmbean/OpenDataException.java, * javax/management/openmbean/OpenMBeanAttributeInfo.java, * javax/management/openmbean/OpenMBeanAttributeInfoSupport.java, * javax/management/openmbean/OpenMBeanConstructorInfo.java, * javax/management/openmbean/OpenMBeanConstructorInfoSupport.java, * javax/management/openmbean/OpenMBeanInfo.java, * javax/management/openmbean/OpenMBeanInfoSupport.java, * javax/management/openmbean/OpenMBeanOperationInfo.java, * javax/management/openmbean/OpenMBeanOperationInfoSupport.java, * javax/management/openmbean/OpenMBeanParameterInfo.java, * javax/management/openmbean/OpenMBeanParameterInfoSupport.java, * javax/management/openmbean/OpenType.java, * javax/management/openmbean/SimpleType.java, * javax/management/openmbean/TabularData.java, * javax/management/openmbean/TabularDataSupport.java, * javax/management/openmbean/TabularType.java, * javax/management/remote/NotificationResult.java, * javax/management/remote/TargetedNotification.java, * javax/management/remote/rmi/RMIConnection.java, * javax/naming/AuthenticationException.java, * javax/naming/AuthenticationNotSupportedException.java, * javax/naming/BinaryRefAddr.java, * javax/naming/Binding.java, * javax/naming/CannotProceedException.java, * javax/naming/CommunicationException.java, * javax/naming/CompositeName.java, * javax/naming/CompoundName.java, * javax/naming/ConfigurationException.java, * javax/naming/Context.java, * javax/naming/ContextNotEmptyException.java, * javax/naming/InitialContext.java, * javax/naming/InsufficientResourcesException.java, * javax/naming/InterruptedNamingException.java, * javax/naming/InvalidNameException.java, * javax/naming/LimitExceededException.java, * javax/naming/LinkException.java, * javax/naming/LinkLoopException.java, * javax/naming/MalformedLinkException.java, * javax/naming/Name.java, * javax/naming/NameAlreadyBoundException.java, * javax/naming/NameClassPair.java, * javax/naming/NameNotFoundException.java, * javax/naming/NameParser.java, * javax/naming/NamingEnumeration.java, * javax/naming/NamingException.java, * javax/naming/NamingSecurityException.java, * javax/naming/NoInitialContextException.java, * javax/naming/NoPermissionException.java, * javax/naming/NotContextException.java, * javax/naming/PartialResultException.java, * javax/naming/RefAddr.java, * javax/naming/Reference.java, * javax/naming/Referenceable.java, * javax/naming/ReferralException.java, * javax/naming/ServiceUnavailableException.java, * javax/naming/SizeLimitExceededException.java, * javax/naming/StringRefAddr.java, * javax/naming/TimeLimitExceededException.java, * javax/naming/directory/AttributeInUseException.java, * javax/naming/directory/Attributes.java, * javax/naming/directory/BasicAttribute.java, * javax/naming/directory/BasicAttributes.java, * javax/naming/directory/InitialDirContext.java, * javax/naming/directory/ModificationItem.java, * javax/naming/directory/SearchControls.java, * javax/naming/directory/SearchResult.java, * javax/naming/event/EventContext.java, * javax/naming/event/NamespaceChangeListener.java, * javax/naming/event/NamingEvent.java, * javax/naming/event/NamingExceptionEvent.java, * javax/naming/event/NamingListener.java, * javax/naming/event/ObjectChangeListener.java, * javax/naming/ldap/Control.java, * javax/naming/ldap/ControlFactory.java, * javax/naming/ldap/ExtendedRequest.java, * javax/naming/ldap/ExtendedResponse.java, * javax/naming/ldap/HasControls.java, * javax/naming/ldap/InitialLdapContext.java, * javax/naming/ldap/LdapContext.java, * javax/naming/ldap/LdapReferralException.java, * javax/naming/ldap/StartTlsRequest.java, * javax/naming/ldap/UnsolicitedNotification.java, * javax/naming/ldap/UnsolicitedNotificationEvent.java, * javax/naming/ldap/UnsolicitedNotificationListener.java, * javax/naming/spi/DirObjectFactory.java, * javax/naming/spi/DirStateFactory.java, * javax/naming/spi/DirectoryManager.java, * javax/naming/spi/InitialContextFactory.java, * javax/naming/spi/InitialContextFactoryBuilder.java, * javax/naming/spi/NamingManager.java, * javax/naming/spi/ObjectFactory.java, * javax/naming/spi/ObjectFactoryBuilder.java, * javax/naming/spi/ResolveResult.java, * javax/naming/spi/Resolver.java, * javax/naming/spi/StateFactory.java, * javax/net/ssl/CertPathTrustManagerParameters.java, * javax/net/ssl/KeyManagerFactory.java, * javax/net/ssl/KeyStoreBuilderParameters.java, * javax/net/ssl/SSLContext.java, * javax/net/ssl/SSLEngine.java, * javax/net/ssl/SSLEngineResult.java, * javax/net/ssl/SSLException.java, * javax/net/ssl/TrustManagerFactory.java, * javax/net/ssl/X509ExtendedKeyManager.java, * javax/print/AttributeException.java, * javax/print/CancelablePrintJob.java, * javax/print/Doc.java, * javax/print/DocFlavor.java, * javax/print/DocPrintJob.java, * javax/print/FlavorException.java, * javax/print/MultiDoc.java, * javax/print/MultiDocPrintJob.java, * javax/print/MultiDocPrintService.java, * javax/print/PrintException.java, * javax/print/PrintService.java, * javax/print/PrintServiceLookup.java, * javax/print/ServiceUI.java, * javax/print/ServiceUIFactory.java, * javax/print/SimpleDoc.java, * javax/print/StreamPrintService.java, * javax/print/StreamPrintServiceFactory.java, * javax/print/URIException.java, * javax/print/attribute/Attribute.java, * javax/print/attribute/AttributeSet.java, * javax/print/attribute/AttributeSetUtilities.java, * javax/print/attribute/DateTimeSyntax.java, * javax/print/attribute/DocAttribute.java, * javax/print/attribute/DocAttributeSet.java, * javax/print/attribute/EnumSyntax.java, * javax/print/attribute/HashAttributeSet.java, * javax/print/attribute/HashDocAttributeSet.java, * javax/print/attribute/HashPrintJobAttributeSet.java, * javax/print/attribute/HashPrintRequestAttributeSet.java, * javax/print/attribute/HashPrintServiceAttributeSet.java, * javax/print/attribute/IntegerSyntax.java, * javax/print/attribute/PrintJobAttribute.java, * javax/print/attribute/PrintJobAttributeSet.java, * javax/print/attribute/PrintRequestAttribute.java, * javax/print/attribute/PrintRequestAttributeSet.java, * javax/print/attribute/PrintServiceAttribute.java, * javax/print/attribute/PrintServiceAttributeSet.java, * javax/print/attribute/ResolutionSyntax.java, * javax/print/attribute/SetOfIntegerSyntax.java, * javax/print/attribute/Size2DSyntax.java, * javax/print/attribute/SupportedValuesAttribute.java, * javax/print/attribute/TextSyntax.java, * javax/print/attribute/URISyntax.java, * javax/print/attribute/UnmodifiableSetException.java, * javax/print/attribute/standard/Chromaticity.java, * javax/print/attribute/standard/ColorSupported.java, * javax/print/attribute/standard/Compression.java, * javax/print/attribute/standard/Copies.java, * javax/print/attribute/standard/CopiesSupported.java, * javax/print/attribute/standard/DateTimeAtCompleted.java, * javax/print/attribute/standard/DateTimeAtCreation.java, * javax/print/attribute/standard/DateTimeAtProcessing.java, * javax/print/attribute/standard/Destination.java, * javax/print/attribute/standard/DocumentName.java, * javax/print/attribute/standard/Fidelity.java, * javax/print/attribute/standard/Finishings.java, * javax/print/attribute/standard/JobHoldUntil.java, * javax/print/attribute/standard/JobImpressions.java, * javax/print/attribute/standard/JobImpressionsCompleted.java, * javax/print/attribute/standard/JobImpressionsSupported.java, * javax/print/attribute/standard/JobKOctets.java, * javax/print/attribute/standard/JobKOctetsProcessed.java, * javax/print/attribute/standard/JobKOctetsSupported.java, * javax/print/attribute/standard/JobMediaSheets.java, * javax/print/attribute/standard/JobMediaSheetsCompleted.java, * javax/print/attribute/standard/JobMediaSheetsSupported.java, * javax/print/attribute/standard/JobMessageFromOperator.java, * javax/print/attribute/standard/JobName.java, * javax/print/attribute/standard/JobOriginatingUserName.java, * javax/print/attribute/standard/JobPriority.java, * javax/print/attribute/standard/JobPrioritySupported.java, * javax/print/attribute/standard/JobSheets.java, * javax/print/attribute/standard/JobState.java, * javax/print/attribute/standard/JobStateReason.java, * javax/print/attribute/standard/JobStateReasons.java, * javax/print/attribute/standard/Media.java, * javax/print/attribute/standard/MediaName.java, * javax/print/attribute/standard/MediaPrintableArea.java, * javax/print/attribute/standard/MediaSize.java, * javax/print/attribute/standard/MediaSizeName.java, * javax/print/attribute/standard/MediaTray.java, * javax/print/attribute/standard/MultipleDocumentHandling.java, * javax/print/attribute/standard/NumberOfDocuments.java, * javax/print/attribute/standard/NumberOfInterveningJobs.java, * javax/print/attribute/standard/NumberUp.java, * javax/print/attribute/standard/NumberUpSupported.java, * javax/print/attribute/standard/OrientationRequested.java, * javax/print/attribute/standard/OutputDeviceAssigned.java, * javax/print/attribute/standard/PDLOverrideSupported.java, * javax/print/attribute/standard/PageRanges.java, * javax/print/attribute/standard/PagesPerMinute.java, * javax/print/attribute/standard/PagesPerMinuteColor.java, * javax/print/attribute/standard/PresentationDirection.java, * javax/print/attribute/standard/PrintQuality.java, * javax/print/attribute/standard/PrinterInfo.java, * javax/print/attribute/standard/PrinterIsAcceptingJobs.java, * javax/print/attribute/standard/PrinterLocation.java, * javax/print/attribute/standard/PrinterMakeAndModel.java, * javax/print/attribute/standard/PrinterMessageFromOperator.java, * javax/print/attribute/standard/PrinterMoreInfo.java, * javax/print/attribute/standard/PrinterMoreInfoManufacturer.java, * javax/print/attribute/standard/PrinterName.java, * javax/print/attribute/standard/PrinterResolution.java, * javax/print/attribute/standard/PrinterState.java, * javax/print/attribute/standard/PrinterStateReason.java, * javax/print/attribute/standard/PrinterStateReasons.java, * javax/print/attribute/standard/PrinterURI.java, * javax/print/attribute/standard/QueuedJobCount.java, * javax/print/attribute/standard/ReferenceUriSchemesSupported.java, * javax/print/attribute/standard/RequestingUserName.java, * javax/print/attribute/standard/Severity.java, * javax/print/attribute/standard/SheetCollate.java, * javax/print/attribute/standard/Sides.java, * javax/print/event/PrintEvent.java, * javax/print/event/PrintJobAdapter.java, * javax/print/event/PrintJobAttributeEvent.java, * javax/print/event/PrintJobAttributeListener.java, * javax/print/event/PrintJobEvent.java, * javax/print/event/PrintJobListener.java, * javax/print/event/PrintServiceAttributeEvent.java, * javax/print/event/PrintServiceAttributeListener.java, * javax/rmi/CORBA/ClassDesc.java, * javax/rmi/CORBA/PortableRemoteObjectDelegate.java, * javax/rmi/CORBA/Stub.java, * javax/rmi/CORBA/StubDelegate.java, * javax/rmi/CORBA/Tie.java, * javax/rmi/CORBA/Util.java, * javax/rmi/CORBA/UtilDelegate.java, * javax/rmi/CORBA/ValueHandler.java, * javax/rmi/CORBA/ValueHandlerMultiFormat.java, * javax/rmi/PortableRemoteObject.java, * javax/rmi/ssl/SslRMIClientSocketFactory.java, * javax/rmi/ssl/SslRMIServerSocketFactory.java, * javax/security/auth/Subject.java, * javax/security/auth/callback/ChoiceCallback.java, * javax/security/auth/callback/ConfirmationCallback.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/kerberos/DelegationPermission.java, * javax/security/auth/kerberos/KerberosKey.java, * javax/security/auth/kerberos/KerberosPrincipal.java, * javax/security/auth/kerberos/ServicePermission.java, * javax/security/auth/login/AccountNotFoundException.java, * javax/security/auth/login/AppConfigurationEntry.java, * javax/security/auth/login/LoginContext.java, * javax/security/sasl/Sasl.java, * javax/sound/midi/ControllerEventListener.java, * javax/sound/midi/Instrument.java, * javax/sound/midi/InvalidMidiDataException.java, * javax/sound/midi/MetaEventListener.java, * javax/sound/midi/MetaMessage.java, * javax/sound/midi/MidiChannel.java, * javax/sound/midi/MidiDevice.java, * javax/sound/midi/MidiEvent.java, * javax/sound/midi/MidiFileFormat.java, * javax/sound/midi/MidiMessage.java, * javax/sound/midi/MidiSystem.java, * javax/sound/midi/MidiUnavailableException.java, * javax/sound/midi/Patch.java, * javax/sound/midi/Receiver.java, * javax/sound/midi/Sequence.java, * javax/sound/midi/Sequencer.java, * javax/sound/midi/ShortMessage.java, * javax/sound/midi/Soundbank.java, * javax/sound/midi/SoundbankResource.java, * javax/sound/midi/Synthesizer.java, * javax/sound/midi/SysexMessage.java, * javax/sound/midi/Track.java, * javax/sound/midi/Transmitter.java, * javax/sound/midi/VoiceStatus.java, * javax/sound/midi/spi/MidiDeviceProvider.java, * javax/sound/midi/spi/MidiFileReader.java, * javax/sound/midi/spi/MidiFileWriter.java, * javax/sound/midi/spi/SoundbankReader.java, * javax/sound/sampled/AudioFileFormat.java, * javax/sound/sampled/AudioFormat.java, * javax/sound/sampled/AudioInputStream.java, * javax/sound/sampled/AudioPermission.java, * javax/sound/sampled/AudioSystem.java, * javax/sound/sampled/BooleanControl.java, * javax/sound/sampled/Clip.java, * javax/sound/sampled/CompoundControl.java, * javax/sound/sampled/DataLine.java, * javax/sound/sampled/EnumControl.java, * javax/sound/sampled/FloatControl.java, * javax/sound/sampled/Line.java, * javax/sound/sampled/LineEvent.java, * javax/sound/sampled/LineUnavailableException.java, * javax/sound/sampled/Mixer.java, * javax/sound/sampled/Port.java, * javax/sound/sampled/ReverbType.java, * javax/sound/sampled/UnsupportedAudioFileException.java, * javax/sound/sampled/spi/AudioFileReader.java, * javax/sound/sampled/spi/AudioFileWriter.java, * javax/sound/sampled/spi/FormatConversionProvider.java, * javax/sql/ConnectionEvent.java, * javax/sql/ConnectionEventListener.java, * javax/sql/ConnectionPoolDataSource.java, * javax/sql/DataSource.java, * javax/sql/PooledConnection.java, * javax/sql/RowSet.java, * javax/sql/RowSetEvent.java, * javax/sql/RowSetInternal.java, * javax/sql/RowSetListener.java, * javax/sql/RowSetMetaData.java, * javax/sql/RowSetReader.java, * javax/sql/RowSetWriter.java, * javax/sql/XAConnection.java, * javax/sql/XADataSource.java, * javax/swing/AbstractAction.java, * javax/swing/AbstractButton.java, * javax/swing/AbstractCellEditor.java, * javax/swing/AbstractListModel.java, * javax/swing/AbstractSpinnerModel.java, * javax/swing/Action.java, * javax/swing/BorderFactory.java, * javax/swing/BoundedRangeModel.java, * javax/swing/Box.java, * javax/swing/BoxLayout.java, * javax/swing/ButtonGroup.java, * javax/swing/ButtonModel.java, * javax/swing/CellEditor.java, * javax/swing/CellRendererPane.java, * javax/swing/ComboBoxModel.java, * javax/swing/ComponentInputMap.java, * javax/swing/DebugGraphics.java, * javax/swing/DefaultBoundedRangeModel.java, * javax/swing/DefaultButtonModel.java, * javax/swing/DefaultCellEditor.java, * javax/swing/DefaultComboBoxModel.java, * javax/swing/DefaultDesktopManager.java, * javax/swing/DefaultFocusManager.java, * javax/swing/DefaultListModel.java, * javax/swing/DefaultListSelectionModel.java, * javax/swing/DefaultSingleSelectionModel.java, * javax/swing/FocusManager.java, * javax/swing/GrayFilter.java, * javax/swing/Icon.java, * javax/swing/ImageIcon.java, * javax/swing/InputMap.java, * javax/swing/InternalFrameFocusTraversalPolicy.java, * javax/swing/JApplet.java, * javax/swing/JButton.java, * javax/swing/JCheckBox.java, * javax/swing/JCheckBoxMenuItem.java, * javax/swing/JComboBox.java, * javax/swing/JComponent.java, * javax/swing/JDesktopPane.java, * javax/swing/JDialog.java, * javax/swing/JEditorPane.java, * javax/swing/JFileChooser.java, * javax/swing/JFormattedTextField.java, * javax/swing/JFrame.java, * javax/swing/JInternalFrame.java, * javax/swing/JLabel.java, * javax/swing/JLayeredPane.java, * javax/swing/JList.java, * javax/swing/JMenu.java, * javax/swing/JMenuBar.java, * javax/swing/JMenuItem.java, * javax/swing/JOptionPane.java, * javax/swing/JPanel.java, * javax/swing/JPasswordField.java, * javax/swing/JPopupMenu.java, * javax/swing/JProgressBar.java, * javax/swing/JRadioButton.java, * javax/swing/JRadioButtonMenuItem.java, * javax/swing/JRootPane.java, * javax/swing/JScrollBar.java, * javax/swing/JScrollPane.java, * javax/swing/JSeparator.java, * javax/swing/JSlider.java, * javax/swing/JSpinner.java, * javax/swing/JSplitPane.java, * javax/swing/JTabbedPane.java, * javax/swing/JTable.java, * javax/swing/JTextArea.java, * javax/swing/JTextField.java, * javax/swing/JTextPane.java, * javax/swing/JToggleButton.java, * javax/swing/JToolBar.java, * javax/swing/JToolTip.java, * javax/swing/JTree.java, * javax/swing/JViewport.java, * javax/swing/JWindow.java, * javax/swing/KeyStroke.java, * javax/swing/KeyboardManager.java, * javax/swing/LayoutFocusTraversalPolicy.java, * javax/swing/ListCellRenderer.java, * javax/swing/ListSelectionModel.java, * javax/swing/LookAndFeel.java, * javax/swing/MenuSelectionManager.java, * javax/swing/OverlayLayout.java, * javax/swing/Popup.java, * javax/swing/PopupFactory.java, * javax/swing/ProgressMonitor.java, * javax/swing/ProgressMonitorInputStream.java, * javax/swing/Renderer.java, * javax/swing/RepaintManager.java, * javax/swing/ScrollPaneLayout.java, * javax/swing/Scrollable.java, * javax/swing/SingleSelectionModel.java, * javax/swing/SizeRequirements.java, * javax/swing/SizeSequence.java, * javax/swing/SortingFocusTraversalPolicy.java, * javax/swing/SpinnerDateModel.java, * javax/swing/SpinnerListModel.java, * javax/swing/SpinnerModel.java, * javax/swing/SpinnerNumberModel.java, * javax/swing/Spring.java, * javax/swing/SpringLayout.java, * javax/swing/SwingConstants.java, * javax/swing/SwingUtilities.java, * javax/swing/Timer.java, * javax/swing/ToolTipManager.java, * javax/swing/TransferHandler.java, * javax/swing/UIDefaults.java, * javax/swing/UIManager.java, * javax/swing/UnsupportedLookAndFeelException.java, * javax/swing/ViewportLayout.java, * javax/swing/WindowConstants.java, * javax/swing/border/AbstractBorder.java, * javax/swing/border/BevelBorder.java, * javax/swing/border/Border.java, * javax/swing/border/CompoundBorder.java, * javax/swing/border/EmptyBorder.java, * javax/swing/border/EtchedBorder.java, * javax/swing/border/LineBorder.java, * javax/swing/border/MatteBorder.java, * javax/swing/border/SoftBevelBorder.java, * javax/swing/border/TitledBorder.java, * javax/swing/colorchooser/AbstractColorChooserPanel.java, * javax/swing/colorchooser/ColorChooserComponentFactory.java, * javax/swing/colorchooser/ColorSelectionModel.java, * javax/swing/colorchooser/DefaultColorSelectionModel.java, * javax/swing/colorchooser/DefaultHSBChooserPanel.java, * javax/swing/colorchooser/DefaultRGBChooserPanel.java, * javax/swing/colorchooser/DefaultSwatchChooserPanel.java, * javax/swing/event/AncestorEvent.java, * javax/swing/event/AncestorListener.java, * javax/swing/event/CaretEvent.java, * javax/swing/event/CaretListener.java, * javax/swing/event/CellEditorListener.java, * javax/swing/event/ChangeEvent.java, * javax/swing/event/ChangeListener.java, * javax/swing/event/DocumentEvent.java, * javax/swing/event/DocumentListener.java, * javax/swing/event/EventListenerList.java, * javax/swing/event/HyperlinkEvent.java, * javax/swing/event/HyperlinkListener.java, * javax/swing/event/InternalFrameAdapter.java, * javax/swing/event/InternalFrameEvent.java, * javax/swing/event/InternalFrameListener.java, * javax/swing/event/ListDataEvent.java, * javax/swing/event/ListDataListener.java, * javax/swing/event/ListSelectionEvent.java, * javax/swing/event/ListSelectionListener.java, * javax/swing/event/MenuDragMouseEvent.java, * javax/swing/event/MenuDragMouseListener.java, * javax/swing/event/MenuEvent.java, * javax/swing/event/MenuKeyEvent.java, * javax/swing/event/MenuKeyListener.java, * javax/swing/event/MenuListener.java, * javax/swing/event/MouseInputListener.java, * javax/swing/event/PopupMenuEvent.java, * javax/swing/event/PopupMenuListener.java, * javax/swing/event/SwingPropertyChangeSupport.java, * javax/swing/event/TableColumnModelEvent.java, * javax/swing/event/TableColumnModelListener.java, * javax/swing/event/TableModelEvent.java, * javax/swing/event/TableModelListener.java, * javax/swing/event/TreeExpansionEvent.java, * javax/swing/event/TreeExpansionListener.java, * javax/swing/event/TreeModelEvent.java, * javax/swing/event/TreeModelListener.java, * javax/swing/event/TreeSelectionEvent.java, * javax/swing/event/TreeSelectionListener.java, * javax/swing/event/TreeWillExpandListener.java, * javax/swing/event/UndoableEditEvent.java, * javax/swing/filechooser/FileFilter.java, * javax/swing/filechooser/FileSystemView.java, * javax/swing/filechooser/FileView.java, * javax/swing/filechooser/UnixFileSystemView.java, * javax/swing/plaf/BorderUIResource.java, * javax/swing/plaf/ColorChooserUI.java, * javax/swing/plaf/ColorUIResource.java, * javax/swing/plaf/ComboBoxUI.java, * javax/swing/plaf/ComponentInputMapUIResource.java, * javax/swing/plaf/ComponentUI.java, * javax/swing/plaf/FileChooserUI.java, * javax/swing/plaf/IconUIResource.java, * javax/swing/plaf/SplitPaneUI.java, * javax/swing/plaf/TabbedPaneUI.java, * javax/swing/plaf/TextUI.java, * javax/swing/plaf/UIResource.java, * javax/swing/plaf/basic/BasicArrowButton.java, * javax/swing/plaf/basic/BasicBorders.java, * javax/swing/plaf/basic/BasicButtonListener.java, * javax/swing/plaf/basic/BasicButtonUI.java, * javax/swing/plaf/basic/BasicCheckBoxMenuItemUI.java, * javax/swing/plaf/basic/BasicCheckBoxUI.java, * javax/swing/plaf/basic/BasicColorChooserUI.java, * javax/swing/plaf/basic/BasicComboBoxEditor.java, * javax/swing/plaf/basic/BasicComboBoxRenderer.java, * javax/swing/plaf/basic/BasicComboBoxUI.java, * javax/swing/plaf/basic/BasicComboPopup.java, * javax/swing/plaf/basic/BasicDesktopIconUI.java, * javax/swing/plaf/basic/BasicDesktopPaneUI.java, * javax/swing/plaf/basic/BasicDirectoryModel.java, * javax/swing/plaf/basic/BasicEditorPaneUI.java, * javax/swing/plaf/basic/BasicFileChooserUI.java, * javax/swing/plaf/basic/BasicFormattedTextFieldUI.java, * javax/swing/plaf/basic/BasicGraphicsUtils.java, * javax/swing/plaf/basic/BasicHTML.java, * javax/swing/plaf/basic/BasicIconFactory.java, * javax/swing/plaf/basic/BasicInternalFrameTitlePane.java, * javax/swing/plaf/basic/BasicInternalFrameUI.java, * javax/swing/plaf/basic/BasicLabelUI.java, * javax/swing/plaf/basic/BasicListUI.java, * javax/swing/plaf/basic/BasicLookAndFeel.java, * javax/swing/plaf/basic/BasicMenuBarUI.java, * javax/swing/plaf/basic/BasicMenuItemUI.java, * javax/swing/plaf/basic/BasicMenuUI.java, * javax/swing/plaf/basic/BasicOptionPaneUI.java, * javax/swing/plaf/basic/BasicPanelUI.java, * javax/swing/plaf/basic/BasicPasswordFieldUI.java, * javax/swing/plaf/basic/BasicPopupMenuUI.java, * javax/swing/plaf/basic/BasicProgressBarUI.java, * javax/swing/plaf/basic/BasicRadioButtonUI.java, * javax/swing/plaf/basic/BasicRootPaneUI.java, * javax/swing/plaf/basic/BasicScrollBarUI.java, * javax/swing/plaf/basic/BasicScrollPaneUI.java, * javax/swing/plaf/basic/BasicSeparatorUI.java, * javax/swing/plaf/basic/BasicSliderUI.java, * javax/swing/plaf/basic/BasicSpinnerUI.java, * javax/swing/plaf/basic/BasicSplitPaneDivider.java, * javax/swing/plaf/basic/BasicSplitPaneUI.java, * javax/swing/plaf/basic/BasicTabbedPaneUI.java, * javax/swing/plaf/basic/BasicTableHeaderUI.java, * javax/swing/plaf/basic/BasicTableUI.java, * javax/swing/plaf/basic/BasicTextAreaUI.java, * javax/swing/plaf/basic/BasicTextFieldUI.java, * javax/swing/plaf/basic/BasicTextPaneUI.java, * javax/swing/plaf/basic/BasicTextUI.java, * javax/swing/plaf/basic/BasicToggleButtonUI.java, * javax/swing/plaf/basic/BasicToolBarUI.java, * javax/swing/plaf/basic/BasicToolTipUI.java, * javax/swing/plaf/basic/BasicTreeUI.java, * javax/swing/plaf/basic/BasicViewportUI.java, * javax/swing/plaf/metal/DefaultMetalTheme.java, * javax/swing/plaf/metal/MetalBorders.java, * javax/swing/plaf/metal/MetalButtonListener.java, * javax/swing/plaf/metal/MetalButtonUI.java, * javax/swing/plaf/metal/MetalCheckBoxIcon.java, * javax/swing/plaf/metal/MetalCheckBoxUI.java, * javax/swing/plaf/metal/MetalComboBoxButton.java, * javax/swing/plaf/metal/MetalComboBoxEditor.java, * javax/swing/plaf/metal/MetalComboBoxIcon.java, * javax/swing/plaf/metal/MetalComboBoxUI.java, * javax/swing/plaf/metal/MetalFileChooserUI.java, * javax/swing/plaf/metal/MetalIconFactory.java, * javax/swing/plaf/metal/MetalInternalFrameTitlePane.java, * javax/swing/plaf/metal/MetalInternalFrameUI.java, * javax/swing/plaf/metal/MetalLabelUI.java, * javax/swing/plaf/metal/MetalLookAndFeel.java, * javax/swing/plaf/metal/MetalMenuBarUI.java, * javax/swing/plaf/metal/MetalProgressBarUI.java, * javax/swing/plaf/metal/MetalRadioButtonUI.java, * javax/swing/plaf/metal/MetalRootPaneUI.java, * javax/swing/plaf/metal/MetalScrollBarUI.java, * javax/swing/plaf/metal/MetalScrollButton.java, * javax/swing/plaf/metal/MetalScrollPaneUI.java, * javax/swing/plaf/metal/MetalSeparatorUI.java, * javax/swing/plaf/metal/MetalSliderUI.java, * javax/swing/plaf/metal/MetalSplitPaneDivider.java, * javax/swing/plaf/metal/MetalSplitPaneUI.java, * javax/swing/plaf/metal/MetalTabbedPaneUI.java, * javax/swing/plaf/metal/MetalTextFieldUI.java, * javax/swing/plaf/metal/MetalTheme.java, * javax/swing/plaf/metal/MetalToggleButtonUI.java, * javax/swing/plaf/metal/MetalToolBarUI.java, * javax/swing/plaf/metal/MetalToolTipUI.java, * javax/swing/plaf/metal/MetalTreeUI.java, * javax/swing/plaf/metal/MetalUtils.java, * javax/swing/plaf/metal/OceanTheme.java, * javax/swing/plaf/multi/MultiButtonUI.java, * javax/swing/plaf/multi/MultiColorChooserUI.java, * javax/swing/plaf/multi/MultiComboBoxUI.java, * javax/swing/plaf/multi/MultiDesktopIconUI.java, * javax/swing/plaf/multi/MultiDesktopPaneUI.java, * javax/swing/plaf/multi/MultiFileChooserUI.java, * javax/swing/plaf/multi/MultiInternalFrameUI.java, * javax/swing/plaf/multi/MultiLabelUI.java, * javax/swing/plaf/multi/MultiListUI.java, * javax/swing/plaf/multi/MultiLookAndFeel.java, * javax/swing/plaf/multi/MultiMenuBarUI.java, * javax/swing/plaf/multi/MultiMenuItemUI.java, * javax/swing/plaf/multi/MultiOptionPaneUI.java, * javax/swing/plaf/multi/MultiPanelUI.java, * javax/swing/plaf/multi/MultiPopupMenuUI.java, * javax/swing/plaf/multi/MultiProgressBarUI.java, * javax/swing/plaf/multi/MultiRootPaneUI.java, * javax/swing/plaf/multi/MultiScrollBarUI.java, * javax/swing/plaf/multi/MultiScrollPaneUI.java, * javax/swing/plaf/multi/MultiSeparatorUI.java, * javax/swing/plaf/multi/MultiSliderUI.java, * javax/swing/plaf/multi/MultiSpinnerUI.java, * javax/swing/plaf/multi/MultiSplitPaneUI.java, * javax/swing/plaf/multi/MultiTabbedPaneUI.java, * javax/swing/plaf/multi/MultiTableHeaderUI.java, * javax/swing/plaf/multi/MultiTableUI.java, * javax/swing/plaf/multi/MultiTextUI.java, * javax/swing/plaf/multi/MultiToolBarUI.java, * javax/swing/plaf/multi/MultiToolTipUI.java, * javax/swing/plaf/multi/MultiTreeUI.java, * javax/swing/plaf/multi/MultiViewportUI.java, * javax/swing/plaf/synth/SynthGraphicsUtils.java, * javax/swing/plaf/synth/SynthLookAndFeel.java, * javax/swing/plaf/synth/SynthPainter.java, * javax/swing/table/AbstractTableModel.java, * javax/swing/table/DefaultTableCellRenderer.java, * javax/swing/table/DefaultTableColumnModel.java, * javax/swing/table/DefaultTableModel.java, * javax/swing/table/JTableHeader.java, * javax/swing/table/TableCellEditor.java, * javax/swing/table/TableCellRenderer.java, * javax/swing/table/TableColumn.java, * javax/swing/table/TableColumnModel.java, * javax/swing/table/TableModel.java, * javax/swing/text/AbstractDocument.java, * javax/swing/text/AbstractWriter.java, * javax/swing/text/AsyncBoxView.java, * javax/swing/text/AttributeSet.java, * javax/swing/text/BoxView.java, * javax/swing/text/Caret.java, * javax/swing/text/ComponentView.java, * javax/swing/text/CompositeView.java, * javax/swing/text/DefaultCaret.java, * javax/swing/text/DefaultEditorKit.java, * javax/swing/text/DefaultFormatter.java, * javax/swing/text/DefaultFormatterFactory.java, * javax/swing/text/DefaultHighlighter.java, * javax/swing/text/DefaultStyledDocument.java, * javax/swing/text/DocumentFilter.java, * javax/swing/text/EditorKit.java, * javax/swing/text/Element.java, * javax/swing/text/ElementIterator.java, * javax/swing/text/EmptyAttributeSet.java, * javax/swing/text/FieldView.java, * javax/swing/text/FlowView.java, * javax/swing/text/GapContent.java, * javax/swing/text/GlyphView.java, * javax/swing/text/Highlighter.java, * javax/swing/text/InternationalFormatter.java, * javax/swing/text/JTextComponent.java, * javax/swing/text/Keymap.java, * javax/swing/text/LayeredHighlighter.java, * javax/swing/text/LayoutQueue.java, * javax/swing/text/MaskFormatter.java, * javax/swing/text/MutableAttributeSet.java, * javax/swing/text/NavigationFilter.java, * javax/swing/text/NumberFormatter.java, * javax/swing/text/ParagraphView.java, * javax/swing/text/PasswordView.java, * javax/swing/text/PlainDocument.java, * javax/swing/text/PlainView.java, * javax/swing/text/Position.java, * javax/swing/text/Segment.java, * javax/swing/text/SimpleAttributeSet.java, * javax/swing/text/StringContent.java, * javax/swing/text/Style.java, * javax/swing/text/StyleConstants.java, * javax/swing/text/StyleContext.java, * javax/swing/text/StyledDocument.java, * javax/swing/text/StyledEditorKit.java, * javax/swing/text/TabExpander.java, * javax/swing/text/TabSet.java, * javax/swing/text/TabStop.java, * javax/swing/text/TabableView.java, * javax/swing/text/TableView.java, * javax/swing/text/TextAction.java, * javax/swing/text/Utilities.java, * javax/swing/text/View.java, * javax/swing/text/ViewFactory.java, * javax/swing/text/WrappedPlainView.java, * javax/swing/text/html/BRView.java, * javax/swing/text/html/BlockView.java, * javax/swing/text/html/CSS.java, * javax/swing/text/html/CSSBorder.java, * javax/swing/text/html/CSSParser.java, * javax/swing/text/html/FormView.java, * javax/swing/text/html/HRuleView.java, * javax/swing/text/html/HTMLDocument.java, * javax/swing/text/html/HTMLEditorKit.java, * javax/swing/text/html/HTMLWriter.java, * javax/swing/text/html/ImageView.java, * javax/swing/text/html/InlineView.java, * javax/swing/text/html/ListView.java, * javax/swing/text/html/MinimalHTMLWriter.java, * javax/swing/text/html/MultiAttributeSet.java, * javax/swing/text/html/MultiStyle.java, * javax/swing/text/html/ParagraphView.java, * javax/swing/text/html/StyleSheet.java, * javax/swing/text/html/TableView.java, * javax/swing/text/html/ViewAttributeSet.java, * javax/swing/text/html/parser/Entity.java, * javax/swing/text/html/parser/Parser.java, * javax/swing/text/rtf/RTFParser.java, * javax/swing/text/rtf/RTFScanner.java, * javax/swing/tree/AbstractLayoutCache.java, * javax/swing/tree/DefaultMutableTreeNode.java, * javax/swing/tree/DefaultTreeCellEditor.java, * javax/swing/tree/DefaultTreeCellRenderer.java, * javax/swing/tree/DefaultTreeModel.java, * javax/swing/tree/DefaultTreeSelectionModel.java, * javax/swing/tree/ExpandVetoException.java, * javax/swing/tree/FixedHeightLayoutCache.java, * javax/swing/tree/MutableTreeNode.java, * javax/swing/tree/RowMapper.java, * javax/swing/tree/TreeCellEditor.java, * javax/swing/tree/TreeCellRenderer.java, * javax/swing/tree/TreeNode.java, * javax/swing/tree/TreePath.java, * javax/swing/tree/TreeSelectionModel.java, * javax/swing/tree/VariableHeightLayoutCache.java, * javax/swing/undo/AbstractUndoableEdit.java, * javax/swing/undo/CompoundEdit.java, * javax/swing/undo/StateEdit.java, * javax/swing/undo/UndoManager.java, * javax/swing/undo/UndoableEdit.java, * javax/tools/FileObject.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/stream/EventFilter.java, * javax/xml/stream/FactoryConfigurationError.java, * javax/xml/stream/Location.java, * javax/xml/stream/StreamFilter.java, * javax/xml/stream/XMLEventFactory.java, * javax/xml/stream/XMLEventReader.java, * javax/xml/stream/XMLEventWriter.java, * javax/xml/stream/XMLInputFactory.java, * javax/xml/stream/XMLOutputFactory.java, * javax/xml/stream/XMLReporter.java, * javax/xml/stream/XMLResolver.java, * javax/xml/stream/XMLStreamConstants.java, * javax/xml/stream/XMLStreamException.java, * javax/xml/stream/XMLStreamReader.java, * javax/xml/stream/XMLStreamWriter.java, * javax/xml/stream/events/Attribute.java, * javax/xml/stream/events/Characters.java, * javax/xml/stream/events/Comment.java, * javax/xml/stream/events/DTD.java, * javax/xml/stream/events/EndDocument.java, * javax/xml/stream/events/EndElement.java, * javax/xml/stream/events/EntityDeclaration.java, * javax/xml/stream/events/EntityReference.java, * javax/xml/stream/events/Namespace.java, * javax/xml/stream/events/NotationDeclaration.java, * javax/xml/stream/events/ProcessingInstruction.java, * javax/xml/stream/events/StartDocument.java, * javax/xml/stream/events/StartElement.java, * javax/xml/stream/events/XMLEvent.java, * javax/xml/stream/util/EventReaderDelegate.java, * javax/xml/stream/util/StreamReaderDelegate.java, * javax/xml/stream/util/XMLEventAllocator.java, * javax/xml/stream/util/XMLEventConsumer.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/SchemaFactoryLoader.java, * javax/xml/validation/TypeInfoProvider.java, * javax/xml/validation/Validator.java, * javax/xml/validation/ValidatorHandler.java, * javax/xml/xpath/XPath.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, * javax/xml/xpath/XPathVariableResolver.java, * org/omg/CORBA/ARG_IN.java, * org/omg/CORBA/ARG_INOUT.java, * org/omg/CORBA/ARG_OUT.java, * org/omg/CORBA/AnySeqHolder.java, * org/omg/CORBA/BAD_CONTEXT.java, * org/omg/CORBA/BAD_INV_ORDER.java, * org/omg/CORBA/BAD_OPERATION.java, * org/omg/CORBA/BAD_PARAM.java, * org/omg/CORBA/BAD_POLICY.java, * org/omg/CORBA/BAD_POLICY_TYPE.java, * org/omg/CORBA/BAD_POLICY_VALUE.java, * org/omg/CORBA/BAD_TYPECODE.java, * org/omg/CORBA/COMM_FAILURE.java, * org/omg/CORBA/CTX_RESTRICT_SCOPE.java, * org/omg/CORBA/CompletionStatus.java, * org/omg/CORBA/CompletionStatusHelper.java, * org/omg/CORBA/Context.java, * org/omg/CORBA/Current.java, * org/omg/CORBA/CurrentHelper.java, * org/omg/CORBA/CurrentHolder.java, * org/omg/CORBA/CustomMarshal.java, * org/omg/CORBA/CustomValue.java, * org/omg/CORBA/DATA_CONVERSION.java, * org/omg/CORBA/DataInputStream.java, * org/omg/CORBA/DataOutputStream.java, * org/omg/CORBA/DefinitionKind.java, * org/omg/CORBA/DefinitionKindHelper.java, * org/omg/CORBA/DynamicImplementation.java, * org/omg/CORBA/FREE_MEM.java, * org/omg/CORBA/FieldNameHelper.java, * org/omg/CORBA/IDLTypeHelper.java, * org/omg/CORBA/IMP_LIMIT.java, * org/omg/CORBA/INITIALIZE.java, * org/omg/CORBA/INTERNAL.java, * org/omg/CORBA/INTF_REPOS.java, * org/omg/CORBA/INVALID_TRANSACTION.java, * org/omg/CORBA/INV_FLAG.java, * org/omg/CORBA/INV_IDENT.java, * org/omg/CORBA/INV_OBJREF.java, * org/omg/CORBA/INV_POLICY.java, * org/omg/CORBA/IRObject.java, * org/omg/CORBA/IRObjectOperations.java, * org/omg/CORBA/IdentifierHelper.java, * org/omg/CORBA/LocalObject.java, * org/omg/CORBA/LongSeqHolder.java, * org/omg/CORBA/MARSHAL.java, * org/omg/CORBA/NO_IMPLEMENT.java, * org/omg/CORBA/NO_MEMORY.java, * org/omg/CORBA/NO_PERMISSION.java, * org/omg/CORBA/NO_RESOURCES.java, * org/omg/CORBA/NO_RESPONSE.java, * org/omg/CORBA/NVList.java, * org/omg/CORBA/OBJECT_NOT_EXIST.java, * org/omg/CORBA/OBJ_ADAPTER.java, * org/omg/CORBA/OMGVMCID.java, * org/omg/CORBA/ORB.java, * org/omg/CORBA/ObjectHelper.java, * org/omg/CORBA/ObjectHolder.java, * org/omg/CORBA/PERSIST_STORE.java, * org/omg/CORBA/ParameterMode.java, * org/omg/CORBA/ParameterModeHelper.java, * org/omg/CORBA/PolicyErrorCodeHelper.java, * org/omg/CORBA/PolicyErrorHelper.java, * org/omg/CORBA/PolicyErrorHolder.java, * org/omg/CORBA/PolicyHelper.java, * org/omg/CORBA/PolicyHolder.java, * org/omg/CORBA/PolicyListHelper.java, * org/omg/CORBA/PolicyListHolder.java, * org/omg/CORBA/PolicyOperations.java, * org/omg/CORBA/PolicyTypeHelper.java, * org/omg/CORBA/RepositoryIdHelper.java, * org/omg/CORBA/Request.java, * org/omg/CORBA/ServiceDetailHelper.java, * org/omg/CORBA/ServiceInformationHelper.java, * org/omg/CORBA/SetOverrideTypeHelper.java, * org/omg/CORBA/StringValueHelper.java, * org/omg/CORBA/StructMember.java, * org/omg/CORBA/StructMemberHelper.java, * org/omg/CORBA/SystemException.java, * org/omg/CORBA/TCKind.java, * org/omg/CORBA/TRANSACTION_REQUIRED.java, * org/omg/CORBA/TRANSACTION_ROLLEDBACK.java, * org/omg/CORBA/TRANSIENT.java, * org/omg/CORBA/TypeCode.java, * org/omg/CORBA/TypeCodePackage/BadKind.java, * org/omg/CORBA/TypeCodePackage/Bounds.java, * org/omg/CORBA/UNSUPPORTED_POLICY.java, * org/omg/CORBA/UNSUPPORTED_POLICY_VALUE.java, * org/omg/CORBA/UnionMemberHelper.java, * org/omg/CORBA/UnknownUserException.java, * org/omg/CORBA/UnknownUserExceptionHolder.java, * org/omg/CORBA/ValueBaseHelper.java, * org/omg/CORBA/ValueBaseHolder.java, * org/omg/CORBA/ValueMemberHelper.java, * org/omg/CORBA/VersionSpecHelper.java, * org/omg/CORBA/VisibilityHelper.java, * org/omg/CORBA/WStringValueHelper.java, * org/omg/CORBA/WrongTransactionHelper.java, * org/omg/CORBA/WrongTransactionHolder.java, * org/omg/CORBA/_IDLTypeStub.java, * org/omg/CORBA/_PolicyStub.java, * org/omg/CORBA/portable/CustomValue.java, * org/omg/CORBA/portable/Delegate.java, * org/omg/CORBA/portable/ObjectImpl.java, * org/omg/CORBA/portable/StreamableValue.java, * org/omg/CORBA/portable/ValueBase.java, * org/omg/CORBA_2_3/ORB.java, * org/omg/CORBA_2_3/portable/Delegate.java, * org/omg/CORBA_2_3/portable/InputStream.java, * org/omg/CORBA_2_3/portable/ObjectImpl.java, * org/omg/CORBA_2_3/portable/OutputStream.java, * org/omg/CosNaming/BindingHelper.java, * org/omg/CosNaming/BindingIterator.java, * org/omg/CosNaming/BindingIteratorHelper.java, * org/omg/CosNaming/BindingIteratorOperations.java, * org/omg/CosNaming/BindingIteratorPOA.java, * org/omg/CosNaming/BindingType.java, * org/omg/CosNaming/BindingTypeHelper.java, * org/omg/CosNaming/IstringHelper.java, * org/omg/CosNaming/NameComponentHelper.java, * org/omg/CosNaming/NameHelper.java, * org/omg/CosNaming/NamingContext.java, * org/omg/CosNaming/NamingContextExtHelper.java, * org/omg/CosNaming/NamingContextExtPOA.java, * org/omg/CosNaming/NamingContextExtPackage/InvalidAddress.java, * org/omg/CosNaming/NamingContextHelper.java, * org/omg/CosNaming/NamingContextPOA.java, * org/omg/CosNaming/NamingContextPackage/AlreadyBound.java, * org/omg/CosNaming/NamingContextPackage/CannotProceed.java, * org/omg/CosNaming/NamingContextPackage/CannotProceedHelper.java, * org/omg/CosNaming/NamingContextPackage/InvalidName.java, * org/omg/CosNaming/NamingContextPackage/InvalidNameHelper.java, * org/omg/CosNaming/NamingContextPackage/NotEmptyHelper.java, * org/omg/CosNaming/NamingContextPackage/NotFound.java, * org/omg/CosNaming/NamingContextPackage/NotFoundHelper.java, * org/omg/CosNaming/NamingContextPackage/NotFoundReason.java, * org/omg/CosNaming/NamingContextPackage/NotFoundReasonHelper.java, * org/omg/CosNaming/NamingContextPackage/NotFoundReasonHolder.java, * org/omg/CosNaming/_BindingIteratorImplBase.java, * org/omg/CosNaming/_BindingIteratorStub.java, * org/omg/CosNaming/_NamingContextExtStub.java, * org/omg/CosNaming/_NamingContextStub.java, * org/omg/Dynamic/Parameter.java, * org/omg/DynamicAny/AnySeqHelper.java, * org/omg/DynamicAny/DynAny.java, * org/omg/DynamicAny/DynAnyFactoryHelper.java, * org/omg/DynamicAny/DynAnyFactoryPackage/InconsistentTypeCode.java, * org/omg/DynamicAny/DynAnyFactoryPackage/InconsistentTypeCodeHelper.java, * org/omg/DynamicAny/DynAnyHelper.java, * org/omg/DynamicAny/DynAnyPackage/InvalidValue.java, * org/omg/DynamicAny/DynAnyPackage/InvalidValueHelper.java, * org/omg/DynamicAny/DynAnyPackage/TypeMismatch.java, * org/omg/DynamicAny/DynAnyPackage/TypeMismatchHelper.java, * org/omg/DynamicAny/DynAnySeqHelper.java, * org/omg/DynamicAny/DynArrayHelper.java, * org/omg/DynamicAny/DynEnumHelper.java, * org/omg/DynamicAny/DynFixedHelper.java, * org/omg/DynamicAny/DynSequenceHelper.java, * org/omg/DynamicAny/DynStructHelper.java, * org/omg/DynamicAny/DynUnionHelper.java, * org/omg/DynamicAny/DynValueBox.java, * org/omg/DynamicAny/DynValueCommonOperations.java, * org/omg/DynamicAny/DynValueHelper.java, * org/omg/DynamicAny/FieldNameHelper.java, * org/omg/DynamicAny/NameDynAnyPairHelper.java, * org/omg/DynamicAny/NameDynAnyPairSeqHelper.java, * org/omg/DynamicAny/NameValuePair.java, * org/omg/DynamicAny/NameValuePairHelper.java, * org/omg/DynamicAny/NameValuePairSeqHelper.java, * org/omg/DynamicAny/_DynAnyFactoryStub.java, * org/omg/DynamicAny/_DynAnyStub.java, * org/omg/DynamicAny/_DynArrayStub.java, * org/omg/DynamicAny/_DynEnumStub.java, * org/omg/DynamicAny/_DynFixedStub.java, * org/omg/DynamicAny/_DynSequenceStub.java, * org/omg/DynamicAny/_DynStructStub.java, * org/omg/DynamicAny/_DynUnionStub.java, * org/omg/DynamicAny/_DynValueStub.java, * org/omg/IOP/Codec.java, * org/omg/IOP/CodecFactory.java, * org/omg/IOP/CodecFactoryHelper.java, * org/omg/IOP/CodecFactoryOperations.java, * org/omg/IOP/CodecFactoryPackage/UnknownEncoding.java, * org/omg/IOP/CodecFactoryPackage/UnknownEncodingHelper.java, * org/omg/IOP/CodecOperations.java, * org/omg/IOP/CodecPackage/FormatMismatch.java, * org/omg/IOP/CodecPackage/FormatMismatchHelper.java, * org/omg/IOP/CodecPackage/InvalidTypeForEncoding.java, * org/omg/IOP/CodecPackage/InvalidTypeForEncodingHelper.java, * org/omg/IOP/CodecPackage/TypeMismatch.java, * org/omg/IOP/CodecPackage/TypeMismatchHelper.java, * org/omg/IOP/ComponentIdHelper.java, * org/omg/IOP/Encoding.java, * org/omg/IOP/IOR.java, * org/omg/IOP/IORHelper.java, * org/omg/IOP/IORHolder.java, * org/omg/IOP/MultipleComponentProfileHelper.java, * org/omg/IOP/MultipleComponentProfileHolder.java, * org/omg/IOP/ProfileIdHelper.java, * org/omg/IOP/ServiceContext.java, * org/omg/IOP/ServiceContextHelper.java, * org/omg/IOP/ServiceContextHolder.java, * org/omg/IOP/ServiceContextListHelper.java, * org/omg/IOP/ServiceContextListHolder.java, * org/omg/IOP/ServiceIdHelper.java, * org/omg/IOP/TaggedComponent.java, * org/omg/IOP/TaggedComponentHelper.java, * org/omg/IOP/TaggedComponentHolder.java, * org/omg/IOP/TaggedProfile.java, * org/omg/IOP/TaggedProfileHelper.java, * org/omg/IOP/TaggedProfileHolder.java, * org/omg/IOP/TransactionService.java, * org/omg/Messaging/SYNC_WITH_TRANSPORT.java, * org/omg/Messaging/SyncScopeHelper.java, * org/omg/PortableInterceptor/AdapterManagerIdHelper.java, * org/omg/PortableInterceptor/AdapterNameHelper.java, * org/omg/PortableInterceptor/AdapterStateHelper.java, * org/omg/PortableInterceptor/ClientRequestInfo.java, * org/omg/PortableInterceptor/ClientRequestInfoOperations.java, * org/omg/PortableInterceptor/ClientRequestInterceptor.java, * org/omg/PortableInterceptor/ClientRequestInterceptorOperations.java, * org/omg/PortableInterceptor/Current.java, * org/omg/PortableInterceptor/CurrentHelper.java, * org/omg/PortableInterceptor/CurrentOperations.java, * org/omg/PortableInterceptor/ForwardRequest.java, * org/omg/PortableInterceptor/ForwardRequestHelper.java, * org/omg/PortableInterceptor/IORInfo.java, * org/omg/PortableInterceptor/IORInfoOperations.java, * org/omg/PortableInterceptor/IORInterceptor.java, * org/omg/PortableInterceptor/IORInterceptorOperations.java, * org/omg/PortableInterceptor/IORInterceptor_3_0.java, * org/omg/PortableInterceptor/IORInterceptor_3_0Helper.java, * org/omg/PortableInterceptor/IORInterceptor_3_0Holder.java, * org/omg/PortableInterceptor/IORInterceptor_3_0Operations.java, * org/omg/PortableInterceptor/Interceptor.java, * org/omg/PortableInterceptor/InterceptorOperations.java, * org/omg/PortableInterceptor/InvalidSlot.java, * org/omg/PortableInterceptor/InvalidSlotHelper.java, * org/omg/PortableInterceptor/LOCATION_FORWARD.java, * org/omg/PortableInterceptor/ORBIdHelper.java, * org/omg/PortableInterceptor/ORBInitInfo.java, * org/omg/PortableInterceptor/ORBInitInfoOperations.java, * org/omg/PortableInterceptor/ORBInitInfoPackage/DuplicateName.java, * org/omg/PortableInterceptor/ORBInitInfoPackage/DuplicateNameHelper.java, * org/omg/PortableInterceptor/ORBInitInfoPackage/InvalidName.java, * org/omg/PortableInterceptor/ORBInitInfoPackage/InvalidNameHelper.java, * org/omg/PortableInterceptor/ORBInitInfoPackage/ObjectIdHelper.java, * org/omg/PortableInterceptor/ORBInitializer.java, * org/omg/PortableInterceptor/ORBInitializerOperations.java, * org/omg/PortableInterceptor/ObjectIdHelper.java, * org/omg/PortableInterceptor/ObjectReferenceFactory.java, * org/omg/PortableInterceptor/ObjectReferenceFactoryHelper.java, * org/omg/PortableInterceptor/ObjectReferenceFactoryHolder.java, * org/omg/PortableInterceptor/ObjectReferenceTemplate.java, * org/omg/PortableInterceptor/ObjectReferenceTemplateHelper.java, * org/omg/PortableInterceptor/ObjectReferenceTemplateHolder.java, * org/omg/PortableInterceptor/ObjectReferenceTemplateSeqHelper.java, * org/omg/PortableInterceptor/ObjectReferenceTemplateSeqHolder.java, * org/omg/PortableInterceptor/PolicyFactory.java, * org/omg/PortableInterceptor/PolicyFactoryOperations.java, * org/omg/PortableInterceptor/RequestInfo.java, * org/omg/PortableInterceptor/RequestInfoOperations.java, * org/omg/PortableInterceptor/SUCCESSFUL.java, * org/omg/PortableInterceptor/SYSTEM_EXCEPTION.java, * org/omg/PortableInterceptor/ServerIdHelper.java, * org/omg/PortableInterceptor/ServerRequestInfo.java, * org/omg/PortableInterceptor/ServerRequestInfoOperations.java, * org/omg/PortableInterceptor/ServerRequestInterceptor.java, * org/omg/PortableInterceptor/ServerRequestInterceptorOperations.java, * org/omg/PortableInterceptor/TRANSPORT_RETRY.java, * org/omg/PortableInterceptor/USER_EXCEPTION.java, * org/omg/PortableInterceptor/_IORInterceptor_3_0Stub.java, * org/omg/PortableServer/AdapterActivator.java, * org/omg/PortableServer/AdapterActivatorOperations.java, * org/omg/PortableServer/Current.java, * org/omg/PortableServer/CurrentHelper.java, * org/omg/PortableServer/CurrentOperations.java, * org/omg/PortableServer/CurrentPackage/NoContext.java, * org/omg/PortableServer/CurrentPackage/NoContextHelper.java, * org/omg/PortableServer/DynamicImplementation.java, * org/omg/PortableServer/ForwardRequest.java, * org/omg/PortableServer/ForwardRequestHelper.java, * org/omg/PortableServer/ID_ASSIGNMENT_POLICY_ID.java, * org/omg/PortableServer/ID_UNIQUENESS_POLICY_ID.java, * org/omg/PortableServer/IMPLICIT_ACTIVATION_POLICY_ID.java, * org/omg/PortableServer/IdAssignmentPolicy.java, * org/omg/PortableServer/IdAssignmentPolicyOperations.java, * org/omg/PortableServer/IdAssignmentPolicyValue.java, * org/omg/PortableServer/IdUniquenessPolicy.java, * org/omg/PortableServer/IdUniquenessPolicyOperations.java, * org/omg/PortableServer/IdUniquenessPolicyValue.java, * org/omg/PortableServer/ImplicitActivationPolicy.java, * org/omg/PortableServer/ImplicitActivationPolicyOperations.java, * org/omg/PortableServer/ImplicitActivationPolicyValue.java, * org/omg/PortableServer/LifespanPolicy.java, * org/omg/PortableServer/LifespanPolicyOperations.java, * org/omg/PortableServer/LifespanPolicyValue.java, * org/omg/PortableServer/POA.java, * org/omg/PortableServer/POAHelper.java, * org/omg/PortableServer/POAManager.java, * org/omg/PortableServer/POAManagerOperations.java, * org/omg/PortableServer/POAManagerPackage/AdapterInactive.java, * org/omg/PortableServer/POAManagerPackage/AdapterInactiveHelper.java, * org/omg/PortableServer/POAManagerPackage/State.java, * org/omg/PortableServer/POAOperations.java, * org/omg/PortableServer/POAPackage/AdapterAlreadyExists.java, * org/omg/PortableServer/POAPackage/AdapterAlreadyExistsHelper.java, * org/omg/PortableServer/POAPackage/AdapterNonExistent.java, * org/omg/PortableServer/POAPackage/AdapterNonExistentHelper.java, * org/omg/PortableServer/POAPackage/InvalidPolicy.java, * org/omg/PortableServer/POAPackage/InvalidPolicyHelper.java, * org/omg/PortableServer/POAPackage/NoServant.java, * org/omg/PortableServer/POAPackage/NoServantHelper.java, * org/omg/PortableServer/POAPackage/ObjectAlreadyActive.java, * org/omg/PortableServer/POAPackage/ObjectAlreadyActiveHelper.java, * org/omg/PortableServer/POAPackage/ObjectNotActive.java, * org/omg/PortableServer/POAPackage/ObjectNotActiveHelper.java, * org/omg/PortableServer/POAPackage/ServantAlreadyActive.java, * org/omg/PortableServer/POAPackage/ServantAlreadyActiveHelper.java, * org/omg/PortableServer/POAPackage/ServantNotActive.java, * org/omg/PortableServer/POAPackage/ServantNotActiveHelper.java, * org/omg/PortableServer/POAPackage/WrongAdapter.java, * org/omg/PortableServer/POAPackage/WrongAdapterHelper.java, * org/omg/PortableServer/POAPackage/WrongPolicy.java, * org/omg/PortableServer/POAPackage/WrongPolicyHelper.java, * org/omg/PortableServer/RequestProcessingPolicy.java, * org/omg/PortableServer/RequestProcessingPolicyOperations.java, * org/omg/PortableServer/RequestProcessingPolicyValue.java, * org/omg/PortableServer/Servant.java, * org/omg/PortableServer/ServantActivator.java, * org/omg/PortableServer/ServantActivatorHelper.java, * org/omg/PortableServer/ServantActivatorOperations.java, * org/omg/PortableServer/ServantActivatorPOA.java, * org/omg/PortableServer/ServantLocator.java, * org/omg/PortableServer/ServantLocatorHelper.java, * org/omg/PortableServer/ServantLocatorOperations.java, * org/omg/PortableServer/ServantLocatorPOA.java, * org/omg/PortableServer/ServantLocatorPackage/CookieHolder.java, * org/omg/PortableServer/ServantManager.java, * org/omg/PortableServer/ServantManagerOperations.java, * org/omg/PortableServer/ServantRetentionPolicy.java, * org/omg/PortableServer/ServantRetentionPolicyOperations.java, * org/omg/PortableServer/ServantRetentionPolicyValue.java, * org/omg/PortableServer/ThreadPolicy.java, * org/omg/PortableServer/ThreadPolicyOperations.java, * org/omg/PortableServer/ThreadPolicyValue.java, * org/omg/PortableServer/_ServantActivatorStub.java, * org/omg/PortableServer/_ServantLocatorStub.java, * org/omg/PortableServer/portable/Delegate.java, * org/omg/SendingContext/RunTime.java, * org/omg/SendingContext/RunTimeOperations.java, * sun/misc/Service.java, * sun/misc/ServiceConfigurationError.java, * sun/reflect/annotation/AnnotationInvocationHandler.java, * sun/reflect/annotation/AnnotationParser.java, * sun/reflect/annotation/AnnotationType.java, * sun/reflect/annotation/EnumConstantNotPresentExceptionProxy.java, * sun/reflect/annotation/ExceptionProxy.java, * tools/com/sun/javadoc/ClassDoc.java, * tools/com/sun/javadoc/ConstructorDoc.java, * tools/com/sun/javadoc/Doc.java, * tools/com/sun/javadoc/DocErrorReporter.java, * tools/com/sun/javadoc/Doclet.java, * tools/com/sun/javadoc/ExecutableMemberDoc.java, * tools/com/sun/javadoc/FieldDoc.java, * tools/com/sun/javadoc/MemberDoc.java, * tools/com/sun/javadoc/MethodDoc.java, * tools/com/sun/javadoc/PackageDoc.java, * tools/com/sun/javadoc/ParamTag.java, * tools/com/sun/javadoc/Parameter.java, * tools/com/sun/javadoc/ProgramElementDoc.java, * tools/com/sun/javadoc/RootDoc.java, * tools/com/sun/javadoc/SeeTag.java, * tools/com/sun/javadoc/SerialFieldTag.java, * tools/com/sun/javadoc/Tag.java, * tools/com/sun/javadoc/ThrowsTag.java, * tools/com/sun/javadoc/Type.java, * tools/com/sun/javadoc/TypeVariable.java, * tools/com/sun/tools/javadoc/Main.java, * tools/com/sun/tools/javah/Main.java, * tools/external/asm/org/objectweb/asm/AnnotationVisitor.java, * tools/external/asm/org/objectweb/asm/AnnotationWriter.java, * tools/external/asm/org/objectweb/asm/Attribute.java, * tools/external/asm/org/objectweb/asm/ByteVector.java, * tools/external/asm/org/objectweb/asm/ClassAdapter.java, * tools/external/asm/org/objectweb/asm/ClassReader.java, * tools/external/asm/org/objectweb/asm/ClassVisitor.java, * tools/external/asm/org/objectweb/asm/ClassWriter.java, * tools/external/asm/org/objectweb/asm/Edge.java, * tools/external/asm/org/objectweb/asm/FieldVisitor.java, * tools/external/asm/org/objectweb/asm/FieldWriter.java, * tools/external/asm/org/objectweb/asm/Handler.java, * tools/external/asm/org/objectweb/asm/Item.java, * tools/external/asm/org/objectweb/asm/Label.java, * tools/external/asm/org/objectweb/asm/MethodAdapter.java, * tools/external/asm/org/objectweb/asm/MethodVisitor.java, * tools/external/asm/org/objectweb/asm/MethodWriter.java, * tools/external/asm/org/objectweb/asm/Opcodes.java, * tools/external/asm/org/objectweb/asm/Type.java, * tools/external/asm/org/objectweb/asm/attrs/StackMapAttribute.java, * tools/external/asm/org/objectweb/asm/attrs/StackMapFrame.java, * tools/external/asm/org/objectweb/asm/attrs/StackMapTableAttribute.java, * tools/external/asm/org/objectweb/asm/attrs/StackMapType.java, * tools/external/asm/org/objectweb/asm/commons/AdviceAdapter.java, * tools/external/asm/org/objectweb/asm/commons/EmptyVisitor.java, * tools/external/asm/org/objectweb/asm/commons/GeneratorAdapter.java, * tools/external/asm/org/objectweb/asm/commons/LocalVariablesSorter.java, * tools/external/asm/org/objectweb/asm/commons/Method.java, * tools/external/asm/org/objectweb/asm/commons/SerialVersionUIDAdder.java, * tools/external/asm/org/objectweb/asm/commons/StaticInitMerger.java, * tools/external/asm/org/objectweb/asm/commons/TableSwitchGenerator.java, * tools/external/asm/org/objectweb/asm/optimizer/AnnotationConstantsCollector.java, * tools/external/asm/org/objectweb/asm/optimizer/ClassConstantsCollector.java, * tools/external/asm/org/objectweb/asm/optimizer/ClassOptimizer.java, * tools/external/asm/org/objectweb/asm/optimizer/Constant.java, * tools/external/asm/org/objectweb/asm/optimizer/ConstantPool.java, * tools/external/asm/org/objectweb/asm/optimizer/FieldConstantsCollector.java, * tools/external/asm/org/objectweb/asm/optimizer/JarOptimizer.java, * tools/external/asm/org/objectweb/asm/optimizer/MethodConstantsCollector.java, * tools/external/asm/org/objectweb/asm/optimizer/MethodOptimizer.java, * tools/external/asm/org/objectweb/asm/optimizer/NameMapping.java, * tools/external/asm/org/objectweb/asm/optimizer/Shrinker.java, * tools/external/asm/org/objectweb/asm/signature/SignatureReader.java, * tools/external/asm/org/objectweb/asm/signature/SignatureVisitor.java, * tools/external/asm/org/objectweb/asm/signature/SignatureWriter.java, * tools/external/asm/org/objectweb/asm/tree/AbstractInsnNode.java, * tools/external/asm/org/objectweb/asm/tree/AnnotationNode.java, * tools/external/asm/org/objectweb/asm/tree/ClassNode.java, * tools/external/asm/org/objectweb/asm/tree/FieldInsnNode.java, * tools/external/asm/org/objectweb/asm/tree/FieldNode.java, * tools/external/asm/org/objectweb/asm/tree/IincInsnNode.java, * tools/external/asm/org/objectweb/asm/tree/InnerClassNode.java, * tools/external/asm/org/objectweb/asm/tree/InsnNode.java, * tools/external/asm/org/objectweb/asm/tree/IntInsnNode.java, * tools/external/asm/org/objectweb/asm/tree/JumpInsnNode.java, * tools/external/asm/org/objectweb/asm/tree/LabelNode.java, * tools/external/asm/org/objectweb/asm/tree/LdcInsnNode.java, * tools/external/asm/org/objectweb/asm/tree/LineNumberNode.java, * tools/external/asm/org/objectweb/asm/tree/LocalVariableNode.java, * tools/external/asm/org/objectweb/asm/tree/LookupSwitchInsnNode.java, * tools/external/asm/org/objectweb/asm/tree/MemberNode.java, * tools/external/asm/org/objectweb/asm/tree/MethodInsnNode.java, * tools/external/asm/org/objectweb/asm/tree/MethodNode.java, * tools/external/asm/org/objectweb/asm/tree/MultiANewArrayInsnNode.java, * tools/external/asm/org/objectweb/asm/tree/TableSwitchInsnNode.java, * tools/external/asm/org/objectweb/asm/tree/TryCatchBlockNode.java, * tools/external/asm/org/objectweb/asm/tree/TypeInsnNode.java, * tools/external/asm/org/objectweb/asm/tree/VarInsnNode.java, * tools/external/asm/org/objectweb/asm/tree/analysis/Analyzer.java, * tools/external/asm/org/objectweb/asm/tree/analysis/AnalyzerException.java, * tools/external/asm/org/objectweb/asm/tree/analysis/BasicInterpreter.java, * tools/external/asm/org/objectweb/asm/tree/analysis/BasicValue.java, * tools/external/asm/org/objectweb/asm/tree/analysis/BasicVerifier.java, * tools/external/asm/org/objectweb/asm/tree/analysis/DataflowInterpreter.java, * tools/external/asm/org/objectweb/asm/tree/analysis/DataflowValue.java, * tools/external/asm/org/objectweb/asm/tree/analysis/Frame.java, * tools/external/asm/org/objectweb/asm/tree/analysis/IntMap.java, * tools/external/asm/org/objectweb/asm/tree/analysis/Interpreter.java, * tools/external/asm/org/objectweb/asm/tree/analysis/SimpleVerifier.java, * tools/external/asm/org/objectweb/asm/tree/analysis/SmallSet.java, * tools/external/asm/org/objectweb/asm/tree/analysis/Subroutine.java, * tools/external/asm/org/objectweb/asm/tree/analysis/Value.java, * tools/external/asm/org/objectweb/asm/util/ASMifierAbstractVisitor.java, * tools/external/asm/org/objectweb/asm/util/ASMifierAnnotationVisitor.java, * tools/external/asm/org/objectweb/asm/util/ASMifierClassVisitor.java, * tools/external/asm/org/objectweb/asm/util/ASMifierFieldVisitor.java, * tools/external/asm/org/objectweb/asm/util/ASMifierMethodVisitor.java, * tools/external/asm/org/objectweb/asm/util/AbstractVisitor.java, * tools/external/asm/org/objectweb/asm/util/CheckAnnotationAdapter.java, * tools/external/asm/org/objectweb/asm/util/CheckClassAdapter.java, * tools/external/asm/org/objectweb/asm/util/CheckMethodAdapter.java, * tools/external/asm/org/objectweb/asm/util/TraceAbstractVisitor.java, * tools/external/asm/org/objectweb/asm/util/TraceAnnotationVisitor.java, * tools/external/asm/org/objectweb/asm/util/TraceClassVisitor.java, * tools/external/asm/org/objectweb/asm/util/TraceFieldVisitor.java, * tools/external/asm/org/objectweb/asm/util/TraceMethodVisitor.java, * tools/external/asm/org/objectweb/asm/util/TraceSignatureVisitor.java, * tools/external/asm/org/objectweb/asm/util/attrs/ASMStackMapAttribute.java, * tools/external/asm/org/objectweb/asm/util/attrs/ASMStackMapTableAttribute.java, * tools/external/asm/org/objectweb/asm/util/attrs/ASMifiable.java, * tools/external/asm/org/objectweb/asm/util/attrs/Traceable.java, * tools/external/asm/org/objectweb/asm/xml/ASMContentHandler.java, * tools/external/asm/org/objectweb/asm/xml/Processor.java, * tools/external/asm/org/objectweb/asm/xml/SAXAdapter.java, * tools/external/asm/org/objectweb/asm/xml/SAXAnnotationAdapter.java, * tools/external/asm/org/objectweb/asm/xml/SAXClassAdapter.java, * tools/external/asm/org/objectweb/asm/xml/SAXCodeAdapter.java, * tools/external/asm/org/objectweb/asm/xml/SAXFieldAdapter.java, * tools/generated/gnu/classpath/tools/gjdoc/expr/JavaLexer.java, * tools/generated/gnu/classpath/tools/gjdoc/expr/JavaRecognizer.java, * tools/generated/gnu/classpath/tools/gjdoc/expr/JavaTokenTypes.java, * tools/gnu/classpath/tools/FileSystemClassLoader.java, * tools/gnu/classpath/tools/IOToolkit.java, * tools/gnu/classpath/tools/MalformedInputEvent.java, * tools/gnu/classpath/tools/MalformedInputListener.java, * tools/gnu/classpath/tools/NotifyingInputStreamReader.java, * tools/gnu/classpath/tools/StringToolkit.java, * tools/gnu/classpath/tools/appletviewer/AppletSecurityManager.java, * tools/gnu/classpath/tools/appletviewer/AppletTag.java, * tools/gnu/classpath/tools/appletviewer/CommonAppletContext.java, * tools/gnu/classpath/tools/appletviewer/CommonAppletStub.java, * tools/gnu/classpath/tools/appletviewer/Main.java, * tools/gnu/classpath/tools/appletviewer/PluginAppletViewer.java, * tools/gnu/classpath/tools/appletviewer/PluginAppletWindow.java, * tools/gnu/classpath/tools/appletviewer/StandaloneAppletViewer.java, * tools/gnu/classpath/tools/appletviewer/StandaloneAppletWindow.java, * tools/gnu/classpath/tools/appletviewer/TagParser.java, * tools/gnu/classpath/tools/common/CallbackUtil.java, * tools/gnu/classpath/tools/common/ClasspathToolParser.java, * tools/gnu/classpath/tools/common/Persistent.java, * tools/gnu/classpath/tools/common/ProviderUtil.java, * tools/gnu/classpath/tools/common/SecurityProviderInfo.java, * tools/gnu/classpath/tools/doclets/AbstractDoclet.java, * tools/gnu/classpath/tools/doclets/DocletConfigurationException.java, * tools/gnu/classpath/tools/doclets/DocletOption.java, * tools/gnu/classpath/tools/doclets/DocletOptionColonSeparated.java, * tools/gnu/classpath/tools/doclets/DocletOptionFile.java, * tools/gnu/classpath/tools/doclets/DocletOptionFlag.java, * tools/gnu/classpath/tools/doclets/DocletOptionPackageWildcard.java, * tools/gnu/classpath/tools/doclets/DocletOptionString.java, * tools/gnu/classpath/tools/doclets/InlineTagRenderer.java, * tools/gnu/classpath/tools/doclets/InvalidPackageWildcardException.java, * tools/gnu/classpath/tools/doclets/PackageGroup.java, * tools/gnu/classpath/tools/doclets/PackageMatcher.java, * tools/gnu/classpath/tools/doclets/StandardTaglet.java, * tools/gnu/classpath/tools/doclets/TagletPrinter.java, * tools/gnu/classpath/tools/doclets/debugdoclet/DebugDoclet.java, * tools/gnu/classpath/tools/doclets/htmldoclet/CssClass.java, * tools/gnu/classpath/tools/doclets/htmldoclet/ExternalDocSet.java, * tools/gnu/classpath/tools/doclets/htmldoclet/HtmlDoclet.java, * tools/gnu/classpath/tools/doclets/htmldoclet/HtmlPage.java, * tools/gnu/classpath/tools/doclets/htmldoclet/HtmlTagletContext.java, * tools/gnu/classpath/tools/doclets/xmldoclet/Driver.java, * tools/gnu/classpath/tools/doclets/xmldoclet/Driver1_4.java, * tools/gnu/classpath/tools/doclets/xmldoclet/HtmlRepairer.java, * tools/gnu/classpath/tools/doclets/xmldoclet/TargetContext.java, * tools/gnu/classpath/tools/doclets/xmldoclet/doctranslet/DocTranslet.java, * tools/gnu/classpath/tools/doclets/xmldoclet/doctranslet/DocTransletConfigurationException.java, * tools/gnu/classpath/tools/doclets/xmldoclet/doctranslet/DocTransletException.java, * tools/gnu/classpath/tools/doclets/xmldoclet/doctranslet/DocTransletOptions.java, * tools/gnu/classpath/tools/doclets/xmldoclet/doctranslet/JarClassLoader.java, * tools/gnu/classpath/tools/doclets/xmldoclet/doctranslet/OutputFileInfo.java, * tools/gnu/classpath/tools/getopt/FileArgumentCallback.java, * tools/gnu/classpath/tools/getopt/Option.java, * tools/gnu/classpath/tools/getopt/OptionGroup.java, * tools/gnu/classpath/tools/getopt/Parser.java, * tools/gnu/classpath/tools/gjdoc/AbstractTagImpl.java, * tools/gnu/classpath/tools/gjdoc/ArrayCharacterIterator.java, * tools/gnu/classpath/tools/gjdoc/ClassDocImpl.java, * tools/gnu/classpath/tools/gjdoc/ClassDocProxy.java, * tools/gnu/classpath/tools/gjdoc/ClassDocReflectedImpl.java, * tools/gnu/classpath/tools/gjdoc/ConstructorDocImpl.java, * tools/gnu/classpath/tools/gjdoc/Debug.java, * tools/gnu/classpath/tools/gjdoc/DirectoryTree.java, * tools/gnu/classpath/tools/gjdoc/DocImpl.java, * tools/gnu/classpath/tools/gjdoc/ErrorReporter.java, * tools/gnu/classpath/tools/gjdoc/ExecutableMemberDocImpl.java, * tools/gnu/classpath/tools/gjdoc/FieldDocImpl.java, * tools/gnu/classpath/tools/gjdoc/GjdocPackageDoc.java, * tools/gnu/classpath/tools/gjdoc/GjdocRootDoc.java, * tools/gnu/classpath/tools/gjdoc/InheritDocTagImpl.java, * tools/gnu/classpath/tools/gjdoc/JavadocWrapper.java, * tools/gnu/classpath/tools/gjdoc/LinkTagImpl.java, * tools/gnu/classpath/tools/gjdoc/Main.java, * tools/gnu/classpath/tools/gjdoc/MemberDocImpl.java, * tools/gnu/classpath/tools/gjdoc/MethodDocImpl.java, * tools/gnu/classpath/tools/gjdoc/PackageDocImpl.java, * tools/gnu/classpath/tools/gjdoc/ParamTagImpl.java, * tools/gnu/classpath/tools/gjdoc/ParameterImpl.java, * tools/gnu/classpath/tools/gjdoc/ParseException.java, * tools/gnu/classpath/tools/gjdoc/Parser.java, * tools/gnu/classpath/tools/gjdoc/ProgramElementDocImpl.java, * tools/gnu/classpath/tools/gjdoc/RootDocImpl.java, * tools/gnu/classpath/tools/gjdoc/SeeTagImpl.java, * tools/gnu/classpath/tools/gjdoc/SerialFieldTagImpl.java, * tools/gnu/classpath/tools/gjdoc/SourcePositionImpl.java, * tools/gnu/classpath/tools/gjdoc/TagContainer.java, * tools/gnu/classpath/tools/gjdoc/TagImpl.java, * tools/gnu/classpath/tools/gjdoc/TemporaryStore.java, * tools/gnu/classpath/tools/gjdoc/TextTagImpl.java, * tools/gnu/classpath/tools/gjdoc/ThrowsTagImpl.java, * tools/gnu/classpath/tools/gjdoc/Timer.java, * tools/gnu/classpath/tools/gjdoc/TimerDoclet.java, * tools/gnu/classpath/tools/gjdoc/TypeImpl.java, * tools/gnu/classpath/tools/gjdoc/TypeVariableImpl.java, * tools/gnu/classpath/tools/gjdoc/ValueTagImpl.java, * tools/gnu/classpath/tools/gjdoc/WritableType.java, * tools/gnu/classpath/tools/gjdoc/expr/AdditionExpression.java, * tools/gnu/classpath/tools/gjdoc/expr/AndExpression.java, * tools/gnu/classpath/tools/gjdoc/expr/BinaryBitwiseExpression.java, * tools/gnu/classpath/tools/gjdoc/expr/BinaryComputationExpression.java, * tools/gnu/classpath/tools/gjdoc/expr/BinaryEqualityExpression.java, * tools/gnu/classpath/tools/gjdoc/expr/BinaryExpression.java, * tools/gnu/classpath/tools/gjdoc/expr/BinaryLogicalExpression.java, * tools/gnu/classpath/tools/gjdoc/expr/BinaryRelationExpression.java, * tools/gnu/classpath/tools/gjdoc/expr/BinaryShiftExpression.java, * tools/gnu/classpath/tools/gjdoc/expr/BitShiftRightExpression.java, * tools/gnu/classpath/tools/gjdoc/expr/CircularExpressionException.java, * tools/gnu/classpath/tools/gjdoc/expr/ConditionalExpression.java, * tools/gnu/classpath/tools/gjdoc/expr/ConstantBoolean.java, * tools/gnu/classpath/tools/gjdoc/expr/ConstantByte.java, * tools/gnu/classpath/tools/gjdoc/expr/ConstantChar.java, * tools/gnu/classpath/tools/gjdoc/expr/ConstantDouble.java, * tools/gnu/classpath/tools/gjdoc/expr/ConstantExpression.java, * tools/gnu/classpath/tools/gjdoc/expr/ConstantFloat.java, * tools/gnu/classpath/tools/gjdoc/expr/ConstantInteger.java, * tools/gnu/classpath/tools/gjdoc/expr/ConstantLong.java, * tools/gnu/classpath/tools/gjdoc/expr/ConstantNull.java, * tools/gnu/classpath/tools/gjdoc/expr/ConstantShort.java, * tools/gnu/classpath/tools/gjdoc/expr/ConstantString.java, * tools/gnu/classpath/tools/gjdoc/expr/Context.java, * tools/gnu/classpath/tools/gjdoc/expr/DivisionExpression.java, * tools/gnu/classpath/tools/gjdoc/expr/EqualExpression.java, * tools/gnu/classpath/tools/gjdoc/expr/Evaluator.java, * tools/gnu/classpath/tools/gjdoc/expr/EvaluatorEnvironment.java, * tools/gnu/classpath/tools/gjdoc/expr/ExclusiveOrExpression.java, * tools/gnu/classpath/tools/gjdoc/expr/Expression.java, * tools/gnu/classpath/tools/gjdoc/expr/GreaterThanExpression.java, * tools/gnu/classpath/tools/gjdoc/expr/GreaterThanOrEqualExpression.java, * tools/gnu/classpath/tools/gjdoc/expr/IdentifierExpression.java, * tools/gnu/classpath/tools/gjdoc/expr/IllegalExpressionException.java, * tools/gnu/classpath/tools/gjdoc/expr/InclusiveOrExpression.java, * tools/gnu/classpath/tools/gjdoc/expr/LessThanExpression.java, * tools/gnu/classpath/tools/gjdoc/expr/LessThanOrEqualExpression.java, * tools/gnu/classpath/tools/gjdoc/expr/LogicalAndExpression.java, * tools/gnu/classpath/tools/gjdoc/expr/LogicalNotExpression.java, * tools/gnu/classpath/tools/gjdoc/expr/LogicalOrExpression.java, * tools/gnu/classpath/tools/gjdoc/expr/ModuloExpression.java, * tools/gnu/classpath/tools/gjdoc/expr/MultiplicationExpression.java, * tools/gnu/classpath/tools/gjdoc/expr/NegateExpression.java, * tools/gnu/classpath/tools/gjdoc/expr/NotEqualExpression.java, * tools/gnu/classpath/tools/gjdoc/expr/NotExpression.java, * tools/gnu/classpath/tools/gjdoc/expr/ShiftLeftExpression.java, * tools/gnu/classpath/tools/gjdoc/expr/ShiftRightExpression.java, * tools/gnu/classpath/tools/gjdoc/expr/SubtractionExpression.java, * tools/gnu/classpath/tools/gjdoc/expr/Type.java, * tools/gnu/classpath/tools/gjdoc/expr/TypeCastExpression.java, * tools/gnu/classpath/tools/gjdoc/expr/UnaryExpression.java, * tools/gnu/classpath/tools/gjdoc/expr/UnknownIdentifierException.java, * tools/gnu/classpath/tools/jar/Creator.java, * tools/gnu/classpath/tools/jar/Indexer.java, * tools/gnu/classpath/tools/jar/Main.java, * tools/gnu/classpath/tools/jar/Updater.java, * tools/gnu/classpath/tools/jarsigner/JarVerifier.java, * tools/gnu/classpath/tools/jarsigner/Main.java, * tools/gnu/classpath/tools/jarsigner/SFHelper.java, * tools/gnu/classpath/tools/java2xhtml/Java2xhtml.java, * tools/gnu/classpath/tools/javah/ClassWrapper.java, * tools/gnu/classpath/tools/javah/CniPrintStream.java, * tools/gnu/classpath/tools/javah/GcjhMain.java, * tools/gnu/classpath/tools/javah/JniHelper.java, * tools/gnu/classpath/tools/javah/JniIncludePrinter.java, * tools/gnu/classpath/tools/javah/JniStubPrinter.java, * tools/gnu/classpath/tools/javah/Keywords.java, * tools/gnu/classpath/tools/javah/Main.java, * tools/gnu/classpath/tools/javah/MethodHelper.java, * tools/gnu/classpath/tools/keytool/CACertCmd.java, * tools/gnu/classpath/tools/keytool/CertReqCmd.java, * tools/gnu/classpath/tools/keytool/Command.java, * tools/gnu/classpath/tools/keytool/DeleteCmd.java, * tools/gnu/classpath/tools/keytool/ExportCmd.java, * tools/gnu/classpath/tools/keytool/GenKeyCmd.java, * tools/gnu/classpath/tools/keytool/IdentityDBCmd.java, * tools/gnu/classpath/tools/keytool/ImportCmd.java, * tools/gnu/classpath/tools/keytool/KeyCloneCmd.java, * tools/gnu/classpath/tools/keytool/KeyPasswdCmd.java, * tools/gnu/classpath/tools/keytool/ListCmd.java, * tools/gnu/classpath/tools/keytool/PrintCertCmd.java, * tools/gnu/classpath/tools/keytool/SelfCertCmd.java, * tools/gnu/classpath/tools/keytool/StorePasswdCmd.java, * tools/gnu/classpath/tools/orbd/Main.java, * tools/gnu/classpath/tools/orbd/PersistentContext.java, * tools/gnu/classpath/tools/orbd/PersistentContextMap.java, * tools/gnu/classpath/tools/orbd/PersistentMap.java, * tools/gnu/classpath/tools/rmic/AbstractMethodGenerator.java, * tools/gnu/classpath/tools/rmic/ClassRmicCompiler.java, * tools/gnu/classpath/tools/rmic/CompilationError.java, * tools/gnu/classpath/tools/rmic/Generator.java, * tools/gnu/classpath/tools/rmic/GiopIo.java, * tools/gnu/classpath/tools/rmic/HashFinder.java, * tools/gnu/classpath/tools/rmic/Main.java, * tools/gnu/classpath/tools/rmic/MethodGenerator.java, * tools/gnu/classpath/tools/rmic/RMICException.java, * tools/gnu/classpath/tools/rmic/RmiMethodGenerator.java, * tools/gnu/classpath/tools/rmic/RmicBackend.java, * tools/gnu/classpath/tools/rmic/SourceGiopRmicCompiler.java, * tools/gnu/classpath/tools/rmic/SourceRmicCompiler.java, * tools/gnu/classpath/tools/rmic/Variables.java, * tools/gnu/classpath/tools/rmic/WrapUnWrapper.java, * tools/gnu/classpath/tools/rmid/ActivationSystemImpl.java, * tools/gnu/classpath/tools/rmid/ActivationSystemImpl_Stub.java, * tools/gnu/classpath/tools/rmid/Main.java, * tools/gnu/classpath/tools/rmid/PersistentBidiHashTable.java, * tools/gnu/classpath/tools/rmiregistry/Main.java, * tools/gnu/classpath/tools/rmiregistry/PersistentHashTable.java, * tools/gnu/classpath/tools/rmiregistry/RegistryImpl.java, * tools/gnu/classpath/tools/rmiregistry/RegistryImpl_Skel.java, * tools/gnu/classpath/tools/rmiregistry/RegistryImpl_Stub.java, * tools/gnu/classpath/tools/serialver/SerialVer.java, * tools/gnu/classpath/tools/taglets/AuthorTaglet.java, * tools/gnu/classpath/tools/taglets/CodeTaglet.java, * tools/gnu/classpath/tools/taglets/CopyrightTaglet.java, * tools/gnu/classpath/tools/taglets/DeprecatedTaglet.java, * tools/gnu/classpath/tools/taglets/GenericTaglet.java, * tools/gnu/classpath/tools/taglets/GnuExtendedTaglet.java, * tools/gnu/classpath/tools/taglets/SinceTaglet.java, * tools/gnu/classpath/tools/taglets/TagletContext.java, * tools/gnu/classpath/tools/taglets/ValueTaglet.java, * tools/gnu/classpath/tools/taglets/VersionTaglet.java, * tools/gnu/classpath/tools/tnameserv/Main.java, * vm/reference/gnu/classpath/jdwp/VMFrame.java, * vm/reference/gnu/classpath/jdwp/VMIdManager.java, * vm/reference/gnu/classpath/jdwp/VMMethod.java, * vm/reference/gnu/classpath/jdwp/VMVirtualMachine.java, * vm/reference/gnu/java/lang/VMCPStringBuilder.java, * vm/reference/gnu/java/lang/VMInstrumentationImpl.java, * vm/reference/gnu/java/lang/management/VMClassLoadingMXBeanImpl.java, * vm/reference/gnu/java/lang/management/VMCompilationMXBeanImpl.java, * vm/reference/gnu/java/lang/management/VMGarbageCollectorMXBeanImpl.java, * vm/reference/gnu/java/lang/management/VMMemoryMXBeanImpl.java, * vm/reference/gnu/java/lang/management/VMMemoryManagerMXBeanImpl.java, * vm/reference/gnu/java/lang/management/VMMemoryPoolMXBeanImpl.java, * vm/reference/gnu/java/lang/management/VMThreadMXBeanImpl.java, * vm/reference/gnu/java/net/VMPlainDatagramSocketImpl.java, * vm/reference/gnu/java/net/VMPlainSocketImpl.java, * vm/reference/gnu/java/nio/VMChannel.java, * vm/reference/gnu/java/nio/VMPipe.java, * vm/reference/gnu/java/nio/VMSelector.java, * vm/reference/gnu/java/security/jce/prng/VMSecureRandom.java, * vm/reference/java/io/VMFile.java, * vm/reference/java/io/VMObjectInputStream.java, * vm/reference/java/io/VMObjectStreamClass.java, * vm/reference/java/lang/VMClass.java, * vm/reference/java/lang/VMClassLoader.java, * vm/reference/java/lang/VMDouble.java, * vm/reference/java/lang/VMFloat.java, * vm/reference/java/lang/VMMath.java, * vm/reference/java/lang/VMObject.java, * vm/reference/java/lang/VMProcess.java, * vm/reference/java/lang/VMRuntime.java, * vm/reference/java/lang/VMString.java, * vm/reference/java/lang/VMSystem.java, * vm/reference/java/lang/VMThread.java, * vm/reference/java/lang/reflect/VMConstructor.java, * vm/reference/java/lang/reflect/VMField.java, * vm/reference/java/lang/reflect/VMMethod.java, * vm/reference/java/net/VMNetworkInterface.java, * vm/reference/java/nio/channels/VMChannels.java, * vm/reference/java/security/VMAccessController.java, * vm/reference/java/security/VMSecureRandom.java, * vm/reference/java/util/VMTimeZone.java, * vm/reference/sun/misc/Unsafe.java, * vm/reference/sun/reflect/Reflection.java, * vm/reference/sun/reflect/misc/ReflectUtil.java: Normalise whitespace. From-SVN: r168680
author: Andrew John Hughes <ahughes@redhat.com> 2011-01-11 19:46:05 +0000
committer: Andrew John Hughes <gandalf@gcc.gnu.org> 2011-01-11 19:46:05 +0000
commit: dc6715320db92089b3c1b046157b56b5680738a5 (patch)
tree: 0da7dbb2f6c016ebe1a6d0bf012840bd76da9170 /libjava/classpath/java/awt
parent: 9a270ad3c0ba0eb21d09657f8fb3a7786a69ec5d (diff)
download: gcc-dc6715320db92089b3c1b046157b56b5680738a5.zip
gcc-dc6715320db92089b3c1b046157b56b5680738a5.tar.gz
gcc-dc6715320db92089b3c1b046157b56b5680738a5.tar.bz2
235 files changed, 7168 insertions, 7223 deletions
diff --git a/libjava/classpath/java/awt/AWTEvent.java b/libjava/classpath/java/awt/AWTEvent.java
index 102062c..c4f7728 100644
--- a/libjava/classpath/java/awt/AWTEvent.java
+++ b/libjava/classpath/java/awt/AWTEvent.java
@@ -55,7 +55,7 @@ import java.awt.event.WindowEvent;
 import java.util.EventObject;
 
 /**
- * AWTEvent is the root event class for all AWT events in the JDK 1.1 event 
+ * AWTEvent is the root event class for all AWT events in the JDK 1.1 event
  * model. It supersedes the Event class from JDK 1.0. Subclasses outside of
  * the java.awt package should have IDs greater than RESERVED_ID_MAX.
  *
@@ -206,7 +206,7 @@ public abstract class AWTEvent extends EventObject
   */
   public static final int RESERVED_ID_MAX = 1999;
 
-
+
   /**
    * Initializes a new AWTEvent from the old Java 1.0 event object.
    *
diff --git a/libjava/classpath/java/awt/AWTEventMulticaster.java b/libjava/classpath/java/awt/AWTEventMulticaster.java
index 07a6ffc..722dc75 100644
--- a/libjava/classpath/java/awt/AWTEventMulticaster.java
+++ b/libjava/classpath/java/awt/AWTEventMulticaster.java
@@ -719,7 +719,7 @@ public class AWTEventMulticaster
    * Chain <code>WindowListener</code> a and b.
    *
    * @param a the "a" listener, may be null
-   * @param b the "b" listener, may be null 
+   * @param b the "b" listener, may be null
    * @return latest entry in the chain
    */
   public static WindowListener add(WindowListener a, WindowListener b)
@@ -731,7 +731,7 @@ public class AWTEventMulticaster
    * Chain <code>WindowStateListener</code> a and b.
    *
    * @param a the "a" listener, may be null
-   * @param b the "b" listener, may be null 
+   * @param b the "b" listener, may be null
    * @return latest entry in the chain
    * @since 1.4
    */
@@ -745,7 +745,7 @@ public class AWTEventMulticaster
    * Chain <code>WindowFocusListener</code> a and b.
    *
    * @param a the "a" listener, may be null
-   * @param b the "b" listener, may be null 
+   * @param b the "b" listener, may be null
    * @return latest entry in the chain
    * @since 1.4
    */
@@ -1083,7 +1083,7 @@ public class AWTEventMulticaster
    * Chain <code>EventListener</code> a and b.
    *
    * @param a the "a" listener, may be null
-   * @param b the "b" listener, may be null 
+   * @param b the "b" listener, may be null
    * @return latest entry in the chain
    */
   protected static EventListener addInternal(EventListener a, EventListener b)
@@ -1176,7 +1176,7 @@ public class AWTEventMulticaster
    * @since 1.4
    */
   public static <T extends EventListener> T[] getListeners(EventListener l,
-							   Class<T> type)
+                                                           Class<T> type)
   {
     ArrayList<EventListener> list = new ArrayList<EventListener>();
     if (l instanceof AWTEventMulticaster)
diff --git a/libjava/classpath/java/awt/AWTKeyStroke.java b/libjava/classpath/java/awt/AWTKeyStroke.java
index 378e4eb..bdccbf0 100644
--- a/libjava/classpath/java/awt/AWTKeyStroke.java
+++ b/libjava/classpath/java/awt/AWTKeyStroke.java
@@ -94,7 +94,7 @@ public class AWTKeyStroke implements Serializable
 
     /** Prune stale entries. */
     protected boolean removeEldestEntry(Map.Entry<AWTKeyStroke,AWTKeyStroke>
-					eldest)
+                                        eldest)
     {
       return size() > MAX_CACHE_SIZE;
     }
@@ -256,7 +256,7 @@ public class AWTKeyStroke implements Serializable
                        IllegalAccessException, InvocationTargetException
               {
                 Constructor<?> c =
-		  subclass.getDeclaredConstructor((Class<?>[])null);
+                  subclass.getDeclaredConstructor((Class<?>[])null);
                 c.setAccessible(true);
                 // Create a new instance, to make sure that we can, and
                 // to cause any ClassCastException.
@@ -279,7 +279,7 @@ public class AWTKeyStroke implements Serializable
   /**
    * Returns a keystroke representing a typed character.
    *
-   * @param keyChar the typed character 
+   * @param keyChar the typed character
    * @return the specified keystroke
    */
   public static AWTKeyStroke getAWTKeyStroke(char keyChar)
@@ -396,7 +396,7 @@ public class AWTKeyStroke implements Serializable
    * "alt shift released X" =&gt; getAWTKeyStroke(KeyEvent.VK_X,
    *    InputEvent.ALT_MASK | InputEvent.SHIFT_MASK, true);<br>
    * "typed a" =&gt; getAWTKeyStroke('a');
-   * </code>      
+   * </code>
    *
    * @param s the string to parse
    * @throws IllegalArgumentException if s is null or cannot be parsed
@@ -416,25 +416,25 @@ public class AWTKeyStroke implements Serializable
       {
         token = t.nextToken();
         if ("shift".equals(token))
-	  {
-	    modifiers |= KeyEvent.SHIFT_MASK;
-	    modifiers |= KeyEvent.SHIFT_DOWN_MASK;
-	  }
+          {
+            modifiers |= KeyEvent.SHIFT_MASK;
+            modifiers |= KeyEvent.SHIFT_DOWN_MASK;
+          }
         else if ("ctrl".equals(token) || "control".equals(token))
-	  {
-	    modifiers |= KeyEvent.CTRL_MASK;
-	    modifiers |= KeyEvent.CTRL_DOWN_MASK;
-	  }
+          {
+            modifiers |= KeyEvent.CTRL_MASK;
+            modifiers |= KeyEvent.CTRL_DOWN_MASK;
+          }
         else if ("meta".equals(token))
-	  {
-	    modifiers |= KeyEvent.META_MASK;
-	    modifiers |= KeyEvent.META_DOWN_MASK;
-	  }
+          {
+            modifiers |= KeyEvent.META_MASK;
+            modifiers |= KeyEvent.META_DOWN_MASK;
+          }
         else if ("alt".equals(token))
-	  {
-	    modifiers |= KeyEvent.ALT_MASK;
-	    modifiers |= KeyEvent.ALT_DOWN_MASK;
-	  }
+          {
+            modifiers |= KeyEvent.ALT_MASK;
+            modifiers |= KeyEvent.ALT_DOWN_MASK;
+          }
         else if ("button1".equals(token))
           modifiers |= KeyEvent.BUTTON1_DOWN_MASK;
         else if ("button2".equals(token))
@@ -452,7 +452,7 @@ public class AWTKeyStroke implements Serializable
                                          false);
               }
             throw new IllegalArgumentException("Invalid 'typed' argument '"
-			    		       + s + "'");
+                                               + s + "'");
           }
         else if ("pressed".equals(token))
           {
@@ -475,7 +475,7 @@ public class AWTKeyStroke implements Serializable
     Integer code = (Integer) vktable.get(token);
     if (code == null)
       throw new IllegalArgumentException("Unknown token '" + token
-					 + "' in '" + s + "'");
+                                         + "' in '" + s + "'");
     if (t.hasMoreTokens())
       throw new IllegalArgumentException("Too many tokens: " + s);
     return getAWTKeyStroke(KeyEvent.CHAR_UNDEFINED, code.intValue(),
diff --git a/libjava/classpath/java/awt/AlphaComposite.java b/libjava/classpath/java/awt/AlphaComposite.java
index a668fda..d6c43d1 100644
--- a/libjava/classpath/java/awt/AlphaComposite.java
+++ b/libjava/classpath/java/awt/AlphaComposite.java
@@ -91,7 +91,7 @@ public final class AlphaComposite implements Composite
   public static final AlphaComposite SrcAtop = getInstance(SRC_ATOP);
   public static final AlphaComposite DstAtop = getInstance(DST_ATOP);
   public static final AlphaComposite Xor = getInstance(XOR);
-  
+
   private final int rule;
   private final float alpha;
   private AlphaComposite(int rule, float alpha)
@@ -113,7 +113,7 @@ public final class AlphaComposite implements Composite
   {
     return getInstance(rule, 1);
   }
-  
+
   /**
    * Creates an AlphaComposite object with the specified rule and the constant
    * alpha to multiply with the alpha of the source. The source is multiplied
@@ -162,7 +162,7 @@ public final class AlphaComposite implements Composite
    * Return an <code>AlphaComposite</code> similar to <code>this</code>,
    * that uses the specified rule. If <code>rule</code> is the same as
    * <code>this.rule</code>, then <code>this</code> is returned.
-   * 
+   *
    * @since 1.6
    */
   public AlphaComposite derive(int rule)
@@ -172,14 +172,14 @@ public final class AlphaComposite implements Composite
     else
       return AlphaComposite.getInstance(rule, this.getAlpha());
   }
-  
+
   /**
    * Return an <code>AlphaComposite</code> similar to <code>this</code>,
    * that uses the specified <code>alpha</code>.
-   * 
+   *
    * If <code>alph</code> is the same as <code>this.alpha</code>,
    * then <code>this</code> is returned.
-   * 
+   *
    * @since 1.6
    */
   public AlphaComposite derive(float alpha)
@@ -189,22 +189,22 @@ public final class AlphaComposite implements Composite
       else
         return AlphaComposite.getInstance(this.getRule(), alpha);
   }
-  
+
   public float getAlpha()
   {
     return alpha;
   }
-  
+
   public int getRule()
   {
     return rule;
   }
-  
+
   public int hashCode()
   {
     return 31 * Float.floatToIntBits(alpha) + rule;
   }
-  
+
   public boolean equals(Object o)
   {
     if (! (o instanceof AlphaComposite))
diff --git a/libjava/classpath/java/awt/BasicStroke.java b/libjava/classpath/java/awt/BasicStroke.java
index ef6a7f0..eac69d9 100644
--- a/libjava/classpath/java/awt/BasicStroke.java
+++ b/libjava/classpath/java/awt/BasicStroke.java
@@ -1,4 +1,4 @@
-/* BasicStroke.java -- 
+/* BasicStroke.java --
    Copyright (C) 2002, 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -53,7 +53,7 @@ import java.util.Arrays;
  * A general purpose {@link Stroke} implementation that can represent a wide
  * variety of line styles for use with subclasses of {@link Graphics2D}.
  * <p>
- * The line cap and join styles can be set using the options illustrated 
+ * The line cap and join styles can be set using the options illustrated
  * here:
  * <p>
  * <img src="doc-files/capjoin.png" width="350" height="180"
@@ -64,37 +64,37 @@ import java.util.Arrays;
  */
 public class BasicStroke implements Stroke
 {
-  /** 
+  /**
    * Indicates a mitered line join style. See the class overview for an
    * illustration.
    */
   public static final int JOIN_MITER = 0;
-  
-  /** 
+
+  /**
    * Indicates a rounded line join style. See the class overview for an
    * illustration.
    */
   public static final int JOIN_ROUND = 1;
-  
-  /** 
+
+  /**
    * Indicates a bevelled line join style. See the class overview for an
    * illustration.
    */
   public static final int JOIN_BEVEL = 2;
 
-  /** 
+  /**
    * Indicates a flat line cap style. See the class overview for an
    * illustration.
    */
   public static final int CAP_BUTT = 0;
-  
-  /** 
+
+  /**
    * Indicates a rounded line cap style. See the class overview for an
    * illustration.
    */
   public static final int CAP_ROUND = 1;
-  
-  /** 
+
+  /**
    * Indicates a square line cap style. See the class overview for an
    * illustration.
    */
@@ -102,19 +102,19 @@ public class BasicStroke implements Stroke
 
   /** The stroke width. */
   private final float width;
-  
+
   /** The line cap style. */
   private final int cap;
-  
+
   /** The line join style. */
   private final int join;
-  
+
   /** The miter limit. */
   private final float limit;
-  
+
   /** The dash array. */
   private final float[] dash;
-  
+
   /** The dash phase. */
   private final float phase;
 
@@ -125,9 +125,9 @@ public class BasicStroke implements Stroke
    * Creates a new <code>BasicStroke</code> instance with the given attributes.
    *
    * @param width  the line width (>= 0.0f).
-   * @param cap  the line cap style (one of {@link #CAP_BUTT}, 
+   * @param cap  the line cap style (one of {@link #CAP_BUTT},
    *             {@link #CAP_ROUND} or {@link #CAP_SQUARE}).
-   * @param join  the line join style (one of {@link #JOIN_ROUND}, 
+   * @param join  the line join style (one of {@link #JOIN_ROUND},
    *              {@link #JOIN_BEVEL}, or {@link #JOIN_MITER}).
    * @param miterlimit  the limit to trim the miter join. The miterlimit must be
    * greater than or equal to 1.0f.
@@ -145,36 +145,36 @@ public class BasicStroke implements Stroke
       throw new IllegalArgumentException("width " + width + " < 0");
     else if (cap < CAP_BUTT || cap > CAP_SQUARE)
       throw new IllegalArgumentException("cap " + cap + " out of range ["
-					 + CAP_BUTT + ".." + CAP_SQUARE + "]");
+                                         + CAP_BUTT + ".." + CAP_SQUARE + "]");
     else if (miterlimit < 1.0f && join == JOIN_MITER)
       throw new IllegalArgumentException("miterlimit " + miterlimit
-					 + " < 1.0f while join == JOIN_MITER");
+                                         + " < 1.0f while join == JOIN_MITER");
     else if (join < JOIN_MITER || join > JOIN_BEVEL)
       throw new IllegalArgumentException("join " + join + " out of range ["
-					 + JOIN_MITER + ".." + JOIN_BEVEL
-					 + "]");
+                                         + JOIN_MITER + ".." + JOIN_BEVEL
+                                         + "]");
     else if (dashPhase < 0.0f && dash != null)
       throw new IllegalArgumentException("dashPhase " + dashPhase
-					 + " < 0.0f while dash != null");
+                                         + " < 0.0f while dash != null");
     else if (dash != null)
       if (dash.length == 0)
-	throw new IllegalArgumentException("dash.length is 0");
+        throw new IllegalArgumentException("dash.length is 0");
       else
-	{
-	  boolean allZero = true;
-	  
-	  for ( int i = 0; i < dash.length; ++i)
-	    {
-	      if (dash[i] != 0.0f)
-		{
-		  allZero = false;
-		  break;
-		}
-	    }
-	  
-	  if (allZero)
-	    throw new IllegalArgumentException("all dashes are 0.0f");
-	}
+        {
+          boolean allZero = true;
+
+          for ( int i = 0; i < dash.length; ++i)
+            {
+              if (dash[i] != 0.0f)
+                {
+                  allZero = false;
+                  break;
+                }
+            }
+
+          if (allZero)
+            throw new IllegalArgumentException("all dashes are 0.0f");
+        }
 
     this.width = width;
     this.cap = cap;
@@ -188,13 +188,13 @@ public class BasicStroke implements Stroke
    * Creates a new <code>BasicStroke</code> instance with the given attributes.
    *
    * @param width  the line width (>= 0.0f).
-   * @param cap  the line cap style (one of {@link #CAP_BUTT}, 
+   * @param cap  the line cap style (one of {@link #CAP_BUTT},
    *             {@link #CAP_ROUND} or {@link #CAP_SQUARE}).
-   * @param join  the line join style (one of {@link #JOIN_ROUND}, 
+   * @param join  the line join style (one of {@link #JOIN_ROUND},
    *              {@link #JOIN_BEVEL}, or {@link #JOIN_MITER}).
    * @param miterlimit the limit to trim the miter join. The miterlimit must be
    * greater than or equal to 1.0f.
-   * 
+   *
    * @throws IllegalArgumentException If one input parameter doesn't meet
    * its needs.
    */
@@ -208,11 +208,11 @@ public class BasicStroke implements Stroke
    * The miter limit defaults to <code>10.0</code>.
    *
    * @param width  the line width (>= 0.0f).
-   * @param cap  the line cap style (one of {@link #CAP_BUTT}, 
+   * @param cap  the line cap style (one of {@link #CAP_BUTT},
    *             {@link #CAP_ROUND} or {@link #CAP_SQUARE}).
-   * @param join  the line join style (one of {@link #JOIN_ROUND}, 
+   * @param join  the line join style (one of {@link #JOIN_ROUND},
    *              {@link #JOIN_BEVEL}, or {@link #JOIN_MITER}).
-   * 
+   *
    * @throws IllegalArgumentException If one input parameter doesn't meet
    * its needs.
    */
@@ -229,9 +229,9 @@ public class BasicStroke implements Stroke
    * <li>line join style: {@link #JOIN_MITER};</li>
    * <li>miter limit: <code>10.0f</code>.
    * </ul>
-   * 
+   *
    * @param width  the line width (>= 0.0f).
-   * 
+   *
    * @throws IllegalArgumentException If <code>width</code> is negative.
    */
   public BasicStroke(float width)
@@ -252,11 +252,11 @@ public class BasicStroke implements Stroke
   {
     this(1, CAP_SQUARE, JOIN_MITER, 10, null, 0);
   }
-  
+
   /**
    * Creates a shape representing the stroked outline of the given shape.
    * THIS METHOD IS NOT YET IMPLEMENTED.
-   * 
+   *
    * @param s  the shape.
    */
   public Shape createStrokedShape(Shape s)
@@ -271,7 +271,7 @@ public class BasicStroke implements Stroke
 
   /**
    * Returns the line width.
-   * 
+   *
    * @return The line width.
    */
   public float getLineWidth()
@@ -282,7 +282,7 @@ public class BasicStroke implements Stroke
   /**
    * Returns a code indicating the line cap style (one of {@link #CAP_BUTT},
    * {@link #CAP_ROUND}, {@link #CAP_SQUARE}).
-   * 
+   *
    * @return A code indicating the line cap style.
    */
   public int getEndCap()
@@ -293,7 +293,7 @@ public class BasicStroke implements Stroke
   /**
    * Returns a code indicating the line join style (one of {@link #JOIN_BEVEL},
    * {@link #JOIN_MITER} or {@link #JOIN_ROUND}).
-   * 
+   *
    * @return A code indicating the line join style.
    */
   public int getLineJoin()
@@ -303,7 +303,7 @@ public class BasicStroke implements Stroke
 
   /**
    * Returns the miter limit.
-   * 
+   *
    * @return The miter limit.
    */
   public float getMiterLimit()
@@ -312,10 +312,10 @@ public class BasicStroke implements Stroke
   }
 
   /**
-   * Returns the dash array, which defines the length of alternate opaque and 
-   * transparent sections in lines drawn with this stroke.  If 
+   * Returns the dash array, which defines the length of alternate opaque and
+   * transparent sections in lines drawn with this stroke.  If
    * <code>null</code>, a continuous line will be drawn.
-   * 
+   *
    * @return The dash array (possibly <code>null</code>).
    */
   public float[] getDashArray()
@@ -325,9 +325,9 @@ public class BasicStroke implements Stroke
 
   /**
    * Returns the dash phase for the stroke.  This is the offset from the start
-   * of a path at which the pattern defined by {@link #getDashArray()} is 
+   * of a path at which the pattern defined by {@link #getDashArray()} is
    * rendered.
-   * 
+   *
    * @return The dash phase.
    */
   public float getDashPhase()
@@ -341,7 +341,7 @@ public class BasicStroke implements Stroke
    * (converted to <code>int</code> first with
    * <code>Float.floatToIntBits()</code> if the value is a
    * <code>float</code>).
-   * 
+   *
    * @return The hash code.
    */
   public int hashCode()
@@ -350,10 +350,10 @@ public class BasicStroke implements Stroke
     hash ^= cap;
     hash ^= join;
     hash ^= Float.floatToIntBits(limit);
-   
+
     if (dash != null)
       for (int i = 0; i < dash.length; i++)
-	hash ^=  Float.floatToIntBits(dash[i]);
+        hash ^=  Float.floatToIntBits(dash[i]);
 
     hash ^= Float.floatToIntBits(phase);
 
@@ -361,16 +361,16 @@ public class BasicStroke implements Stroke
   }
 
   /**
-   * Compares this <code>BasicStroke</code> for equality with an arbitrary 
+   * Compares this <code>BasicStroke</code> for equality with an arbitrary
    * object.  This method returns <code>true</code> if and only if:
    * <ul>
    * <li><code>o</code> is an instanceof <code>BasicStroke</code>;</li>
    * <li>this object has the same width, line cap style, line join style,
    * miter limit, dash array and dash phase as <code>o</code>.</li>
    * </ul>
-   * 
+   *
    * @param o  the object (<code>null</code> permitted).
-   * 
+   *
    * @return <code>true</code> if this stroke is equal to <code>o</code> and
    *         <code>false</code> otherwise.
    */
@@ -401,7 +401,7 @@ public class BasicStroke implements Stroke
             y0 = y = coords[1];
             if( pathOpen )
               {
-                capEnds();              
+                capEnds();
                 convertPath(output, start);
                 start = end = null;
                 pathOpen = false;
@@ -425,7 +425,7 @@ public class BasicStroke implements Stroke
             break;
 
           case PathIterator.SEG_QUADTO:
-            p = (new QuadSegment(x, y, coords[0], coords[1], coords[2], 
+            p = (new QuadSegment(x, y, coords[0], coords[1], coords[2],
                                  coords[3])).getDisplacedSegments(width/2.0);
             if( !pathOpen )
               {
@@ -549,7 +549,7 @@ public class BasicStroke implements Stroke
                   {
                     spanBoundary = false;
                   }
-                
+
                 // Otherwise, we need to split the segment in two, as this
                 // segment spans a dash boundry
                 else
@@ -671,23 +671,23 @@ public class BasicStroke implements Stroke
         else if(v instanceof QuadSegment)
           p.quadTo((float)((QuadSegment)v).cp.getX(),
                    (float)((QuadSegment)v).cp.getY(),
-                   (float)v.P2.getX(), 
+                   (float)v.P2.getX(),
                    (float)v.P2.getY());
         else if(v instanceof CubicSegment)
           p.curveTo((float)((CubicSegment)v).cp1.getX(),
                     (float)((CubicSegment)v).cp1.getY(),
                     (float)((CubicSegment)v).cp2.getX(),
                     (float)((CubicSegment)v).cp2.getY(),
-                    (float)v.P2.getX(), 
+                    (float)v.P2.getX(),
                     (float)v.P2.getY());
         v = v.next;
       } while(v != s && v != null);
 
     p.closePath();
   }
-  
+
   /**
-   * Add the segments to start and end (the inner and outer edges of the stroke) 
+   * Add the segments to start and end (the inner and outer edges of the stroke)
    */
   private void addSegments(Segment[] segments)
   {
@@ -707,26 +707,26 @@ public class BasicStroke implements Stroke
     p = lineIntersection(p0[0],p0[1],p1[0],p1[1],
                                  p2[0],p2[1],p3[0],p3[1], false);
 
-    double det = (p1[0] - p0[0])*(p3[1] - p2[1]) - 
+    double det = (p1[0] - p0[0])*(p3[1] - p2[1]) -
       (p3[0] - p2[0])*(p1[1] - p0[1]);
 
     if( det > 0 )
       {
-        // start and segment[0] form the 'inner' part of a join, 
+        // start and segment[0] form the 'inner' part of a join,
         // connect the overlapping segments
         joinInnerSegments(start, segments[0], p);
         joinOuterSegments(end, segments[1], p);
       }
     else
       {
-        // end and segment[1] form the 'inner' part 
+        // end and segment[1] form the 'inner' part
         joinInnerSegments(end, segments[1], p);
         joinOuterSegments(start, segments[0], p);
       }
   }
 
   /**
-   * Make a cap between a and b segments, 
+   * Make a cap between a and b segments,
    * where a-->b is the direction of iteration.
    */
   private void capEnd(Segment a, Segment b)
@@ -767,7 +767,7 @@ public class BasicStroke implements Stroke
             dx = (2.0/3.0)*width*dx/l;
             dy = (2.0/3.0)*width*dy/l;
           }
-        
+
         c1 = new Point2D.Double(p1[0] + dx, p1[1] + dy);
         c2 = new Point2D.Double(b.P1.getX() + dx, b.P1.getY() + dy);
         a.add(new CubicSegment(a.last.P2, c1, c2, b.P1));
@@ -782,9 +782,9 @@ public class BasicStroke implements Stroke
    * if the intersection must be within the given segments.
    * @return a Point2D or null.
    */
-  private Point2D lineIntersection(double X1, double Y1, 
-                                   double X2, double Y2, 
-                                   double X3, double Y3, 
+  private Point2D lineIntersection(double X1, double Y1,
+                                   double X2, double Y2,
+                                   double X3, double Y3,
                                    double X4, double Y4,
                                    boolean infinite)
   {
@@ -840,7 +840,7 @@ public class BasicStroke implements Stroke
           {
             a.add(new LineSegment(a.last.P2, p));
             a.add(new LineSegment(p, b.P1));
-          } 
+          }
         else
           {
             // outside miter limit, do a bevel join.
diff --git a/libjava/classpath/java/awt/BorderLayout.java b/libjava/classpath/java/awt/BorderLayout.java
index 50061ec..c06eb83 100644
--- a/libjava/classpath/java/awt/BorderLayout.java
+++ b/libjava/classpath/java/awt/BorderLayout.java
@@ -299,7 +299,7 @@ public class BorderLayout implements LayoutManager2, java.io.Serializable
   }
 
   /**
-   * Adds a component to the layout in the specified constraint position, 
+   * Adds a component to the layout in the specified constraint position,
    * which must be one of the string constants defined in this class.
    *
    * @param component The component to add.
@@ -317,7 +317,7 @@ public class BorderLayout implements LayoutManager2, java.io.Serializable
   }
 
   /**
-   * Adds a component to the layout in the specified constraint position, 
+   * Adds a component to the layout in the specified constraint position,
    * which must be one of the string constants defined in this class.
    *
    * @param constraints The constraint string.
@@ -462,7 +462,7 @@ public class BorderLayout implements LayoutManager2, java.io.Serializable
   /**
    * Lays out the specified container according to the constraints in this
    * object.
-   * 
+   *
    * @param target The container to lay out.
    */
   public void layoutContainer(Container target)
@@ -538,7 +538,7 @@ public class BorderLayout implements LayoutManager2, java.io.Serializable
 
   /**
    * Returns a string representation of this layout manager.
-   * 
+   *
    * @return A string representation of this object.
    */
   public String toString()
@@ -634,11 +634,11 @@ public class BorderLayout implements LayoutManager2, java.io.Serializable
 
   /**
    * Return the component at the indicated location, or null if no component
-   * is at that location.  The constraints argument must be one of the 
-   * location constants specified by this class.   
+   * is at that location.  The constraints argument must be one of the
+   * location constants specified by this class.
    * @param constraints the location
    * @return the component at that location, or null
-   * @throws IllegalArgumentException if the constraints argument is not 
+   * @throws IllegalArgumentException if the constraints argument is not
    * recognized
    * @since 1.5
    */
@@ -662,7 +662,7 @@ public class BorderLayout implements LayoutManager2, java.io.Serializable
       return firstItem;
     if (constraints == LINE_END)
       return lastItem;
-    throw new IllegalArgumentException("constraint " + constraints 
+    throw new IllegalArgumentException("constraint " + constraints
                                        + " is not recognized");
   }
 
diff --git a/libjava/classpath/java/awt/BufferCapabilities.java b/libjava/classpath/java/awt/BufferCapabilities.java
index bba83dc..522fdf7 100644
--- a/libjava/classpath/java/awt/BufferCapabilities.java
+++ b/libjava/classpath/java/awt/BufferCapabilities.java
@@ -143,7 +143,7 @@ public class BufferCapabilities implements Cloneable
    * null
    */
   public BufferCapabilities(ImageCapabilities frontCaps,
-			    ImageCapabilities backCaps,
+                            ImageCapabilities backCaps,
                             FlipContents flip)
   {
     if (frontCaps ==  null || backCaps == null)
diff --git a/libjava/classpath/java/awt/Button.java b/libjava/classpath/java/awt/Button.java
index 4c246c7..458a45e 100644
--- a/libjava/classpath/java/awt/Button.java
+++ b/libjava/classpath/java/awt/Button.java
@@ -51,7 +51,7 @@ import javax.accessibility.AccessibleRole;
 import javax.accessibility.AccessibleValue;
 
 /**
-  * This class provides a button widget for the AWT. 
+  * This class provides a button widget for the AWT.
   *
   * @author Aaron M. Renn (arenn@urbanophile.com)
   * @author Tom Tromey (tromey@cygnus.com)
@@ -94,7 +94,7 @@ private transient ActionListener action_listeners;
    * The number used to generate the name returned by getName.
    */
   private static transient long next_button_number;
-  
+
   protected class AccessibleAWTButton extends AccessibleAWTComponent
     implements AccessibleAction, AccessibleValue
   {
@@ -138,17 +138,17 @@ private transient ActionListener action_listeners;
       processActionEvent(new ActionEvent(this, ActionEvent.ACTION_PERFORMED, actionCommand));
       return true;
     }
-    
+
     public String getAccessibleName()
     {
       return label;
     }
-    
+
     public AccessibleAction getAccessibleAction()
     {
       return this;
     }
-    
+
     public AccessibleValue getAccessibleValue()
     {
       return this;
@@ -188,7 +188,7 @@ private transient ActionListener action_listeners;
     {
       return new Integer(0);
     }
-    
+
     public AccessibleRole getAccessibleRole()
     {
       return AccessibleRole.PUSH_BUTTON;
@@ -315,7 +315,7 @@ addActionListener(ActionListener listener)
 /**
   * Removes the specified listener from the list of listeners that will
   * receive action events from this button.
-  * 
+  *
   * @param listener The listener to remove.
   */
 public synchronized void
@@ -339,18 +339,18 @@ removeActionListener(ActionListener listener)
   }
 
 /**
- * Returns all registered EventListers of the given listenerType. 
- * listenerType must be a subclass of EventListener, or a 
+ * Returns all registered EventListers of the given listenerType.
+ * listenerType must be a subclass of EventListener, or a
  * ClassClassException is thrown.
  *
  * @param listenerType the listener type to return
  *
  * @return an array of listeners
- * 
+ *
  * @exception ClassCastException If listenerType doesn't specify a class or
  * interface that implements @see java.util.EventListener.
  *
- * @since 1.3 
+ * @since 1.3
  */
   public <T extends EventListener> T[] getListeners(Class<T> listenerType)
   {
@@ -412,10 +412,10 @@ processActionEvent(ActionEvent event)
 void
 dispatchEventImpl(AWTEvent e)
 {
-  if (e.id <= ActionEvent.ACTION_LAST 
+  if (e.id <= ActionEvent.ACTION_LAST
       && e.id >= ActionEvent.ACTION_FIRST
-      && (action_listeners != null 
-	  || (eventMask & AWTEvent.ACTION_EVENT_MASK) != 0))
+      && (action_listeners != null
+          || (eventMask & AWTEvent.ACTION_EVENT_MASK) != 0))
     processEvent(e);
   else
     super.dispatchEventImpl(e);
@@ -464,5 +464,4 @@ public AccessibleContext getAccessibleContext()
     return next_button_number++;
   }
 
-} // class Button 
-
+} // class Button
diff --git a/libjava/classpath/java/awt/Canvas.java b/libjava/classpath/java/awt/Canvas.java
index 95db1f5..ab7a8e3 100644
--- a/libjava/classpath/java/awt/Canvas.java
+++ b/libjava/classpath/java/awt/Canvas.java
@@ -68,7 +68,7 @@ public class Canvas
    * Compatible with Sun's JDK.
    */
   private static final long serialVersionUID = -2284879212465893870L;
-  
+
   /**
    * The number used to generate the name returned by getName.
    */
@@ -82,8 +82,8 @@ public class Canvas
   /**
    * Initializes a new instance of <code>Canvas</code>.
    */
-  public Canvas() 
-  { 
+  public Canvas()
+  {
   }
 
   /**
@@ -109,7 +109,7 @@ public class Canvas
   }
 
   /**
-   * Repaints the canvas window.  This method should be overridden by 
+   * Repaints the canvas window.  This method should be overridden by
    * a subclass to do something useful, as this method simply paints
    * the window with the background color.
    *
@@ -154,7 +154,7 @@ public class Canvas
     {
       return AccessibleRole.CANVAS;
     }
-    
+
   }
 
   /**
@@ -186,9 +186,9 @@ public class Canvas
     CanvasBltBufferStrategy(int numBuffers, boolean accelerated)
     {
       super(numBuffers,
-	    new BufferCapabilities(new ImageCapabilities(accelerated),
-				   new ImageCapabilities(accelerated),
-				   BufferCapabilities.FlipContents.COPIED));
+            new BufferCapabilities(new ImageCapabilities(accelerated),
+                                   new ImageCapabilities(accelerated),
+                                   BufferCapabilities.FlipContents.COPIED));
     }
   }
 
@@ -209,9 +209,9 @@ public class Canvas
       throws AWTException
     {
       super(numBuffers,
-	    new BufferCapabilities(new ImageCapabilities(true),
-				   new ImageCapabilities(true),
-				   BufferCapabilities.FlipContents.COPIED));
+            new BufferCapabilities(new ImageCapabilities(true),
+                                   new ImageCapabilities(true),
+                                   BufferCapabilities.FlipContents.COPIED));
     }
   }
 
@@ -242,18 +242,18 @@ public class Canvas
   {
     if (numBuffers < 1)
       throw new IllegalArgumentException("Canvas.createBufferStrategy: number"
-					 + " of buffers is less than one");
+                                         + " of buffers is less than one");
 
     if (!isDisplayable())
       throw new IllegalStateException("Canvas.createBufferStrategy: canvas is"
-				      + " not displayable");
+                                      + " not displayable");
 
     BufferStrategy newStrategy = null;
 
     // try a flipping strategy
     try
       {
-	newStrategy = new CanvasFlipBufferStrategy(numBuffers);
+        newStrategy = new CanvasFlipBufferStrategy(numBuffers);
       }
     catch (AWTException e)
       {
@@ -290,11 +290,11 @@ public class Canvas
   {
     if (numBuffers < 1)
       throw new IllegalArgumentException("Canvas.createBufferStrategy: number"
-					 + " of buffers is less than one");
+                                         + " of buffers is less than one");
 
     if (caps == null)
       throw new IllegalArgumentException("Canvas.createBufferStrategy:"
-					 + " capabilities object is null");
+                                         + " capabilities object is null");
 
     // a flipping strategy was requested
     if (caps.isPageFlipping())
@@ -336,7 +336,7 @@ public class Canvas
     /* Call the paint method */
     paint(graphics);
   }
-  
+
   /**
    * Generate a unique name for this <code>Canvas</code>.
    *
diff --git a/libjava/classpath/java/awt/CardLayout.java b/libjava/classpath/java/awt/CardLayout.java
index 35380d2..c36daf4 100644
--- a/libjava/classpath/java/awt/CardLayout.java
+++ b/libjava/classpath/java/awt/CardLayout.java
@@ -85,7 +85,7 @@ public class CardLayout implements LayoutManager2, Serializable
    *
    * @param comp The component to add
    * @param constraints The name by which the component can later be called
-   * 
+   *
    * @exception IllegalArgumentException If `constraints' is not a
    * <code>String</code>
    */
@@ -93,17 +93,17 @@ public class CardLayout implements LayoutManager2, Serializable
   {
     if (! (constraints instanceof String))
       throw new IllegalArgumentException ("Object " + constraints
-					  + " is not a string");
+                                          + " is not a string");
     addLayoutComponent ((String) constraints, comp);
   }
 
   /**
    * Add a new component to the layout.  The name can be used later
    * to refer to the component.
-   * 
+   *
    * @param name The name by which the component can later be called
    * @param comp The component to add
-   * 
+   *
    * @deprecated This method is deprecated in favor of
    * <code>addLayoutComponent(Component, Object)</code>.
    */
@@ -137,7 +137,7 @@ public class CardLayout implements LayoutManager2, Serializable
   /**
    * Return this layout manager's x alignment.  This method always
    * returns Component.CENTER_ALIGNMENT.
-   * 
+   *
    * @param parent Container using this layout manager instance
    *
    * @return the x-axis alignment
@@ -150,7 +150,7 @@ public class CardLayout implements LayoutManager2, Serializable
   /**
    * Returns this layout manager's y alignment.  This method always
    * returns Component.CENTER_ALIGNMENT.
-   * 
+   *
    * @param parent Container using this layout manager instance
    *
    * @return the y-axis alignment
@@ -180,7 +180,7 @@ public class CardLayout implements LayoutManager2, Serializable
 
   /**
    * Cause the last component in the container to be displayed.
-   * 
+   *
    * @param parent The parent container, not <code>null</code>.
    */
   public void last (Container parent)
@@ -193,32 +193,32 @@ public class CardLayout implements LayoutManager2, Serializable
    * to be the same size as the parent, less insets and gaps.
    *
    * @param parent The parent container.
-   */ 
+   */
   public void layoutContainer (Container parent)
   {
     synchronized (parent.getTreeLock ())
       {
-	int width = parent.width;
-	int height = parent.height;
+        int width = parent.width;
+        int height = parent.height;
 
-	Insets ins = parent.getInsets ();
+        Insets ins = parent.getInsets ();
 
-	int num = parent.ncomponents;
-	Component[] comps = parent.component;
+        int num = parent.ncomponents;
+        Component[] comps = parent.component;
 
-	int x = ins.left + hgap;
-	int y = ins.top + vgap;
-	width = width - 2 * hgap - ins.left - ins.right;
-	height = height - 2 * vgap - ins.top - ins.bottom;
+        int x = ins.left + hgap;
+        int y = ins.top + vgap;
+        width = width - 2 * hgap - ins.left - ins.right;
+        height = height - 2 * vgap - ins.top - ins.bottom;
 
-	for (int i = 0; i < num; ++i)
-	  comps[i].setBounds (x, y, width, height);
+        for (int i = 0; i < num; ++i)
+          comps[i].setBounds (x, y, width, height);
       }
   }
 
   /**
    * Get the maximum layout size of the container.
-   * 
+   *
    * @param target The parent container
    *
    * @return the maximum layout size
@@ -234,7 +234,7 @@ public class CardLayout implements LayoutManager2, Serializable
 
   /**
    * Get the minimum layout size of the container.
-   * 
+   *
    * @param target The parent container
    *
    * @return the minimum layout size
@@ -248,7 +248,7 @@ public class CardLayout implements LayoutManager2, Serializable
    * Cause the next component in the container to be displayed.  If
    * this current card is the  last one in the deck, the first
    * component is displayed.
-   * 
+   *
    * @param parent The parent container, not <code>null</code>.
    */
   public void next (Container parent)
@@ -258,7 +258,7 @@ public class CardLayout implements LayoutManager2, Serializable
 
   /**
    * Get the preferred layout size of the container.
-   * 
+   *
    * @param parent The parent container
    *
    * @return the preferred layout size
@@ -272,7 +272,7 @@ public class CardLayout implements LayoutManager2, Serializable
    * Cause the previous component in the container to be displayed.
    * If this current card is the first one in the deck, the last
    * component is displayed.
-   * 
+   *
    * @param parent The parent container, not <code>null</code>.
    */
   public void previous (Container parent)
@@ -282,7 +282,7 @@ public class CardLayout implements LayoutManager2, Serializable
 
   /**
    * Remove the indicated component from this layout manager.
-   * 
+   *
    * @param comp The component to remove
    */
   public void removeLayoutComponent (Component comp)
@@ -290,20 +290,20 @@ public class CardLayout implements LayoutManager2, Serializable
     Enumeration e = tab.keys ();
     while (e.hasMoreElements ())
       {
-	Object key = e.nextElement ();
-	if (tab.get (key) == comp)
-	  {
-	    tab.remove (key);
-	    Container parent = comp.getParent();
-	    next(parent);
-	    break;
-	  }
+        Object key = e.nextElement ();
+        if (tab.get (key) == comp)
+          {
+            tab.remove (key);
+            Container parent = comp.getParent();
+            next(parent);
+            break;
+          }
       }
   }
 
   /**
    * Set this layout manager's horizontal gap.
-   * 
+   *
    * @param hgap The new gap
    */
   public void setHgap (int hgap)
@@ -313,7 +313,7 @@ public class CardLayout implements LayoutManager2, Serializable
 
   /**
    * Set this layout manager's vertical gap.
-   * 
+   *
    * @param vgap The new gap
    */
   public void setVgap (int vgap)
@@ -324,34 +324,34 @@ public class CardLayout implements LayoutManager2, Serializable
   /**
    * Cause the named component to be shown.  If the component name is
    * unknown or <code>null</code>, this method does nothing.
-   * 
+   *
    * @param parent The parent container, not <code>null</code>.
-   * @param name The name of the component to show 
+   * @param name The name of the component to show
    */
   public void show (Container parent, String name)
   {
     if (name == null)
       return;
-   
+
     if (parent.getLayout() != this)
       throw new IllegalArgumentException("parent's layout is not this CardLayout");
-    
+
     Object target = tab.get (name);
     if (target != null)
       {
-	int num = parent.ncomponents;
-	// This is more efficient than calling getComponents().
-	Component[] comps = parent.component;
-	for (int i = 0; i < num; ++i)
-	  {
-	    if (comps[i].isVisible())
-	      {
-		if (target == comps[i])
-		  return;
-		comps[i].setVisible (false);
-	      }
-	  }
-	((Component) target).setVisible (true);
+        int num = parent.ncomponents;
+        // This is more efficient than calling getComponents().
+        Component[] comps = parent.component;
+        for (int i = 0; i < num; ++i)
+          {
+            if (comps[i].isVisible())
+              {
+                if (target == comps[i])
+                  return;
+                comps[i].setVisible (false);
+              }
+          }
+        ((Component) target).setVisible (true);
         parent.validate();
       }
   }
@@ -368,71 +368,71 @@ public class CardLayout implements LayoutManager2, Serializable
 
   /**
    * This implements first(), last(), next(), and previous().
-   * 
+   *
    * @param parent The parent container
    * @param what The type of goto: FIRST, LAST, NEXT or PREV
-   * 
-   * @throws IllegalArgumentException if parent has not this 
+   *
+   * @throws IllegalArgumentException if parent has not this
    * CardLayout set as its layout.
    */
   private void gotoComponent (Container parent, int what)
   {
     if (parent.getLayout() != this)
       throw new IllegalArgumentException("parent's layout is not this CardLayout");
-    
+
     synchronized (parent.getTreeLock ())
       {
-	int num = parent.ncomponents;
-	// This is more efficient than calling getComponents().
-	Component[] comps = parent.component;
-
-	if (num == 1)
-	  {
-	    comps[0].setVisible(true);
-	    return;
-	  }
-
-	int choice = -1;
-
-	if (what == FIRST)
-	  choice = 0;
-	else if (what == LAST)
-	  choice = num - 1;
-
-	for (int i = 0; i < num; ++i)
-	  {
-	    if (comps[i].isVisible ())
-	      {
-		if (choice == i)
-		  {
-		    // Do nothing if we're already looking at the right
+        int num = parent.ncomponents;
+        // This is more efficient than calling getComponents().
+        Component[] comps = parent.component;
+
+        if (num == 1)
+          {
+            comps[0].setVisible(true);
+            return;
+          }
+
+        int choice = -1;
+
+        if (what == FIRST)
+          choice = 0;
+        else if (what == LAST)
+          choice = num - 1;
+
+        for (int i = 0; i < num; ++i)
+          {
+            if (comps[i].isVisible ())
+              {
+                if (choice == i)
+                  {
+                    // Do nothing if we're already looking at the right
                     // component.
                     return;
-		  }
-		else if (what == PREV)
-		  {
-		    choice = i - 1;
-		    if (choice < 0)
-		      choice = num - 1;
-		  }
-		else if (what == NEXT)
-		  {
+                  }
+                else if (what == PREV)
+                  {
+                    choice = i - 1;
+                    if (choice < 0)
+                      choice = num - 1;
+                  }
+                else if (what == NEXT)
+                  {
                     choice = i + 1;
                     if (choice == num)
                       choice = 0;
-		  }
-		comps[i].setVisible (false);
- 
-		if (choice >= 0)
-		  break;
-	      } else 
+                  }
+                comps[i].setVisible (false);
+
+                if (choice >= 0)
+                  break;
+              } else
                 {
                   comps[i].setVisible(true);
                 }
-	  }
+          }
 
-	if (choice >= 0 && choice < num)
-	  comps[choice].setVisible (true);
+        if (choice >= 0 && choice < num)
+          comps[choice].setVisible (true);
       }
   }
 
@@ -441,35 +441,35 @@ public class CardLayout implements LayoutManager2, Serializable
   {
     synchronized (parent.getTreeLock ())
       {
-	int w = 0, h = 0, num = parent.ncomponents;
-	Component[] comps = parent.component;
-
-	for (int i = 0; i < num; ++i)
-	  {
-	    Dimension d;
-
-	    if (what == MIN)
-	      d = comps[i].getMinimumSize ();
-	    else if (what == MAX)
-	      d = comps[i].getMaximumSize ();
-	    else
-	      d = comps[i].getPreferredSize ();
-
-	    w = Math.max (d.width, w);
-	    h = Math.max (d.height, h);
-	  }
-
-	Insets i = parent.getInsets ();
-	w += 2 * hgap + i.right + i.left;
-	h += 2 * vgap + i.bottom + i.top;
-
-	// Handle overflow.
-	if (w < 0)
-	  w = Integer.MAX_VALUE;
-	if (h < 0)
-	  h = Integer.MAX_VALUE;
-
-	return new Dimension (w, h);
+        int w = 0, h = 0, num = parent.ncomponents;
+        Component[] comps = parent.component;
+
+        for (int i = 0; i < num; ++i)
+          {
+            Dimension d;
+
+            if (what == MIN)
+              d = comps[i].getMinimumSize ();
+            else if (what == MAX)
+              d = comps[i].getMaximumSize ();
+            else
+              d = comps[i].getPreferredSize ();
+
+            w = Math.max (d.width, w);
+            h = Math.max (d.height, h);
+          }
+
+        Insets i = parent.getInsets ();
+        w += 2 * hgap + i.right + i.left;
+        h += 2 * vgap + i.bottom + i.top;
+
+        // Handle overflow.
+        if (w < 0)
+          w = Integer.MAX_VALUE;
+        if (h < 0)
+          h = Integer.MAX_VALUE;
+
+        return new Dimension (w, h);
       }
   }
 
diff --git a/libjava/classpath/java/awt/Checkbox.java b/libjava/classpath/java/awt/Checkbox.java
index eea443e..dffb57d 100644
--- a/libjava/classpath/java/awt/Checkbox.java
+++ b/libjava/classpath/java/awt/Checkbox.java
@@ -138,10 +138,10 @@ protected class AccessibleAWTCheckbox
   public void itemStateChanged(ItemEvent event)
   {
     firePropertyChange(ACCESSIBLE_STATE_PROPERTY,
-		       state ? null : AccessibleState.CHECKED,
+                       state ? null : AccessibleState.CHECKED,
                        state ? AccessibleState.CHECKED : null);
   }
-  
+
   /**
    * Returns an implementation of the <code>AccessibleAction</code>
    * interface for this accessible object.  In this case, the
@@ -156,7 +156,7 @@ protected class AccessibleAWTCheckbox
   {
     return this;
   }
-  
+
   /**
    * Returns an implementation of the <code>AccessibleValue</code>
    * interface for this accessible object.  In this case, the
@@ -171,8 +171,8 @@ protected class AccessibleAWTCheckbox
   {
     return this;
   }
-  
-  /* 
+
+  /*
    * The following methods are implemented in the JDK (up to
    * 1.5) as stubs.  We do likewise here.
    */
@@ -277,7 +277,7 @@ protected class AccessibleAWTCheckbox
   {
     return null;
   }
-  
+
   /**
    * Returns the role of this accessible object.
    *
@@ -285,11 +285,11 @@ protected class AccessibleAWTCheckbox
    *         which describes this object.
    * @see javax.accessibility.AccessibleRole
    */
-  public AccessibleRole getAccessibleRole() 
+  public AccessibleRole getAccessibleRole()
   {
     return AccessibleRole.CHECK_BOX;
   }
-  
+
   /**
    * Returns the state set of this accessible object.
    *
@@ -319,7 +319,7 @@ protected class AccessibleAWTCheckbox
   * Initializes a new instance of <code>Checkbox</code> with no label,
   * an initial state of off, and that is not part of any checkbox group.
   */
-public 
+public
 Checkbox()
 {
   this("", false, null);
@@ -464,10 +464,10 @@ setState(boolean state)
     {
       this.state = state;
       if (peer != null)
-	{
-	  CheckboxPeer cp = (CheckboxPeer) peer;
-	  cp.setState (state);
-	}
+        {
+          CheckboxPeer cp = (CheckboxPeer) peer;
+          cp.setState (state);
+        }
     }
 }
 
@@ -608,9 +608,9 @@ dispatchEventImpl(AWTEvent e)
       ItemEvent ie = (ItemEvent) e;
       int itemState = ie.getStateChange();
       setState(itemState == ItemEvent.SELECTED ? true : false);
-      if (item_listeners != null 
-	  || (eventMask & AWTEvent.ITEM_EVENT_MASK) != 0)
-	processEvent(e);
+      if (item_listeners != null
+          || (eventMask & AWTEvent.ITEM_EVENT_MASK) != 0)
+        processEvent(e);
     }
   else
     super.dispatchEventImpl(e);
diff --git a/libjava/classpath/java/awt/CheckboxGroup.java b/libjava/classpath/java/awt/CheckboxGroup.java
index 31b573e..30f3e16 100644
--- a/libjava/classpath/java/awt/CheckboxGroup.java
+++ b/libjava/classpath/java/awt/CheckboxGroup.java
@@ -106,14 +106,14 @@ getSelectedCheckbox()
   *
   * @return The selected checkbox.
   *
-  * @deprecated This method is deprecated in favor of 
+  * @deprecated This method is deprecated in favor of
   * <code>getSelectedCheckbox()</code>.
   */
 public Checkbox
 getCurrent()
 {
   return(selectedCheckbox);
-} 
+}
 
 /*************************************************************************/
 
@@ -169,5 +169,4 @@ toString()
   return(getClass().getName() + "[selectedCheckbox=" + selectedCheckbox + "]");
 }
 
-} // class CheckboxGroup 
-
+} // class CheckboxGroup
diff --git a/libjava/classpath/java/awt/CheckboxMenuItem.java b/libjava/classpath/java/awt/CheckboxMenuItem.java
index c886fc67..597e196 100644
--- a/libjava/classpath/java/awt/CheckboxMenuItem.java
+++ b/libjava/classpath/java/awt/CheckboxMenuItem.java
@@ -287,10 +287,10 @@ dispatchEventImpl(AWTEvent e)
         }
     }
 
-  if (e.id <= ItemEvent.ITEM_LAST 
+  if (e.id <= ItemEvent.ITEM_LAST
       && e.id >= ItemEvent.ITEM_FIRST
-      && (item_listeners != null 
-	  || (eventMask & AWTEvent.ITEM_EVENT_MASK) != 0))
+      && (item_listeners != null
+          || (eventMask & AWTEvent.ITEM_EVENT_MASK) != 0))
     processEvent(e);
   else
     super.dispatchEventImpl(e);
@@ -307,7 +307,7 @@ public String
 paramString()
 {
   return ("label=" + getLabel() + ",state=" + state
-	  + "," + super.paramString());
+          + "," + super.paramString());
 }
 
   /**
@@ -321,7 +321,7 @@ paramString()
   public <T extends EventListener> T[] getListeners (Class<T> listenerType)
   {
     if (listenerType == ItemListener.class)
-      return AWTEventMulticaster.getListeners (item_listeners, listenerType); 
+      return AWTEventMulticaster.getListeners (item_listeners, listenerType);
 
     return super.getListeners (listenerType);
   }
@@ -340,10 +340,10 @@ paramString()
     implements AccessibleAction, AccessibleValue
   {
     // I think the base class provides the necessary implementation
-    
+
     private static final long serialVersionUID = -1122642964303476L;
   }
-  
+
   /**
    * Gets the AccessibleContext associated with this <code>CheckboxMenuItem</code>.
    * The context is created, if necessary.
@@ -357,7 +357,7 @@ paramString()
       accessibleContext = new AccessibleAWTCheckboxMenuItem();
     return accessibleContext;
   }
-  
+
   /**
    * Generate a unique name for this <code>CheckboxMenuItem</code>.
    *
@@ -374,4 +374,3 @@ paramString()
   }
 
 } // class CheckboxMenuItem
-
diff --git a/libjava/classpath/java/awt/Choice.java b/libjava/classpath/java/awt/Choice.java
index ae89b9e..5d2cfaf 100644
--- a/libjava/classpath/java/awt/Choice.java
+++ b/libjava/classpath/java/awt/Choice.java
@@ -135,7 +135,7 @@ public class Choice extends Component
     {
       return AccessibleRole.COMBO_BOX;
     }
-	  
+
     /**
      * Returns the number of actions associated with this accessible
      * object.  In this case, it is the number of choices available.
@@ -162,7 +162,7 @@ public class Choice extends Component
     {
       return (String) pItems.get(i);
     }
-	  
+
     /**
      * Executes the action with the specified id.  In this case,
      * calling this method provides the same behaviour as would
@@ -175,8 +175,8 @@ public class Choice extends Component
     public boolean doAccessibleAction(int i)
     {
       if (i < 0 || i >= pItems.size())
-	return false;
-	    
+        return false;
+
       Choice.this.select( i );
 
       return true;
@@ -248,14 +248,14 @@ public class Choice extends Component
     if (peer != null)
       ((ChoicePeer) peer).add(item, getItemCount() - 1);
 
-    if (selectedIndex == -1) 
+    if (selectedIndex == -1)
       select( 0 );
   }
 
   /**
    * Adds the specified item to this choice box.
    *
-   * This method is oboslete since Java 2 platform 1.1. Please use 
+   * This method is oboslete since Java 2 platform 1.1. Please use
    * {@link #add(String)} instead.
    *
    * @param item The item to add.
@@ -307,7 +307,7 @@ public class Choice extends Component
     int index = pItems.indexOf(item);
     if (index == -1)
       throw new IllegalArgumentException ("item \""
-					  + item + "\" not found in Choice");
+                                          + item + "\" not found in Choice");
     remove(index);
   }
 
@@ -327,15 +327,15 @@ public class Choice extends Component
 
     if( getItemCount() == 0 )
       selectedIndex = -1;
-    else 
+    else
       {
-	if( selectedIndex > index ) 
-	  selectedIndex--;
-	else if( selectedIndex == index )
-	  selectedIndex = 0;
+        if( selectedIndex > index )
+          selectedIndex--;
+        else if( selectedIndex == index )
+          selectedIndex = 0;
 
-	if( peer != null )
-	  ((ChoicePeer)peer).select( selectedIndex );
+        if( peer != null )
+          ((ChoicePeer)peer).select( selectedIndex );
       }
   }
 
@@ -346,13 +346,13 @@ public class Choice extends Component
   {
     if (getItemCount() <= 0)
       return;
-  
+
     pItems.removeAllElements ();
 
     if (peer != null)
       {
-	ChoicePeer cp = (ChoicePeer) peer;
-	cp.removeAll ();
+        ChoicePeer cp = (ChoicePeer) peer;
+        cp.removeAll ();
       }
 
     selectedIndex = -1;
@@ -367,8 +367,8 @@ public class Choice extends Component
   public synchronized String getSelectedItem()
   {
     return (selectedIndex == -1
-	    ? null
-	    : ((String)pItems.elementAt(selectedIndex)));
+            ? null
+            : ((String)pItems.elementAt(selectedIndex)));
   }
 
   /**
@@ -409,11 +409,11 @@ public class Choice extends Component
     if ((index < 0) || (index >= getItemCount()))
       throw new IllegalArgumentException("Bad index: " + index);
 
-    if( selectedIndex == index ) 
+    if( selectedIndex == index )
       return;
 
     selectedIndex = index;
-    if( peer != null ) 
+    if( peer != null )
       ((ChoicePeer)peer).select( index );
   }
 
@@ -482,9 +482,9 @@ public class Choice extends Component
   {
     super.dispatchEventImpl(e);
 
-    if( e.id <= ItemEvent.ITEM_LAST && e.id >= ItemEvent.ITEM_FIRST && 
-	( item_listeners != null || 
-	  ( eventMask & AWTEvent.ITEM_EVENT_MASK ) != 0 ) )
+    if( e.id <= ItemEvent.ITEM_LAST && e.id >= ItemEvent.ITEM_FIRST &&
+        ( item_listeners != null ||
+          ( eventMask & AWTEvent.ITEM_EVENT_MASK ) != 0 ) )
       processEvent(e);
   }
 
@@ -551,7 +551,7 @@ public class Choice extends Component
       accessibleContext = new AccessibleAWTChoice();
     return accessibleContext;
   }
-  
+
   /**
    * Generate a unique name for this <code>Choice</code>.
    *
@@ -566,4 +566,4 @@ public class Choice extends Component
   {
     return next_choice_number++;
   }
-} // class Choice 
+} // class Choice
diff --git a/libjava/classpath/java/awt/Color.java b/libjava/classpath/java/awt/Color.java
index c3d04c0..243a5e8 100644
--- a/libjava/classpath/java/awt/Color.java
+++ b/libjava/classpath/java/awt/Color.java
@@ -538,7 +538,7 @@ public class Color implements Paint, Serializable
     hues[0] = (value & RED_MASK) >> 16;
     hues[1] = (value & GREEN_MASK) >> 8;
     hues[2] = value & BLUE_MASK;
-  
+
     // (0,0,0) is a special case.
     if (hues[0] == 0 && hues[1] == 0 && hues[2] ==0)
       {
@@ -547,10 +547,10 @@ public class Color implements Paint, Serializable
         hues[2] = 3;
       }
     else
-      {                    
+      {
         for (int index = 0; index < 3; index++)
           {
-            
+
             if (hues[index] > 2)
               hues[index] = (int) Math.min(255, hues[index]/0.7f);
             if (hues[index] == 1 || hues[index] == 2)
diff --git a/libjava/classpath/java/awt/ColorPaintContext.java b/libjava/classpath/java/awt/ColorPaintContext.java
index 2996f89..5ba6886 100644
--- a/libjava/classpath/java/awt/ColorPaintContext.java
+++ b/libjava/classpath/java/awt/ColorPaintContext.java
@@ -59,7 +59,7 @@ class ColorPaintContext implements PaintContext
 
   private ColorRaster cachedRaster;
 
-  
+
   /**
    * Create the context for a given color.
    *
@@ -69,11 +69,11 @@ class ColorPaintContext implements PaintContext
   {
     this(ColorModel.getRGBdefault(), colorRGB);
   }
-  
+
   /**
    * Create the context for a given color.
    *
-   * @param cm The color model of this context. 
+   * @param cm The color model of this context.
    * @param colorRGB The solid color to use.
    */
   ColorPaintContext(ColorModel cm,int colorRGB)
@@ -91,7 +91,7 @@ class ColorPaintContext implements PaintContext
   }
 
   /**
-   * Return the color model of this context. 
+   * Return the color model of this context.
    *
    * @return the context color model
    */
@@ -111,7 +111,7 @@ class ColorPaintContext implements PaintContext
    */
   public Raster getRaster(int x, int y, int width, int height)
   {
-   if(  cachedRaster == null 
+   if(  cachedRaster == null
        || cachedRaster.getWidth() < width
        || cachedRaster.getHeight() < height)
    {
@@ -119,16 +119,16 @@ class ColorPaintContext implements PaintContext
    }
    return cachedRaster.createChild(0 ,0 ,width ,height ,0 ,0 , null);
   }
-  
+
   /**
-   * A ColorRaster is a raster that is completely filled with one color. The 
+   * A ColorRaster is a raster that is completely filled with one color. The
    * data layout is taken from the color model given to the constructor.
    */
   private class ColorRaster extends Raster
   {
-    
+
     /**
-     * Create a raster that is compaltible with the given color model and 
+     * Create a raster that is compaltible with the given color model and
      * filled with the given color.
      * @param cm The color model for this raster.
      * @param x The smallest horizontal corrdinate in the raster.
@@ -146,9 +146,9 @@ class ColorPaintContext implements PaintContext
       getSampleModel().setPixels(0, 0, width, height, d,
                                  dataBuffer);
     }
-    
-    
-    
+
+
+
     private Object multiplyData(Object src, Object dest, int factor)
     {
       Object from;
@@ -156,7 +156,7 @@ class ColorPaintContext implements PaintContext
       if (src instanceof byte[])
       {
         srcLength = ((byte[])src).length;
-        
+
         if (dest == null) dest = new byte[factor * srcLength];
       }
       else if (src instanceof short[])
@@ -173,23 +173,23 @@ class ColorPaintContext implements PaintContext
       {
         throw new ClassCastException("Unknown data buffer type");
       }
-      
+
       System.arraycopy(src,0,dest,0,srcLength);
-      
+
       int count = 1;
       while(count*2 < factor)
       {
         System.arraycopy(dest, 0, dest, count * srcLength, count*srcLength);
-        count *= 2; 
+        count *= 2;
       }
-      
+
       if(factor > count)
-        System.arraycopy(dest,0, dest, count * srcLength, 
+        System.arraycopy(dest,0, dest, count * srcLength,
                          (factor - count) * srcLength );
-      
+
       return dest;
     }
-    
+
   }
-  
+
 } // class ColorPaintContext
diff --git a/libjava/classpath/java/awt/Component.java b/libjava/classpath/java/awt/Component.java
index 44676ba..d2878a9 100644
--- a/libjava/classpath/java/awt/Component.java
+++ b/libjava/classpath/java/awt/Component.java
@@ -158,7 +158,7 @@ public abstract class Component
 {
   // Word to the wise - this file is huge. Search for '\f' (^L) for logical
   // sectioning by fields, public API, private API, and nested classes.
-
+
 
   /**
    * Compatible with JDK 1.0+.
@@ -223,7 +223,7 @@ public abstract class Component
   /**
    * The default maximum size.
    */
-  private static final Dimension DEFAULT_MAX_SIZE 
+  private static final Dimension DEFAULT_MAX_SIZE
                              = new Dimension(Short.MAX_VALUE, Short.MAX_VALUE);
 
   // Serialized fields from the serialization spec.
@@ -444,19 +444,19 @@ public abstract class Component
    * by a call to {@link #setMinimumSize(Dimension)} with a non-null value.
    */
   boolean minSizeSet;
-  
+
   /**
    * The maximum size for the component.
    * @see #setMaximumSize(Dimension)
    */
   Dimension maxSize;
-  
+
   /**
    * A flag indicating whether the maximum size for the component has been set
    * by a call to {@link #setMaximumSize(Dimension)} with a non-null value.
    */
   boolean maxSizeSet;
-  
+
   /**
    * Cached information on the preferred size. Should have been transient.
    *
@@ -527,7 +527,7 @@ public abstract class Component
    */
   AccessibleContext accessibleContext;
 
-
+
   // Guess what - listeners are special cased in serialization. See
   // readObject and writeObject.
 
@@ -627,7 +627,7 @@ public abstract class Component
     incrementalDraw = Boolean.getBoolean ("awt.image.incrementalDraw");
     redrawRate = Long.getLong ("awt.image.redrawrate");
   }
-
+
   // Public and protected API.
 
   /**
@@ -704,7 +704,7 @@ public abstract class Component
   public void setDropTarget(DropTarget dt)
   {
     this.dropTarget = dt;
-    
+
     if (peer != null)
       dropTarget.addNotify(peer);
   }
@@ -802,8 +802,8 @@ public abstract class Component
 
   /**
    * Tests if the component is displayable. It must be connected to a native
-   * screen resource.  This reduces to checking that peer is not null.  A 
-   * containment  hierarchy is made displayable when a window is packed or 
+   * screen resource.  This reduces to checking that peer is not null.  A
+   * containment  hierarchy is made displayable when a window is packed or
    * made visible.
    *
    * @return true if the component is displayable
@@ -863,10 +863,10 @@ public abstract class Component
    * events).
    *
    * @param enabled true to enable this component
-   * 
+   *
    * @see #isEnabled()
    * @see #isLightweight()
-   * 
+   *
    * @since 1.1
    */
   public void setEnabled(boolean enabled)
@@ -898,7 +898,7 @@ public abstract class Component
    * Enables or disables this component.
    *
    * @param enabled true to enable this component
-   * 
+   *
    * @deprecated use {@link #setEnabled(boolean)} instead
    */
   public void enable(boolean enabled)
@@ -964,9 +964,9 @@ public abstract class Component
    * not show the component, if a parent is invisible.
    *
    * @param visible true to make this component visible
-   * 
+   *
    * @see #isVisible()
-   * 
+   *
    * @since 1.1
    */
   public void setVisible(boolean visible)
@@ -1037,7 +1037,7 @@ public abstract class Component
    * Makes this component visible or invisible.
    *
    * @param visible true to make this component visible
-   * 
+   *
    * @deprecated use {@link #setVisible(boolean)} instead
    */
   public void show(boolean visible)
@@ -1124,7 +1124,7 @@ public abstract class Component
   {
     if (peer != null)
       peer.setForeground(c);
-    
+
     Color previous = foreground;
     foreground = c;
     firePropertyChange("foreground", previous, c);
@@ -1231,7 +1231,7 @@ public abstract class Component
    * property.
    *
    * @param f the new font for this component
-   * 
+   *
    * @see #getFont()
    */
   public void setFont(Font f)
@@ -1254,7 +1254,7 @@ public abstract class Component
         ComponentPeer p = peer;
         if (p != null)
           {
-            // The peer receives the real font setting, which can depend on 
+            // The peer receives the real font setting, which can depend on
             // the parent font when this component's font has been set to null.
             f = getFont();
             if (f != null)
@@ -1591,7 +1591,7 @@ public abstract class Component
         int oldy = this.y;
         int oldwidth = this.width;
         int oldheight = this.height;
-    
+
         boolean resized = oldwidth != width || oldheight != height;
         boolean moved = oldx != x || oldy != y;
 
@@ -1820,15 +1820,15 @@ public abstract class Component
   }
 
   /**
-   * Sets the preferred size that will be returned by 
-   * {@link #getPreferredSize()} always, and sends a 
-   * {@link PropertyChangeEvent} (with the property name 'preferredSize') to 
+   * Sets the preferred size that will be returned by
+   * {@link #getPreferredSize()} always, and sends a
+   * {@link PropertyChangeEvent} (with the property name 'preferredSize') to
    * all registered listeners.
-   * 
+   *
    * @param size  the preferred size (<code>null</code> permitted).
-   * 
+   *
    * @since 1.5
-   * 
+   *
    * @see #getPreferredSize()
    */
   public void setPreferredSize(Dimension size)
@@ -1838,21 +1838,21 @@ public abstract class Component
     prefSizeSet = (size != null);
     firePropertyChange("preferredSize", old, size);
   }
-  
+
   /**
-   * Returns <code>true</code> if the current preferred size is not 
-   * <code>null</code> and was set by a call to 
+   * Returns <code>true</code> if the current preferred size is not
+   * <code>null</code> and was set by a call to
    * {@link #setPreferredSize(Dimension)}, otherwise returns <code>false</code>.
-   * 
+   *
    * @return A boolean.
-   * 
+   *
    * @since 1.5
    */
   public boolean isPreferredSizeSet()
   {
     return prefSizeSet;
   }
-  
+
   /**
    * Returns the component's preferred size.
    *
@@ -1870,7 +1870,7 @@ public abstract class Component
    * The actual calculation is pulled out of preferredSize() so that
    * we can call it from Container.preferredSize() and avoid creating a
    * new intermediate Dimension object.
-   * 
+   *
    * @return the preferredSize of the component
    */
   Dimension preferredSizeImpl()
@@ -1895,7 +1895,7 @@ public abstract class Component
 
   /**
    * Returns the component's minimum size.
-   * 
+   *
    * @return the component's minimum size
    * @see #getPreferredSize()
    * @see #setMinimumSize(Dimension)
@@ -1910,11 +1910,11 @@ public abstract class Component
    * Sets the minimum size that will be returned by {@link #getMinimumSize()}
    * always, and sends a {@link PropertyChangeEvent} (with the property name
    * 'minimumSize') to all registered listeners.
-   * 
+   *
    * @param size  the minimum size (<code>null</code> permitted).
-   * 
+   *
    * @since 1.5
-   * 
+   *
    * @see #getMinimumSize()
    */
   public void setMinimumSize(Dimension size)
@@ -1924,21 +1924,21 @@ public abstract class Component
     minSizeSet = (size != null);
     firePropertyChange("minimumSize", old, size);
   }
-  
+
   /**
-   * Returns <code>true</code> if the current minimum size is not 
-   * <code>null</code> and was set by a call to 
+   * Returns <code>true</code> if the current minimum size is not
+   * <code>null</code> and was set by a call to
    * {@link #setMinimumSize(Dimension)}, otherwise returns <code>false</code>.
-   * 
+   *
    * @return A boolean.
-   * 
+   *
    * @since 1.5
    */
   public boolean isMinimumSizeSet()
   {
     return minSizeSet;
   }
-  
+
   /**
    * Returns the component's minimum size.
    *
@@ -1957,7 +1957,7 @@ public abstract class Component
    * we can call it from Container.preferredSize() and
    * Component.preferredSizeImpl and avoid creating a
    * new intermediate Dimension object.
-   * 
+   *
    * @return the minimum size of the component
    */
   Dimension minimumSizeImpl()
@@ -2014,11 +2014,11 @@ public abstract class Component
    * Sets the maximum size that will be returned by {@link #getMaximumSize()}
    * always, and sends a {@link PropertyChangeEvent} (with the property name
    * 'maximumSize') to all registered listeners.
-   * 
+   *
    * @param size  the maximum size (<code>null</code> permitted).
-   * 
+   *
    * @since 1.5
-   * 
+   *
    * @see #getMaximumSize()
    */
   public void setMaximumSize(Dimension size)
@@ -2030,19 +2030,19 @@ public abstract class Component
   }
 
   /**
-   * Returns <code>true</code> if the current maximum size is not 
-   * <code>null</code> and was set by a call to 
+   * Returns <code>true</code> if the current maximum size is not
+   * <code>null</code> and was set by a call to
    * {@link #setMaximumSize(Dimension)}, otherwise returns <code>false</code>.
-   * 
+   *
    * @return A boolean.
-   * 
+   *
    * @since 1.5
    */
   public boolean isMaximumSizeSet()
   {
     return maxSizeSet;
   }
-  
+
   /**
    * Returns the preferred horizontal alignment of this component. The value
    * returned will be between {@link #LEFT_ALIGNMENT} and
@@ -2313,7 +2313,7 @@ public abstract class Component
    * Paints this entire component, including any sub-components.
    *
    * @param g the graphics context for this paint job
-   * 
+   *
    * @see #paint(Graphics)
    */
   public void paintAll(Graphics g)
@@ -2336,7 +2336,7 @@ public abstract class Component
    * @see #repaint(long, int, int, int, int)
    */
   public void repaint()
-  {   
+  {
     repaint(0, 0, 0, width, height);
   }
 
@@ -2406,7 +2406,7 @@ public abstract class Component
         // region to this component.
         if (parent != null)
           {
-            int px = this.x + Math.max(0, x); 
+            int px = this.x + Math.max(0, x);
             int py = this.y + Math.max(0, y);
             int pw = Math.min(this.width, width);
             int ph = Math.min(this.height, height);
@@ -2431,7 +2431,7 @@ public abstract class Component
    * in this class simply calls the <code>paint()</code> method.
    *
    * @param g the graphics context of the print device
-   * 
+   *
    * @see #paint(Graphics)
    */
   public void print(Graphics g)
@@ -2440,10 +2440,10 @@ public abstract class Component
   }
 
   /**
-   * Prints this component, including all sub-components. 
+   * Prints this component, including all sub-components.
    *
    * @param g the graphics context of the print device
-   * 
+   *
    * @see #paintAll(Graphics)
    */
   public void printAll(Graphics g)
@@ -2485,18 +2485,18 @@ public abstract class Component
       repaint();
     else if ((flags & SOMEBITS) != 0)
       {
-	if (incrementalDraw)
-	  {
-	    if (redrawRate != null)
-	      {
-		long tm = redrawRate.longValue();
-		if (tm < 0)
-		  tm = 0;
+        if (incrementalDraw)
+          {
+            if (redrawRate != null)
+              {
+                long tm = redrawRate.longValue();
+                if (tm < 0)
+                  tm = 0;
                 repaint(tm);
-	      }
-	    else
+              }
+            else
               repaint(100);
-	  }
+          }
       }
     return (flags & (ALLBITS | ABORT | ERROR)) == 0;
   }
@@ -2650,9 +2650,9 @@ public abstract class Component
 
     boolean retval;
     if (p != null)
-	retval = p.prepareImage(image, width, height, observer);
+        retval = p.prepareImage(image, width, height, observer);
     else
-	retval = getToolkit().prepareImage(image, width, height, observer);
+        retval = getToolkit().prepareImage(image, width, height, observer);
     return retval;
   }
 
@@ -2855,14 +2855,14 @@ public abstract class Component
   /**
    * By default, no old mouse events should be ignored.
    * This can be overridden by subclasses.
-   * 
+   *
    * @return false, no mouse events are ignored.
    */
   static boolean ignoreOldMouseEvents()
   {
     return false;
   }
-  
+
   /**
    * AWT 1.0 event handler.
    *
@@ -3414,19 +3414,19 @@ public abstract class Component
   }
 
   /**
-   * Returns all registered {@link EventListener}s of the given 
+   * Returns all registered {@link EventListener}s of the given
    * <code>listenerType</code>.
    *
-   * @param listenerType the class of listeners to filter (<code>null</code> 
+   * @param listenerType the class of listeners to filter (<code>null</code>
    *                     not permitted).
-   *                     
+   *
    * @return An array of registered listeners.
-   * 
+   *
    * @throws ClassCastException if <code>listenerType</code> does not implement
    *                            the {@link EventListener} interface.
-   * @throws NullPointerException if <code>listenerType</code> is 
+   * @throws NullPointerException if <code>listenerType</code> is
    *                              <code>null</code>.
-   *                            
+   *
    * @see #getComponentListeners()
    * @see #getFocusListeners()
    * @see #getHierarchyListeners()
@@ -3819,8 +3819,8 @@ public abstract class Component
           mouseListener.mouseClicked(e);
         break;
         case MouseEvent.MOUSE_ENTERED:
- 	  if( isLightweight() )
- 	    setCursor( getCursor() );
+          if( isLightweight() )
+            setCursor( getCursor() );
           mouseListener.mouseEntered(e);
         break;
         case MouseEvent.MOUSE_EXITED:
@@ -3882,7 +3882,7 @@ public abstract class Component
     {
       mouseWheelListener.mouseWheelMoved(e);
       e.consume();
-    }	
+    }
   }
 
   /**
@@ -3977,37 +3977,37 @@ public abstract class Component
   {
     switch (evt.id)
       {
-	// Handle key events.
+        // Handle key events.
       case Event.KEY_ACTION:
       case Event.KEY_PRESS:
-	return keyDown (evt, evt.key);
+        return keyDown (evt, evt.key);
       case Event.KEY_ACTION_RELEASE:
       case Event.KEY_RELEASE:
-	return keyUp (evt, evt.key);
+        return keyUp (evt, evt.key);
 
-	// Handle mouse events.
+        // Handle mouse events.
       case Event.MOUSE_DOWN:
-	return mouseDown (evt, evt.x, evt.y);
+        return mouseDown (evt, evt.x, evt.y);
       case Event.MOUSE_UP:
-	return mouseUp (evt, evt.x, evt.y);
+        return mouseUp (evt, evt.x, evt.y);
       case Event.MOUSE_MOVE:
-	return mouseMove (evt, evt.x, evt.y);
+        return mouseMove (evt, evt.x, evt.y);
       case Event.MOUSE_DRAG:
-	return mouseDrag (evt, evt.x, evt.y);
+        return mouseDrag (evt, evt.x, evt.y);
       case Event.MOUSE_ENTER:
-	return mouseEnter (evt, evt.x, evt.y);
+        return mouseEnter (evt, evt.x, evt.y);
       case Event.MOUSE_EXIT:
-	return mouseExit (evt, evt.x, evt.y);
+        return mouseExit (evt, evt.x, evt.y);
 
-	// Handle focus events.
+        // Handle focus events.
       case Event.GOT_FOCUS:
-	return gotFocus (evt, evt.arg);
+        return gotFocus (evt, evt.arg);
       case Event.LOST_FOCUS:
-	return lostFocus (evt, evt.arg);
+        return lostFocus (evt, evt.arg);
 
-	// Handle action event.
+        // Handle action event.
       case Event.ACTION_EVENT:
-	return action (evt, evt.arg);
+        return action (evt, evt.arg);
       }
     // Unknown event.
     return false;
@@ -4186,7 +4186,7 @@ public abstract class Component
         // much.
         invalidate();
 
-        if (dropTarget != null) 
+        if (dropTarget != null)
           dropTarget.addNotify(peer);
 
         // Fetch the peerFont for later installation in validate().
@@ -4354,7 +4354,7 @@ public abstract class Component
    * @since 1.4
    */
   public void setFocusTraversalKeys(int id,
-				    Set<? extends AWTKeyStroke> keystrokes)
+                                    Set<? extends AWTKeyStroke> keystrokes)
   {
     if (keystrokes == null)
       {
@@ -4438,12 +4438,12 @@ public abstract class Component
    * @return set of traversal keys
    *
    * @throws IllegalArgumentException if id is invalid
-   * 
+   *
    * @see #setFocusTraversalKeys (int, Set)
    * @see KeyboardFocusManager#FORWARD_TRAVERSAL_KEYS
    * @see KeyboardFocusManager#BACKWARD_TRAVERSAL_KEYS
    * @see KeyboardFocusManager#UP_CYCLE_TRAVERSAL_KEYS
-   * 
+   *
    * @since 1.4
    */
   public Set<AWTKeyStroke> getFocusTraversalKeys (int id)
@@ -4506,8 +4506,8 @@ public abstract class Component
   public void setFocusTraversalKeysEnabled (boolean focusTraversalKeysEnabled)
   {
     firePropertyChange ("focusTraversalKeysEnabled",
-			this.focusTraversalKeysEnabled,
-			focusTraversalKeysEnabled);
+                        this.focusTraversalKeysEnabled,
+                        focusTraversalKeysEnabled);
     this.focusTraversalKeysEnabled = focusTraversalKeysEnabled;
   }
 
@@ -4670,7 +4670,7 @@ public abstract class Component
   private boolean requestFocusImpl(boolean temporary, boolean focusWindow)
   {
     boolean retval = false;
- 
+
     // Don't try to focus non-focusable and non-visible components.
     if (isFocusable() && isVisible())
       {
@@ -4954,9 +4954,9 @@ public abstract class Component
    * Adds the specified popup menu to this component.
    *
    * @param popup the popup menu to be added
-   * 
+   *
    * @see #remove(MenuComponent)
-   * 
+   *
    * @since 1.1
    */
   public synchronized void add(PopupMenu popup)
@@ -5233,7 +5233,7 @@ p   * <li>the set of backward traversal keys
                                     Object newValue)
   {
     if (changeSupport != null)
-      changeSupport.firePropertyChange(propertyName, oldValue, newValue);  
+      changeSupport.firePropertyChange(propertyName, oldValue, newValue);
   }
 
   /**
@@ -5379,7 +5379,7 @@ p   * <li>the set of backward traversal keys
    */
   public void setComponentOrientation(ComponentOrientation o)
   {
- 
+
     ComponentOrientation oldOrientation = componentOrientation;
     componentOrientation = o;
     firePropertyChange("componentOrientation", oldOrientation, o);
@@ -5426,7 +5426,7 @@ p   * <li>the set of backward traversal keys
     return null;
   }
 
-
+
   // Helper methods; some are package visible for use by subclasses.
 
   /**
@@ -5463,13 +5463,13 @@ p   * <li>the set of backward traversal keys
   {
     Object target = e.getSource ();
     Event translated = null;
-    
+
     if (e instanceof WindowEvent)
       {
         WindowEvent we = (WindowEvent) e;
         int id = we.id;
         int newId = 0;
-        
+
         switch (id)
           {
           case WindowEvent.WINDOW_DEICONIFIED:
@@ -5666,22 +5666,22 @@ p   * <li>the set of backward traversal keys
       }
     else if (e instanceof AdjustmentEvent)
       {
-	AdjustmentEvent ae = (AdjustmentEvent) e;
-	int type = ae.getAdjustmentType();
-	int oldType;
-	if (type == AdjustmentEvent.BLOCK_DECREMENT)
-	  oldType = Event.SCROLL_PAGE_UP;
-	else if (type == AdjustmentEvent.BLOCK_INCREMENT)
-	  oldType = Event.SCROLL_PAGE_DOWN;
-	else if (type == AdjustmentEvent.TRACK)
-	  oldType = Event.SCROLL_ABSOLUTE;
-	else if (type == AdjustmentEvent.UNIT_DECREMENT)
-	  oldType = Event.SCROLL_LINE_UP;
-	else if (type == AdjustmentEvent.UNIT_INCREMENT)
-	  oldType = Event.SCROLL_LINE_DOWN;
-	else
-	  oldType = type;
-	translated = new Event(target, oldType, new Integer(ae.getValue()));
+        AdjustmentEvent ae = (AdjustmentEvent) e;
+        int type = ae.getAdjustmentType();
+        int oldType;
+        if (type == AdjustmentEvent.BLOCK_DECREMENT)
+          oldType = Event.SCROLL_PAGE_UP;
+        else if (type == AdjustmentEvent.BLOCK_INCREMENT)
+          oldType = Event.SCROLL_PAGE_DOWN;
+        else if (type == AdjustmentEvent.TRACK)
+          oldType = Event.SCROLL_ABSOLUTE;
+        else if (type == AdjustmentEvent.UNIT_DECREMENT)
+          oldType = Event.SCROLL_LINE_UP;
+        else if (type == AdjustmentEvent.UNIT_INCREMENT)
+          oldType = Event.SCROLL_LINE_DOWN;
+        else
+          oldType = type;
+        translated = new Event(target, oldType, new Integer(ae.getValue()));
       }
     else if (e instanceof ActionEvent)
       translated = new Event (target, Event.ACTION_EVENT,
@@ -5760,14 +5760,14 @@ p   * <li>the set of backward traversal keys
     switch (type)
       {
       case HierarchyEvent.HIERARCHY_CHANGED:
-        return (hierarchyListener != null 
+        return (hierarchyListener != null
             || (eventMask & AWTEvent.HIERARCHY_EVENT_MASK) != 0);
-        
+
       case HierarchyEvent.ANCESTOR_MOVED:
       case HierarchyEvent.ANCESTOR_RESIZED:
-        return (hierarchyBoundsListener != null 
+        return (hierarchyBoundsListener != null
             || (eventMask & AWTEvent.HIERARCHY_BOUNDS_EVENT_MASK) != 0);
-        
+
       case ComponentEvent.COMPONENT_HIDDEN:
       case ComponentEvent.COMPONENT_MOVED:
       case ComponentEvent.COMPONENT_RESIZED:
@@ -5795,7 +5795,7 @@ p   * <li>the set of backward traversal keys
       case MouseEvent.MOUSE_WHEEL:
         return (mouseWheelListener != null
                 || (eventMask & AWTEvent.MOUSE_WHEEL_EVENT_MASK) != 0);
-        
+
       case FocusEvent.FOCUS_GAINED:
       case FocusEvent.FOCUS_LOST:
         return (focusListener != null
@@ -5805,11 +5805,11 @@ p   * <li>the set of backward traversal keys
       case InputMethodEvent.CARET_POSITION_CHANGED:
         return (inputMethodListener != null
                 || (eventMask & AWTEvent.INPUT_METHOD_EVENT_MASK) != 0);
-        
+
       case PaintEvent.PAINT:
       case PaintEvent.UPDATE:
         return (eventMask & AWTEvent.PAINT_EVENT_MASK) != 0;
-        
+
       default:
         return false;
       }
@@ -5966,14 +5966,14 @@ p   * <li>the set of backward traversal keys
     s.writeObject(null);
   }
 
-  
+
   // Nested classes.
-  
+
   /**
    * This class fixes the bounds for a Heavyweight component that
    * is placed inside a Lightweight container. When the lightweight is
    * moved or resized, setBounds for the lightweight peer does nothing.
-   * Therefore, it was never moved on the screen. This class is 
+   * Therefore, it was never moved on the screen. This class is
    * attached to the lightweight, and it adjusts the position and size
    * of the peer when notified.
    * This is the same for show and hide.
@@ -5981,20 +5981,20 @@ p   * <li>the set of backward traversal keys
   class HeavyweightInLightweightListener
       implements ComponentListener
   {
-    
+
     /**
      * Constructor. Adds component listener to lightweight parent.
-     * 
+     *
      * @param parent - the lightweight container.
      */
     public HeavyweightInLightweightListener(Container parent)
     {
       parent.addComponentListener(this);
     }
-    
+
     /**
      * This method is called when the component is resized.
-     * 
+     *
      * @param event the <code>ComponentEvent</code> indicating the resize
      */
     public void componentResized(ComponentEvent event)
@@ -6004,7 +6004,7 @@ p   * <li>the set of backward traversal keys
 
     /**
      * This method is called when the component is moved.
-     * 
+     *
      * @param event the <code>ComponentEvent</code> indicating the move
      */
     public void componentMoved(ComponentEvent event)
@@ -6015,7 +6015,7 @@ p   * <li>the set of backward traversal keys
 
     /**
      * This method is called when the component is made visible.
-     * 
+     *
      * @param event the <code>ComponentEvent</code> indicating the visibility
      */
     public void componentShown(ComponentEvent event)
@@ -6026,7 +6026,7 @@ p   * <li>the set of backward traversal keys
 
     /**
      * This method is called when the component is hidden.
-     * 
+     *
      * @param event the <code>ComponentEvent</code> indicating the visibility
      */
     public void componentHidden(ComponentEvent event)
@@ -6035,7 +6035,7 @@ p   * <li>the set of backward traversal keys
         peer.hide();
     }
   }
-  
+
   /**
    * This class provides accessibility support for subclasses of container.
    *
@@ -6732,13 +6732,13 @@ p   * <li>the set of backward traversal keys
     protected void createBackBuffers(int numBuffers)
     {
       GraphicsConfiguration c =
-	GraphicsEnvironment.getLocalGraphicsEnvironment()
-	.getDefaultScreenDevice().getDefaultConfiguration();
+        GraphicsEnvironment.getLocalGraphicsEnvironment()
+        .getDefaultScreenDevice().getDefaultConfiguration();
 
       backBuffers = new VolatileImage[numBuffers];
 
       for (int i = 0; i < numBuffers; i++)
-	backBuffers[i] = c.createCompatibleVolatileImage(width, height);
+        backBuffers[i] = c.createCompatibleVolatileImage(width, height);
     }
 
     /**
@@ -6769,30 +6769,30 @@ p   * <li>the set of backward traversal keys
     public void show()
     {
       GraphicsConfiguration c =
-	GraphicsEnvironment.getLocalGraphicsEnvironment()
-	.getDefaultScreenDevice().getDefaultConfiguration();
+        GraphicsEnvironment.getLocalGraphicsEnvironment()
+        .getDefaultScreenDevice().getDefaultConfiguration();
 
       // draw the front buffer.
       getGraphics().drawImage(backBuffers[backBuffers.length - 1],
-			      width, height, null);
+                              width, height, null);
 
       BufferCapabilities.FlipContents f = getCapabilities().getFlipContents();
 
       // blit the back buffers.
       for (int i = backBuffers.length - 1; i > 0 ; i--)
-	backBuffers[i] = backBuffers[i - 1];
+        backBuffers[i] = backBuffers[i - 1];
 
       // create new backmost buffer.
       if (f == BufferCapabilities.FlipContents.UNDEFINED)
-	backBuffers[0] = c.createCompatibleVolatileImage(width, height);
+        backBuffers[0] = c.createCompatibleVolatileImage(width, height);
 
       // create new backmost buffer and clear it to the background
       // color.
       if (f == BufferCapabilities.FlipContents.BACKGROUND)
-	{
-	  backBuffers[0] = c.createCompatibleVolatileImage(width, height);
-	  backBuffers[0].getGraphics().clearRect(0, 0, width, height);
-	}
+        {
+          backBuffers[0] = c.createCompatibleVolatileImage(width, height);
+          backBuffers[0].getGraphics().clearRect(0, 0, width, height);
+        }
 
       // FIXME: set the backmost buffer to the prior contents of the
       // front buffer.  How do we retrieve the contents of the front
@@ -6802,7 +6802,7 @@ p   * <li>the set of backward traversal keys
 
       // set the backmost buffer to a copy of the new front buffer.
       if (f == BufferCapabilities.FlipContents.COPIED)
-	backBuffers[0] = backBuffers[backBuffers.length - 1];
+        backBuffers[0] = backBuffers[backBuffers.length - 1];
     }
 
     /**
@@ -6811,15 +6811,15 @@ p   * <li>the set of backward traversal keys
     protected void revalidate()
     {
       GraphicsConfiguration c =
-	GraphicsEnvironment.getLocalGraphicsEnvironment()
-	.getDefaultScreenDevice().getDefaultConfiguration();
+        GraphicsEnvironment.getLocalGraphicsEnvironment()
+        .getDefaultScreenDevice().getDefaultConfiguration();
 
       for (int i = 0; i < backBuffers.length; i++)
-	{
-	  int result = backBuffers[i].validate(c);
-	  if (result == VolatileImage.IMAGE_INCOMPATIBLE)
-	    backBuffers[i] = c.createCompatibleVolatileImage(width, height);
-	}
+        {
+          int result = backBuffers[i].validate(c);
+          if (result == VolatileImage.IMAGE_INCOMPATIBLE)
+            backBuffers[i] = c.createCompatibleVolatileImage(width, height);
+        }
       validatedContents = true;
     }
 
@@ -6832,13 +6832,13 @@ p   * <li>the set of backward traversal keys
     public boolean contentsLost()
     {
       for (int i = 0; i < backBuffers.length; i++)
-	{
-	  if (backBuffers[i].contentsLost())
-	    {
-	      validatedContents = false;
-	      return true;
-	    }
-	}
+        {
+          if (backBuffers[i].contentsLost())
+            {
+              validatedContents = false;
+              return true;
+            }
+        }
       // we know that the buffer resources are valid now because we
       // just checked them
       validatedContents = true;
@@ -6855,19 +6855,19 @@ p   * <li>the set of backward traversal keys
     public boolean contentsRestored()
     {
       GraphicsConfiguration c =
-	GraphicsEnvironment.getLocalGraphicsEnvironment()
-	.getDefaultScreenDevice().getDefaultConfiguration();
+        GraphicsEnvironment.getLocalGraphicsEnvironment()
+        .getDefaultScreenDevice().getDefaultConfiguration();
 
       boolean imageRestored = false;
 
       for (int i = 0; i < backBuffers.length; i++)
-	{
-	  int result = backBuffers[i].validate(c);
-	  if (result == VolatileImage.IMAGE_RESTORED)
-	    imageRestored = true;
-	  else if (result == VolatileImage.IMAGE_INCOMPATIBLE)
-	    return false;
-	}
+        {
+          int result = backBuffers[i].validate(c);
+          if (result == VolatileImage.IMAGE_RESTORED)
+            imageRestored = true;
+          else if (result == VolatileImage.IMAGE_INCOMPATIBLE)
+            return false;
+        }
       // we know that the buffer resources are valid now because we
       // just checked them
       validatedContents = true;
@@ -6939,12 +6939,12 @@ p   * <li>the set of backward traversal keys
       height = getHeight();
 
       if (numBuffers > 1)
-	createBuffers(numBuffers, caps);
+        createBuffers(numBuffers, caps);
       else
-	{
-	  drawVBuffer = peer.createVolatileImage(width, height);
-	  drawBuffer = drawVBuffer;
-	}
+        {
+          drawVBuffer = peer.createVolatileImage(width, height);
+          drawBuffer = drawVBuffer;
+        }
     }
 
     /**
@@ -6967,14 +6967,14 @@ p   * <li>the set of backward traversal keys
       throws AWTException
     {
       if (numBuffers <= 1)
-	throw new IllegalArgumentException("FlipBufferStrategy.createBuffers:"
-					   + " numBuffers must be greater than"
-					   + " one.");
+        throw new IllegalArgumentException("FlipBufferStrategy.createBuffers:"
+                                           + " numBuffers must be greater than"
+                                           + " one.");
 
       if (!caps.isPageFlipping())
-	throw new IllegalArgumentException("FlipBufferStrategy.createBuffers:"
-					   + " flipping must be a specified"
-					   + " capability.");
+        throw new IllegalArgumentException("FlipBufferStrategy.createBuffers:"
+                                           + " flipping must be a specified"
+                                           + " capability.");
 
       peer.createBuffers(numBuffers, caps);
     }
@@ -7033,11 +7033,11 @@ p   * <li>the set of backward traversal keys
     protected void revalidate()
     {
       GraphicsConfiguration c =
-	GraphicsEnvironment.getLocalGraphicsEnvironment()
-	.getDefaultScreenDevice().getDefaultConfiguration();
+        GraphicsEnvironment.getLocalGraphicsEnvironment()
+        .getDefaultScreenDevice().getDefaultConfiguration();
 
       if (drawVBuffer.validate(c) == VolatileImage.IMAGE_INCOMPATIBLE)
-	drawVBuffer = peer.createVolatileImage(width, height);
+        drawVBuffer = peer.createVolatileImage(width, height);
       validatedContents = true;
     }
 
@@ -7050,10 +7050,10 @@ p   * <li>the set of backward traversal keys
     public boolean contentsLost()
     {
       if (drawVBuffer.contentsLost())
-	{
-	  validatedContents = false;
-	  return true;
-	}
+        {
+          validatedContents = false;
+          return true;
+        }
       // we know that the buffer resources are valid now because we
       // just checked them
       validatedContents = true;
@@ -7070,17 +7070,17 @@ p   * <li>the set of backward traversal keys
     public boolean contentsRestored()
     {
       GraphicsConfiguration c =
-	GraphicsEnvironment.getLocalGraphicsEnvironment()
-	.getDefaultScreenDevice().getDefaultConfiguration();
+        GraphicsEnvironment.getLocalGraphicsEnvironment()
+        .getDefaultScreenDevice().getDefaultConfiguration();
 
       int result = drawVBuffer.validate(c);
 
       boolean imageRestored = false;
 
       if (result == VolatileImage.IMAGE_RESTORED)
-	imageRestored = true;
+        imageRestored = true;
       else if (result == VolatileImage.IMAGE_INCOMPATIBLE)
-	return false;
+        return false;
 
       // we know that the buffer resources are valid now because we
       // just checked them
diff --git a/libjava/classpath/java/awt/Container.java b/libjava/classpath/java/awt/Container.java
index 2634735..7e596f1 100644
--- a/libjava/classpath/java/awt/Container.java
+++ b/libjava/classpath/java/awt/Container.java
@@ -330,7 +330,7 @@ public class Container extends Component
 
         if (component == null)
           component = new Component[4]; // FIXME, better initial size?
-   
+
         // This isn't the most efficient implementation.  We could do less
         // copying when growing the array.  It probably doesn't matter.
         if (ncomponents >= component.length)
@@ -340,7 +340,7 @@ public class Container extends Component
             System.arraycopy(component, 0, c, 0, ncomponents);
             component = c;
           }
-  
+
         if (index == -1)
           component[ncomponents++] = comp;
         else
@@ -379,8 +379,8 @@ public class Container extends Component
         // Notify the layout manager.
         if (layoutMgr != null)
           {
-	    // If we have a LayoutManager2 the constraints are "real",
-	    // otherwise they are the "name" of the Component to add.
+            // If we have a LayoutManager2 the constraints are "real",
+            // otherwise they are the "name" of the Component to add.
             if (layoutMgr instanceof LayoutManager2)
               {
                 LayoutManager2 lm2 = (LayoutManager2) layoutMgr;
@@ -990,21 +990,21 @@ public class Container extends Component
   }
 
   /**
-   * Returns all registered {@link EventListener}s of the given 
+   * Returns all registered {@link EventListener}s of the given
    * <code>listenerType</code>.
    *
-   * @param listenerType the class of listeners to filter (<code>null</code> 
+   * @param listenerType the class of listeners to filter (<code>null</code>
    *                     not permitted).
-   *                     
+   *
    * @return An array of registered listeners.
-   * 
+   *
    * @throws ClassCastException if <code>listenerType</code> does not implement
    *                            the {@link EventListener} interface.
-   * @throws NullPointerException if <code>listenerType</code> is 
+   * @throws NullPointerException if <code>listenerType</code> is
    *                              <code>null</code>.
-   *                            
+   *
    * @see #getContainerListeners()
-   * 
+   *
    * @since 1.3
    */
   public <T extends EventListener> T[] getListeners(Class<T> listenerType)
@@ -1080,11 +1080,11 @@ public class Container extends Component
    * child component claims the point, the container itself is returned,
    * unless the point does not exist within this container, in which
    * case <code>null</code> is returned.
-   * 
+   *
    * When components overlap, the first component is returned. The component
-   * that is closest to (x, y), containing that location, is returned. 
+   * that is closest to (x, y), containing that location, is returned.
    * Heavyweight components take precedence of lightweight components.
-   * 
+   *
    * This function does not ignore invisible components. If there is an invisible
    * component at (x,y), it will be returned.
    *
@@ -1133,14 +1133,14 @@ public class Container extends Component
    * child component claims the point, the container itself is returned,
    * unless the point does not exist within this container, in which
    * case <code>null</code> is returned.
-   * 
+   *
    * When components overlap, the first component is returned. The component
-   * that is closest to (x, y), containing that location, is returned. 
+   * that is closest to (x, y), containing that location, is returned.
    * Heavyweight components take precedence of lightweight components.
-   * 
+   *
    * This function does not ignore invisible components. If there is an invisible
    * component at (x,y), it will be returned.
-   * 
+   *
    * @param x The x position of the point to return the component at.
    * @param y The y position of the point to return the component at.
    *
@@ -1155,7 +1155,7 @@ public class Container extends Component
       {
         if (!contains (x, y))
           return null;
-        
+
         // First find the component closest to (x,y) that is a heavyweight.
         for (int i = 0; i < ncomponents; ++i)
           {
@@ -1165,7 +1165,7 @@ public class Container extends Component
             if (comp.contains (x2, y2) && !comp.isLightweight())
               return comp;
           }
-        
+
         // if a heavyweight component is not found, look for a lightweight
         // closest to (x,y).
         for (int i = 0; i < ncomponents; ++i)
@@ -1176,7 +1176,7 @@ public class Container extends Component
             if (comp.contains (x2, y2) && comp.isLightweight())
               return comp;
           }
-        
+
         return this;
       }
   }
@@ -1190,12 +1190,12 @@ public class Container extends Component
    * case <code>null</code> is returned.
    *
    * The top-most child component is returned in the case where components overlap.
-   * This is determined by finding the component closest to (x,y) and contains 
+   * This is determined by finding the component closest to (x,y) and contains
    * that location. Heavyweight components take precedence of lightweight components.
-   * 
+   *
    * This function does not ignore invisible components. If there is an invisible
    * component at (x,y), it will be returned.
-   * 
+   *
    * @param p The point to return the component at.
    * @return The component containing the specified point, or <code>null</code>
    * if there is no such point.
@@ -1206,19 +1206,19 @@ public class Container extends Component
   }
 
   /**
-   * Locates the visible child component that contains the specified position. 
+   * Locates the visible child component that contains the specified position.
    * The top-most child component is returned in the case where there is overlap
    * in the components. If the containing child component is a Container,
-   * this method will continue searching for the deepest nested child 
+   * this method will continue searching for the deepest nested child
    * component. Components which are not visible are ignored during the search.
-   * 
-   * findComponentAt differs from getComponentAt, because it recursively 
+   *
+   * findComponentAt differs from getComponentAt, because it recursively
    * searches a Container's children.
-   * 
+   *
    * @param x - x coordinate
    * @param y - y coordinate
-   * @return null if the component does not contain the position. 
-   * If there is no child component at the requested point and the point is 
+   * @return null if the component does not contain the position.
+   * If there is no child component at the requested point and the point is
    * within the bounds of the container the container itself is returned.
    */
   public Component findComponentAt(int x, int y)
@@ -1252,20 +1252,20 @@ public class Container extends Component
         return this;
       }
   }
-  
+
   /**
-   * Locates the visible child component that contains the specified position. 
+   * Locates the visible child component that contains the specified position.
    * The top-most child component is returned in the case where there is overlap
    * in the components. If the containing child component is a Container,
-   * this method will continue searching for the deepest nested child 
+   * this method will continue searching for the deepest nested child
    * component. Components which are not visible are ignored during the search.
-   * 
-   * findComponentAt differs from getComponentAt, because it recursively 
+   *
+   * findComponentAt differs from getComponentAt, because it recursively
    * searches a Container's children.
-   * 
+   *
    * @param p - the component's location
-   * @return null if the component does not contain the position. 
-   * If there is no child component at the requested point and the point is 
+   * @return null if the component does not contain the position.
+   * If there is no child component at the requested point and the point is
    * within the bounds of the container the container itself is returned.
    */
   public Component findComponentAt(Point p)
@@ -1324,10 +1324,10 @@ public class Container extends Component
         while (true)
           {
             if (comp == null)
-	      return false;
+              return false;
             comp = comp.getParent();
             if (comp == this)
-	      return true;
+              return true;
           }
       }
   }
@@ -1401,7 +1401,7 @@ public class Container extends Component
    * @since 1.4
    */
   public void setFocusTraversalKeys(int id,
-				    Set<? extends AWTKeyStroke> keystrokes)
+                                    Set<? extends AWTKeyStroke> keystrokes)
   {
     if (id != KeyboardFocusManager.FORWARD_TRAVERSAL_KEYS &&
         id != KeyboardFocusManager.BACKWARD_TRAVERSAL_KEYS &&
@@ -1495,7 +1495,7 @@ public class Container extends Component
 
     focusTraversalKeys[id] = keystrokes;
   }
-  
+
   /**
    * Returns the Set of focus traversal keys for a given traversal operation for
    * this Container.
@@ -1619,14 +1619,14 @@ public class Container extends Component
       {
         Container ancestor = getFocusCycleRootAncestor ();
 
-	if (ancestor != this && ancestor !=  null)
-	  return ancestor.getFocusTraversalPolicy ();
-	else
-	  {
-	    KeyboardFocusManager manager = KeyboardFocusManager.getCurrentKeyboardFocusManager ();
+        if (ancestor != this && ancestor !=  null)
+          return ancestor.getFocusTraversalPolicy ();
+        else
+          {
+            KeyboardFocusManager manager = KeyboardFocusManager.getCurrentKeyboardFocusManager ();
 
-	    return manager.getDefaultFocusTraversalPolicy ();
-	  }
+            return manager.getDefaultFocusTraversalPolicy ();
+          }
       }
     else
       return focusTraversalPolicy;
@@ -1692,7 +1692,7 @@ public class Container extends Component
    * @param b <code>true</code> if this container provides a focus traversal
    *        policy, <code>false</code> when the root container's focus
    *        traversal policy should be used
-   * 
+   *
    * @see #isFocusTraversalPolicyProvider()
    *
    * @since 1.5
@@ -1754,7 +1754,7 @@ public class Container extends Component
     for (int i = 0; i < ncomponents; i++)
       {
         if (component[i] instanceof Container)
-             ((Container) component[i]).applyComponentOrientation(orientation); 
+             ((Container) component[i]).applyComponentOrientation(orientation);
           else
              component[i].setComponentOrientation(orientation);
       }
@@ -1892,7 +1892,7 @@ public class Container extends Component
             Component comp = component[i];
             boolean applicable = comp.isVisible()
                                  && (comp.isLightweight() || ! lightweightOnly);
-            
+
             if (applicable)
               visitChild(gfx, visitor, comp);
           }
@@ -1916,7 +1916,7 @@ public class Container extends Component
                           Component comp)
   {
     Rectangle bounds = comp.getBounds();
-    
+
     if(!gfx.hitClip(bounds.x,bounds.y, bounds.width, bounds.height))
       return;
     Graphics g2 = gfx.create(bounds.x, bounds.y, bounds.width,
@@ -1939,7 +1939,7 @@ public class Container extends Component
    */
   void dispatchEventImpl(AWTEvent e)
   {
-    LightweightDispatcher dispatcher = LightweightDispatcher.getInstance(); 
+    LightweightDispatcher dispatcher = LightweightDispatcher.getInstance();
     if (! isLightweight() && dispatcher.dispatchEvent(e))
       {
         // Some lightweight descendent got this event dispatched. Consume
@@ -1980,11 +1980,11 @@ public class Container extends Component
    */
   boolean eventTypeEnabled(int eventId)
   {
-    if(eventId <= ContainerEvent.CONTAINER_LAST 
+    if(eventId <= ContainerEvent.CONTAINER_LAST
        && eventId >= ContainerEvent.CONTAINER_FIRST)
       return containerListener != null
         || (eventMask & AWTEvent.CONTAINER_EVENT_MASK) != 0;
-      else 
+      else
         return super.eventTypeEnabled(eventId);
   }
 
@@ -2199,7 +2199,7 @@ public class Container extends Component
   static class GfxPaintVisitor extends GfxVisitor
   {
     public static final GfxVisitor INSTANCE = new GfxPaintVisitor();
-    
+
     public void visit(Component c, Graphics gfx)
     {
       c.paint(gfx);
@@ -2209,7 +2209,7 @@ public class Container extends Component
   static class GfxPrintVisitor extends GfxVisitor
   {
     public static final GfxVisitor INSTANCE = new GfxPrintVisitor();
-    
+
     public void visit(Component c, Graphics gfx)
     {
       c.print(gfx);
diff --git a/libjava/classpath/java/awt/ContainerOrderFocusTraversalPolicy.java b/libjava/classpath/java/awt/ContainerOrderFocusTraversalPolicy.java
index 14afd364..3fa437d 100644
--- a/libjava/classpath/java/awt/ContainerOrderFocusTraversalPolicy.java
+++ b/libjava/classpath/java/awt/ContainerOrderFocusTraversalPolicy.java
@@ -1,4 +1,4 @@
-/* ContainerOrderFocusTraversalPolicy.java -- 
+/* ContainerOrderFocusTraversalPolicy.java --
    Copyright (C) 2002, 2005  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -108,21 +108,21 @@ public class ContainerOrderFocusTraversalPolicy extends FocusTraversalPolicy
     Container prevAncestor = ancestor;
     while (ancestor != root)
       {
-	ancestor = current.getFocusCycleRootAncestor ();
-	if (ancestor == prevAncestor)
-	  {
+        ancestor = current.getFocusCycleRootAncestor ();
+        if (ancestor == prevAncestor)
+          {
             // We've reached the top focus cycle root ancestor.  Check
             // if it is root.
             if (ancestor == null)
               ancestor = root;
             else if (ancestor != root)
-	      throw new IllegalArgumentException ("the given container is not"
-						  + " a focus cycle root of the"
-						  + " current component");
+              throw new IllegalArgumentException ("the given container is not"
+                                                  + " a focus cycle root of the"
+                                                  + " current component");
             else
               break;
-	  }
-	prevAncestor = ancestor;
+          }
+        prevAncestor = ancestor;
       }
 
     // FIXME: is this the right thing to do here? It moves the context
@@ -151,7 +151,7 @@ public class ContainerOrderFocusTraversalPolicy extends FocusTraversalPolicy
               componentIndex = i;
           }
 
-        // Search forward for the next acceptable component.  
+        // Search forward for the next acceptable component.
         // Search through all components at least one time
         // i.e. start at componentIndex + 1 --> nComponents -1 --> 0  ---> componentIndex
         int i = componentIndex + 1;
@@ -159,24 +159,24 @@ public class ContainerOrderFocusTraversalPolicy extends FocusTraversalPolicy
         Component next = getNextAvailableComponent(components, i, end);
         if (next != null)
           return next;
-        
+
         // Now check remainder of components from 0 to componentIndex
         i = 0;
         end = componentIndex;
         next = getNextAvailableComponent(components, i, end);
         if (next != null)
-          return next; 
-        
+          return next;
+
         // No focusable components after current in its Container.  So go
         // to the next Component after current's Container (parent).
         Component result = getComponentAfter (root, parent);
         return result;
       }
   }
-  
+
   /**
    * Gets the next available component in the array between the given range.
-   * 
+   *
    * @param components - the array of components.
    * @param start - where to start
    * @param end - where to end
@@ -207,7 +207,7 @@ public class ContainerOrderFocusTraversalPolicy extends FocusTraversalPolicy
 
   /**
    * Gets the previous available component in the array between the given range.
-   * 
+   *
    * @param components - the array of components.
    * @param start - where to start
    * @param end - where to end
@@ -215,7 +215,7 @@ public class ContainerOrderFocusTraversalPolicy extends FocusTraversalPolicy
    */
   Component getPrevAvailableComponent(Component[] components, int start, int end)
   {
-    while (start >= end) 
+    while (start >= end)
       {
         Component c = components[start];
         if (c.visible && c.isDisplayable() && c.enabled && c.focusable)
@@ -238,7 +238,7 @@ public class ContainerOrderFocusTraversalPolicy extends FocusTraversalPolicy
    * Returns the Component that should receive the focus before
    * <code>current</code>. <code>root</code> must be a focus cycle root of
    * current.
-   * 
+   *
    * @param root a focus cycle root of current
    * @param current a (possibly indirect) child of root, or root itself
    * @return the previous Component in the focus traversal order for root, or
@@ -260,21 +260,21 @@ public class ContainerOrderFocusTraversalPolicy extends FocusTraversalPolicy
     Container prevAncestor = ancestor;
     while (ancestor != root)
       {
-	ancestor = current.getFocusCycleRootAncestor ();
-	if (ancestor == prevAncestor)
-	  {
-	    // We've reached the top focus cycle root ancestor.  Check
-	    // if it is root.
+        ancestor = current.getFocusCycleRootAncestor ();
+        if (ancestor == prevAncestor)
+          {
+            // We've reached the top focus cycle root ancestor.  Check
+            // if it is root.
             if (ancestor == null)
               ancestor = root;
             else if (ancestor != root)
-	      throw new IllegalArgumentException ("the given container is not"
-						  + " a focus cycle root of the"
-						  + " current component");
-	    else
-	      break;
-	  }
-	prevAncestor = ancestor;
+              throw new IllegalArgumentException ("the given container is not"
+                                                  + " a focus cycle root of the"
+                                                  + " current component");
+            else
+              break;
+          }
+        prevAncestor = ancestor;
       }
 
     // FIXME: is this the right thing to do here? It moves the context
@@ -311,13 +311,13 @@ public class ContainerOrderFocusTraversalPolicy extends FocusTraversalPolicy
         Component prev = getPrevAvailableComponent(components, i, end);
         if (prev != null)
           return prev;
-        
+
         // Now check remainder of components
         i = numComponents -1;
         end = componentIndex;
         prev = getPrevAvailableComponent(components, i, end);
         if (prev != null)
-          return prev; 
+          return prev;
 
         // No focusable components before current in its Container.  So go
         // to the previous Component before current's Container (parent).
@@ -369,7 +369,7 @@ public class ContainerOrderFocusTraversalPolicy extends FocusTraversalPolicy
               return first;
           }
         else if (accept(component))
-	  return component;
+          return component;
       }
 
     return null;
@@ -399,14 +399,14 @@ public class ContainerOrderFocusTraversalPolicy extends FocusTraversalPolicy
       return root;
 
     Component[] componentArray = root.getComponents ();
-    
+
     for (int i = componentArray.length - 1; i >= 0; i--)
       {
         Component component = componentArray [i];
-	
-	if (component.visible && component.isDisplayable() && component.enabled
+
+        if (component.visible && component.isDisplayable() && component.enabled
             && component.focusable)
-	  return component;
+          return component;
 
         if (component instanceof Container)
           {
diff --git a/libjava/classpath/java/awt/Cursor.java b/libjava/classpath/java/awt/Cursor.java
index 4d339b7..69d0e87 100644
--- a/libjava/classpath/java/awt/Cursor.java
+++ b/libjava/classpath/java/awt/Cursor.java
@@ -125,7 +125,7 @@ public class Cursor implements java.io.Serializable
                                   "North Resize Cursor", "South Resize Cursor",
                                   "West Resize Cursor", "East Resize Cursor",
                                   "Hand Cursor", "Move Cursor" };
-  
+
   public static final int CUSTOM_CURSOR    = 0xFFFFFFFF;
 
   private static final int PREDEFINED_COUNT = 14;
@@ -154,11 +154,11 @@ public class Cursor implements java.io.Serializable
     this.type = type;
 
     name = NAMES[type];
-      
+
     // FIXME: lookup?
   }
 
-  /** This constructor is used internally only. 
+  /** This constructor is used internally only.
    * Application code should call Toolkit.createCustomCursor().
    */
   protected Cursor(String name)
@@ -233,7 +233,7 @@ public class Cursor implements java.io.Serializable
   public String toString()
   {
     return (this.getClass()
-	    + "[type=" + getType()
-	    + ",name=" + getName() + "]");
+            + "[type=" + getType()
+            + ",name=" + getName() + "]");
   }
 }
diff --git a/libjava/classpath/java/awt/DefaultFocusTraversalPolicy.java b/libjava/classpath/java/awt/DefaultFocusTraversalPolicy.java
index a5cb7da..3f017c5 100644
--- a/libjava/classpath/java/awt/DefaultFocusTraversalPolicy.java
+++ b/libjava/classpath/java/awt/DefaultFocusTraversalPolicy.java
@@ -1,4 +1,4 @@
-/* DefaultFocusTraversalPolicy.java -- 
+/* DefaultFocusTraversalPolicy.java --
    Copyright (C) 2002, 2005  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -90,14 +90,14 @@ public class DefaultFocusTraversalPolicy
   protected boolean accept (Component comp)
   {
     if (comp.visible
-	&& comp.isDisplayable ()
-	&& comp.enabled)
+        && comp.isDisplayable ()
+        && comp.enabled)
       {
-	if (comp.isFocusTraversableOverridden != 0
-	    && (comp.isFocusTraversable () || comp.isFocusable()))
+        if (comp.isFocusTraversableOverridden != 0
+            && (comp.isFocusTraversable () || comp.isFocusable()))
           return true;
-        
-	if (!(comp instanceof Canvas
+
+        if (!(comp instanceof Canvas
               || comp instanceof Panel
               || comp instanceof Label
               || comp instanceof ScrollPane
diff --git a/libjava/classpath/java/awt/DefaultKeyboardFocusManager.java b/libjava/classpath/java/awt/DefaultKeyboardFocusManager.java
index 325e3ac..f62e6e5 100644
--- a/libjava/classpath/java/awt/DefaultKeyboardFocusManager.java
+++ b/libjava/classpath/java/awt/DefaultKeyboardFocusManager.java
@@ -1,4 +1,4 @@
-/* DefaultKeyboardFocusManager.java -- 
+/* DefaultKeyboardFocusManager.java --
    Copyright (C) 2002, 2004  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -146,7 +146,7 @@ public class DefaultKeyboardFocusManager extends KeyboardFocusManager
    */
   private AWTKeyStroke waitForKeyStroke = null;
 
-  /** The {@link java.util.SortedSet} of current 
+  /** The {@link java.util.SortedSet} of current
    * {@link EventDelayRequest}s. */
   private SortedSet delayRequests = new TreeSet ();
 
@@ -339,9 +339,9 @@ public class DefaultKeyboardFocusManager extends KeyboardFocusManager
     Component focusOwner = getFocusOwner();
     if (focusOwner == null)
       focusOwner = getFocusedWindow();
-    
+
     if (focusOwner != null)
-      redispatchEvent(focusOwner, e);      
+      redispatchEvent(focusOwner, e);
 
     // Loop through all registered KeyEventPostProcessors, giving
     // each a chance to process this event.
@@ -358,7 +358,7 @@ public class DefaultKeyboardFocusManager extends KeyboardFocusManager
     // MenuShortcut.
     if (postProcessKeyEvent (e))
       return true;
-    
+
     // Always return true.
     return true;
   }
@@ -469,26 +469,26 @@ public class DefaultKeyboardFocusManager extends KeyboardFocusManager
 
     if (forwardKeystrokes.contains (eventKeystroke))
       {
-        waitForKeyStroke = oppositeKeystroke;        
+        waitForKeyStroke = oppositeKeystroke;
         focusNextComponent (comp);
         e.consume ();
       }
     else if (backwardKeystrokes.contains (eventKeystroke))
       {
-        waitForKeyStroke = oppositeKeystroke;        
+        waitForKeyStroke = oppositeKeystroke;
         focusPreviousComponent (comp);
         e.consume ();
       }
     else if (upKeystrokes.contains (eventKeystroke))
       {
-        waitForKeyStroke = oppositeKeystroke;        
+        waitForKeyStroke = oppositeKeystroke;
         upFocusCycle (comp);
         e.consume ();
       }
     else if (comp instanceof Container
              && downKeystrokes.contains (eventKeystroke))
       {
-        waitForKeyStroke = oppositeKeystroke;        
+        waitForKeyStroke = oppositeKeystroke;
         downFocusCycle ((Container) comp);
         e.consume ();
       }
diff --git a/libjava/classpath/java/awt/Desktop.java b/libjava/classpath/java/awt/Desktop.java
index 227b8b1..1b40788 100644
--- a/libjava/classpath/java/awt/Desktop.java
+++ b/libjava/classpath/java/awt/Desktop.java
@@ -53,11 +53,11 @@ import java.net.URI;
  * specified file type. For example, opening an odf file results in launching
  * OpenOffice. If an operation is not supported, or the application fails to
  * launch, an exception is generated.
- * 
+ *
  * <strong>Implementation note: </strong>As this class is used to manage Desktop
  * integration, we provide some extension to configure the behaviour of this
  * class depending on the type of dektop that is detected.<br />
- * 
+ *
  * First of all, we support 5 system properties that can be used to define
  * the application to launch in any given case. These properties are:<br />
  * <br />
@@ -91,8 +91,8 @@ import java.net.URI;
  * <br /><br />
  * <code>
  * gconftool-2 -g /apps/classpath/gnu/java/awt/peer/Desktop/html/command
- * </code> 
- * 
+ * </code>
+ *
  * @author Mario Torre <neugens@limasoftware.net>
  * @since 1.6
  */
@@ -100,11 +100,11 @@ public class Desktop
 {
   /**
    * Represents an action type supported by a platform.
-   * 
+   *
    * To determine if a given action is supported by the platform,
    * use the <code>Desktop.isSupported(java.awt.Desktop.Action)</code>
    * method.
-   * 
+   *
    * @author Mario Torre <neugens@limasoftware.net>
    */
   public enum Action
@@ -118,15 +118,15 @@ public class Desktop
   {
     /* nothing to be done */
   }
-  
+
   /**
    * Returns an instance of the Desktop Class.
-   * 
-   * If this implementation does not support Desktop, an 
+   *
+   * If this implementation does not support Desktop, an
    * UnsupportedOperationException will be thrown.
    * Also, an HeadlessException will be generated if
    * GraphicsEnvironment.isHeadless() returns true.
-   * 
+   *
    * @throws UnsupportedOperationException
    * @throws HeadlessException
    */
@@ -135,23 +135,23 @@ public class Desktop
   {
     if (GraphicsEnvironment.isHeadless())
       throw new HeadlessException();
-    
+
     if (!Desktop.isDesktopSupported())
       throw new UnsupportedOperationException();
-    
+
     Desktop desktop = new Desktop();
     desktop.peer = Toolkit.getDefaultToolkit().createDesktopPeer(desktop);
-    
+
     return desktop;
   }
 
   /**
    * Check if this implementation supports Desktop.
    * If true, use getDesktop to get an instance of this class.
-   * 
+   *
    * This implementation will return false when GraphicsEnvironment.isHeadless
    * returns true.
-   * 
+   *
    * @return true if this class is supported on the current platform;
    * false otherwise
    */
@@ -159,13 +159,13 @@ public class Desktop
   {
     if (GraphicsEnvironment.isHeadless())
       return false;
-    
+
     return true;
   }
-  
+
   /**
    * Check if the given Action is supported by this implementation.
-   * 
+   *
    * @param action
    * @return
    */
@@ -173,14 +173,14 @@ public class Desktop
   {
     return peer.isSupported(action);
   }
-  
+
   /**
    * Launches the Desktop default browser to open the given <code>uri</code>.
-   * 
+   *
    * If a security manager exists and denies
    * AWTPermission("showWindowWithoutWarningBanner"),a SecurityException will
    * be generated.
-   * 
+   *
    * @param uri
    * @throws IOException
    */
@@ -189,16 +189,16 @@ public class Desktop
   {
     peer.browse(uri);
   }
-  
+
   /**
    * Launch the edit command to edit this file.
-   * File should already exist before the editing starts. 
-   * 
+   * File should already exist before the editing starts.
+   *
    * If a security manager exists and
    * SecurityManager.checkRead(java.lang.String) method denies read access to
    * the file, or SecurityManager.checkPrintJobAccess() method denies the
    * permission to print the file, a SecurityException will be generated.
-   * 
+   *
    * @param file
    * @throws IOException
    */
@@ -207,10 +207,10 @@ public class Desktop
   {
     peer.edit(file);
   }
-  
+
   /**
    * Launches the Desktop default mailer.
-   * 
+   *
    * If a security manager exists and denies
    * AWTPermission("showWindowWithoutWarningBanner"), a SecurityException will
    * be generated.
@@ -222,16 +222,16 @@ public class Desktop
   {
     peer.mail();
   }
-  
+
   /**
    * Launches the Desktop default mailer, with the given mailtoURI
    * as agrument. The <code>mailtoURI</code> must conform to the
-   * {@link http://www.ietf.org/rfc/rfc2368.txt The mailto URL scheme (RFC 2368)} 
-   * 
+   * {@link http://www.ietf.org/rfc/rfc2368.txt The mailto URL scheme (RFC 2368)}
+   *
    * If a security manager exists and denies
    * AWTPermission("showWindowWithoutWarningBanner"), a SecurityException will
    * be generated.
-   * 
+   *
    * @param mailtoURI
    * @throws IOException
    */
@@ -240,11 +240,11 @@ public class Desktop
   {
     peer.mail(mailtoURI);
   }
-  
+
   /**
    * Launches the Desktop default application to open the given File.
    * If <code>file</code> is a directory, a file manager is launched.
-   * 
+   *
    * @param file
    * @throws IOException
    */
@@ -256,7 +256,7 @@ public class Desktop
 
   /**
    * Launch the print program to print this file.
-   * 
+   *
    * @param file
    * @throws IOException
    */
diff --git a/libjava/classpath/java/awt/Dialog.java b/libjava/classpath/java/awt/Dialog.java
index 83fb52d89..d12e1eb 100644
--- a/libjava/classpath/java/awt/Dialog.java
+++ b/libjava/classpath/java/awt/Dialog.java
@@ -1,5 +1,5 @@
 /* Dialog.java -- An AWT dialog box
- Copyright (C) 1999, 2000, 2001, 2002, 2005, 2006  
+ Copyright (C) 1999, 2000, 2001, 2002, 2005, 2006
  Free Software Foundation, Inc.
 
  This file is part of GNU Classpath.
@@ -47,15 +47,15 @@ import javax.accessibility.AccessibleState;
 import javax.accessibility.AccessibleStateSet;
 
 /**
- * <code>Dialog</code> provides a top-level window normally used to receive 
+ * <code>Dialog</code> provides a top-level window normally used to receive
  * user input in applications.
  * <p>
  * A dialog always has another top-level window as owner and is only visible
- * if this owner is visible to the user. The default layout of dialogs is the 
+ * if this owner is visible to the user. The default layout of dialogs is the
  * <code>BorderLayout</code>. Dialogs can be modal (blocks user input to other
  * components) or non-modal (user input in other components are allowed).
- * </p> 
- * 
+ * </p>
+ *
  * @author Aaron M. Renn (arenn@urbanophile.com)
  * @author Tom Tromey (tromey@redhat.com)
  */
@@ -106,7 +106,7 @@ public class Dialog extends Window
   private boolean blocked = false;
 
   /**
-   * Secondary EventQueue to handle AWT events while we are blocked for 
+   * Secondary EventQueue to handle AWT events while we are blocked for
    * modality in show.
    */
   private EventQueue eq2 = null;
@@ -119,10 +119,10 @@ public class Dialog extends Window
   /**
    * Initializes a new instance of <code>Dialog</code> with the specified
    * parent, that is resizable and not modal, and which has no title.
-   * 
+   *
    * @param parent The parent frame of this dialog box.
-   * @exception IllegalArgumentException If the owner's GraphicsConfiguration 
-   * is not from a screen device, or if owner is null. This exception is 
+   * @exception IllegalArgumentException If the owner's GraphicsConfiguration
+   * is not from a screen device, or if owner is null. This exception is
    * always thrown when GraphicsEnvironment.isHeadless() returns true.
    */
   public Dialog(Frame parent)
@@ -133,13 +133,13 @@ public class Dialog extends Window
   /**
    * Initializes a new instance of <code>Dialog</code> with the specified
    * parent and modality, that is resizable and which has no title.
-   * 
+   *
    * @param parent The parent frame of this dialog box.
    * @param modal <code>true</code> if this dialog box is modal,
    * <code>false</code> otherwise.
-   * 
+   *
    * @exception IllegalArgumentException If the owner's GraphicsConfiguration
-   * is not from a screen device, or if owner is null. This exception is 
+   * is not from a screen device, or if owner is null. This exception is
    * always thrown when GraphicsEnvironment.isHeadless() returns true.
    */
   public Dialog(Frame parent, boolean modal)
@@ -149,14 +149,14 @@ public class Dialog extends Window
 
   /**
    * Initializes a new instance of <code>Dialog</code> with the specified
-   * parent, that is resizable and not modal, and which has the specified 
+   * parent, that is resizable and not modal, and which has the specified
    * title.
-   * 
+   *
    * @param parent The parent frame of this dialog box.
    * @param title The title string for this dialog box.
-   * 
+   *
    * @exception IllegalArgumentException If the owner's GraphicsConfiguration
-   * is not from a screen device, or if owner is null. This exceptionnis 
+   * is not from a screen device, or if owner is null. This exceptionnis
    * always thrown when GraphicsEnvironment.isHeadless() returns true.
    */
   public Dialog(Frame parent, String title)
@@ -167,12 +167,12 @@ public class Dialog extends Window
   /**
    * Initializes a new instance of <code>Dialog</code> with the specified,
    * parent, title, and modality, that is resizable.
-   * 
+   *
    * @param parent The parent frame of this dialog box.
    * @param title The title string for this dialog box.
    * @param modal <code>true</code> if this dialog box is modal,
    * <code>false</code> otherwise.
-   *          
+   *
    * @exception IllegalArgumentException If owner is null or
    *              GraphicsEnvironment.isHeadless() returns true.
    */
@@ -185,15 +185,15 @@ public class Dialog extends Window
    * Initializes a new instance of <code>Dialog</code> with the specified,
    * parent, title, modality and <code>GraphicsConfiguration</code>, that is
    * resizable.
-   * 
+   *
    * @param parent The parent frame of this dialog box.
    * @param title The title string for this dialog box.
    * @param modal <code>true</code> if this dialog box is modal,
    * <code>false</code> otherwise.
-   * @param gc The <code>GraphicsConfiguration</code> object to use. If 
-   * <code>null</code> the <code>GraphicsConfiguration</code> of the target 
+   * @param gc The <code>GraphicsConfiguration</code> object to use. If
+   * <code>null</code> the <code>GraphicsConfiguration</code> of the target
    * frame is used.
-   * 
+   *
    * @exception IllegalArgumentException If owner is null, the
    *              GraphicsConfiguration is not a screen device or
    *              GraphicsEnvironment.isHeadless() returns true.
@@ -216,12 +216,12 @@ public class Dialog extends Window
   /**
    * Initializes a new instance of <code>Dialog</code> with the specified,
    * parent, that is resizable.
-   * 
+   *
    * @param owner The parent frame of this dialog box.
-   * 
+   *
    * @exception IllegalArgumentException If parent is null. This exception is
    * always thrown when GraphicsEnvironment.isHeadless() returns true.
-   * 
+   *
    * @since 1.2
    */
   public Dialog(Dialog owner)
@@ -232,10 +232,10 @@ public class Dialog extends Window
   /**
    * Initializes a new instance of <code>Dialog</code> with the specified,
    * parent and title, that is resizable.
-   * 
+   *
    * @param owner The parent frame of this dialog box.
    * @param title The title string for this dialog box.
-   * 
+   *
    * @exception IllegalArgumentException If parent is null. This exception is
    *              always thrown when GraphicsEnvironment.isHeadless() returns
    *              true.
@@ -249,12 +249,12 @@ public class Dialog extends Window
   /**
    * Initializes a new instance of <code>Dialog</code> with the specified,
    * parent, title and modality, that is resizable.
-   * 
+   *
    * @param owner The parent frame of this dialog box.
    * @param title The title string for this dialog box.
    * @param modal <code>true</code> if this dialog box is modal,
    * <code>false</code> otherwise.
-   * 
+   *
    * @exception IllegalArgumentException If parent is null. This exception is
    * always thrown when GraphicsEnvironment.isHeadless() returns true.
    * @since 1.2
@@ -268,19 +268,19 @@ public class Dialog extends Window
    * Initializes a new instance of <code>Dialog</code> with the specified,
    * parent, title, modality and <code>GraphicsConfiguration</code>, that is
    * resizable.
-   * 
+   *
    * @param parent The parent frame of this dialog box.
    * @param title The title string for this dialog box.
    * @param modal <code>true</code> if this dialog box is modal,
    * <code>false</code> otherwise.
-   * @param gc The <code>GraphicsConfiguration</code> object to use. If 
-   * <code>null</code> the <code>GraphicsConfiguration</code> of the target 
+   * @param gc The <code>GraphicsConfiguration</code> object to use. If
+   * <code>null</code> the <code>GraphicsConfiguration</code> of the target
    * frame is used.
-   * 
+   *
    * @exception IllegalArgumentException If parent is null, the
-   * GraphicsConfiguration is not a screen device or 
+   * GraphicsConfiguration is not a screen device or
    * GraphicsEnvironment.isHeadless() returns true.
-   * 
+   *
    * @since 1.4
    */
   public Dialog(Dialog parent, String title, boolean modal,
@@ -299,7 +299,7 @@ public class Dialog extends Window
 
   /**
    * Returns the title of this dialog box.
-   * 
+   *
    * @return The title of this dialog box.
    */
   public String getTitle()
@@ -309,7 +309,7 @@ public class Dialog extends Window
 
   /**
    * Sets the title of this dialog box to the specified string.
-   * 
+   *
    * @param title the new title. If <code>null</code> an empty
    * title will be set.
    */
@@ -327,7 +327,7 @@ public class Dialog extends Window
 
   /**
    * Tests whether or not this dialog box is modal.
-   * 
+   *
    * @return <code>true</code> if this dialog box is modal, <code>false</code>
    * otherwise.
    */
@@ -339,9 +339,9 @@ public class Dialog extends Window
   /**
    * Changes the modality of this dialog box. This can only be done before the
    * peer is created.
-   * 
+   *
    * @param modal <code>true</code> to make this dialog box modal,
-   * <code>false</code> to make it non-modal. 
+   * <code>false</code> to make it non-modal.
    */
   public void setModal(boolean modal)
   {
@@ -350,7 +350,7 @@ public class Dialog extends Window
 
   /**
    * Tests whether or not this dialog box is resizable.
-   * 
+   *
    * @return <code>true</code> if this dialog is resizable,
    * <code>false</code> otherwise.
    */
@@ -361,7 +361,7 @@ public class Dialog extends Window
 
   /**
    * Changes the resizability of this dialog box.
-   * 
+   *
    * @param resizable <code>true</code> to make this dialog resizable,
    * <code>false</code> to make it non-resizable.
    */
@@ -391,7 +391,7 @@ public class Dialog extends Window
    * dialog is hidden by someone calling hide or dispose. If this is the event
    * dispatching thread we must ensure that another event thread runs while the
    * one which invoked this method is blocked.
-   * 
+   *
    * @deprecated Use {@link Component#setVisible(boolean)} instead.
    */
   public synchronized void show()
@@ -438,7 +438,7 @@ public class Dialog extends Window
   /**
    * Hides the Dialog and then causes show() to return if it is currently
    * blocked.
-   * 
+   *
    * @deprecated Use {@link Component#setVisible(boolean)} instead.
    */
   public synchronized void hide()
@@ -467,7 +467,7 @@ public class Dialog extends Window
 
   /**
    * Returns a debugging string for this component.
-   * 
+   *
    * @return A debugging string for this component.
    */
   protected String paramString()
@@ -478,10 +478,10 @@ public class Dialog extends Window
 
   /**
    * Returns whether this frame is undecorated or not.
-   * 
+   *
    * @return <code>true</code> if this dialog is undecorated,
    * <code>false</code> otherwise.
-   * 
+   *
    * @since 1.4
    */
   public boolean isUndecorated()
@@ -492,10 +492,10 @@ public class Dialog extends Window
   /**
    * Disables or enables decorations for this frame. This method can only be
    * called while the frame is not displayable.
-   * 
+   *
    * @param undecorated <code>true</code> to disable dialog decorations,
    * <code>false</code> otherwise.
-   * 
+   *
    * @exception IllegalComponentStateException If this frame is displayable.
    * @since 1.4
    */
@@ -517,7 +517,7 @@ public class Dialog extends Window
 
     /**
      * Gets the role of this object.
-     * @return AccessibleRole.DIALOG 
+     * @return AccessibleRole.DIALOG
      */
     public AccessibleRole getAccessibleRole()
     {
@@ -542,7 +542,7 @@ public class Dialog extends Window
   /**
    * Gets the AccessibleContext associated with this <code>Dialog</code>. The
    * context is created, if necessary.
-   * 
+   *
    * @return the associated context
    */
   public AccessibleContext getAccessibleContext()
@@ -552,7 +552,7 @@ public class Dialog extends Window
       accessibleContext = new AccessibleAWTDialog();
     return accessibleContext;
   }
-  
+
   /**
    * Generate a unique name for this <code>Dialog</code>.
    *
diff --git a/libjava/classpath/java/awt/DisplayMode.java b/libjava/classpath/java/awt/DisplayMode.java
index d41d4a8..be2a1d1 100644
--- a/libjava/classpath/java/awt/DisplayMode.java
+++ b/libjava/classpath/java/awt/DisplayMode.java
@@ -147,9 +147,9 @@ public final class DisplayMode
   public boolean equals (DisplayMode dm)
   {
     return (width == dm.width
-	    && height == dm.height
-	    && bitDepth == dm.bitDepth
-	    && refreshRate == dm.refreshRate);
+            && height == dm.height
+            && bitDepth == dm.bitDepth
+            && refreshRate == dm.refreshRate);
   }
 
   /**
diff --git a/libjava/classpath/java/awt/Event.java b/libjava/classpath/java/awt/Event.java
index 648139c..f2c98b9 100644
--- a/libjava/classpath/java/awt/Event.java
+++ b/libjava/classpath/java/awt/Event.java
@@ -115,10 +115,10 @@ public class Event implements java.io.Serializable
 
   public Object arg;
   public int clickCount;
-  boolean consumed;		// Required by serialization spec.
+  boolean consumed;             // Required by serialization spec.
   public Event evt;
   public int id;
-  public int key; 
+  public int key;
   public int modifiers;
   public Object target;
   public long when;
@@ -131,9 +131,9 @@ public class Event implements java.io.Serializable
     this.target = target;
     this.arg = arg;
   }
-  
-  public Event (Object target, long when, int id, int x, int y, int key, 
-		int modifiers)
+
+  public Event (Object target, long when, int id, int x, int y, int key,
+                int modifiers)
   {
     this.target = target;
     this.when = when;
@@ -144,8 +144,8 @@ public class Event implements java.io.Serializable
     this.modifiers = modifiers;
   }
 
-  public Event (Object target, long when, int id, int x, int y, int key, 
-	        int modifiers, Object arg) 
+  public Event (Object target, long when, int id, int x, int y, int key,
+                int modifiers, Object arg)
   {
     this (target, when, id, x, y, key, modifiers);
     this.arg = arg;
@@ -167,7 +167,7 @@ public class Event implements java.io.Serializable
       + ",target=" + target + ",arg=" + arg;
   }
 
-  public boolean shiftDown() 
+  public boolean shiftDown()
   {
     return ((modifiers & SHIFT_MASK) == 0 ? false : true);
   }
diff --git a/libjava/classpath/java/awt/EventDispatchThread.java b/libjava/classpath/java/awt/EventDispatchThread.java
index 9f81a79..c2147f4 100644
--- a/libjava/classpath/java/awt/EventDispatchThread.java
+++ b/libjava/classpath/java/awt/EventDispatchThread.java
@@ -65,8 +65,8 @@ class EventDispatchThread extends Thread
           System.getProperty("gnu.awt.dispatchthread.priority");
         if (priorityString != null)
           {
-            priority = Integer.parseInt(priorityString); 
-          }      
+            priority = Integer.parseInt(priorityString);
+          }
       }
     catch (NumberFormatException ex)
       {
@@ -83,25 +83,25 @@ class EventDispatchThread extends Thread
     while (true)
       {
         try
-	{
-	  AWTEvent evt = queue.getNextEvent();
+        {
+          AWTEvent evt = queue.getNextEvent();
           queue.dispatchEvent(evt);
-	}
+        }
         catch (ThreadDeath death)
         {
           // If someone wants to kill us, let them.
           return;
         }
-	catch (InterruptedException ie)
-	{
-	  // We are interrupted when we should finish executing
-	  return;
-	}
-	catch (Throwable x)
-	{
-	  System.err.println("Exception during event dispatch:");
-	  x.printStackTrace(System.err);
-	}
+        catch (InterruptedException ie)
+        {
+          // We are interrupted when we should finish executing
+          return;
+        }
+        catch (Throwable x)
+        {
+          System.err.println("Exception during event dispatch:");
+          x.printStackTrace(System.err);
+        }
       }
   }
 }
diff --git a/libjava/classpath/java/awt/EventQueue.java b/libjava/classpath/java/awt/EventQueue.java
index eb17449..cb52ae0 100644
--- a/libjava/classpath/java/awt/EventQueue.java
+++ b/libjava/classpath/java/awt/EventQueue.java
@@ -51,8 +51,8 @@ import java.awt.peer.LightweightPeer;
 import java.lang.reflect.InvocationTargetException;
 import java.util.EmptyStackException;
 
-/* Written using on-line Java 2 Platform Standard Edition v1.3 API 
- * Specification, as well as "The Java Class Libraries", 2nd edition 
+/* Written using on-line Java 2 Platform Standard Edition v1.3 API
+ * Specification, as well as "The Java Class Libraries", 2nd edition
  * (Addison-Wesley, 1998).
  * Status:  Believed complete, but untested.
  */
@@ -225,9 +225,9 @@ public class EventQueue
    * is interrupted.
    *
    * @return The next event in the queue.
-   * @specnote Does not block. Returns null if there are no events on the 
-   *            queue. 
-   */ 
+   * @specnote Does not block. Returns null if there are no events on the
+   *            queue.
+   */
   public synchronized AWTEvent peekEvent()
   {
     if (next != null)
@@ -246,9 +246,9 @@ public class EventQueue
    *
    * @return The next event in the queue.
    *
-   * @specnote Does not block. Returns null if there are no matching events 
-   *            on the queue. 
-   */ 
+   * @specnote Does not block. Returns null if there are no matching events
+   *            on the queue.
+   */
   public synchronized AWTEvent peekEvent(int id)
   {
     if (next != null)
@@ -306,7 +306,7 @@ public class EventQueue
    * Actually performs the event posting. This is needed because the
    * RI doesn't use the public postEvent() method when transferring events
    * between event queues in push() and pop().
-   * 
+   *
    * @param evt the event to post
    * @param priority the priority of the event
    */
@@ -342,7 +342,7 @@ public class EventQueue
             Object src = qevt.getSource();
             if (qevt.id == evt.id && src == comp)
               {
-                // If there are, call coalesceEvents on the source component 
+                // If there are, call coalesceEvents on the source component
                 // to see if they can be combined.
                 Component srccmp = (Component) src;
                 AWTEvent coalescedEvt = srccmp.coalesceEvents(qevt, evt);
@@ -414,7 +414,7 @@ public class EventQueue
     if (isDispatchThread ())
       throw new Error("Can't call invokeAndWait from event dispatch thread");
 
-    EventQueue eq = Toolkit.getDefaultToolkit().getSystemEventQueue(); 
+    EventQueue eq = Toolkit.getDefaultToolkit().getSystemEventQueue();
     Object notifyObject = new Object();
 
     InvocationEvent ie =
@@ -441,9 +441,9 @@ public class EventQueue
    */
   public static void invokeLater(Runnable runnable)
   {
-    EventQueue eq = Toolkit.getDefaultToolkit().getSystemEventQueue(); 
+    EventQueue eq = Toolkit.getDefaultToolkit().getSystemEventQueue();
 
-    InvocationEvent ie = 
+    InvocationEvent ie =
       new InvocationEvent(eq, runnable, null, false);
 
     eq.postEvent(ie);
@@ -456,8 +456,8 @@ public class EventQueue
   public static boolean isDispatchThread()
   {
     EventQueue eq = Toolkit.getDefaultToolkit().getSystemEventQueue();
-    
-    /* Find last EventQueue in chain */ 
+
+    /* Find last EventQueue in chain */
     while (eq.next != null)
       eq = eq.next;
 
@@ -473,11 +473,11 @@ public class EventQueue
    */
   public static AWTEvent getCurrentEvent()
   {
-    EventQueue eq = Toolkit.getDefaultToolkit().getSystemEventQueue(); 
+    EventQueue eq = Toolkit.getDefaultToolkit().getSystemEventQueue();
     Thread ct = Thread.currentThread();
-    
+
     /* Find out if this thread is the dispatch thread for any of the
-       EventQueues in the chain */ 
+       EventQueues in the chain */
     while (ct != eq.dispatchThread)
       {
         // Try next EventQueue, if any
@@ -490,7 +490,7 @@ public class EventQueue
   }
 
   /**
-   * Allows a custom EventQueue implementation to replace this one. 
+   * Allows a custom EventQueue implementation to replace this one.
    * All pending events are transferred to the new queue. Calls to postEvent,
    * getNextEvent, and peekEvent and others are forwarded to the pushed queue
    * until it is removed with a pop().
@@ -650,7 +650,7 @@ public class EventQueue
    */
   public static long getMostRecentEventTime()
   {
-    EventQueue eq = Toolkit.getDefaultToolkit().getSystemEventQueue(); 
+    EventQueue eq = Toolkit.getDefaultToolkit().getSystemEventQueue();
     if (Thread.currentThread() != eq.dispatchThread)
       return System.currentTimeMillis();
     return eq.lastWhen;
diff --git a/libjava/classpath/java/awt/FileDialog.java b/libjava/classpath/java/awt/FileDialog.java
index 2111770..c1bd082 100644
--- a/libjava/classpath/java/awt/FileDialog.java
+++ b/libjava/classpath/java/awt/FileDialog.java
@@ -90,7 +90,7 @@ private String file;
 private FilenameFilter filter;
 
 /**
-  * @serial The mode of this dialog, either <code>LOAD</code> or 
+  * @serial The mode of this dialog, either <code>LOAD</code> or
   * <code>SAVE</code>.
   */
 private int mode;
@@ -109,41 +109,41 @@ private static transient long next_file_dialog_number;
   /**
    * Initializes a new instance of <code>FileDialog</code> with the specified
    * parent. This dialog will have no title and will be for loading a file.
-   * 
+   *
    * @param parent The parent dialog for this.
-   * 
+   *
    * @since 1.5
    */
   public FileDialog(Dialog parent)
   {
     this(parent, "", LOAD);
   }
-  
+
   /**
    * Initialized a new instance of <code>FileDialog</code> with the
    * specified parent and title.  This dialog will be for opening a file.
    *
    * @param parent The parent dialog for this.
    * @param title The title for this dialog.
-   * 
+   *
    * @since 1.5
    */
   public FileDialog(Dialog parent, String title)
   {
     this(parent, title, LOAD);
   }
-  
+
   /**
    * Initialized a new instance of <code>FileDialog</code> with the specified
    * parent, title, and mode.
-   * 
+   *
    * @param parent The parent dialog for this.
    * @param title The title for this dialog.
    * @param mode The mode of the dialog, either <code>LOAD</code> or
    *          <code>SAVE</code>.
    * @throws IllegalArgumentException - if illegal mode, if
    *           GraphicsEnvironment.isHeadless or if parent is null.
-   *           
+   *
    * @since 1.5
    */
   public FileDialog(Dialog parent, String title, int mode)
@@ -154,12 +154,12 @@ private static transient long next_file_dialog_number;
     if (mode != LOAD && mode != SAVE)
       throw new IllegalArgumentException (
         "Mode argument must be either LOAD or SAVE");
-    
+
     setMode(mode);
   }
 
 /**
-  * Initializes a new instance of <code>FileDialog</code> with the 
+  * Initializes a new instance of <code>FileDialog</code> with the
   * specified parent.  This dialog will have no title and will be for
   * loading a file.
   *
@@ -204,7 +204,7 @@ public
 FileDialog(Frame parent, String title, int mode)
 {
   super(parent, title, true);
-  
+
   if ((mode != LOAD) && (mode != SAVE))
     throw new IllegalArgumentException (
       "Mode argument must be either LOAD or SAVE");
@@ -309,7 +309,7 @@ setFile(String file)
     this.file = null;
   else
     this.file = file;
-  
+
   if (peer != null)
     {
       FileDialogPeer f = (FileDialogPeer) peer;
@@ -372,7 +372,7 @@ protected String
 paramString()
 {
   return ("dir=" + dir + ",file=" + file +
-	  ",mode=" + mode + "," + super.paramString());
+          ",mode=" + mode + "," + super.paramString());
 }
 
 /**
@@ -380,17 +380,16 @@ paramString()
  *
  * @return A unique name for this <code>FileDialog</code>.
  */
-String 
+String
 generateName()
 {
   return "filedlg" + getUniqueLong();
 }
 
-private static synchronized long 
+private static synchronized long
 getUniqueLong()
 {
   return next_file_dialog_number++;
 }
 
-} // class FileDialog 
-
+} // class FileDialog
diff --git a/libjava/classpath/java/awt/FlowLayout.java b/libjava/classpath/java/awt/FlowLayout.java
index 70c98a2..231d041 100644
--- a/libjava/classpath/java/awt/FlowLayout.java
+++ b/libjava/classpath/java/awt/FlowLayout.java
@@ -73,7 +73,7 @@ public class FlowLayout implements LayoutManager, Serializable
    * does nothing.
    *
    * @param name the name
-   * @param comp the component 
+   * @param comp the component
    */
   public void addLayoutComponent (String name, Component comp)
   {
@@ -155,78 +155,78 @@ public class FlowLayout implements LayoutManager, Serializable
   {
     synchronized (parent.getTreeLock ())
       {
-	int num = parent.getComponentCount ();
-	// This is more efficient than calling getComponents().
-	Component[] comps = parent.component;
-
-	Dimension d = parent.getSize ();
-	Insets ins = parent.getInsets ();
-
-	ComponentOrientation orient = parent.getComponentOrientation ();
-	boolean left_to_right = orient.isLeftToRight ();
-
-	int y = ins.top + vgap;
-	int i = 0;
-	while (i < num)
-	  {
-	    // Find the components which go in the current row.
-	    int new_w = ins.left + hgap + ins.right;
-	    int new_h = 0;
-	    int j;
-	    boolean found_one = false;
-	    for (j = i; j < num; ++j)
-	      {
-		// Skip invisible items.
-		if (! comps[j].visible)
-		  continue;
-
-		Dimension c = comps[j].getPreferredSize ();
-
-		int next_w = new_w + hgap + c.width;
-		if (next_w <= d.width || ! found_one)
-		  {
-		    new_w = next_w;
-		    new_h = Math.max (new_h, c.height);
-		    found_one = true;
-		  }
-		else
-		  {
-		    // Must start a new row, and we already found an item
-		    break;
-		  }
-	      }
-
-	    // Set the location of each component for this row.
-	    int x;
-
-	    int myalign = align;
-	    if (align == LEADING)
-	      myalign = left_to_right ? LEFT : RIGHT;
-	    else if (align == TRAILING)
-	      myalign = left_to_right ? RIGHT : LEFT;
-
-	    if (myalign == RIGHT)
-	      x = ins.left + (d.width - new_w) + hgap;
-	    else if (myalign == CENTER)
-	      x = ins.left + (d.width - new_w) / 2 + hgap;
-	    else // LEFT and all other values of align.
-	      x = ins.left + hgap;
-
-	    for (int k = i; k < j; ++k)
-	      {
-		if (comps[k].visible)
-		  {
-		    Dimension c = comps[k].getPreferredSize ();
-		    comps[k].setBounds (x, y + (new_h - c.height) / 2,
-					c.width, c.height);
-		    x += c.width + hgap;
-		  }
-	      }
-
-	    // Advance to next row.
-	    i = j;
-	    y += new_h + vgap;
-	  }
+        int num = parent.getComponentCount ();
+        // This is more efficient than calling getComponents().
+        Component[] comps = parent.component;
+
+        Dimension d = parent.getSize ();
+        Insets ins = parent.getInsets ();
+
+        ComponentOrientation orient = parent.getComponentOrientation ();
+        boolean left_to_right = orient.isLeftToRight ();
+
+        int y = ins.top + vgap;
+        int i = 0;
+        while (i < num)
+          {
+            // Find the components which go in the current row.
+            int new_w = ins.left + hgap + ins.right;
+            int new_h = 0;
+            int j;
+            boolean found_one = false;
+            for (j = i; j < num; ++j)
+              {
+                // Skip invisible items.
+                if (! comps[j].visible)
+                  continue;
+
+                Dimension c = comps[j].getPreferredSize ();
+
+                int next_w = new_w + hgap + c.width;
+                if (next_w <= d.width || ! found_one)
+                  {
+                    new_w = next_w;
+                    new_h = Math.max (new_h, c.height);
+                    found_one = true;
+                  }
+                else
+                  {
+                    // Must start a new row, and we already found an item
+                    break;
+                  }
+              }
+
+            // Set the location of each component for this row.
+            int x;
+
+            int myalign = align;
+            if (align == LEADING)
+              myalign = left_to_right ? LEFT : RIGHT;
+            else if (align == TRAILING)
+              myalign = left_to_right ? RIGHT : LEFT;
+
+            if (myalign == RIGHT)
+              x = ins.left + (d.width - new_w) + hgap;
+            else if (myalign == CENTER)
+              x = ins.left + (d.width - new_w) / 2 + hgap;
+            else // LEFT and all other values of align.
+              x = ins.left + hgap;
+
+            for (int k = i; k < j; ++k)
+              {
+                if (comps[k].visible)
+                  {
+                    Dimension c = comps[k].getPreferredSize ();
+                    comps[k].setBounds (x, y + (new_h - c.height) / 2,
+                                        c.width, c.height);
+                    x += c.width + hgap;
+                  }
+              }
+
+            // Advance to next row.
+            i = j;
+            y += new_h + vgap;
+          }
       }
   }
 
@@ -278,7 +278,7 @@ public class FlowLayout implements LayoutManager, Serializable
   /**
    * Sets the horizontal gap between lines of components to the specified value.
    * No Exception is thrown if hgap < 0.
-   * 
+   *
    * @param hgap The new horizontal gap between components.
    */
   public void setHgap (int hgap)
@@ -303,7 +303,7 @@ public class FlowLayout implements LayoutManager, Serializable
   public String toString ()
   {
     return ("[" + getClass ().getName () + ",hgap=" + hgap + ",vgap=" + vgap
-	    + ",align=" + align + "]");
+            + ",align=" + align + "]");
   }
 
   // This method is used to compute the various sizes.
@@ -311,39 +311,39 @@ public class FlowLayout implements LayoutManager, Serializable
   {
     synchronized (parent.getTreeLock ())
       {
-	int w, h, num = parent.getComponentCount ();
-	// This is more efficient than calling getComponents().
-	Component[] comps = parent.component;
+        int w, h, num = parent.getComponentCount ();
+        // This is more efficient than calling getComponents().
+        Component[] comps = parent.component;
 
-	w = 0;
-	h = 0;
-	for (int i = 0; i < num; ++i)
-	  {
-	    if (! comps[i].visible)
-	      continue;
+        w = 0;
+        h = 0;
+        for (int i = 0; i < num; ++i)
+          {
+            if (! comps[i].visible)
+              continue;
 
-	    // FIXME: can we just directly read the fields in Component?
-	    // Or will that not work with subclassing?
-	    Dimension d;
+            // FIXME: can we just directly read the fields in Component?
+            // Or will that not work with subclassing?
+            Dimension d;
 
-	    if (is_min)
-	      d = comps[i].getMinimumSize ();
-	    else
-	      d = comps[i].getPreferredSize ();
+            if (is_min)
+              d = comps[i].getMinimumSize ();
+            else
+              d = comps[i].getPreferredSize ();
 
-	    w += d.width;
-	    h = Math.max (d.height, h);
-	  }
+            w += d.width;
+            h = Math.max (d.height, h);
+          }
 
-	Insets ins = parent.getInsets ();
+        Insets ins = parent.getInsets ();
 
         if (num == 0)
           w += 2 * hgap + ins.left + ins.right;
         else
           w += (num + 1) * hgap + ins.left + ins.right;
-	h += 2 * vgap + ins.top + ins.bottom;
+        h += 2 * vgap + ins.top + ins.bottom;
 
-	return new Dimension (w, h);
+        return new Dimension (w, h);
       }
   }
 
diff --git a/libjava/classpath/java/awt/FocusTraversalPolicy.java b/libjava/classpath/java/awt/FocusTraversalPolicy.java
index a7f1558..d9374ea 100644
--- a/libjava/classpath/java/awt/FocusTraversalPolicy.java
+++ b/libjava/classpath/java/awt/FocusTraversalPolicy.java
@@ -1,4 +1,4 @@
-/* FocusTraversalPolicy.java -- 
+/* FocusTraversalPolicy.java --
    Copyright (C) 2002 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
diff --git a/libjava/classpath/java/awt/Font.java b/libjava/classpath/java/awt/Font.java
index 4e6e6bd..89ff1f5 100644
--- a/libjava/classpath/java/awt/Font.java
+++ b/libjava/classpath/java/awt/Font.java
@@ -101,7 +101,7 @@ public class Font implements Serializable
   /**
    * Constant indicating the baseline mode characteristic of Devanigri.
    */
-  public static final int HANGING_BASELINE = 2;  
+  public static final int HANGING_BASELINE = 2;
 
 
   /**
@@ -117,11 +117,11 @@ public class Font implements Serializable
    * @since 1.3
    */
   public static final int TRUETYPE_FONT = 0;
-  
+
   /**
    * Indicates to <code>createFont</code> that the supplied font data
    * is in Type1 format.
-   * 
+   *
    * @since 1.5
    */
   public static final int TYPE1_FONT = 1;
@@ -249,15 +249,15 @@ public class Font implements Serializable
    * The style should be one of BOLD, ITALIC, or BOLDITALIC.  The default
    * style if none is specified is PLAIN.  The default size if none
    * is specified is 12.
-   * 
-   * @param fontspec  a string specifying the required font (<code>null</code> 
+   *
+   * @param fontspec  a string specifying the required font (<code>null</code>
    *                  permitted, interpreted as 'Dialog-PLAIN-12').
-   * 
+   *
    * @return A font.
    */
   public static Font decode(String fontspec)
   {
-    if (fontspec == null) 
+    if (fontspec == null)
       fontspec = "Dialog-PLAIN-12";
     String name = null;
     int style = PLAIN;
@@ -336,7 +336,7 @@ public class Font implements Serializable
    * @param propname The name of the system property.
    * @param defval Value to use if the property is not found.
    *
-   * @return The requested font, or <code>default</code> if the property 
+   * @return The requested font, or <code>default</code> if the property
    * not exist or is malformed.
    */
   public static Font getFont(String propname, Font defval)
@@ -352,7 +352,7 @@ public class Font implements Serializable
    *
    * @param propname The name of the system property.
    *
-   * @return The requested font, or <code>null</code> if the property 
+   * @return The requested font, or <code>null</code> if the property
    * not exist or is malformed.
    */
   public static Font getFont(String propname)
@@ -430,7 +430,7 @@ public class Font implements Serializable
   /**
    * Returns the size of the font, in typographics points (1/72 of an inch),
    * rounded to an integer.
-   * 
+   *
    * @return The font size
    */
   public int getSize()
@@ -440,7 +440,7 @@ public class Font implements Serializable
 
   /**
    * Returns the size of the font, in typographics points (1/72 of an inch).
-   * 
+   *
    * @return The font size
    */
   public float getSize2D()
@@ -457,7 +457,7 @@ public class Font implements Serializable
    */
   public boolean isPlain()
   {
-    return peer.isPlain(this); 
+    return peer.isPlain(this);
   }
 
   /**
@@ -535,7 +535,7 @@ public class Font implements Serializable
   }
 
   /**
-   * Checks how much of a given string can be mapped to glyphs in 
+   * Checks how much of a given string can be mapped to glyphs in
    * this font.
    *
    * @param s The string to check.
@@ -548,7 +548,7 @@ public class Font implements Serializable
    */
   public int canDisplayUpTo(String s)
   {
-    return peer.canDisplayUpTo(this, new StringCharacterIterator(s), 
+    return peer.canDisplayUpTo(this, new StringCharacterIterator(s),
                                0, s.length() - 1);
   }
 
@@ -595,7 +595,7 @@ public class Font implements Serializable
    */
   public int canDisplayUpTo(CharacterIterator i, int start, int limit)
   {
-    return peer.canDisplayUpTo(this, i, start, limit);    
+    return peer.canDisplayUpTo(this, i, start, limit);
   }
 
   /**
@@ -717,7 +717,7 @@ public class Font implements Serializable
 
   /**
    * Extracts a sequence of glyphs from a font, returning a new {@link
-   * GlyphVector} with a mapped glyph for each input glyph code. 
+   * GlyphVector} with a mapped glyph for each input glyph code.
    *
    * @param ctx The rendering context used for precise glyph placement.
    * @param glyphCodes Array of characters to convert to glyphs.
@@ -858,7 +858,7 @@ public class Font implements Serializable
   }
 
   /**
-   * Returns an array of chracter attribute keys which this font understands. 
+   * Returns an array of chracter attribute keys which this font understands.
    *
    * @return An array of chracter attribute keys which this font understands.
    *
@@ -917,7 +917,7 @@ public class Font implements Serializable
    */
   public String getFamily(Locale lc)
   {
-    return peer.getFamily(this, lc); 
+    return peer.getFamily(this, lc);
   }
 
   /**
@@ -929,7 +929,7 @@ public class Font implements Serializable
    *
    * @since 1.2
    *
-   * @see java.awt.font.TextAttribute  
+   * @see java.awt.font.TextAttribute
    */
   public static Font getFont(Map<? extends AttributedCharacterIterator.Attribute, ?> attributes)
   {
@@ -990,7 +990,7 @@ public class Font implements Serializable
 
   /**
    * Returns a {@link LineMetrics} object constructed with the specified
-   * text and {@link FontRenderContext}. 
+   * text and {@link FontRenderContext}.
    *
    * @param text The string to calculate metrics from.
    * @param begin Index of first character in <code>text</code> to measure.
@@ -1002,16 +1002,16 @@ public class Font implements Serializable
    * @throws IndexOutOfBoundsException if the range [begin, limit] is
    * invalid in <code>text</code>.
    */
-  public LineMetrics getLineMetrics(String text, int begin, 
+  public LineMetrics getLineMetrics(String text, int begin,
                                     int limit, FontRenderContext rc)
   {
-    return peer.getLineMetrics(this, new StringCharacterIterator(text), 
+    return peer.getLineMetrics(this, new StringCharacterIterator(text),
                                begin, limit, rc);
   }
 
   /**
    * Returns a {@link LineMetrics} object constructed with the specified
-   * text and {@link FontRenderContext}. 
+   * text and {@link FontRenderContext}.
    *
    * @param chars The string to calculate metrics from.
    * @param begin Index of first character in <code>text</code> to measure.
@@ -1023,17 +1023,17 @@ public class Font implements Serializable
    * @throws IndexOutOfBoundsException if the range [begin, limit] is
    * invalid in <code>chars</code>.
    */
-  public LineMetrics getLineMetrics(char[] chars, int begin, 
+  public LineMetrics getLineMetrics(char[] chars, int begin,
                                     int limit, FontRenderContext rc)
   {
     return peer.getLineMetrics(this,
-                               new StringCharacterIterator(new String(chars)), 
+                               new StringCharacterIterator(new String(chars)),
                                begin, limit, rc);
   }
 
   /**
    * Returns a {@link LineMetrics} object constructed with the specified
-   * text and {@link FontRenderContext}. 
+   * text and {@link FontRenderContext}.
    *
    * @param ci The string to calculate metrics from.
    * @param begin Index of first character in <code>text</code> to measure.
@@ -1045,7 +1045,7 @@ public class Font implements Serializable
    * @throws IndexOutOfBoundsException if the range [begin, limit] is
    * invalid in <code>ci</code>.
    */
-  public LineMetrics getLineMetrics(CharacterIterator ci, int begin, 
+  public LineMetrics getLineMetrics(CharacterIterator ci, int begin,
                                     int limit, FontRenderContext rc)
   {
     return peer.getLineMetrics(this, ci, begin, limit, rc);
@@ -1086,7 +1086,7 @@ public class Font implements Serializable
    * <code>[ 0, getNumGlyphs() - 1 ]</code>.
    *
    * @return The number of glyphs in this font.
-   * 
+   *
    * @since 1.2
    */
   public int getNumGlyphs()
@@ -1095,7 +1095,7 @@ public class Font implements Serializable
   }
 
   /**
-   * Returns the PostScript Name of this font.   
+   * Returns the PostScript Name of this font.
    *
    * @return The PostScript Name of this font.
    *
@@ -1115,12 +1115,12 @@ public class Font implements Serializable
    * font in the specified {@link FontRenderContext}. This box will include the
    * glyph origin, ascent, advance, height, and leading, but may not include all
    * diacritics or accents. To get the complete visual bounding box of all the
-   * glyphs in a run of text, use the {@link TextLayout#getBounds} method of 
+   * glyphs in a run of text, use the {@link TextLayout#getBounds} method of
    * {@link TextLayout}.
    *
    * @param str The string to measure.
    * @param frc The context in which to make the precise glyph measurements.
-   * 
+   *
    * @return A bounding box covering the logical bounds of the specified text.
    *
    * @see #createGlyphVector(FontRenderContext, String)
@@ -1143,7 +1143,7 @@ public class Font implements Serializable
    * @param begin Index of the first character in <code>str</code> to measure.
    * @param limit Index of the last character in <code>str</code> to measure.
    * @param frc The context in which to make the precise glyph measurements.
-   * 
+   *
    * @return A bounding box covering the logical bounds of the specified text.
    *
    * @throws IndexOutOfBoundsException if the range [begin, limit] is
@@ -1153,7 +1153,7 @@ public class Font implements Serializable
    *
    * @see #createGlyphVector(FontRenderContext, String)
    */
-  public Rectangle2D getStringBounds(String str, int begin, 
+  public Rectangle2D getStringBounds(String str, int begin,
                                      int limit, FontRenderContext frc)
   {
     String sub = str.substring(begin, limit);
@@ -1172,7 +1172,7 @@ public class Font implements Serializable
    * @param begin Index of the first character in <code>ci</code> to measure.
    * @param limit Index of the last character in <code>ci</code> to measure.
    * @param frc The context in which to make the precise glyph measurements.
-   * 
+   *
    * @return A bounding box covering the logical bounds of the specified text.
    *
    * @throws IndexOutOfBoundsException if the range [begin, limit] is
@@ -1182,7 +1182,7 @@ public class Font implements Serializable
    *
    * @see #createGlyphVector(FontRenderContext, CharacterIterator)
    */
-  public Rectangle2D getStringBounds(CharacterIterator ci, int begin, 
+  public Rectangle2D getStringBounds(CharacterIterator ci, int begin,
                                      int limit, FontRenderContext frc)
   {
     int start = ci.getBeginIndex();
@@ -1209,7 +1209,7 @@ public class Font implements Serializable
    * @param begin Index of the first character in <code>ci</code> to measure.
    * @param limit Index of the last character in <code>ci</code> to measure.
    * @param frc The context in which to make the precise glyph measurements.
-   * 
+   *
    * @return A bounding box covering the logical bounds of the specified text.
    *
    * @throws IndexOutOfBoundsException if the range [begin, limit] is
@@ -1219,7 +1219,7 @@ public class Font implements Serializable
    *
    * @see #createGlyphVector(FontRenderContext, char[])
    */
-  public Rectangle2D getStringBounds(char[] chars, int begin, 
+  public Rectangle2D getStringBounds(char[] chars, int begin,
                                      int limit, FontRenderContext frc)
   {
     String str = new String(chars, begin, limit - begin);
@@ -1293,10 +1293,10 @@ public class Font implements Serializable
    * @return A new {@link GlyphVector} representing the specified text.
    *
    * @throws IndexOutOfBoundsException if the range [begin, limit] is
-   * invalid in <code>chars</code>. 
+   * invalid in <code>chars</code>.
    */
-  public GlyphVector layoutGlyphVector(FontRenderContext frc, 
-                                       char[] chars, int start, 
+  public GlyphVector layoutGlyphVector(FontRenderContext frc,
+                                       char[] chars, int start,
                                        int limit, int flags)
   {
     return peer.layoutGlyphVector(this, frc, chars, start, limit, flags);
@@ -1318,7 +1318,7 @@ public class Font implements Serializable
 
   /**
    * Returns a hash value for this font.
-   * 
+   *
    * @return A hash for this font.
    */
   public int hashCode()
@@ -1395,8 +1395,8 @@ public class Font implements Serializable
       default:
         styleString = "unknown";
      }
-    
-    return getClass().getName() 
+
+    return getClass().getName()
              + "[family=" + getFamily ()
              + ",name=" + getFontName ()
              + ",style=" + styleString
diff --git a/libjava/classpath/java/awt/FontMetrics.java b/libjava/classpath/java/awt/FontMetrics.java
index 9186646..e483d28 100644
--- a/libjava/classpath/java/awt/FontMetrics.java
+++ b/libjava/classpath/java/awt/FontMetrics.java
@@ -362,7 +362,7 @@ public abstract class FontMetrics implements java.io.Serializable
       rc = gRC;
     return font.getLineMetrics(chars, begin, limit, rc);
   }
-  
+
   /**
    * Returns the bounds of the largest character in a Graphics context.
    * @param context the Graphics context object.
diff --git a/libjava/classpath/java/awt/Frame.java b/libjava/classpath/java/awt/Frame.java
index 3cc8738..83bdb09 100644
--- a/libjava/classpath/java/awt/Frame.java
+++ b/libjava/classpath/java/awt/Frame.java
@@ -336,10 +336,10 @@ public class Frame extends Window implements MenuContainer
     this.menuBar = menuBar;
     if (menuBar != null)
       {
-	MenuContainer parent = menuBar.getParent();
-	if (parent != null)
-	  parent.remove(menuBar);
-	menuBar.setParent(this);
+        MenuContainer parent = menuBar.getParent();
+        if (parent != null)
+          parent.remove(menuBar);
+        menuBar.setParent(this);
 
         // Create local copy for thread safety.
         FramePeer p = (FramePeer) peer;
@@ -355,7 +355,7 @@ public class Frame extends Window implements MenuContainer
   }
 
   /**
-   * Tests whether or not this frame is resizable.  This will be 
+   * Tests whether or not this frame is resizable.  This will be
    * <code>true</code> by default.
    *
    * @return <code>true</code> if this frame is resizable, <code>false</code>
@@ -417,16 +417,16 @@ public class Frame extends Window implements MenuContainer
   {
     if (menu == menuBar)
       {
-	if (menuBar != null)
-	  {
-	    if (peer != null)
-	      {
-		((FramePeer) peer).setMenuBar(null);
-		menuBar.removeNotify();
-	      }
-	    menuBar.setParent(null);
-	  }
-	menuBar = null;
+        if (menuBar != null)
+          {
+            if (peer != null)
+              {
+                ((FramePeer) peer).setMenuBar(null);
+                menuBar.removeNotify();
+              }
+            menuBar.setParent(null);
+          }
+        menuBar = null;
       }
     else
       super.remove(menu);
@@ -493,7 +493,7 @@ public class Frame extends Window implements MenuContainer
 
   /**
    * The death queue for all frames.
-   */ 
+   */
   private static ReferenceQueue weakFramesQueue =
     new ReferenceQueue<Frame>();
 
@@ -560,7 +560,7 @@ public class Frame extends Window implements MenuContainer
     if (state == NORMAL
         && (current_state & ICONIFIED) != 0)
       setExtendedState(current_state | ICONIFIED);
-    
+
     if (state == ICONIFIED
         && (current_state & ~ICONIFIED) == 0)
       setExtendedState(current_state & ~ICONIFIED);
@@ -618,7 +618,7 @@ public class Frame extends Window implements MenuContainer
 
   /**
    * Returns whether this frame is undecorated or not.
-   * 
+   *
    * @since 1.4
    */
   public boolean isUndecorated()
@@ -629,9 +629,9 @@ public class Frame extends Window implements MenuContainer
   /**
    * Disables or enables decorations for this frame. This method can only be
    * called while the frame is not displayable.
-   * 
+   *
    * @throws IllegalComponentStateException if this frame is displayable
-   * 
+   *
    * @since 1.4
    */
   public void setUndecorated(boolean undecorated)
@@ -656,7 +656,7 @@ public class Frame extends Window implements MenuContainer
   {
     return next_frame_number++;
   }
-  
+
   /**
    * Accessibility support for <code>Frame</code>.
    */
@@ -672,7 +672,7 @@ public class Frame extends Window implements MenuContainer
     {
       return AccessibleRole.FRAME;
     }
-    
+
     /**
      * Gets the state set of this object.
      * @return The current state of this frame.
@@ -687,7 +687,7 @@ public class Frame extends Window implements MenuContainer
       return states;
     }
   }
-  
+
   /**
    * Gets the AccessibleContext associated with this <code>Frame</code>.
    * The context is created, if necessary.
diff --git a/libjava/classpath/java/awt/GradientPaint.java b/libjava/classpath/java/awt/GradientPaint.java
index 74067f4..0bb8407 100644
--- a/libjava/classpath/java/awt/GradientPaint.java
+++ b/libjava/classpath/java/awt/GradientPaint.java
@@ -1,4 +1,4 @@
-/* GradientPaint.java -- 
+/* GradientPaint.java --
    Copyright (C) 2002, 2005, Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -45,7 +45,7 @@ import java.awt.image.ColorModel;
 import gnu.java.awt.GradientPaintContext;
 
 /**
- * A paint object that can be used to color a region by blending two colors. 
+ * A paint object that can be used to color a region by blending two colors.
  * Instances of this class are immutable.
  */
 public class GradientPaint implements Paint
@@ -60,7 +60,7 @@ public class GradientPaint implements Paint
 
   /**
    * Creates a new acyclic <code>GradientPaint</code>.
-   * 
+   *
    * @param x1  the x-coordinate of the anchor point for color 1.
    * @param y1  the y-coordinate of the anchor point for color 1.
    * @param c1  color 1 (<code>null</code> not permitted).
@@ -76,7 +76,7 @@ public class GradientPaint implements Paint
 
   /**
    * Creates a new acyclic <code>GradientPaint</code>.
-   * 
+   *
    * @param p1  anchor point 1 (<code>null</code> not permitted).
    * @param c1  color 1 (<code>null</code> not permitted).
    * @param p2  anchor point 2 (<code>null</code> not permitted).
@@ -90,7 +90,7 @@ public class GradientPaint implements Paint
 
   /**
    * Creates a new cyclic or acyclic <code>GradientPaint</code>.
-   * 
+   *
    * @param x1  the x-coordinate of the anchor point for color 1.
    * @param y1  the y-coordinate of the anchor point for color 1.
    * @param c1  color 1 (<code>null</code> not permitted).
@@ -116,7 +116,7 @@ public class GradientPaint implements Paint
 
   /**
    * Creates a new cyclic or acyclic <code>GradientPaint</code>.
-   * 
+   *
    * @param p1  anchor point 1 (<code>null</code> not permitted).
    * @param c1  color 1 (<code>null</code> not permitted).
    * @param p2  anchor point 2 (<code>null</code> not permitted).
@@ -135,7 +135,7 @@ public class GradientPaint implements Paint
    * Returns a point with the same coordinates as the anchor point for color 1.
    * Note that if you modify this point, the <code>GradientPaint</code> remains
    * unchanged.
-   * 
+   *
    * @return A point with the same coordinates as the anchor point for color 1.
    */
   public Point2D getPoint1()
@@ -145,7 +145,7 @@ public class GradientPaint implements Paint
 
   /**
    * Returns the first color.
-   * 
+   *
    * @return The color (never <code>null</code>).
    */
   public Color getColor1()
@@ -157,7 +157,7 @@ public class GradientPaint implements Paint
    * Returns a point with the same coordinates as the anchor point for color 2.
    * Note that if you modify this point, the <code>GradientPaint</code> remains
    * unchanged.
-   * 
+   *
    * @return A point with the same coordinates as the anchor point for color 2.
    */
   public Point2D getPoint2()
@@ -167,7 +167,7 @@ public class GradientPaint implements Paint
 
   /**
    * Returns the second color.
-   * 
+   *
    * @return The color (never <code>null</code>).
    */
   public Color getColor2()
@@ -178,7 +178,7 @@ public class GradientPaint implements Paint
   /**
    * Returns <code>true</code> if this <code>GradientPaint</code> instance is
    * cyclic, and <code>false</code> otherwise.
-   * 
+   *
    * @return A boolean.
    */
   public boolean isCyclic()
@@ -188,14 +188,14 @@ public class GradientPaint implements Paint
 
   /**
    * Returns the {@link PaintContext} used to generate the color pattern.
-   * 
-   * @param cm  the color model, used as a hint (ignored in this 
+   *
+   * @param cm  the color model, used as a hint (ignored in this
    *            implementation).
    * @param deviceBounds  the device space bounding box of the painted area.
    * @param userBounds  the user space bounding box of the painted area.
    * @param xform  the transformation from user space to device space.
    * @param hints  any hints for choosing between rendering alternatives.
-   * 
+   *
    * @return The context for performing the paint
    */
   public PaintContext createContext(ColorModel cm, Rectangle deviceBounds,
@@ -205,17 +205,17 @@ public class GradientPaint implements Paint
   {
     Point2D xp1 = xform.transform(getPoint1(), null);
     Point2D xp2 = xform.transform(getPoint2(), null);
-    return new GradientPaintContext((float) xp1.getX(), (float) xp1.getY(), c1, 
+    return new GradientPaintContext((float) xp1.getX(), (float) xp1.getY(), c1,
             (float) xp2.getX(), (float) xp2.getY(), c2, cyclic);
   }
 
   /**
    * Returns the transparency code for this <code>GradientPaint</code> instance.
    * This is derived from the two {@link Color} objects used in creating this
-   * object:  if both colors are opaque, this method returns 
-   * {@link Transparency#OPAQUE}, otherwise it returns 
+   * object:  if both colors are opaque, this method returns
+   * {@link Transparency#OPAQUE}, otherwise it returns
    * {@link Transparency#TRANSLUCENT}.
-   * 
+   *
    * @return {@link Transparency#OPAQUE} or {@link Transparency#TRANSLUCENT}.
    */
   public int getTransparency()
@@ -223,7 +223,7 @@ public class GradientPaint implements Paint
     if (c1.getAlpha() == 255 && c2.getAlpha() == 255)
       return Transparency.OPAQUE;
     else
-      return Transparency.TRANSLUCENT;   
+      return Transparency.TRANSLUCENT;
   }
-  
+
 } // class GradientPaint
diff --git a/libjava/classpath/java/awt/Graphics.java b/libjava/classpath/java/awt/Graphics.java
index 09bf7ca..dfc7722 100644
--- a/libjava/classpath/java/awt/Graphics.java
+++ b/libjava/classpath/java/awt/Graphics.java
@@ -74,8 +74,8 @@ public abstract class Graphics
    *
    * @param x The new X coordinate of the clipping region rect.
    * @param y The new Y coordinate of the clipping region rect.
-   * @param width The width of the clipping region intersect rectangle. 
-   * @param height The height of the clipping region intersect rectangle. 
+   * @param width The width of the clipping region intersect rectangle.
+   * @param height The height of the clipping region intersect rectangle.
    *
    * @return A copy of this object, modified as specified.
    */
@@ -122,12 +122,12 @@ public abstract class Graphics
 
   /**
    * Sets this context info "XOR" mode, where the targe pixles are
-   * XOR-ed when drawn on. 
+   * XOR-ed when drawn on.
    *
    * @param color The color to XOR against.
    */
   public abstract void setXORMode(Color color);
-  
+
   /**
    * Returns the current font for this graphics context.
    *
@@ -162,7 +162,7 @@ public abstract class Graphics
   public abstract FontMetrics getFontMetrics(Font font);
 
   /**
-   * Returns the bounding rectangle of the clipping region for this 
+   * Returns the bounding rectangle of the clipping region for this
    * graphics context.
    *
    * @return The bounding rectangle for the clipping region.
@@ -170,7 +170,7 @@ public abstract class Graphics
   public abstract Rectangle getClipBounds();
 
   /**
-   * Returns the bounding rectangle of the clipping region for this 
+   * Returns the bounding rectangle of the clipping region for this
    * graphics context.
    *
    * @return The bounding rectangle for the clipping region.
@@ -313,19 +313,19 @@ public abstract class Graphics
     Color color = getColor();
     Color tl = color.brighter();
     Color br = color.darker();
-    
+
     if (!raised)
       {
         Color tmp = tl;
         tl = br;
         br = tmp;
       }
-    
+
     int x1 = x;
     int y1 = y;
     int x2 = x + width;
     int y2 = y + height;
-    
+
     setColor(tl);
     drawLine(x1, y1, x2, y1);
     drawLine(x1, y2, x1, y1);
@@ -488,8 +488,8 @@ public abstract class Graphics
 
   /**
    * Draws all of the image that is available and returns.  If the image
-   * is not completely loaded, <code>false</code> is returned and 
-   * the specified iamge observer is notified as more data becomes 
+   * is not completely loaded, <code>false</code> is returned and
+   * the specified iamge observer is notified as more data becomes
    * available.
    *
    * @param image The image to draw.
@@ -502,12 +502,12 @@ public abstract class Graphics
    */
   public abstract boolean drawImage(Image image, int x, int y,
                                     ImageObserver observer);
- 
+
   /**
    * Draws all of the image that is available and returns.  The image
    * is scaled to fit in the specified rectangle.  If the image
-   * is not completely loaded, <code>false</code> is returned and 
-   * the specified iamge observer is notified as more data becomes 
+   * is not completely loaded, <code>false</code> is returned and
+   * the specified iamge observer is notified as more data becomes
    * available.
    *
    * @param image The image to draw.
@@ -522,11 +522,11 @@ public abstract class Graphics
    */
   public abstract boolean drawImage(Image image, int x, int y, int width,
                                     int height, ImageObserver observer);
- 
+
   /**
    * Draws all of the image that is available and returns.  If the image
-   * is not completely loaded, <code>false</code> is returned and 
-   * the specified iamge observer is notified as more data becomes 
+   * is not completely loaded, <code>false</code> is returned and
+   * the specified iamge observer is notified as more data becomes
    * available.
    *
    * @param image The image to draw.
@@ -540,12 +540,12 @@ public abstract class Graphics
    */
   public abstract boolean drawImage(Image image, int x, int y, Color bgcolor,
                                     ImageObserver observer);
- 
+
   /**
    * Draws all of the image that is available and returns.  The image
    * is scaled to fit in the specified rectangle.  If the image
-   * is not completely loaded, <code>false</code> is returned and 
-   * the specified iamge observer is notified as more data becomes 
+   * is not completely loaded, <code>false</code> is returned and
+   * the specified iamge observer is notified as more data becomes
    * available.
    *
    * @param image The image to draw.
@@ -596,7 +596,7 @@ public abstract class Graphics
   /**
    * Returns a string representation of this object.
    *
-   * @return A string representation of this object. 
+   * @return A string representation of this object.
    */
   public String toString()
   {
@@ -626,7 +626,7 @@ public abstract class Graphics
   public Rectangle getClipBounds(Rectangle r)
   {
     Rectangle clipBounds = getClipBounds();
-  
+
     if (r == null)
       return clipBounds;
 
diff --git a/libjava/classpath/java/awt/Graphics2D.java b/libjava/classpath/java/awt/Graphics2D.java
index e0a1b47..7c9622a 100644
--- a/libjava/classpath/java/awt/Graphics2D.java
+++ b/libjava/classpath/java/awt/Graphics2D.java
@@ -51,27 +51,27 @@ import java.text.AttributedCharacterIterator;
 import java.util.Map;
 
 /**
- * An abstract class defining a device independent two-dimensional vector 
- * graphics API.  Concrete subclasses implement this API for output of 
+ * An abstract class defining a device independent two-dimensional vector
+ * graphics API.  Concrete subclasses implement this API for output of
  * vector graphics to:
  * <p>
  * <ul>
- * <li>a {@link javax.swing.JComponent} - in the 
- *     {@link javax.swing.JComponent#paint(Graphics)} method, the incoming 
- *     {@link Graphics} should always be an instance of 
- *     <code>Graphics2D</code>;</li> 
- * <li>a {@link BufferedImage} - see 
+ * <li>a {@link javax.swing.JComponent} - in the
+ *     {@link javax.swing.JComponent#paint(Graphics)} method, the incoming
+ *     {@link Graphics} should always be an instance of
+ *     <code>Graphics2D</code>;</li>
+ * <li>a {@link BufferedImage} - see
  *     {@link BufferedImage#createGraphics()};</li>
- * <li>a {@link java.awt.print.PrinterJob} - in the 
+ * <li>a {@link java.awt.print.PrinterJob} - in the
  *     {@link Printable#print(Graphics, PageFormat, int)} method, the incoming
- *     {@link Graphics} should always be an instance of 
+ *     {@link Graphics} should always be an instance of
  *     <code>Graphics2D</code>.</li>
  * </ul>
  * <p>
- * Third party libraries provide support for output to other formats via this 
+ * Third party libraries provide support for output to other formats via this
  * API, including encapsulated postscript (EPS), portable document format (PDF),
  * and scalable vector graphics (SVG).
- * 
+ *
  * @author Rolf W. Rasmussen (rolfwr@ii.uib.no)
  */
 public abstract class Graphics2D extends Graphics
@@ -80,68 +80,68 @@ public abstract class Graphics2D extends Graphics
   protected Graphics2D()
   {
   }
-  
+
   public void draw3DRect(int x, int y, int width, int height,
-			 boolean raised)
+                         boolean raised)
   {
     super.draw3DRect(x, y, width, height, raised);
   }
-  
+
   public void fill3DRect(int x, int y, int width, int height,
-			 boolean raised)
+                         boolean raised)
   {
     super.fill3DRect(x, y, width, height, raised);
   }
 
   /**
    * Draws an outline around a shape using the current stroke and paint.
-   * 
+   *
    * @param shape  the shape (<code>null</code> not permitted).
-   * 
+   *
    * @see #getStroke()
    * @see #getPaint()
    */
   public abstract void draw(Shape shape);
 
   public abstract boolean drawImage(Image image, AffineTransform xform,
-				    ImageObserver obs);
+                                    ImageObserver obs);
 
   public abstract void drawImage(BufferedImage image,
-				 BufferedImageOp op,
-				 int x,
-				 int y);
+                                 BufferedImageOp op,
+                                 int x,
+                                 int y);
 
   public abstract void drawRenderedImage(RenderedImage image,
-					 AffineTransform xform);
+                                         AffineTransform xform);
 
   public abstract void drawRenderableImage(RenderableImage image,
                                            AffineTransform xform);
 
   /**
    * Draws a string at the specified location, using the current font.
-   * 
+   *
    * @param text  the string to draw.
    * @param x  the x-coordinate.
    * @param y  the y-coordinate.
-   * 
+   *
    * @see Graphics#setFont(Font)
    */
   public abstract void drawString(String text, int x, int y);
 
   /**
    * Draws a string at the specified location, using the current font.
-   * 
+   *
    * @param text  the string to draw.
    * @param x  the x-coordinate.
    * @param y  the y-coordinate.
-   * 
+   *
    * @see Graphics#setFont(Font)
    */
   public abstract void drawString(String text, float x, float y);
-    
+
   /**
    * Draws an attributed string at the specified location.
-   * 
+   *
    * @param iterator  the source of the attributed text.
    * @param x  the x-coordinate.
    * @param y  the y-coordinate.
@@ -151,60 +151,60 @@ public abstract class Graphics2D extends Graphics
 
   /**
    * Draws an attributed string at the specified location.
-   * 
+   *
    * @param iterator  the source of the attributed text.
    * @param x  the x-coordinate.
    * @param y  the y-coordinate.
    */
   public abstract void drawString(AttributedCharacterIterator iterator,
-				  float x, float y);
+                                  float x, float y);
 
   /**
    * Fills the interior of the specified <code>shape</code> using the current
    * paint.
-   * 
+   *
    * @param shape  the shape to fill (<code>null</code> not permitted).
-   * 
+   *
    * @see #draw(Shape)
    * @see #getPaint()
    */
   public abstract void fill(Shape shape);
-    
+
   public abstract boolean hit(Rectangle rect, Shape text,
-			      boolean onStroke);
+                              boolean onStroke);
 
   public abstract GraphicsConfiguration getDeviceConfiguration();
 
   /**
    * Sets the current compositing rule.
-   * 
+   *
    * @param comp  the composite.
-   * 
+   *
    * @see #getComposite()
    */
   public abstract void setComposite(Composite comp);
-    
+
   /**
    * Sets the paint to be used for subsequent drawing operations.
-   * 
+   *
    * @param paint  the paint (<code>null</code> not permitted).
-   * 
+   *
    * @see #getPaint()
    */
   public abstract void setPaint(Paint paint);
 
   /**
    * Sets the stroke to be used for subsequent drawing operations.
-   * 
+   *
    * @param stroke  the stroke (<code>null</code> not permitted).
-   * 
+   *
    * @see #getStroke()
    */
   public abstract void setStroke(Stroke stroke);
 
   /**
    * Adds or updates a hint in the current rendering hints table.
-   * 
+   *
    * @param hintKey  the hint key.
    * @param hintValue  the hint value.
    */
@@ -213,32 +213,32 @@ public abstract class Graphics2D extends Graphics
 
   /**
    * Returns the current value of a rendering hint.
-   * 
+   *
    * @param hintKey  the key for the hint.
-   * 
+   *
    * @return The value for the specified hint.
    */
   public abstract Object getRenderingHint(RenderingHints.Key hintKey);
-  
+
   /**
    * Replaces the current rendering hints with the supplied hints.
-   * 
+   *
    * @param hints  the hints.
-   * 
+   *
    * @see #addRenderingHints(Map)
    */
   public abstract void setRenderingHints(Map<?,?> hints);
 
   /**
    * Adds/updates the rendering hint.
-   * 
+   *
    * @param hints  the hints to add or update.
    */
   public abstract void addRenderingHints(Map<?,?> hints);
 
   /**
    * Returns the current rendering hints.
-   * 
+   *
    * @return The current rendering hints.
    */
   public abstract RenderingHints getRenderingHints();
@@ -246,7 +246,7 @@ public abstract class Graphics2D extends Graphics
   public abstract void translate(int x, int y);
 
   public abstract void translate(double tx, double ty);
-    
+
   public abstract void rotate(double theta);
 
   public abstract void rotate(double theta, double x, double y);
@@ -258,98 +258,98 @@ public abstract class Graphics2D extends Graphics
   /**
    * Sets the current transform to a concatenation of <code>transform</code>
    * and the existing transform.
-   * 
+   *
    * @param transform  the transform.
    */
   public abstract void transform(AffineTransform transform);
-  
+
   /**
    * Sets the current transform.  If the caller specifies a <code>null</code>
-   * transform, this method should set the current transform to the 
+   * transform, this method should set the current transform to the
    * identity transform.
-   * 
+   *
    * @param transform  the transform (<code>null</code> permitted).
-   * 
+   *
    * @see #getTransform()
    */
   public abstract void setTransform(AffineTransform transform);
 
   /**
    * Returns the current transform.
-   * 
+   *
    * @return The current transform.
-   * 
+   *
    * @see #setTransform(AffineTransform)
    */
   public abstract AffineTransform getTransform();
 
   /**
    * Returns the current paint.
-   * 
+   *
    * @return The current paint.
-   * 
+   *
    * @see #setPaint(Paint)
    */
   public abstract Paint getPaint();
 
   /**
    * Returns the current compositing rule.
-   * 
+   *
    * @return The current compositing rule.
-   * 
+   *
    * @see #setComposite(Composite)
    */
   public abstract Composite getComposite();
 
   /**
-   * Sets the background color (used by the 
+   * Sets the background color (used by the
    * {@link Graphics#clearRect(int, int, int, int)} method).
-   * 
+   *
    * @param color  the color.
-   * 
+   *
    * @see #getBackground()
    */
   public abstract void setBackground(Color color);
 
   /**
-   * Returns the color used by the 
+   * Returns the color used by the
    * {@link Graphics#clearRect(int, int, int, int)} method.
-   * 
+   *
    * @return The background color.
-   * 
+   *
    * @see #setBackground(Color)
    */
   public abstract Color getBackground();
 
   /**
    * Returns the current stroke.
-   * 
+   *
    * @return The current stroke.
-   * 
+   *
    * @see #setStroke(Stroke)
    */
-  public abstract Stroke getStroke();    
+  public abstract Stroke getStroke();
 
   /**
-   * Sets the clip region to the intersection of the current clipping region 
+   * Sets the clip region to the intersection of the current clipping region
    * and <code>s</code>.
-   * 
+   *
    * @param s  the shape to intersect with the current clipping region.
-   * 
+   *
    * @see Graphics#setClip(Shape)
    */
   public abstract void clip(Shape s);
 
   /**
    * Returns the font render context.
-   * 
+   *
    * @return The font render context.
    */
   public abstract FontRenderContext getFontRenderContext();
 
   /**
    * Draws a glyph vector at the specified location.
-   * 
+   *
    * @param g  the glyph vector.
    * @param x  the x-coordinate.
    * @param y  the y-coordinate.
diff --git a/libjava/classpath/java/awt/GraphicsConfiguration.java b/libjava/classpath/java/awt/GraphicsConfiguration.java
index 3cf8b65..bbd9820 100644
--- a/libjava/classpath/java/awt/GraphicsConfiguration.java
+++ b/libjava/classpath/java/awt/GraphicsConfiguration.java
@@ -63,13 +63,13 @@ import java.awt.image.VolatileImage;
  */
 public abstract class GraphicsConfiguration
 {
-  
+
   /** The cached image capabilities. */
   private ImageCapabilities imageCapabilities;
-  
+
   /** The cached buffer capabilities. */
   private BufferCapabilities bufferCapabilities;
-  
+
   /**
    * The default constructor.
    *
@@ -253,7 +253,7 @@ public abstract class GraphicsConfiguration
   {
     if (imageCapabilities == null)
       getImageCapabilities();
-    
+
     if (bufferCapabilities == null)
       bufferCapabilities = new BufferCapabilities(imageCapabilities,
                                                   imageCapabilities, null);
diff --git a/libjava/classpath/java/awt/GraphicsDevice.java b/libjava/classpath/java/awt/GraphicsDevice.java
index 95487a2..c99c14b 100644
--- a/libjava/classpath/java/awt/GraphicsDevice.java
+++ b/libjava/classpath/java/awt/GraphicsDevice.java
@@ -175,7 +175,7 @@ public abstract class GraphicsDevice
     // Restore the previous window to normal mode and release the reference.
     if (full_screen != null)
       {
-	full_screen.setBounds(fullScreenOldBounds);
+        full_screen.setBounds(fullScreenOldBounds);
       }
 
     full_screen = null;
@@ -183,12 +183,12 @@ public abstract class GraphicsDevice
     // If w != null, make it full-screen.
     if (w != null)
       {
-	fullScreenOldBounds = w.getBounds();
-	full_screen = w;
-	DisplayMode dMode = getDisplayMode();
-	full_screen.setBounds(0, 0, dMode.getWidth(), dMode.getHeight());
-	full_screen.requestFocus();
-	full_screen.setLocationRelativeTo(null);
+        fullScreenOldBounds = w.getBounds();
+        full_screen = w;
+        DisplayMode dMode = getDisplayMode();
+        full_screen.setBounds(0, 0, dMode.getWidth(), dMode.getHeight());
+        full_screen.requestFocus();
+        full_screen.setLocationRelativeTo(null);
       }
   }
 
diff --git a/libjava/classpath/java/awt/GridBagConstraints.java b/libjava/classpath/java/awt/GridBagConstraints.java
index a6a64c3..8231300 100644
--- a/libjava/classpath/java/awt/GridBagConstraints.java
+++ b/libjava/classpath/java/awt/GridBagConstraints.java
@@ -191,14 +191,14 @@ public class GridBagConstraints implements Cloneable, Serializable
   {
     try
       {
-	GridBagConstraints g = (GridBagConstraints) super.clone ();
-	g.insets = (Insets) insets.clone ();
-	return g;
+        GridBagConstraints g = (GridBagConstraints) super.clone ();
+        g.insets = (Insets) insets.clone ();
+        return g;
       }
     catch (CloneNotSupportedException _)
       {
-	// Can't happen.
-	return null;
+        // Can't happen.
+        return null;
       }
   }
 
@@ -226,10 +226,10 @@ public class GridBagConstraints implements Cloneable, Serializable
    * parameters.
    */
   public GridBagConstraints (int gridx, int gridy,
-			     int gridwidth, int gridheight,
-			     double weightx, double weighty,
-			     int anchor, int fill,
-			     Insets insets, int ipadx, int ipady)
+                             int gridwidth, int gridheight,
+                             double weightx, double weighty,
+                             int anchor, int fill,
+                             Insets insets, int ipadx, int ipady)
   {
     this.anchor = anchor;
     this.fill = fill;
diff --git a/libjava/classpath/java/awt/GridBagLayout.java b/libjava/classpath/java/awt/GridBagLayout.java
index d016fd3..224d53f 100644
--- a/libjava/classpath/java/awt/GridBagLayout.java
+++ b/libjava/classpath/java/awt/GridBagLayout.java
@@ -75,9 +75,9 @@ public class GridBagLayout
 
     public GridBagLayout ()
     {
-	this.comptable = new Hashtable<Component,GridBagConstraints>();
-	this.internalcomptable = new Hashtable<Component,GridBagConstraints>();
-	this.defaultConstraints= new GridBagConstraints();
+        this.comptable = new Hashtable<Component,GridBagConstraints>();
+        this.internalcomptable = new Hashtable<Component,GridBagConstraints>();
+        this.defaultConstraints= new GridBagConstraints();
     }
 
     /**
@@ -85,12 +85,12 @@ public class GridBagLayout
      */
     private int sumIntArray (int[] array, int upto)
     {
-	int result = 0;
+        int result = 0;
 
-	for (int i = 0; i < upto; i++)
-	    result += array [i];
+        for (int i = 0; i < upto; i++)
+            result += array [i];
 
-	return result;
+        return result;
     }
 
     /**
@@ -98,7 +98,7 @@ public class GridBagLayout
      */
     private int sumIntArray (int[] array)
     {
-	return sumIntArray(array, array.length);
+        return sumIntArray(array, array.length);
     }
 
     /**
@@ -106,58 +106,58 @@ public class GridBagLayout
      */
     private double sumDoubleArray (double[] array)
     {
-	double result = 0;
+        double result = 0;
 
-	for (int i = 0; i < array.length; i++)
-	    result += array [i];
+        for (int i = 0; i < array.length; i++)
+            result += array [i];
 
-	return result;
+        return result;
     }
 
     public void addLayoutComponent (String name, Component component)
     {
-	// do nothing here.
+        // do nothing here.
     }
 
     public void removeLayoutComponent (Component component)
     {
-	// do nothing here
+        // do nothing here
     }
 
     public void addLayoutComponent (Component component, Object constraints)
     {
-	if (constraints == null)
-	    return;
+        if (constraints == null)
+            return;
 
-	if (!(constraints instanceof GridBagConstraints))
-	    throw new IllegalArgumentException("constraints " 
-					       + constraints 
-					       + " are not an instance of GridBagConstraints");
+        if (!(constraints instanceof GridBagConstraints))
+            throw new IllegalArgumentException("constraints "
+                                               + constraints
+                                               + " are not an instance of GridBagConstraints");
 
-	setConstraints (component, (GridBagConstraints) constraints);
+        setConstraints (component, (GridBagConstraints) constraints);
     }
 
     public Dimension preferredLayoutSize (Container parent)
     {
-	if (parent == null)
-	    return new Dimension (0, 0);
-    
-	GridBagLayoutInfo li = getLayoutInfo (parent, PREFERREDSIZE);
-	return getMinSize (parent, li);
+        if (parent == null)
+            return new Dimension (0, 0);
+
+        GridBagLayoutInfo li = getLayoutInfo (parent, PREFERREDSIZE);
+        return getMinSize (parent, li);
     }
 
     public Dimension minimumLayoutSize (Container parent)
     {
-	if (parent == null)
-	    return new Dimension (0, 0);
-    
-	GridBagLayoutInfo li = getLayoutInfo (parent, MINSIZE);
-	return getMinSize (parent, li);
+        if (parent == null)
+            return new Dimension (0, 0);
+
+        GridBagLayoutInfo li = getLayoutInfo (parent, MINSIZE);
+        return getMinSize (parent, li);
     }
 
     public Dimension maximumLayoutSize (Container target)
     {
-	return new Dimension (Integer.MAX_VALUE, Integer.MAX_VALUE);
+        return new Dimension (Integer.MAX_VALUE, Integer.MAX_VALUE);
     }
 
     public void layoutContainer (Container parent)
@@ -167,72 +167,72 @@ public class GridBagLayout
 
     public float getLayoutAlignmentX (Container target)
     {
-	return Component.CENTER_ALIGNMENT;
+        return Component.CENTER_ALIGNMENT;
     }
 
     public float getLayoutAlignmentY (Container target)
     {
-	return Component.CENTER_ALIGNMENT;
+        return Component.CENTER_ALIGNMENT;
     }
 
     public void invalidateLayout (Container target)
     {
-	this.layoutInfo = null;
+        this.layoutInfo = null;
     }
 
     public void setConstraints (Component component,
-	GridBagConstraints constraints)
+        GridBagConstraints constraints)
     {
-	GridBagConstraints clone = (GridBagConstraints) constraints.clone();
-
-	if (clone.gridx < 0)
-	    clone.gridx = GridBagConstraints.RELATIVE;
-    
-	if (clone.gridy < 0)
-	    clone.gridy = GridBagConstraints.RELATIVE;
-
-	if (clone.gridwidth == 0)
-	    clone.gridwidth = GridBagConstraints.REMAINDER;
-	else if (clone.gridwidth < 0)
-	    clone.gridwidth = 1;
-    
-	if (clone.gridheight == 0)
-	    clone.gridheight = GridBagConstraints.REMAINDER;
-	else if (clone.gridheight < 0)
-	    clone.gridheight = 1;
-    
-	comptable.put (component, clone);
+        GridBagConstraints clone = (GridBagConstraints) constraints.clone();
+
+        if (clone.gridx < 0)
+            clone.gridx = GridBagConstraints.RELATIVE;
+
+        if (clone.gridy < 0)
+            clone.gridy = GridBagConstraints.RELATIVE;
+
+        if (clone.gridwidth == 0)
+            clone.gridwidth = GridBagConstraints.REMAINDER;
+        else if (clone.gridwidth < 0)
+            clone.gridwidth = 1;
+
+        if (clone.gridheight == 0)
+            clone.gridheight = GridBagConstraints.REMAINDER;
+        else if (clone.gridheight < 0)
+            clone.gridheight = 1;
+
+        comptable.put (component, clone);
     }
 
     public GridBagConstraints getConstraints (Component component)
     {
-	return (GridBagConstraints) (lookupConstraints (component).clone());
+        return (GridBagConstraints) (lookupConstraints (component).clone());
     }
 
     protected GridBagConstraints lookupConstraints (Component component)
     {
-	GridBagConstraints result = comptable.get (component);
-
-	if (result == null)
-	{
-	    setConstraints (component, defaultConstraints);
-	    result = comptable.get (component);
-	}
-    
-	return result;
+        GridBagConstraints result = comptable.get (component);
+
+        if (result == null)
+        {
+            setConstraints (component, defaultConstraints);
+            result = comptable.get (component);
+        }
+
+        return result;
     }
 
     private GridBagConstraints lookupInternalConstraints (Component component)
     {
-	GridBagConstraints result = internalcomptable.get (component);
-
-	if (result == null)
-	{
-	    result = (GridBagConstraints) lookupConstraints(component).clone();
-	    internalcomptable.put (component, result);
-	}
-    
-	return result;
+        GridBagConstraints result = internalcomptable.get (component);
+
+        if (result == null)
+        {
+            result = (GridBagConstraints) lookupConstraints(component).clone();
+            internalcomptable.put (component, result);
+        }
+
+        return result;
     }
 
     /**
@@ -240,10 +240,10 @@ public class GridBagLayout
      */
     public Point getLayoutOrigin ()
     {
-	if (layoutInfo == null)
-	    return new Point (0, 0);
-    
-	return new Point (layoutInfo.pos_x, layoutInfo.pos_y);
+        if (layoutInfo == null)
+            return new Point (0, 0);
+
+        return new Point (layoutInfo.pos_x, layoutInfo.pos_y);
     }
 
     /**
@@ -251,38 +251,38 @@ public class GridBagLayout
      */
     public int[][] getLayoutDimensions ()
     {
-	int[][] result = new int [2][];
-	if (layoutInfo == null)
-	  {
-	    result[0] = new int[0];
-	    result[1] = new int[0];
-
-	    return result;
-	  }
-
-	result [0] = new int [layoutInfo.cols];
-	System.arraycopy (layoutInfo.colWidths, 0, result [0], 0, layoutInfo.cols);
-	result [1] = new int [layoutInfo.rows];
-	System.arraycopy (layoutInfo.rowHeights, 0, result [1], 0, layoutInfo.rows);
-	return result;
+        int[][] result = new int [2][];
+        if (layoutInfo == null)
+          {
+            result[0] = new int[0];
+            result[1] = new int[0];
+
+            return result;
+          }
+
+        result [0] = new int [layoutInfo.cols];
+        System.arraycopy (layoutInfo.colWidths, 0, result [0], 0, layoutInfo.cols);
+        result [1] = new int [layoutInfo.rows];
+        System.arraycopy (layoutInfo.rowHeights, 0, result [1], 0, layoutInfo.rows);
+        return result;
     }
 
     public double[][] getLayoutWeights ()
     {
-	double[][] result = new double [2][];
-	if (layoutInfo == null)
-	  {
-	    result[0] = new double[0];
-	    result[1] = new double[0];
-
-	    return result;
-	  }
-
-	result [0] = new double [layoutInfo.cols];
-	System.arraycopy (layoutInfo.colWeights, 0, result [0], 0, layoutInfo.cols);
-	result [1] = new double [layoutInfo.rows];
-	System.arraycopy (layoutInfo.rowWeights, 0, result [1], 0, layoutInfo.rows);
-	return result;
+        double[][] result = new double [2][];
+        if (layoutInfo == null)
+          {
+            result[0] = new double[0];
+            result[1] = new double[0];
+
+            return result;
+          }
+
+        result [0] = new double [layoutInfo.cols];
+        System.arraycopy (layoutInfo.colWeights, 0, result [0], 0, layoutInfo.cols);
+        result [1] = new double [layoutInfo.rows];
+        System.arraycopy (layoutInfo.rowWeights, 0, result [1], 0, layoutInfo.rows);
+        return result;
     }
 
     /**
@@ -290,33 +290,33 @@ public class GridBagLayout
      */
     public Point location (int x, int y)
     {
-	if (layoutInfo == null)
-	    return new Point (0, 0);
+        if (layoutInfo == null)
+            return new Point (0, 0);
 
-	int col;
-	int row;
-	int pixel_x = layoutInfo.pos_x;
-	int pixel_y = layoutInfo.pos_y;
+        int col;
+        int row;
+        int pixel_x = layoutInfo.pos_x;
+        int pixel_y = layoutInfo.pos_y;
 
-	for (col = 0; col < layoutInfo.cols; col++)
-	{
-	    int w = layoutInfo.colWidths [col];
-	    if (x < pixel_x + w)
-		break;
+        for (col = 0; col < layoutInfo.cols; col++)
+        {
+            int w = layoutInfo.colWidths [col];
+            if (x < pixel_x + w)
+                break;
 
-	    pixel_x += w;
-	}
+            pixel_x += w;
+        }
 
-	for (row = 0; row < layoutInfo.rows; row++)
-	{
-	    int h = layoutInfo.rowHeights [row];
-	    if (y < pixel_y + h)
-		break;
+        for (row = 0; row < layoutInfo.rows; row++)
+        {
+            int h = layoutInfo.rowHeights [row];
+            if (y < pixel_y + h)
+                break;
 
-	    pixel_y += h;
-	}
+            pixel_y += h;
+        }
 
-	return new Point (col, row);
+        return new Point (col, row);
     }
 
     /**
@@ -328,7 +328,7 @@ public class GridBagLayout
     {
       return getClass().getName();
     }
-    
+
     /**
      * Move and resize a rectangle according to a set of grid bag
      * constraints.  The x, y, width and height fields of the
@@ -342,12 +342,12 @@ public class GridBagLayout
     {
       Insets insets = constraints.insets;
       if (insets != null)
-	{
-	  r.x += insets.left;
-	  r.y += insets.top;
-	  r.width -= insets.left + insets.right;
-	  r.height -= insets.top + insets.bottom;
-	}
+        {
+          r.x += insets.left;
+          r.y += insets.top;
+          r.width -= insets.left + insets.right;
+          r.height -= insets.top + insets.bottom;
+        }
     }
 
     /**
@@ -385,13 +385,13 @@ public class GridBagLayout
 
         Dimension dim = component.getPreferredSize();
         GridBagConstraints constraints = lookupInternalConstraints(component);
-        
+
         if (lastComp != null
             && constraints.gridheight == GridBagConstraints.REMAINDER)
           cell.y += cell.height;
         else
           cell.y = sumIntArray(info.rowHeights, constraints.gridy);
-        
+
         if (lastComp != null
             && constraints.gridwidth == GridBagConstraints.REMAINDER)
           cell.x += cell.width;
@@ -402,9 +402,9 @@ public class GridBagLayout
                                             + constraints.gridwidth) - cell.x;
         cell.height = sumIntArray(info.rowHeights, constraints.gridy
                                              + constraints.gridheight) - cell.y;
-	
+
         // Adjust for insets.
- 	AdjustForGravity( constraints, cell );
+        AdjustForGravity( constraints, cell );
 
         // Note: Documentation says that padding is added on both sides, but
         // visual inspection shows that the Sun implementation only adds it
@@ -492,7 +492,7 @@ public class GridBagLayout
       Insets parentInsets = parent.getInsets ();
       parentDim.width -= parentInsets.left + parentInsets.right;
       parentDim.height -= parentInsets.top + parentInsets.bottom;
-   
+
       int current_y = 0;
       int max_x = 0;
       int max_y = 0;
@@ -508,13 +508,13 @@ public class GridBagLayout
       // smallest to largest, with REMAINDER and RELATIVE at the end.
       // These are useful when determining sizes and weights.
       ArrayList<Component> sortedByWidth =
-	new ArrayList<Component>(components.length);
+        new ArrayList<Component>(components.length);
       ArrayList<Component> sortedByHeight =
-	new ArrayList<Component>(components.length);
+        new ArrayList<Component>(components.length);
 
       // STEP 1: first we figure out how many rows/columns
       for (int i = 0; i < components.length; i++)
-	{
+        {
           Component component = components [i];
           // If component is not visible we dont have to care about it.
           if (!component.isVisible())
@@ -557,7 +557,7 @@ public class GridBagLayout
               // Check the component that occupies the right-most spot in this
               // row. We want to add this component after it.
               // If this row is empty, add to the 0 position.
-              if (!lastInRow.containsKey(new Integer(constraints.gridy))) 
+              if (!lastInRow.containsKey(new Integer(constraints.gridy)))
                 x = 0;
               else
                 {
@@ -588,7 +588,7 @@ public class GridBagLayout
               // Check the component that occupies the bottom-most spot in
               // this column. We want to add this component below it.
               // If this column is empty, add to the 0 position.
-              if (!lastInCol.containsKey(new Integer(constraints.gridx))) 
+              if (!lastInCol.containsKey(new Integer(constraints.gridx)))
                 {
                   y = current_y;
                 }
@@ -616,7 +616,7 @@ public class GridBagLayout
             }
           // case 4: do nothing
 
-          max_x = Math.max(max_x, 
+          max_x = Math.max(max_x,
                            constraints.gridx + Math.max(1, constraints.gridwidth));
           max_y = Math.max(max_y,
                            constraints.gridy + Math.max(1, constraints.gridheight));
@@ -626,11 +626,11 @@ public class GridBagLayout
 
           // Update our reference points for RELATIVE gridx and gridy.
           if(constraints.gridwidth == GridBagConstraints.REMAINDER)
-	    {
+            {
           current_y = constraints.gridy + Math.max(1, constraints.gridheight);
-	    }
+            }
           else if (constraints.gridwidth != GridBagConstraints.REMAINDER)
-	    {
+            {
               for (int y = constraints.gridy; y < constraints.gridy + Math.max(1, constraints.gridheight); y++)
                 {
                   if(lastInRow.containsKey(new Integer(y)))
@@ -664,9 +664,9 @@ public class GridBagLayout
                       lastInCol.put(new Integer(x), component);
                     }
                 }
-	    }
-	} // end of STEP 1
-	
+            }
+        } // end of STEP 1
+
       GridBagLayoutInfo info = new GridBagLayoutInfo(max_x, max_y);
 
       // Check if column widths and row heights are overridden.
@@ -691,11 +691,11 @@ public class GridBagLayout
       for (int i = 0; i < components.length; i++)
         {
           Component component = components [i];
-			
+
           // If component is not visible we dont have to care about it.
           if (!component.isVisible())
             continue;
-			
+
           GridBagConstraints constraints = lookupInternalConstraints (component);
 
           if(constraints.gridwidth == GridBagConstraints.REMAINDER || constraints.gridwidth == GridBagConstraints.RELATIVE)
@@ -745,7 +745,7 @@ public class GridBagLayout
                           if (lastComponent != null)
                             {
                               GridBagConstraints lastConstraints = lookupInternalConstraints(lastComponent);
-    
+
                               if (lastConstraints.gridheight == GridBagConstraints.RELATIVE)
                                 {
                                   constraints.gridy = max_y - 1;
@@ -776,7 +776,7 @@ public class GridBagLayout
       for (int i = 0; i < sortedByWidth.size(); i++)
         {
           Component component = sortedByWidth.get(i);
-			
+
           // If component is not visible we dont have to care about it.
           if (!component.isVisible())
             continue;
@@ -793,7 +793,7 @@ public class GridBagLayout
           width += constraints.ipadx;
 
           distributeSizeAndWeight(width,
-                                  constraints.weightx, 
+                                  constraints.weightx,
                                   constraints.gridx,
                                   constraints.gridwidth,
                                   info.colWidths,
@@ -804,7 +804,7 @@ public class GridBagLayout
       for (int i = 0; i < sortedByHeight.size(); i++)
         {
           Component component = sortedByHeight.get(i);
-			
+
           // If component is not visible we dont have to care about it.
           if (!component.isVisible())
             continue;
@@ -819,9 +819,9 @@ public class GridBagLayout
             height += constraints.insets.top + constraints.insets.bottom;
 
           height += constraints.ipady;
-          
+
           distributeSizeAndWeight(height,
-                                  constraints.weighty, 
+                                  constraints.weighty,
                                   constraints.gridy,
                                   constraints.gridheight,
                                   info.rowHeights,
@@ -890,7 +890,7 @@ public class GridBagLayout
      * FIXME: Use a better sorting algorithm.
      */
     private void sortBySpan (Component component, int span,
-			     ArrayList<Component> list, boolean sortByWidth)
+                             ArrayList<Component> list, boolean sortByWidth)
     {
       if (span == GridBagConstraints.REMAINDER
           || span == GridBagConstraints.RELATIVE)
@@ -1005,7 +1005,7 @@ public class GridBagLayout
                   double extraWeight = diff * weights[k] / totalWeight;
                   weights[k] += extraWeight;
                   remaining -= extraWeight;
-                } 
+                }
 
               if (remaining > 0.0 && weights[start + span - 1] != 0.0)
                 {
@@ -1044,42 +1044,42 @@ public class GridBagLayout
 
     private void dumpLayoutInfo (GridBagLayoutInfo info)
     {
-	System.out.println ("GridBagLayoutInfo:");
-	System.out.println ("cols: " + info.cols + ", rows: " + info.rows);
-	System.out.print ("colWidths: ");
-	dumpArray(info.colWidths);
-	System.out.print ("rowHeights: ");
-	dumpArray(info.rowHeights);
-	System.out.print ("colWeights: ");
-	dumpArray(info.colWeights);
-	System.out.print ("rowWeights: ");
-	dumpArray(info.rowWeights);
+        System.out.println ("GridBagLayoutInfo:");
+        System.out.println ("cols: " + info.cols + ", rows: " + info.rows);
+        System.out.print ("colWidths: ");
+        dumpArray(info.colWidths);
+        System.out.print ("rowHeights: ");
+        dumpArray(info.rowHeights);
+        System.out.print ("colWeights: ");
+        dumpArray(info.colWeights);
+        System.out.print ("rowWeights: ");
+        dumpArray(info.rowWeights);
     }
 
     private void dumpArray(int[] array)
     {
-	String sep = "";
-	for(int i = 0; i < array.length; i++)
-	{
-	    System.out.print(sep);
-	    System.out.print(array[i]);
-	    sep = ", ";
-	}
-	System.out.println();
+        String sep = "";
+        for(int i = 0; i < array.length; i++)
+        {
+            System.out.print(sep);
+            System.out.print(array[i]);
+            sep = ", ";
+        }
+        System.out.println();
     }
 
     private void dumpArray(double[] array)
     {
-	String sep = "";
-	for(int i = 0; i < array.length; i++)
-	{
-	    System.out.print(sep);
-	    System.out.print(array[i]);
-	    sep = ", ";
-	}
-	System.out.println();
+        String sep = "";
+        for(int i = 0; i < array.length; i++)
+        {
+            System.out.print(sep);
+            System.out.print(array[i]);
+            sep = ", ";
+        }
+        System.out.println();
     }
-  
+
     /**
      * @since 1.4
      */
diff --git a/libjava/classpath/java/awt/GridLayout.java b/libjava/classpath/java/awt/GridLayout.java
index 65e09aa..a8b0189 100644
--- a/libjava/classpath/java/awt/GridLayout.java
+++ b/libjava/classpath/java/awt/GridLayout.java
@@ -58,7 +58,7 @@ import java.io.Serializable;
 public class GridLayout implements LayoutManager, Serializable
 {
   static final long serialVersionUID = -7411804673224730901L;
-  
+
   /** Add a new component to the layout.  This particular implementation
    * does nothing.
    * @param name The name of the component to add.
@@ -154,63 +154,63 @@ public class GridLayout implements LayoutManager, Serializable
   {
     synchronized (parent.getTreeLock ())
       {
-	int num = parent.ncomponents;
-
-	// There's no point, and handling this would mean adding special
-	// cases.
-	if (num == 0)
-	  return;
-
-	// This is more efficient than calling getComponents().
-	Component[] comps = parent.component;
-
-	int real_rows = rows;
-	int real_cols = cols;
-	if (real_rows == 0)
-	  real_rows = (num + real_cols - 1) / real_cols;
-	else
-	  real_cols = (num + real_rows - 1) / real_rows;
-
-	// We might have less than a single row.  In this case we expand
-	// to fill.
-	if (num < real_cols)
-	  real_cols = num;
-
-	Dimension d = parent.getSize ();
-	Insets ins = parent.getInsets ();
-
-	// Compute width and height of each cell in the grid.
-	int tw = d.width - ins.left - ins.right;
-	tw = (tw - (real_cols - 1) * hgap) / real_cols;
-	int th = d.height - ins.top - ins.bottom;
-	th = (th - (real_rows - 1) * vgap) / real_rows;
-
-	// If the cells are too small, still try to do something.
-	if (tw < 0)
-	  tw = 1;
-	if (th < 0)
-	  th = 1;
-
-	int x = ins.left;
-	int y = ins.top;
-	int i = 0;
-	int recount = 0;
-
-	while (i < num)
-	  {
-	    comps[i].setBounds (x, y, tw, th);
-
-	    ++i;
-	    ++recount;
-	    if (recount == real_cols)
-	      {
-		recount = 0;
-		y += vgap + th;
-		x = ins.left;
-	      }
-	    else
-	      x += hgap + tw;
-	  }
+        int num = parent.ncomponents;
+
+        // There's no point, and handling this would mean adding special
+        // cases.
+        if (num == 0)
+          return;
+
+        // This is more efficient than calling getComponents().
+        Component[] comps = parent.component;
+
+        int real_rows = rows;
+        int real_cols = cols;
+        if (real_rows == 0)
+          real_rows = (num + real_cols - 1) / real_cols;
+        else
+          real_cols = (num + real_rows - 1) / real_rows;
+
+        // We might have less than a single row.  In this case we expand
+        // to fill.
+        if (num < real_cols)
+          real_cols = num;
+
+        Dimension d = parent.getSize ();
+        Insets ins = parent.getInsets ();
+
+        // Compute width and height of each cell in the grid.
+        int tw = d.width - ins.left - ins.right;
+        tw = (tw - (real_cols - 1) * hgap) / real_cols;
+        int th = d.height - ins.top - ins.bottom;
+        th = (th - (real_rows - 1) * vgap) / real_rows;
+
+        // If the cells are too small, still try to do something.
+        if (tw < 0)
+          tw = 1;
+        if (th < 0)
+          th = 1;
+
+        int x = ins.left;
+        int y = ins.top;
+        int i = 0;
+        int recount = 0;
+
+        while (i < num)
+          {
+            comps[i].setBounds (x, y, tw, th);
+
+            ++i;
+            ++recount;
+            if (recount == real_cols)
+              {
+                recount = 0;
+                y += vgap + th;
+                x = ins.left;
+              }
+            else
+              x += hgap + tw;
+          }
       }
   }
 
@@ -289,9 +289,9 @@ public class GridLayout implements LayoutManager, Serializable
   public String toString ()
   {
     return (getClass ().getName () + "["
-	    + "hgap=" + hgap + ",vgap=" + vgap
-	    + ",rows=" + rows + ",cols=" + cols
-	    + "]");
+            + "hgap=" + hgap + ",vgap=" + vgap
+            + ",rows=" + rows + ",cols=" + cols
+            + "]");
   }
 
   // This method is used to compute the various sizes.
@@ -299,36 +299,36 @@ public class GridLayout implements LayoutManager, Serializable
   {
     synchronized (parent.getTreeLock ())
       {
-	int w = 0, h = 0, num = parent.ncomponents;
-	// This is more efficient than calling getComponents().
-	Component[] comps = parent.component;
-
-	for (int i = 0; i < num; ++i)
-	  {
-	    Dimension d;
-
-	    if (is_min)
-	      d = comps[i].getMinimumSize ();
-	    else
-	      d = comps[i].getPreferredSize ();
-
-	    w = Math.max (d.width, w);
-	    h = Math.max (d.height, h);
-	  }
-
-	int real_rows = rows;
-	int real_cols = cols;
-	if (real_rows == 0)
-	  real_rows = (num + real_cols - 1) / real_cols;
-	else
-	  real_cols = (num + real_rows - 1) / real_rows;
-
-	Insets ins = parent.getInsets ();
-	// We subtract out an extra gap here because the gaps are only
-	// between cells.
-	w = ins.left + ins.right + real_cols * (w + hgap) - hgap;
-	h = ins.top + ins.bottom + real_rows * (h + vgap) - vgap;
-	return new Dimension (w, h);
+        int w = 0, h = 0, num = parent.ncomponents;
+        // This is more efficient than calling getComponents().
+        Component[] comps = parent.component;
+
+        for (int i = 0; i < num; ++i)
+          {
+            Dimension d;
+
+            if (is_min)
+              d = comps[i].getMinimumSize ();
+            else
+              d = comps[i].getPreferredSize ();
+
+            w = Math.max (d.width, w);
+            h = Math.max (d.height, h);
+          }
+
+        int real_rows = rows;
+        int real_cols = cols;
+        if (real_rows == 0)
+          real_rows = (num + real_cols - 1) / real_cols;
+        else
+          real_cols = (num + real_rows - 1) / real_rows;
+
+        Insets ins = parent.getInsets ();
+        // We subtract out an extra gap here because the gaps are only
+        // between cells.
+        w = ins.left + ins.right + real_cols * (w + hgap) - hgap;
+        h = ins.top + ins.bottom + real_rows * (h + vgap) - vgap;
+        return new Dimension (w, h);
       }
   }
 
diff --git a/libjava/classpath/java/awt/Image.java b/libjava/classpath/java/awt/Image.java
index 8a1cc0f..7b2cee7 100644
--- a/libjava/classpath/java/awt/Image.java
+++ b/libjava/classpath/java/awt/Image.java
@@ -193,13 +193,13 @@ public abstract class Image
     {
       case SCALE_AREA_AVERAGING:
       case SCALE_SMOOTH:
-	filter = new AreaAveragingScaleFilter(width, height);
-	break;
+        filter = new AreaAveragingScaleFilter(width, height);
+        break;
       case SCALE_DEFAULT:
       case SCALE_FAST:
       case SCALE_REPLICATE:
       default:
-	filter = new ReplicateScaleFilter(width, height);
+        filter = new ReplicateScaleFilter(width, height);
     }
 
     ImageProducer producer = new FilteredImageSource(getSource(), filter);
@@ -215,7 +215,7 @@ public abstract class Image
   /**
    * Sets the acceleration priority of the image.
    * This is a value from 0 (lowest) to 1 (highest), which may
-   * be used as a hint for image acceleration. 
+   * be used as a hint for image acceleration.
    * E.g. higher priority images may be stored in video memory.
    * @param priority - the priority
    * @throws IllegalArgumentException if priority is not >= 0 and <= 1.
diff --git a/libjava/classpath/java/awt/Insets.java b/libjava/classpath/java/awt/Insets.java
index 762b697..1747cae 100644
--- a/libjava/classpath/java/awt/Insets.java
+++ b/libjava/classpath/java/awt/Insets.java
@@ -45,7 +45,7 @@ import java.io.Serializable;
  *
  * @author Aaron M. Renn (arenn@urbanophile.com)
  * @author Eric Blake (ebb9@email.byu.edu)
- * @status 
+ * @status
  */
 public class Insets implements Cloneable, Serializable
 {
diff --git a/libjava/classpath/java/awt/JobAttributes.java b/libjava/classpath/java/awt/JobAttributes.java
index 9ffc048..e84901d 100644
--- a/libjava/classpath/java/awt/JobAttributes.java
+++ b/libjava/classpath/java/awt/JobAttributes.java
@@ -1,4 +1,4 @@
-/* JobAttributes.java -- 
+/* JobAttributes.java --
    Copyright (C) 2002, 2005  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
diff --git a/libjava/classpath/java/awt/KeyboardFocusManager.java b/libjava/classpath/java/awt/KeyboardFocusManager.java
index cd13826..6913511 100644
--- a/libjava/classpath/java/awt/KeyboardFocusManager.java
+++ b/libjava/classpath/java/awt/KeyboardFocusManager.java
@@ -423,7 +423,7 @@ public abstract class KeyboardFocusManager
   {
     if (focusOwner == null || focusOwner.focusable)
       setGlobalObject (currentPermanentFocusOwners, focusOwner,
-		       "permanentFocusOwner");
+                       "permanentFocusOwner");
   }
 
   /**
@@ -556,8 +556,8 @@ public abstract class KeyboardFocusManager
    * @see #DOWN_CYCLE_TRAVERSAL_KEYS
    */
   public void setDefaultFocusTraversalKeys (int id,
-					    Set<? extends AWTKeyStroke>
-					    keystrokes)
+                                            Set<? extends AWTKeyStroke>
+                                            keystrokes)
   {
     if (id != KeyboardFocusManager.FORWARD_TRAVERSAL_KEYS &&
         id != KeyboardFocusManager.BACKWARD_TRAVERSAL_KEYS &&
@@ -668,7 +668,7 @@ public abstract class KeyboardFocusManager
    * {@link java.lang.ThreadGroup}) and {@link
    * #getGlobalCurrentFocusCycleRoot}.  This method does not actually
    * make <code>cycleRoot</code> the current focus cycle root.
-   * 
+   *
    * @param cycleRoot the focus cycle root to return from
    * getCurrentFocusCycleRoot and getGlobalCurrentFocusCycleRoot
    */
@@ -752,7 +752,7 @@ public abstract class KeyboardFocusManager
    * Nothing occurs if a null listener is supplied.  null is regarded as a valid property name.
    *
    * @param name the name of the property to handle change events for.
-   * @param l the listener to register for changes to the specified property. 
+   * @param l the listener to register for changes to the specified property.
    * @see KeyboardFocusManager#addPropertyChangeListener(java.beans.PropertyChangeListener)
    */
   public void addPropertyChangeListener(String name, PropertyChangeListener l)
@@ -819,7 +819,7 @@ public abstract class KeyboardFocusManager
    *
    * Nothing occurs if a null listener is supplied.
    *
-   * @param l the listener to register. 
+   * @param l the listener to register.
    * @see KeyboardFocusManager#addVetoableChangeListener(String, java.beans.VetoableChangeListener)
    */
   public void addVetoableChangeListener(VetoableChangeListener l)
@@ -870,7 +870,7 @@ public abstract class KeyboardFocusManager
    * Nothing occurs if a null listener is supplied.  null is regarded as a valid property name.
    *
    * @param name the name of the property to handle change events for.
-   * @param l the listener to register for changes to the specified property. 
+   * @param l the listener to register for changes to the specified property.
    * @see KeyboardFocusManager#addVetoableChangeListener(java.beans.VetoableChangeListener)
    */
   public void addVetoableChangeListener(String name, VetoableChangeListener l)
@@ -1070,7 +1070,7 @@ public abstract class KeyboardFocusManager
    * The actual dispatching is performed by calling
    * <code>redispatchEvent()</code>.  This avoids the infinite recursion
    * of dispatch requests which may occur if this method is called on
-   * the target component.  
+   * the target component.
    *
    * @param e the event to dispatch.
    * @return true if the event was dispatched.
@@ -1087,14 +1087,14 @@ public abstract class KeyboardFocusManager
    * within this manager (<code>dispatchEvent()</code>) and
    * the key event dispatchers should use this method to handle
    * dispatching rather than the dispatch method of the target
-   * component.  
+   * component.
    * <br />
    * <br />
    * <strong>
    * This method is not intended for general consumption, and is
    * only for the use of the aforementioned classes.
    * </strong>
-   * 
+   *
    * @param target the target component to which the event is
    *        dispatched.
    * @param e the event to dispatch.
@@ -1229,9 +1229,9 @@ public abstract class KeyboardFocusManager
    * However, in the case of a <code>Window</code>, the default
    * focus component becomes the focus owner and the focus cycle
    * root is not changed.
-   * 
+   *
    * @param comp the component used as part of the focus traversal.
-   */ 
+   */
   public abstract void upFocusCycle(Component comp);
 
   /**
@@ -1239,10 +1239,10 @@ public abstract class KeyboardFocusManager
    * If the supplied container is a focus cycle root, then this
    * becomes the current focus cycle root and the focus goes
    * to the default component of the specified container.
-   * Nothing happens for non-focus cycle root containers. 
-   * 
+   * Nothing happens for non-focus cycle root containers.
+   *
    * @param cont the container used as part of the focus traversal.
-   */ 
+   */
   public abstract void downFocusCycle(Container cont);
 
   /**
@@ -1433,7 +1433,7 @@ public abstract class KeyboardFocusManager
       }
   }
 
-  
+
   /**
    * Maps focus requests from heavyweight to lightweight components.
    */
diff --git a/libjava/classpath/java/awt/Label.java b/libjava/classpath/java/awt/Label.java
index 71614da..1522dac 100644
--- a/libjava/classpath/java/awt/Label.java
+++ b/libjava/classpath/java/awt/Label.java
@@ -1,5 +1,5 @@
 /* Label.java -- Java label widget
-   Copyright (C) 1999, 2000, 2002, 2004, 2005, 2006,  Free Software 
+   Copyright (C) 1999, 2000, 2002, 2004, 2005, 2006,  Free Software
    Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -76,7 +76,7 @@ public class Label extends Component implements Accessible
 
   /**
    * @serial Indicates the alignment of the text within this label's window.
-   * This is one of the constants in this class.  The default value is 
+   * This is one of the constants in this class.  The default value is
    * <code>LEFT</code>.
    */
   private int alignment;
@@ -211,7 +211,7 @@ public class Label extends Component implements Accessible
   protected String paramString()
   {
     return ("text=" + getText() + ",alignment=" +
-  	  getAlignment() + "," + super.paramString());
+          getAlignment() + "," + super.paramString());
   }
 
   /**
@@ -280,7 +280,7 @@ public class Label extends Component implements Accessible
   {
     return "label" + getUniqueLong();
   }
-  
+
   /**
    * The number used to generate the name returned by getName.
    */
@@ -292,4 +292,3 @@ public class Label extends Component implements Accessible
   }
 
 }
-
diff --git a/libjava/classpath/java/awt/LightweightDispatcher.java b/libjava/classpath/java/awt/LightweightDispatcher.java
index 39bdb88..11b83d8 100644
--- a/libjava/classpath/java/awt/LightweightDispatcher.java
+++ b/libjava/classpath/java/awt/LightweightDispatcher.java
@@ -101,7 +101,7 @@ final class LightweightDispatcher
   {
     // Nothing to do here.
   }
-  
+
   /**
    * Receives notification if a mouse event passes along the eventqueue.
    *
@@ -120,7 +120,7 @@ final class LightweightDispatcher
   /**
    * Handles all mouse events that are targetted at toplevel containers
    * (Window instances) and dispatches them to the correct lightweight child.
-   * 
+   *
    * @param ev the mouse event
    * @return whether or not we found a lightweight that handled the event.
    */
diff --git a/libjava/classpath/java/awt/List.java b/libjava/classpath/java/awt/List.java
index df8bffa..dc1199b 100644
--- a/libjava/classpath/java/awt/List.java
+++ b/libjava/classpath/java/awt/List.java
@@ -65,7 +65,7 @@ public class List extends Component
   /**
    * The number used to generate the name returned by getName.
    */
-  private static transient long next_list_number;  
+  private static transient long next_list_number;
 
   // Serialization constant
   private static final long serialVersionUID = -3304312411574666869L;
@@ -147,20 +147,20 @@ public class List extends Component
       this.rows = 4;
     else
       this.rows = rows;
-  
+
     this.multipleMode = multipleMode;
     selected = new int[0];
 
     if (GraphicsEnvironment.isHeadless())
       throw new HeadlessException();
-  
+
   }
 
   /**
    * Returns the number of items in this list.
    *
    * @return The number of items in this list.
-   * 
+   *
    * @since 1.1
    */
   public int getItemCount()
@@ -185,13 +185,13 @@ public class List extends Component
    * Returns the complete list of items.
    *
    * @return The complete list of items in the list.
-   * 
+   *
    * @since 1.1
    */
   public synchronized String[] getItems()
   {
     String[] l_items = new String[getItemCount()];
- 
+
     items.copyInto(l_items);
     return(l_items);
   }
@@ -223,7 +223,7 @@ public class List extends Component
    *
    * @return <code>true</code> if multi-select mode is enabled,
    * <code>false</code> otherwise.
-   * 
+   *
    * @since 1.1
    */
   public boolean isMultipleMode()
@@ -237,7 +237,7 @@ public class List extends Component
    * @return <code>true</code> if multi-select mode is enabled,
    * <code>false</code> otherwise.
    *
-   * @deprecated This method is deprecated in favor of 
+   * @deprecated This method is deprecated in favor of
    * <code>isMultipleMode()</code>.
    */
   public boolean allowsMultipleSelections()
@@ -251,7 +251,7 @@ public class List extends Component
    *
    * @param multipleMode <code>true</code> to enable multiple mode,
    * <code>false</code> otherwise.
-   * 
+   *
    * @since 1.1
    */
   public void setMultipleMode(boolean multipleMode)
@@ -269,20 +269,20 @@ public class List extends Component
    * @deprecated
    */
   public void setMultipleSelections(boolean multipleMode)
-  {  
+  {
     this.multipleMode = multipleMode;
 
     ListPeer peer = (ListPeer) getPeer();
     if (peer != null)
       peer.setMultipleMode(multipleMode);
-      
+
   }
 
   /**
    * Returns the minimum size of this component.
    *
    * @return The minimum size of this component.
-   * 
+   *
    * @since 1.1
    */
   public Dimension getMinimumSize()
@@ -310,7 +310,7 @@ public class List extends Component
    * @param rows The number of rows to size for.
    *
    * @return The minimum size of this component.
-   * 
+   *
    * @since 1.1
    */
   public Dimension getMinimumSize(int rows)
@@ -326,7 +326,7 @@ public class List extends Component
    *
    * @return The minimum size of this component.
    *
-   * @deprecated This method is deprecated in favor of 
+   * @deprecated This method is deprecated in favor of
    * <code>getMinimumSize(int)</code>>
    */
   public Dimension minimumSize(int rows)
@@ -342,7 +342,7 @@ public class List extends Component
    * Returns the preferred size of this component.
    *
    * @return The preferred size of this component.
-   * 
+   *
    * @since 1.1
    */
   public Dimension getPreferredSize()
@@ -358,7 +358,7 @@ public class List extends Component
    * @deprecated This method is deprecated in favor of
    * <code>getPreferredSize</code>.
    */
-  public Dimension preferredSize() 
+  public Dimension preferredSize()
   {
     return preferredSize(getRows());
   }
@@ -370,7 +370,7 @@ public class List extends Component
    * @param rows The number of rows to size for.
    *
    * @return The preferred size of this component.
-   * 
+   *
    * @since 1.1
    */
   public Dimension getPreferredSize(int rows)
@@ -386,7 +386,7 @@ public class List extends Component
    *
    * @return The preferred size of this component.
    *
-   * @deprecated This method is deprecated in favor of 
+   * @deprecated This method is deprecated in favor of
    * <code>getPreferredSize(int)</code>>
    */
   public Dimension preferredSize(int rows)
@@ -402,7 +402,7 @@ public class List extends Component
    * This method adds the specified item to the end of the list.
    *
    * @param item The item to add to the list.
-   * 
+   *
    * @since 1.1
    */
   public void add(String item)
@@ -430,7 +430,7 @@ public class List extends Component
    * @param item The item to add to the list.
    * @param index The location in the list to add the item, or -1 to add
    * to the end.
-   * 
+   *
    * @since 1.1
    */
   public void add(String item, int index)
@@ -452,11 +452,11 @@ public class List extends Component
   public void addItem(String item, int index)
   {
     if (item == null)
-      item = ""; 
-  
+      item = "";
+
     if (index < -1)
       index = -1;
-  
+
     if ((index == -1) || (index >= items.size ()))
       items.addElement (item);
     else
@@ -482,11 +482,11 @@ public class List extends Component
     if (isSelected(index))
       {
         selected = true;
-        deselect(index);   
+        deselect(index);
       }
-  
+
     items.removeElementAt (index);
-  
+
     if (selected)
       select(index);
 
@@ -501,7 +501,7 @@ public class List extends Component
    * @param index The index of the item to delete.
    *
    * @exception IllegalArgumentException If the index is not valid
-   * 
+   *
    * @since 1.1
    */
   public void remove(int index) throws IllegalArgumentException
@@ -519,7 +519,7 @@ public class List extends Component
    *
    * @deprecated This method is deprecated for some unknown reason.
    */
-  public synchronized void delItems(int start, int end) 
+  public synchronized void delItems(int start, int end)
     throws IllegalArgumentException
   {
     // We must run the loop in reverse direction.
@@ -538,7 +538,7 @@ public class List extends Component
    * @param item The item to delete.
    *
    * @exception IllegalArgumentException If the specified item does not exist.
-   * 
+   *
    * @since 1.1
    */
   public synchronized void remove(String item) throws IllegalArgumentException
@@ -552,7 +552,7 @@ public class List extends Component
 
   /**
    * Deletes all of the items from the list.
-   * 
+   *
    * @since 1.1
    */
   public synchronized void removeAll()
@@ -562,7 +562,7 @@ public class List extends Component
 
   /**
    * Deletes all of the items from the list.
-   * 
+   *
    * @deprecated This method is deprecated in favor of <code>removeAll()</code>.
    */
   public void clear()
@@ -572,7 +572,7 @@ public class List extends Component
     ListPeer peer = (ListPeer) getPeer();
     if (peer != null)
       peer.removeAll();
-  
+
     selected = new int[0];
   }
 
@@ -584,7 +584,7 @@ public class List extends Component
    *
    * @exception ArrayIndexOutOfBoundsException If the index is not valid.
    */
-  public synchronized void replaceItem(String item, int index) 
+  public synchronized void replaceItem(String item, int index)
     throws ArrayIndexOutOfBoundsException
   {
     if ((index < 0) || (index >= items.size()))
@@ -598,7 +598,7 @@ public class List extends Component
         ListPeer l = (ListPeer) peer;
 
         /* We add first and then remove so that the selected
-	   item remains the same */
+           item remains the same */
         l.add (item, index + 1);
         l.delItems (index, index);
       }
@@ -620,12 +620,12 @@ public class List extends Component
 
     if (selected == null || selected.length != 1)
       return -1;
-  
+
     return selected[0];
   }
 
   /**
-   * Returns an array containing the indexes of the rows that are 
+   * Returns an array containing the indexes of the rows that are
    * currently selected.
    *
    * @return A list of indexes of selected rows.
@@ -636,13 +636,13 @@ public class List extends Component
       {
         ListPeer l = (ListPeer) peer;
         selected = l.getSelectedIndexes();
-      }   
-   
+      }
+
     return selected;
   }
 
   /**
-   * Returns the item that is currently selected, or <code>null</code> if there 
+   * Returns the item that is currently selected, or <code>null</code> if there
    * is no item selected.  FIXME: What happens if multiple items selected?
    *
    * @return The selected item, or <code>null</code> if there is no
@@ -703,7 +703,7 @@ public class List extends Component
    *
    * @return <code>true</code> if the index is selected, <code>false</code>
    * otherwise.
-   * 
+   *
    * @since 1.1
    */
   public boolean isIndexSelected(int index)
@@ -738,7 +738,7 @@ public class List extends Component
    *
    * @param index The index of the item to be made visible.
    */
-  public synchronized void makeVisible(int index) 
+  public synchronized void makeVisible(int index)
     throws IllegalArgumentException
   {
     visibleIndex = index;
@@ -753,7 +753,7 @@ public class List extends Component
    * Returns the index of the last item that was made visible via the
    * <code>makeVisible()</code> method.
    *
-   * @return The index of the last item made visible via the 
+   * @return The index of the last item made visible via the
    * <code>makeVisible()</code> method.
    */
   public int getVisibleIndex()
@@ -771,7 +771,7 @@ public class List extends Component
     ListPeer lp = (ListPeer) getPeer();
     if (lp != null)
       lp.select(index);
-    
+
    if (selected != null)
      {
        boolean found = false;
@@ -786,14 +786,14 @@ public class List extends Component
              {
                selected = new int[] { index };
                return;
-             }       
+             }
            int[] temp = new int[selected.length + 1];
            System.arraycopy(selected, 0, temp, 0, selected.length);
            temp[selected.length] = index;
            selected = temp;
          }
-     } 
-   else 
+     }
+   else
      {
        selected = new int[1];
        selected[0] = index;
@@ -820,7 +820,7 @@ public class List extends Component
               temp[i] = selected[i];
             else
               {
-                System.arraycopy(selected, i + 1, temp, i, 
+                System.arraycopy(selected, i + 1, temp, i,
                                  selected.length - i - 1);
                 break;
               }
@@ -852,7 +852,7 @@ public class List extends Component
    * registered listeners for this object.
    *
    * @param listener The listener to add.
-   * 
+   *
    * @since 1.1
    */
   public synchronized void addActionListener(ActionListener listener)
@@ -865,7 +865,7 @@ public class List extends Component
    * registers listeners for this object.
    *
    * @param listener The listener to remove.
-   * 
+   *
    * @since 1.1
    */
   public synchronized void removeActionListener(ActionListener listener)
@@ -878,7 +878,7 @@ public class List extends Component
    * registered listeners for this object.
    *
    * @param listener The listener to add.
-   * 
+   *
    * @since 1.1
    */
   public synchronized void addItemListener(ItemListener listener)
@@ -891,7 +891,7 @@ public class List extends Component
    * registers listeners for this object.
    *
    * @param listener The listener to remove.
-   * 
+   *
    * @since 1.1
    */
   public synchronized void removeItemListener(ItemListener listener)
@@ -908,7 +908,7 @@ public class List extends Component
    * superclass method is called to process this event.
    *
    * @param event The event to process.
-   * 
+   *
    * @since 1.1
    */
   protected void processEvent(AWTEvent event)
@@ -929,7 +929,7 @@ public class List extends Component
    * the <code>enableEvents()</code> method.
    *
    * @param event The event to process.
-   * 
+   *
    * @since 1.1
    */
   protected void processActionEvent(ActionEvent event)
@@ -946,7 +946,7 @@ public class List extends Component
    * the <code>enableEvents()</code> method.
    *
    * @param event The event to process.
-   * 
+   *
    * @since 1.1
    */
   protected void processItemEvent(ItemEvent event)
@@ -959,12 +959,12 @@ public class List extends Component
   {
     if (e.id <= ItemEvent.ITEM_LAST
         && e.id >= ItemEvent.ITEM_FIRST
-        && (item_listeners != null 
+        && (item_listeners != null
         || (eventMask & AWTEvent.ITEM_EVENT_MASK) != 0))
       processEvent(e);
-    else if (e.id <= ActionEvent.ACTION_LAST 
-	   && e.id >= ActionEvent.ACTION_FIRST
-	   && (action_listeners != null 
+    else if (e.id <= ActionEvent.ACTION_LAST
+           && e.id >= ActionEvent.ACTION_FIRST
+           && (action_listeners != null
            || (eventMask & AWTEvent.ACTION_EVENT_MASK) != 0))
       processEvent(e);
     else
@@ -983,12 +983,12 @@ public class List extends Component
 
   /**
    * Returns an array of all the objects currently registered as FooListeners
-   * upon this <code>List</code>. FooListeners are registered using the 
+   * upon this <code>List</code>. FooListeners are registered using the
    * addFooListener method.
    *
    * @exception ClassCastException If listenerType doesn't specify a class or
    * interface that implements java.util.EventListener.
-   * 
+   *
    * @since 1.3
    */
   public <T extends EventListener> T[] getListeners (Class<T> listenerType)
@@ -1004,25 +1004,25 @@ public class List extends Component
 
   /**
    * Returns all action listeners registered to this object.
-   * 
+   *
    * @since 1.4
    */
   public ActionListener[] getActionListeners ()
   {
     return (ActionListener[]) getListeners (ActionListener.class);
   }
-  
+
   /**
    * Returns all action listeners registered to this object.
-   * 
+   *
    * @since 1.4
    */
   public ItemListener[] getItemListeners ()
   {
     return (ItemListener[]) getListeners (ItemListener.class);
   }
-  
-  // Accessibility internal class 
+
+  // Accessibility internal class
   protected class AccessibleAWTList extends AccessibleAWTComponent
     implements AccessibleSelection, ItemListener, ActionListener
   {
@@ -1032,11 +1032,11 @@ public class List extends Component
       implements Accessible
     {
       private static final long serialVersionUID = 4412022926028300317L;
-      
+
       // Field names are fixed by serialization spec.
       private List parent;
       private int indexInParent;
-      
+
       public AccessibleAWTListChild(List parent, int indexInParent)
       {
         this.parent = parent;
@@ -1044,7 +1044,7 @@ public class List extends Component
         if (parent == null)
           this.indexInParent = -1;
       }
-      
+
       /* (non-Javadoc)
        * @see javax.accessibility.Accessible#getAccessibleContext()
        */
@@ -1052,12 +1052,12 @@ public class List extends Component
       {
         return this;
       }
-      
+
       public AccessibleRole getAccessibleRole()
       {
         return AccessibleRole.LIST_ITEM;
       }
-      
+
       public AccessibleStateSet getAccessibleStateSet()
       {
         AccessibleStateSet states = super.getAccessibleStateSet();
@@ -1065,25 +1065,25 @@ public class List extends Component
           states.add(AccessibleState.SELECTED);
         return states;
       }
-      
+
       public int getAccessibleIndexInParent()
       {
         return indexInParent;
       }
 
     }
-    
+
     public AccessibleAWTList()
     {
       addItemListener(this);
       addActionListener(this);
     }
-    
+
     public AccessibleRole getAccessibleRole()
     {
       return AccessibleRole.LIST;
     }
-    
+
     public AccessibleStateSet getAccessibleStateSet()
     {
       AccessibleStateSet states = super.getAccessibleStateSet();
@@ -1104,7 +1104,7 @@ public class List extends Component
         return null;
       return new AccessibleAWTListChild(List.this, i);
     }
-    
+
     /* (non-Javadoc)
      * @see javax.accessibility.AccessibleSelection#getAccessibleSelectionCount()
      */
@@ -1188,7 +1188,7 @@ public class List extends Component
     public void actionPerformed(ActionEvent event)
     {
     }
-    
+
   }
 
   /**
@@ -1204,7 +1204,7 @@ public class List extends Component
       accessibleContext = new AccessibleAWTList();
     return accessibleContext;
   }
-  
+
   /**
    * Generate a unique name for this <code>List</code>.
    *
diff --git a/libjava/classpath/java/awt/MediaTracker.java b/libjava/classpath/java/awt/MediaTracker.java
index 8792e1d..e69d23e 100644
--- a/libjava/classpath/java/awt/MediaTracker.java
+++ b/libjava/classpath/java/awt/MediaTracker.java
@@ -52,7 +52,7 @@ import java.util.ArrayList;
   * means that you cannot say exactly which media object has which status,
   * at most you can say that there <em>are</em> certain media objects with
   * some certain status.
-  * 
+  *
   * At the moment only images are supported by this class.
   *
   * @author Aaron M. Renn (arenn@urbanophile.com)
@@ -85,7 +85,7 @@ public class MediaTracker implements java.io.Serializable
    * This represents a media object that is tracked by a MediaTracker.
    * It also implements a simple linked list.
    */
-  // FIXME: The serialized form documentation says MediaEntry is a 
+  // FIXME: The serialized form documentation says MediaEntry is a
   // serializable field, but the serialized form of MediaEntry itself
   // doesn't appear to be documented.
   class MediaEntry implements ImageObserver
@@ -107,7 +107,7 @@ public class MediaTracker implements java.io.Serializable
 
     /** The height of the image. */
     int height;
-    
+
     /**
      * Receives notification from an {@link java.awt.image.ImageProducer}
      * that more data of the image is available.
@@ -125,7 +125,7 @@ public class MediaTracker implements java.io.Serializable
      *
      * @see java.awt.image.ImageObserver
      */
-    public boolean imageUpdate(Image img, int flags, int x, int y, 
+    public boolean imageUpdate(Image img, int flags, int x, int y,
                                int width, int height)
     {
       if ((flags & ABORT) != 0)
@@ -234,31 +234,31 @@ public class MediaTracker implements java.io.Serializable
   {
     MediaEntry e = head;
     boolean result = true;
-    
+
     while (e != null)
       {
         if ((e.status & (COMPLETE | ERRORED | ABORTED)) == 0)
           {
             if (load && ((e.status & LOADING) == 0))
               {
-		if (target.prepareImage(e.image, e))
-		  e.status = COMPLETE;
-		else
-		  {
-		    e.status = LOADING;
-		    int flags = target.checkImage(e.image, e);
-		    if ((flags & ImageObserver.ABORT) != 0)
-		      e.status = ABORTED;
-		    else if ((flags & ImageObserver.ERROR) != 0)
-		      e.status = ERRORED;
-		    else if ((flags & ImageObserver.ALLBITS) != 0)
-		      e.status = COMPLETE;
-		  }
-		boolean complete = (e.status
-				    & (COMPLETE | ABORTED | ERRORED)) != 0;
-		if (!complete)
-		  result = false;
-	      }
+                if (target.prepareImage(e.image, e))
+                  e.status = COMPLETE;
+                else
+                  {
+                    e.status = LOADING;
+                    int flags = target.checkImage(e.image, e);
+                    if ((flags & ImageObserver.ABORT) != 0)
+                      e.status = ABORTED;
+                    else if ((flags & ImageObserver.ERROR) != 0)
+                      e.status = ERRORED;
+                    else if ((flags & ImageObserver.ALLBITS) != 0)
+                      e.status = COMPLETE;
+                  }
+                boolean complete = (e.status
+                                    & (COMPLETE | ABORTED | ERRORED)) != 0;
+                if (!complete)
+                  result = false;
+              }
             else
               result = false;
           }
@@ -277,7 +277,7 @@ public class MediaTracker implements java.io.Serializable
    */
   public boolean isErrorAny()
   {
-    MediaEntry e = head;    
+    MediaEntry e = head;
     while (e != null)
       {
         if ((e.status & ERRORED) != 0)
@@ -385,16 +385,16 @@ public class MediaTracker implements java.io.Serializable
             if (target.prepareImage(e.image, e))
               e.status = COMPLETE;
             else
-	      {
+              {
                 e.status = LOADING;
                 int flags = target.checkImage(e.image, e);
-		if ((flags & ImageObserver.ABORT) != 0)
-		  e.status = ABORTED;
-		else if ((flags & ImageObserver.ERROR) != 0)
-		  e.status = ERRORED;
-		else if ((flags & ImageObserver.ALLBITS) != 0)
-		  e.status = COMPLETE;
-	      }
+                if ((flags & ImageObserver.ABORT) != 0)
+                  e.status = ABORTED;
+                else if ((flags & ImageObserver.ERROR) != 0)
+                  e.status = ERRORED;
+                else if ((flags & ImageObserver.ALLBITS) != 0)
+                  e.status = COMPLETE;
+              }
           }
         result |= e.status;
         e = e.next;
@@ -431,7 +431,7 @@ public class MediaTracker implements java.io.Serializable
   {
     MediaEntry e = head;
     boolean result = true;
-    
+
     while (e != null)
       {
         if (e.id == id && ((e.status & (COMPLETE | ABORTED | ERRORED)) == 0))
@@ -439,22 +439,22 @@ public class MediaTracker implements java.io.Serializable
             if (load && ((e.status & LOADING) == 0))
               {
                 e.status = LOADING;
-		if (target.prepareImage(e.image, e))
-		  e.status = COMPLETE;
-		else
-		  {
-		    int flags = target.checkImage(e.image, e);
-		    if ((flags & ImageObserver.ABORT) != 0)
-		      e.status = ABORTED;
-		    else if ((flags & ImageObserver.ERROR) != 0)
-		      e.status = ERRORED;
-		    else if ((flags & ImageObserver.ALLBITS) != 0)
-		      e.status = COMPLETE;
-		  }
-		boolean complete = (e.status
-				    & (COMPLETE | ABORTED | ERRORED)) != 0;
-		if (!complete)
-		  result = false;
+                if (target.prepareImage(e.image, e))
+                  e.status = COMPLETE;
+                else
+                  {
+                    int flags = target.checkImage(e.image, e);
+                    if ((flags & ImageObserver.ABORT) != 0)
+                      e.status = ABORTED;
+                    else if ((flags & ImageObserver.ERROR) != 0)
+                      e.status = ERRORED;
+                    else if ((flags & ImageObserver.ALLBITS) != 0)
+                      e.status = COMPLETE;
+                  }
+                boolean complete = (e.status
+                                    & (COMPLETE | ABORTED | ERRORED)) != 0;
+                if (!complete)
+                  result = false;
               }
             else
               result = false;
@@ -475,7 +475,7 @@ public class MediaTracker implements java.io.Serializable
    */
   public boolean isErrorID(int id)
   {
-    MediaEntry e = head;    
+    MediaEntry e = head;
     while (e != null)
       {
         if (e.id == id && ((e.status & ERRORED) != 0))
@@ -593,19 +593,19 @@ public class MediaTracker implements java.io.Serializable
           {
             if (load && e.status == 0)
               {
-		if (target.prepareImage(e.image, e))
+                if (target.prepareImage(e.image, e))
                   e.status = COMPLETE;
-		else
-		  {
-		    e.status = LOADING;
-		    int flags = target.checkImage(e.image, e);
-		    if ((flags & ImageObserver.ABORT) != 0)
-		      e.status = ABORTED;
-		    else if ((flags & ImageObserver.ERROR) != 0)
-		      e.status = ERRORED;
-		    else if ((flags & ImageObserver.ALLBITS) != 0)
-		      e.status = COMPLETE;
-		  }
+                else
+                  {
+                    e.status = LOADING;
+                    int flags = target.checkImage(e.image, e);
+                    if ((flags & ImageObserver.ABORT) != 0)
+                      e.status = ABORTED;
+                    else if ((flags & ImageObserver.ERROR) != 0)
+                      e.status = ERRORED;
+                    else if ((flags & ImageObserver.ALLBITS) != 0)
+                      e.status = COMPLETE;
+                  }
               }
             result |= e.status;
           }
diff --git a/libjava/classpath/java/awt/Menu.java b/libjava/classpath/java/awt/Menu.java
index cef04a3..c640b5e 100644
--- a/libjava/classpath/java/awt/Menu.java
+++ b/libjava/classpath/java/awt/Menu.java
@@ -163,10 +163,10 @@ public class Menu extends MenuItem implements MenuContainer, Serializable
   {
     return items.size();
   }
- 
+
   /**
    * Returns the item at the specified index.
-   * 
+   *
    * @param index  the item index.
    *
    * @return The item at the specified index.
@@ -240,7 +240,7 @@ public class Menu extends MenuItem implements MenuContainer, Serializable
         MenuContainer parent = item.getParent();
         if (parent != null)
           parent.remove(item);
-      
+
         items.insertElementAt(item, index);
         item.setParent(this);
 
@@ -263,8 +263,8 @@ public class Menu extends MenuItem implements MenuContainer, Serializable
   }
 
   /**
-   * Inserts an item with the specified label into this menu at the specified 
-   * index.  If the index is greater than or equal to the number of items 
+   * Inserts an item with the specified label into this menu at the specified
+   * index.  If the index is greater than or equal to the number of items
    * already in the menu, the new item is added as the last item in the menu.
    *
    * @param label The label of the item to add.
@@ -302,7 +302,7 @@ public class Menu extends MenuItem implements MenuContainer, Serializable
    * Deletes the item at the specified index from this menu.
    *
    * @param index The index of the item to remove.
-   * 
+   *
    * @exception ArrayIndexOutOfBoundsException If the index is otherwise invalid.
    */
   public synchronized void remove(int index)
@@ -391,7 +391,7 @@ public class Menu extends MenuItem implements MenuContainer, Serializable
   public String paramString()
   {
     return (",tearOff=" + tearOff + ",isHelpMenu=" + isHelpMenu
-	    + super.paramString());
+            + super.paramString());
   }
 
   /**
@@ -405,7 +405,7 @@ public class Menu extends MenuItem implements MenuContainer, Serializable
     protected AccessibleAWTMenu()
     {
     }
-    
+
     public AccessibleRole getAccessibleRole()
     {
       return AccessibleRole.MENU;
@@ -425,7 +425,7 @@ public class Menu extends MenuItem implements MenuContainer, Serializable
       accessibleContext = new AccessibleAWTMenu();
     return accessibleContext;
   }
-  
+
   /**
    * Generate a unique name for this <code>Menu</code>.
    *
@@ -440,5 +440,5 @@ public class Menu extends MenuItem implements MenuContainer, Serializable
   {
     return next_menu_number++;
   }
-  
+
 } // class Menu
diff --git a/libjava/classpath/java/awt/MenuBar.java b/libjava/classpath/java/awt/MenuBar.java
index 6737d04..3fc5622 100644
--- a/libjava/classpath/java/awt/MenuBar.java
+++ b/libjava/classpath/java/awt/MenuBar.java
@@ -67,7 +67,7 @@ public class MenuBar extends MenuComponent
    * The number used to generate the name returned by getName.
    */
   private static transient long next_menubar_number;
-  
+
   /**
    * @serial The menu used for providing help information
    */
@@ -110,8 +110,8 @@ public class MenuBar extends MenuComponent
 
     if (helpMenu != null)
       {
-	if (myPeer != null)
-	  helpMenu.removeNotify();
+        if (myPeer != null)
+          helpMenu.removeNotify();
         helpMenu.setParent(null);
       }
     helpMenu = menu;
@@ -234,8 +234,8 @@ public class MenuBar extends MenuComponent
     MenuBarPeer peer = (MenuBarPeer) getPeer();
     if (peer == null)
       {
-	peer = getToolkit().createMenuBar(this);
-	setPeer(peer);
+        peer = getToolkit().createMenuBar(this);
+        setPeer(peer);
       }
 
     Enumeration e = menus.elements();
@@ -243,7 +243,7 @@ public class MenuBar extends MenuComponent
       {
         Menu mi = (Menu)e.nextElement();
         mi.addNotify();
-	peer.addMenu(mi);
+        peer.addMenu(mi);
       }
 
     if (helpMenu != null)
@@ -336,7 +336,7 @@ public class MenuBar extends MenuComponent
       accessibleContext = new AccessibleAWTMenuBar();
     return accessibleContext;
   }
-  
+
   /**
    * Generate a unique name for this <code>MenuBar</code>.
    *
@@ -360,7 +360,7 @@ public class MenuBar extends MenuComponent
   protected class AccessibleAWTMenuBar
     extends AccessibleAWTMenuComponent
   {
-  
+
     /**
      * Compatible with JDK 1.4.2 revision 5
      */
diff --git a/libjava/classpath/java/awt/MenuComponent.java b/libjava/classpath/java/awt/MenuComponent.java
index 1630926..fb0f14e 100644
--- a/libjava/classpath/java/awt/MenuComponent.java
+++ b/libjava/classpath/java/awt/MenuComponent.java
@@ -53,7 +53,7 @@ import javax.accessibility.AccessibleSelection;
 import javax.accessibility.AccessibleStateSet;
 
 /**
-  * This is the superclass of all menu AWT widgets. 
+  * This is the superclass of all menu AWT widgets.
   *
   * @author Aaron M. Renn (arenn@urbanophile.com)
   * @author Andrew John Hughes (gnu_andrew@member.fsf.org)
@@ -204,7 +204,7 @@ public abstract class MenuComponent implements Serializable
       name = generateName();
     return name;
   }
-  
+
   /**
    * Subclasses should override this to return unique component names like
    * "menuitem0".
@@ -230,13 +230,13 @@ public abstract class MenuComponent implements Serializable
 
   /**
    * Returns the parent of this component.
-   * 
+   *
    * @return the parent of this component
    */
   public MenuContainer getParent()
   {
     return parent;
-  } 
+  }
 
   /**
    * Sets the parent of this component.
@@ -365,7 +365,7 @@ public abstract class MenuComponent implements Serializable
   /**
    * Processes the specified event.  In this class, this method simply
    * calls one of the more specific event handlers.
-   * 
+   *
    * @param event the event to process
    */
   protected void processEvent(AWTEvent event)
@@ -505,7 +505,7 @@ public abstract class MenuComponent implements Serializable
      * Please note that this method depends on a correctly implemented
      * version of the <code>getBounds()</code> method.  Subclasses
      * must provide the bounding rectangle via <code>getBounds()</code>
-     * in order for this method to work.  
+     * in order for this method to work.
      *
      * @param point the point to check against this component
      * @return true if the point is within this component
@@ -530,7 +530,7 @@ public abstract class MenuComponent implements Serializable
      * As the existence of children can not be determined from
      * this abstract class, the implementation of this method
      * is left to subclasses.
-     * 
+     *
      * @param point the point at which the returned accessible
      *        is located
      * @return null
@@ -901,7 +901,7 @@ public abstract class MenuComponent implements Serializable
      * Please note that this method depends on a correctly implemented
      * version of the <code>getBounds()</code> method.  Subclasses
      * must provide the bounding rectangle via <code>getBounds()</code>
-     * in order for this method to work.  
+     * in order for this method to work.
      *
      * @return the location of the component, relative to its parent
      *
@@ -940,7 +940,7 @@ public abstract class MenuComponent implements Serializable
      * Please note that this method depends on a correctly implemented
      * version of the <code>getBounds()</code> method.  Subclasses
      * must provide the bounding rectangle via <code>getBounds()</code>
-     * in order for this method to work.  
+     * in order for this method to work.
      *
      * @return the size of the component
      *
@@ -1103,7 +1103,7 @@ public abstract class MenuComponent implements Serializable
      * which don't support multiple selections.  Concrete implementations should
      * override this with a more appopriate and efficient implementation, which
      * properly takes into account the ability of the component to support multiple
-     * selections. 
+     * selections.
      */
     public void selectAllAccessibleSelection()
     {
@@ -1122,7 +1122,7 @@ public abstract class MenuComponent implements Serializable
      * <br />
      * This abstract class knows nothing about how the component
      * is drawn on screen, so this method simply ignores the supplied
-     * color and continues to use the default system color.   
+     * color and continues to use the default system color.
      * Concrete subclasses which handle the drawing of an onscreen
      * menu component should override this method and provide
      * the appropriate information.
@@ -1246,7 +1246,7 @@ public abstract class MenuComponent implements Serializable
      * Please note that this method depends on a correctly implemented
      * version of the <code>getBounds()</code> method.  Subclasses
      * must provide the bounding rectangle via <code>getBounds()</code>
-     * in order for this method to work.  
+     * in order for this method to work.
      *
      * @param point the location of the component, relative to its parent
      *
@@ -1264,7 +1264,7 @@ public abstract class MenuComponent implements Serializable
      * Please note that this method depends on a correctly implemented
      * version of the <code>getBounds()</code> method.  Subclasses
      * must provide the bounding rectangle via <code>getBounds()</code>
-     * in order for this method to work.  
+     * in order for this method to work.
      *
      * @param size the new size of the component
      *
diff --git a/libjava/classpath/java/awt/MenuItem.java b/libjava/classpath/java/awt/MenuItem.java
index b80ee4c..52d0b4d 100644
--- a/libjava/classpath/java/awt/MenuItem.java
+++ b/libjava/classpath/java/awt/MenuItem.java
@@ -63,7 +63,7 @@ public class MenuItem extends MenuComponent
 /*
  * Static Variables
  */
-  
+
 
   /**
    * The number used to generate the name returned by getName.
@@ -121,24 +121,24 @@ private transient ActionListener action_listeners;
     {
       super();
     }
-  
-  
-  
+
+
+
     public String getAccessibleName()
     {
       return label;
     }
-  
+
     public AccessibleAction getAccessibleAction()
     {
       return this;
     }
-  
+
     public AccessibleRole getAccessibleRole()
     {
       return AccessibleRole.MENU_ITEM;
     }
-  
+
     /* (non-Javadoc)
      * @see javax.accessibility.AccessibleAction#getAccessibleActionCount()
      */
@@ -153,9 +153,9 @@ private transient ActionListener action_listeners;
     public String getAccessibleActionDescription(int i)
     {
       if (i == 0)
-	return label;
+        return label;
       else
-	return null;
+        return null;
     }
 
     /* (non-Javadoc)
@@ -164,7 +164,7 @@ private transient ActionListener action_listeners;
     public boolean doAccessibleAction(int i)
     {
       if (i != 0)
-	return false;
+        return false;
       processActionEvent(new ActionEvent(this, ActionEvent.ACTION_PERFORMED, actionCommand));
       return true;
     }
@@ -173,7 +173,7 @@ private transient ActionListener action_listeners;
     {
       return this;
     }
-  
+
     /* (non-Javadoc)
      * @see javax.accessibility.AccessibleValue#getCurrentAccessibleValue()
      */
@@ -191,7 +191,7 @@ private transient ActionListener action_listeners;
       // this. is required by javac 1.3, otherwise it is confused with
       // MenuItem.this.setEnabled.
       this.setEnabled(result);
-      return result; 
+      return result;
     }
 
     /* (non-Javadoc)
@@ -209,7 +209,7 @@ private transient ActionListener action_listeners;
     {
       return new Integer(0);
     }
-  
+
   }
 
 
@@ -236,7 +236,7 @@ MenuItem()
   *
   * @param label The label for this menu item.
   */
-public 
+public
 MenuItem(String label)
 {
   this.label = label;
@@ -311,7 +311,7 @@ isEnabled()
 
 /**
   * Sets the enabled status of this menu item.
-  * 
+  *
   * @param enabled <code>true</code> to enable this menu item,
   * <code>false</code> otherwise.
   */
@@ -325,7 +325,7 @@ setEnabled(boolean enabled)
 
 /**
   * Sets the enabled status of this menu item.
-  * 
+  *
   * @param enabled <code>true</code> to enable this menu item,
   * <code>false</code> otherwise.
   *
@@ -449,7 +449,7 @@ setActionCommand(String actionCommand)
 /*************************************************************************/
 
 /**
-  * Enables the specified events.  This is done automatically when a 
+  * Enables the specified events.  This is done automatically when a
   * listener is added and does not normally need to be done by
   * application code.
   *
@@ -460,7 +460,7 @@ protected final void
 enableEvents(long events)
 {
   eventMask |= events;
-  // TODO: see comment in Component.enableEvents().    
+  // TODO: see comment in Component.enableEvents().
 }
 
 /*************************************************************************/
@@ -518,10 +518,10 @@ removeActionListener(ActionListener l)
                                        ActionListener.class);
   }
 
-/** Returns all registered EventListers of the given listenerType. 
- * listenerType must be a subclass of EventListener, or a 
+/** Returns all registered EventListers of the given listenerType.
+ * listenerType must be a subclass of EventListener, or a
  * ClassClassException is thrown.
- * @since 1.3 
+ * @since 1.3
  */
   public <T extends EventListener> T[] getListeners(Class<T> listenerType)
   {
@@ -535,10 +535,10 @@ removeActionListener(ActionListener l)
 void
 dispatchEventImpl(AWTEvent e)
 {
-  if (e.id <= ActionEvent.ACTION_LAST 
+  if (e.id <= ActionEvent.ACTION_LAST
       && e.id >= ActionEvent.ACTION_FIRST
       && (action_listeners != null
-	  || (eventMask & AWTEvent.ACTION_EVENT_MASK) != 0))
+          || (eventMask & AWTEvent.ACTION_EVENT_MASK) != 0))
     processEvent(e);
 
   // Send the event to the parent menu if it has not yet been
@@ -588,7 +588,7 @@ public String
 paramString()
 {
   return ("label=" + label + ",enabled=" + enabled +
-	  ",actionCommand=" + actionCommand + "," + super.paramString());
+          ",actionCommand=" + actionCommand + "," + super.paramString());
 }
 
 /**
@@ -620,4 +620,4 @@ private static synchronized long getUniqueLong()
   return next_menuitem_number++;
 }
 
-} // class MenuItem 
+} // class MenuItem
diff --git a/libjava/classpath/java/awt/MenuShortcut.java b/libjava/classpath/java/awt/MenuShortcut.java
index 5216d34..4939438 100644
--- a/libjava/classpath/java/awt/MenuShortcut.java
+++ b/libjava/classpath/java/awt/MenuShortcut.java
@@ -170,7 +170,7 @@ equals(Object obj)
     {
       MenuShortcut ms = (MenuShortcut) obj;
       return (ms.key == key && ms.usesShift == usesShift);
-    }      
+    }
   return false;
 }
 
@@ -211,7 +211,7 @@ paramString()
   return "key=" + key + ",usesShift=" + usesShift;
 }
 
-private void 
+private void
 setKeyName(int key)
 {
   if (key == '\n')
diff --git a/libjava/classpath/java/awt/MouseInfo.java b/libjava/classpath/java/awt/MouseInfo.java
index 8a853e1..62d7d30 100644
--- a/libjava/classpath/java/awt/MouseInfo.java
+++ b/libjava/classpath/java/awt/MouseInfo.java
@@ -81,7 +81,7 @@ public class MouseInfo
 
     GraphicsDevice[] gds = GraphicsEnvironment.getLocalGraphicsEnvironment().
       getScreenDevices();
-    
+
     return new PointerInfo( gds[ screen ], p );
   }
 
@@ -99,4 +99,4 @@ public class MouseInfo
     return ((ClasspathToolkit)Toolkit.getDefaultToolkit()).
       getMouseNumberOfButtons();
   }
-} 
+}
diff --git a/libjava/classpath/java/awt/PageAttributes.java b/libjava/classpath/java/awt/PageAttributes.java
index 38fb696..825d0fe 100644
--- a/libjava/classpath/java/awt/PageAttributes.java
+++ b/libjava/classpath/java/awt/PageAttributes.java
@@ -1,4 +1,4 @@
-/* PageAttributes.java -- 
+/* PageAttributes.java --
    Copyright (C) 2002, 2005  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -265,7 +265,7 @@ public final class PageAttributes implements Cloneable
     }
   } // class PrintQualityType
 
-
+
   private ColorType color;
   private MediaType media;
   private OrientationRequestedType orientation;
diff --git a/libjava/classpath/java/awt/Point.java b/libjava/classpath/java/awt/Point.java
index 64bc07e..8712024 100644
--- a/libjava/classpath/java/awt/Point.java
+++ b/libjava/classpath/java/awt/Point.java
@@ -178,7 +178,7 @@ public class Point extends Point2D implements Serializable
 
   /**
    * Sets this object's coordinates to the specified values.  This method
-   * rounds to the nearest integer coordinates by adding 0.5 and calling 
+   * rounds to the nearest integer coordinates by adding 0.5 and calling
    * {@link Math#floor(double)}.
    *
    * @param x the new X coordinate
diff --git a/libjava/classpath/java/awt/PointerInfo.java b/libjava/classpath/java/awt/PointerInfo.java
index 14d44a6..2bbd976 100644
--- a/libjava/classpath/java/awt/PointerInfo.java
+++ b/libjava/classpath/java/awt/PointerInfo.java
@@ -81,4 +81,4 @@ public class PointerInfo
   {
     return p;
   }
-} 
+}
diff --git a/libjava/classpath/java/awt/Polygon.java b/libjava/classpath/java/awt/Polygon.java
index 403c336..03e91f8 100644
--- a/libjava/classpath/java/awt/Polygon.java
+++ b/libjava/classpath/java/awt/Polygon.java
@@ -175,13 +175,13 @@ public class Polygon implements Shape, Serializable
     int i = npoints;
     while (--i >= 0)
       {
-	xpoints[i] += dx;
-	ypoints[i] += dy;
+        xpoints[i] += dx;
+        ypoints[i] += dy;
       }
     if (bounds != null)
       {
-	bounds.x += dx;
-	bounds.y += dy;
+        bounds.x += dx;
+        bounds.y += dy;
       }
   }
 
@@ -196,43 +196,43 @@ public class Polygon implements Shape, Serializable
   {
     if (npoints + 1 > xpoints.length)
       {
-	int[] newx = new int[npoints + 1];
-	System.arraycopy(xpoints, 0, newx, 0, npoints);
-	xpoints = newx;
+        int[] newx = new int[npoints + 1];
+        System.arraycopy(xpoints, 0, newx, 0, npoints);
+        xpoints = newx;
       }
     if (npoints + 1 > ypoints.length)
       {
-	int[] newy = new int[npoints + 1];
-	System.arraycopy(ypoints, 0, newy, 0, npoints);
-	ypoints = newy;
+        int[] newy = new int[npoints + 1];
+        System.arraycopy(ypoints, 0, newy, 0, npoints);
+        ypoints = newy;
       }
     xpoints[npoints] = x;
     ypoints[npoints] = y;
     npoints++;
     if (bounds != null)
       {
-	if (npoints == 1)
-	  {
-	    bounds.x = x;
-	    bounds.y = y;
-	  }
-	else
-	  {
-	    if (x < bounds.x)
-	      {
-		bounds.width += bounds.x - x;
-		bounds.x = x;
-	      }
-	    else if (x > bounds.x + bounds.width)
-	      bounds.width = x - bounds.x;
-	    if (y < bounds.y)
-	      {
-		bounds.height += bounds.y - y;
-		bounds.y = y;
-	      }
-	    else if (y > bounds.y + bounds.height)
-	      bounds.height = y - bounds.y;
-	  }
+        if (npoints == 1)
+          {
+            bounds.x = x;
+            bounds.y = y;
+          }
+        else
+          {
+            if (x < bounds.x)
+              {
+                bounds.width += bounds.x - x;
+                bounds.x = x;
+              }
+            else if (x > bounds.x + bounds.width)
+              bounds.width = x - bounds.x;
+            if (y < bounds.y)
+              {
+                bounds.height += bounds.y - y;
+                bounds.y = y;
+              }
+            else if (y > bounds.y + bounds.height)
+              bounds.height = y - bounds.y;
+          }
       }
   }
 
@@ -263,27 +263,27 @@ public class Polygon implements Shape, Serializable
   {
     if (bounds == null)
       {
-	if (npoints == 0)
-	  return bounds = new Rectangle();
-	int i = npoints - 1;
-	int minx = xpoints[i];
-	int maxx = minx;
-	int miny = ypoints[i];
-	int maxy = miny;
-	while (--i >= 0)
-	  {
-	    int x = xpoints[i];
-	    int y = ypoints[i];
-	    if (x < minx)
-	      minx = x;
-	    else if (x > maxx)
-	      maxx = x;
-	    if (y < miny)
-	      miny = y;
-	    else if (y > maxy)
-	      maxy = y;
-	  }
-	bounds = new Rectangle(minx, miny, maxx - minx, maxy - miny);
+        if (npoints == 0)
+          return bounds = new Rectangle();
+        int i = npoints - 1;
+        int minx = xpoints[i];
+        int maxx = minx;
+        int miny = ypoints[i];
+        int maxy = miny;
+        while (--i >= 0)
+          {
+            int x = xpoints[i];
+            int y = ypoints[i];
+            if (x < minx)
+              minx = x;
+            else if (x > maxx)
+              maxx = x;
+            if (y < miny)
+              miny = y;
+            else if (y > maxy)
+              maxy = y;
+          }
+        bounds = new Rectangle(minx, miny, maxx - minx, maxy - miny);
       }
     return bounds;
   }
@@ -476,45 +476,45 @@ public class Polygon implements Shape, Serializable
   {
     return new PathIterator()
       {
-	/** The current vertex of iteration. */
-	private int vertex;
-
-	public int getWindingRule()
-	{
-	  return WIND_EVEN_ODD;
-	}
-
-	public boolean isDone()
-	{
-	  return vertex > npoints;
-	}
-
-	public void next()
-	{
-	  vertex++;
-	}
-
-	public int currentSegment(float[] coords)
-	{
-	  if (vertex >= npoints)
-	    return SEG_CLOSE;
-	  coords[0] = xpoints[vertex];
-	  coords[1] = ypoints[vertex];
-	  if (transform != null)
-	    transform.transform(coords, 0, coords, 0, 1);
-	  return vertex == 0 ? SEG_MOVETO : SEG_LINETO;
-	}
-
-	public int currentSegment(double[] coords)
-	{
-	  if (vertex >= npoints)
-	    return SEG_CLOSE;
-	  coords[0] = xpoints[vertex];
-	  coords[1] = ypoints[vertex];
-	  if (transform != null)
-	    transform.transform(coords, 0, coords, 0, 1);
-	  return vertex == 0 ? SEG_MOVETO : SEG_LINETO;
-	}
+        /** The current vertex of iteration. */
+        private int vertex;
+
+        public int getWindingRule()
+        {
+          return WIND_EVEN_ODD;
+        }
+
+        public boolean isDone()
+        {
+          return vertex > npoints;
+        }
+
+        public void next()
+        {
+          vertex++;
+        }
+
+        public int currentSegment(float[] coords)
+        {
+          if (vertex >= npoints)
+            return SEG_CLOSE;
+          coords[0] = xpoints[vertex];
+          coords[1] = ypoints[vertex];
+          if (transform != null)
+            transform.transform(coords, 0, coords, 0, 1);
+          return vertex == 0 ? SEG_MOVETO : SEG_LINETO;
+        }
+
+        public int currentSegment(double[] coords)
+        {
+          if (vertex >= npoints)
+            return SEG_CLOSE;
+          coords[0] = xpoints[vertex];
+          coords[1] = ypoints[vertex];
+          if (transform != null)
+            transform.transform(coords, 0, coords, 0, 1);
+          return vertex == 0 ? SEG_MOVETO : SEG_LINETO;
+        }
       };
   }
 
@@ -560,17 +560,17 @@ public class Polygon implements Shape, Serializable
 
     if (useYaxis)
       {
-	xp = ypoints;
-	yp = xpoints;
-	double swap;
-	swap = y;
-	y = x;
-	x = swap;
+        xp = ypoints;
+        yp = xpoints;
+        double swap;
+        swap = y;
+        y = x;
+        x = swap;
       }
     else
       {
-	xp = xpoints;
-	yp = ypoints;
+        xp = xpoints;
+        yp = ypoints;
       }
 
     /* Get a value which is small but not insignificant relative the path. */
@@ -580,19 +580,19 @@ public class Polygon implements Shape, Serializable
     y0 = yp[0] - y;
     for (int i = 1; i < npoints; i++)
       {
-	x1 = xp[i] - x;
-	y1 = yp[i] - y;
-
-	if (y0 == 0.0)
-	  y0 -= epsilon;
-	if (y1 == 0.0)
-	  y1 -= epsilon;
-	if (y0 * y1 < 0)
-	  if (Line2D.linesIntersect(x0, y0, x1, y1, epsilon, 0.0, distance, 0.0))
-	    ++crossings;
-
-	x0 = xp[i] - x;
-	y0 = yp[i] - y;
+        x1 = xp[i] - x;
+        y1 = yp[i] - y;
+
+        if (y0 == 0.0)
+          y0 -= epsilon;
+        if (y1 == 0.0)
+          y1 -= epsilon;
+        if (y0 * y1 < 0)
+          if (Line2D.linesIntersect(x0, y0, x1, y1, epsilon, 0.0, distance, 0.0))
+            ++crossings;
+
+        x0 = xp[i] - x;
+        y0 = yp[i] - y;
       }
 
     // end segment
@@ -604,9 +604,8 @@ public class Polygon implements Shape, Serializable
       y1 -= epsilon;
     if (y0 * y1 < 0)
       if (Line2D.linesIntersect(x0, y0, x1, y1, epsilon, 0.0, distance, 0.0))
-	++crossings;
+        ++crossings;
 
     return crossings;
   }
 } // class Polygon
-
diff --git a/libjava/classpath/java/awt/PopupMenu.java b/libjava/classpath/java/awt/PopupMenu.java
index 9268678..8595300 100644
--- a/libjava/classpath/java/awt/PopupMenu.java
+++ b/libjava/classpath/java/awt/PopupMenu.java
@@ -150,14 +150,14 @@ show(Component component, int x, int y)
     protected AccessibleAWTPopupMenu()
     {
     }
-    
+
     public AccessibleRole getAccessibleRole()
     {
       return AccessibleRole.POPUP_MENU;
     }
-    
+
   }
-  
+
   /**
    * Gets the AccessibleContext associated with this <code>PopupMenu</code>.
    * The context is created, if necessary.
@@ -171,7 +171,7 @@ show(Component component, int x, int y)
       accessibleContext = new AccessibleAWTPopupMenu();
     return accessibleContext;
   }
-  
+
   /**
    * Generate a unique name for this <code>PopupMenu</code>.
    *
@@ -188,4 +188,3 @@ show(Component component, int x, int y)
   }
 
 } // class PopupMenu
-
diff --git a/libjava/classpath/java/awt/Rectangle.java b/libjava/classpath/java/awt/Rectangle.java
index ac2494e..1d5a8da 100644
--- a/libjava/classpath/java/awt/Rectangle.java
+++ b/libjava/classpath/java/awt/Rectangle.java
@@ -183,7 +183,7 @@ public class Rectangle extends Rectangle2D implements Shape, Serializable
    * @param p the upper left corner of the rectangle
    */
   public Rectangle(Point p)
-  { 
+  {
     x = p.x;
     y = p.y;
   }
@@ -196,7 +196,7 @@ public class Rectangle extends Rectangle2D implements Shape, Serializable
    * @param d the width and height of the rectangle
    */
   public Rectangle(Dimension d)
-  {  
+  {
     width = d.width;
     height = d.height;
   }
@@ -299,7 +299,7 @@ public class Rectangle extends Rectangle2D implements Shape, Serializable
   /**
    * Updates this rectangle to have the specified dimensions, rounded to the
    * integer precision used by this class (the values are rounded "outwards" so
-   * that the stored rectangle completely encloses the specified double 
+   * that the stored rectangle completely encloses the specified double
    * precision rectangle).
    *
    * @param x the new X coordinate of the upper left hand corner
diff --git a/libjava/classpath/java/awt/RenderingHints.java b/libjava/classpath/java/awt/RenderingHints.java
index e98a00c..5de6a60 100644
--- a/libjava/classpath/java/awt/RenderingHints.java
+++ b/libjava/classpath/java/awt/RenderingHints.java
@@ -46,7 +46,7 @@ import java.util.Map;
 import java.util.Set;
 
 /**
- * A collection of (key, value) items that provide 'hints' for the 
+ * A collection of (key, value) items that provide 'hints' for the
  * {@link java.awt.Graphics2D} rendering pipeline.  Because these
  * items are hints only, they may be ignored by a particular
  * {@link java.awt.Graphics2D} implementation.
@@ -66,7 +66,7 @@ public class RenderingHints
 
     /**
      * Creates a new key.
-     * 
+     *
      * @param privateKey  the private key.
      */
     protected Key(int privateKey)
@@ -77,16 +77,16 @@ public class RenderingHints
     /**
      * Returns <code>true</code> if the specified value is compatible with
      * this key, and <code>false</code> otherwise.
-     * 
+     *
      * @param value  the value (<code>null</code> permitted).
-     * 
+     *
      * @return A boolean.
      */
     public abstract boolean isCompatibleValue(Object value);
 
     /**
      * Returns the private key for this instance.
-     * 
+     *
      * @return The private key.
      */
     protected final int intKey()
@@ -96,7 +96,7 @@ public class RenderingHints
 
     /**
      * Returns a hash code for the key.
-     * 
+     *
      * @return A hash code.
      */
     public final int hashCode()
@@ -106,9 +106,9 @@ public class RenderingHints
 
     /**
      * Checks this key for equality with an arbitrary object.
-     * 
+     *
      * @param other  the object (<code>null</code> permitted)
-     * 
+     *
      * @return A boolean.
      */
     public final boolean equals(Object other)
@@ -137,9 +137,9 @@ public class RenderingHints
     /**
      * Returns <code>true</code> if the specified value is compatible with
      * this key, and <code>false</code> otherwise.
-     * 
+     *
      * @param value  the value (<code>null</code> permitted).
-     * 
+     *
      * @return A boolean.
      */
     public boolean isCompatibleValue(Object value)
@@ -149,7 +149,7 @@ public class RenderingHints
 
     /**
      * Returns a string representation of the key.
-     * 
+     *
      * @return A string.
      */
     public String toString()
@@ -547,8 +547,8 @@ public class RenderingHints
   /**
    * Creates a new collection of hints containing all the (key, value) pairs
    * in the specified map.
-   * 
-   * @param init  a map containing a collection of hints (<code>null</code> 
+   *
+   * @param init  a map containing a collection of hints (<code>null</code>
    *              permitted).
    */
   public RenderingHints(Map<Key,?> init)
@@ -559,7 +559,7 @@ public class RenderingHints
 
   /**
    * Creates a new collection containing a single (key, value) pair.
-   * 
+   *
    * @param key  the key.
    * @param value  the value.
    */
@@ -570,7 +570,7 @@ public class RenderingHints
 
   /**
    * Returns the number of hints in the collection.
-   * 
+   *
    * @return The number of hints.
    */
   public int size()
@@ -581,7 +581,7 @@ public class RenderingHints
   /**
    * Returns <code>true</code> if there are no hints in the collection,
    * and <code>false</code> otherwise.
-   * 
+   *
    * @return A boolean.
    */
   public boolean isEmpty()
@@ -592,11 +592,11 @@ public class RenderingHints
   /**
    * Returns <code>true</code> if the collection of hints contains the
    * specified key, and <code>false</code> otherwise.
-   * 
+   *
    * @param key  the key (<code>null</code> not permitted).
-   * 
+   *
    * @return A boolean.
-   * 
+   *
    * @throws NullPointerException if <code>key</code> is <code>null</code>.
    * @throws ClassCastException if <code>key</code> is not a {@link Key}.
    */
@@ -611,9 +611,9 @@ public class RenderingHints
   /**
    * Returns <code>true</code> if the collection of hints contains the
    * specified value, and <code>false</code> otherwise.
-   * 
+   *
    * @param value  the value.
-   * 
+   *
    * @return A boolean.
    */
   public boolean containsValue(Object value)
@@ -624,13 +624,13 @@ public class RenderingHints
   /**
    * Returns the value associated with the specified key, or <code>null</code>
    * if there is no value defined for the key.
-   * 
+   *
    * @param key  the key (<code>null</code> permitted).
-   * 
+   *
    * @return The value (possibly <code>null</code>).
-   * 
+   *
    * @throws ClassCastException if <code>key</code> is not a {@link Key}.
-   * 
+   *
    * @see #containsKey(Object)
    */
   public Object get(Object key)
@@ -641,12 +641,12 @@ public class RenderingHints
 
   /**
    * Adds a (key, value) pair to the collection of hints (if the
-   * collection already contains the specified key, then the 
+   * collection already contains the specified key, then the
    * value is updated).
-   * 
+   *
    * @param key  the key.
    * @param value  the value.
-   * 
+   *
    * @return  the previous value of the key or <code>null</code> if the key
    * didn't have a value yet.
    */
@@ -661,7 +661,7 @@ public class RenderingHints
 
   /**
    * Adds all the hints from a collection to this collection.
-   * 
+   *
    * @param hints  the hint collection.
    */
   public void add(RenderingHints hints)
@@ -679,27 +679,27 @@ public class RenderingHints
 
   /**
    * Removes a hint from the collection.
-   * 
+   *
    * @param key  the key.
-   * 
-   * @return The value that was associated with the key, or <code>null</code> if 
+   *
+   * @return The value that was associated with the key, or <code>null</code> if
    *         the key was not part of the collection
-   * 
-   * @throws ClassCastException if the key is not a subclass of 
+   *
+   * @throws ClassCastException if the key is not a subclass of
    *         {@link RenderingHints.Key}.
    */
   public Object remove(Object key)
   {
     // don't remove the (Key) cast, it is necessary to throw the exception
     // required by the spec
-    return hintMap.remove((Key) key);  
+    return hintMap.remove((Key) key);
   }
 
   /**
    * Adds a collection of (key, value) pairs to the collection.
-   * 
+   *
    * @param m  a map containing (key, value) items.
-   * 
+   *
    * @throws ClassCastException if the map contains a key that is not
    *         a subclass of {@link RenderingHints.Key}.
    * @throws IllegalArgumentException if the map contains a value that is
@@ -721,7 +721,7 @@ public class RenderingHints
 
   /**
    * Returns a set containing the keys from this collection.
-   * 
+   *
    * @return A set of keys.
    */
   public Set<Object> keySet()
@@ -731,9 +731,9 @@ public class RenderingHints
 
   /**
    * Returns a collection of the values from this hint collection.  The
-   * collection is backed by the <code>RenderingHints</code> instance, 
+   * collection is backed by the <code>RenderingHints</code> instance,
    * so updates to one will affect the other.
-   * 
+   *
    * @return A collection of values.
    */
   public Collection<Object> values()
@@ -743,7 +743,7 @@ public class RenderingHints
 
   /**
    * Returns a set of entries from the collection.
-   * 
+   *
    * @return A set of entries.
    */
   public Set<Map.Entry<Object,Object>> entrySet()
@@ -753,9 +753,9 @@ public class RenderingHints
 
   /**
    * Checks this collection for equality with an arbitrary object.
-   * 
+   *
    * @param o  the object (<code>null</code> permitted)
-   * 
+   *
    * @return A boolean.
    */
   public boolean equals(Object o)
@@ -765,7 +765,7 @@ public class RenderingHints
 
   /**
    * Returns a hash code for the collection of hints.
-   * 
+   *
    * @return A hash code.
    */
   public int hashCode()
@@ -775,7 +775,7 @@ public class RenderingHints
 
   /**
    * Creates a clone of this instance.
-   * 
+   *
    * @return A clone.
    */
   public Object clone()
@@ -794,7 +794,7 @@ public class RenderingHints
 
   /**
    * Returns a string representation of this instance.
-   * 
+   *
    * @return A string.
    */
   public String toString()
diff --git a/libjava/classpath/java/awt/Robot.java b/libjava/classpath/java/awt/Robot.java
index 485a14e..30de5ca 100644
--- a/libjava/classpath/java/awt/Robot.java
+++ b/libjava/classpath/java/awt/Robot.java
@@ -92,7 +92,7 @@ public class Robot
 
     // createRobot will throw AWTException if XTest is not supported.
     peer = tk.createRobot (GraphicsEnvironment.getLocalGraphicsEnvironment ()
-			   .getDefaultScreenDevice ());
+                           .getDefaultScreenDevice ());
   }
 
   /**
@@ -113,7 +113,7 @@ public class Robot
 
     if (screen.getType () != GraphicsDevice.TYPE_RASTER_SCREEN)
       throw new IllegalArgumentException ("Robot: graphics"
-					  + " device is not a screen");
+                                          + " device is not a screen");
 
     SecurityManager sm = System.getSecurityManager ();
     if (sm != null)
@@ -159,10 +159,10 @@ public class Robot
   public void mousePress (int buttons)
   {
     if ((buttons & InputEvent.BUTTON1_MASK) == 0
-	&& (buttons & InputEvent.BUTTON2_MASK) == 0
-	&& (buttons & InputEvent.BUTTON3_MASK) == 0)
+        && (buttons & InputEvent.BUTTON2_MASK) == 0
+        && (buttons & InputEvent.BUTTON3_MASK) == 0)
       throw new IllegalArgumentException ("Robot: mousePress:"
-					  + " invalid button mask");
+                                          + " invalid button mask");
 
     peer.mousePress (buttons);
 
@@ -190,10 +190,10 @@ public class Robot
   public void mouseRelease(int buttons)
   {
     if ((buttons & InputEvent.BUTTON1_MASK) == 0
-	&& (buttons & InputEvent.BUTTON2_MASK) == 0
-	&& (buttons & InputEvent.BUTTON3_MASK) == 0)
+        && (buttons & InputEvent.BUTTON2_MASK) == 0
+        && (buttons & InputEvent.BUTTON3_MASK) == 0)
       throw new IllegalArgumentException ("Robot: mouseRelease:"
-					  + " invalid button mask");
+                                          + " invalid button mask");
 
     peer.mouseRelease (buttons);
 
@@ -245,7 +245,7 @@ public class Robot
   /**
    * Release a key.
    *
-   * @param keycode key to release, a {@link java.awt.event.KeyEvent} VK_ 
+   * @param keycode key to release, a {@link java.awt.event.KeyEvent} VK_
    *                constant
    *
    * @exception IllegalArgumentException if keycode is not a valid key
@@ -304,10 +304,10 @@ public class Robot
 
     BufferedImage bufferedImage =
       new BufferedImage (screenRect.width, screenRect.height,
-			 BufferedImage.TYPE_INT_ARGB);
+                         BufferedImage.TYPE_INT_ARGB);
 
     bufferedImage.setRGB (0, 0, screenRect.width, screenRect.height,
-			  pixels, 0, screenRect.width);
+                          pixels, 0, screenRect.width);
 
     return bufferedImage;
   }
@@ -377,11 +377,11 @@ public class Robot
 
     try
       {
-	Thread.sleep (ms);
+        Thread.sleep (ms);
       }
     catch (InterruptedException e)
       {
-	System.err.println ("Robot: delay interrupted");
+        System.err.println ("Robot: delay interrupted");
       }
   }
 
@@ -393,19 +393,19 @@ public class Robot
   {
     if (EventQueue.isDispatchThread ())
       throw new IllegalThreadStateException ("Robot: waitForIdle called from "
-					     + "the event dispatch thread");
+                                             + "the event dispatch thread");
 
     try
       {
-	EventQueue.invokeAndWait (new Runnable () { public void run () { } });
+        EventQueue.invokeAndWait (new Runnable () { public void run () { } });
       }
     catch (InterruptedException e)
       {
-	System.err.println ("Robot: waitForIdle interrupted");
+        System.err.println ("Robot: waitForIdle interrupted");
       }
     catch (InvocationTargetException e)
       {
-	System.err.println ("Robot: waitForIdle cannot invoke target");
+        System.err.println ("Robot: waitForIdle cannot invoke target");
       }
   }
 
@@ -417,7 +417,7 @@ public class Robot
   public String toString ()
   {
     return getClass ().getName ()
-	+ "[ autoDelay = " + autoDelay + ", autoWaitForIdle = "
-	+ waitForIdle + " ]";
+        + "[ autoDelay = " + autoDelay + ", autoWaitForIdle = "
+        + waitForIdle + " ]";
   }
 }
diff --git a/libjava/classpath/java/awt/ScrollPane.java b/libjava/classpath/java/awt/ScrollPane.java
index ec9746f..14d15f6 100644
--- a/libjava/classpath/java/awt/ScrollPane.java
+++ b/libjava/classpath/java/awt/ScrollPane.java
@@ -48,7 +48,7 @@ import javax.accessibility.AccessibleRole;
 
 
 /**
-  * This widget provides a scrollable region that allows a single 
+  * This widget provides a scrollable region that allows a single
   * subcomponent to be viewed through a smaller window.
   *
   * @author Aaron M. Renn (arenn@urbanophile.com)
@@ -227,7 +227,7 @@ getVAdjustable()
   * @return The viewport size.
   */
 public Dimension getViewportSize ()
-{ 
+{
   Dimension viewsize = getSize ();
   Insets insets = getInsets ();
 
@@ -237,9 +237,9 @@ public Dimension getViewportSize ()
   Component[] list = getComponents();
   if ((list == null) || (list.length <= 0))
     return viewsize;
-  
+
   Dimension dim = list[0].getPreferredSize();
-  
+
   if (dim.width <= 0 && dim.height <= 0)
     return viewsize;
 
@@ -282,7 +282,7 @@ public Dimension getViewportSize ()
     needHorizontal = true;
   else if (dim.width > (viewsize.width - vScrollbarWidth))
     mayNeedHorizontal = true;
-  
+
   if (needVertical && mayNeedHorizontal)
     needHorizontal = true;
 
@@ -294,7 +294,7 @@ public Dimension getViewportSize ()
 
   if (needVertical)
     viewsize.width -= vScrollbarWidth;
-  
+
   return viewsize;
 }
 
@@ -338,7 +338,7 @@ getVScrollbarWidth()
   * Returns the current scroll position of the viewport.
   *
   * @return The current scroll position of the viewport.
-  * 
+  *
   * @throws NullPointerException if the scrollpane does have a child.
   */
 public Point
@@ -346,7 +346,7 @@ getScrollPosition()
 {
   if (getComponentCount() == 0)
     throw new NullPointerException();
-  
+
   int x = 0;
   int y = 0;
 
@@ -386,7 +386,7 @@ setScrollPosition(Point scrollPosition) throws IllegalArgumentException
   * @param y The new Y coordinate of the scroll position.
   *
   * @throws NullPointerException if scrollpane does not have a child.
-  * 
+  *
   * @exception IllegalArgumentException If the specified value is outside
   * the legal scrolling range.
   */
@@ -405,15 +405,15 @@ setScrollPosition(int x, int y)
     x = 0;
   if (y < 0)
     y = 0;
-    
+
   Adjustable h = getHAdjustable();
   Adjustable v = getVAdjustable();
-  
+
   if (h != null)
     h.setValue(x);
   if (v != null)
     v.setValue(y);
-   
+
   ScrollPanePeer spp = (ScrollPanePeer)getPeer();
   if (spp != null)
     spp.setScrollPosition(x, y);
@@ -457,7 +457,7 @@ removeNotify()
 /*************************************************************************/
 
 /**
-  * Adds the specified child component to this container.  A 
+  * Adds the specified child component to this container.  A
   * <code>ScrollPane</code> can have at most one child, so if a second
   * one is added, then first one is removed.
   *
@@ -467,7 +467,7 @@ removeNotify()
   * in this implementation.
   */
   protected final void addImpl (Component component, Object constraints,
-				int index)
+                                int index)
 {
   Component[] list = getComponents();
   if ((list != null) && (list.length > 0))
@@ -507,14 +507,14 @@ layout()
       Dimension vp = getViewportSize ();
 
       if (dim.width < vp.width)
-	dim.width = vp.width;
+        dim.width = vp.width;
 
       if (dim.height < vp.height)
-	dim.height = vp.height;
+        dim.height = vp.height;
 
       ScrollPanePeer peer = (ScrollPanePeer) getPeer ();
       if (peer != null)
-	peer.childResized (dim.width, dim.height);
+        peer.childResized (dim.width, dim.height);
 
       list[0].setSize (dim);
 
@@ -525,7 +525,7 @@ layout()
         p.y = dim.height;
 
       setScrollPosition (p);
-      
+
       list[0].setLocation(new Point());
     }
 }
@@ -538,7 +538,7 @@ layout()
   * not have layout managers.
   *
   * @param layoutManager Ignored
-  * @throws AWTError Always throws this error when called. 
+  * @throws AWTError Always throws this error when called.
   */
 public final void
 setLayout(LayoutManager layoutManager)
@@ -575,7 +575,7 @@ paramString()
          + getY() + ","
          + getWidth() + "x" + getHeight() + ","
          + getIsValidString() + ","
-         + "ScrollPosition=(" + scrollPosition.x + "," 
+         + "ScrollPosition=(" + scrollPosition.x + ","
                               + scrollPosition.y + "),"
          + "Insets=(" + insets.top + ","
                       + insets.left + ","
@@ -596,7 +596,7 @@ getScrollbarDisplayPolicyString()
     return "never";
 }
 
-private String 
+private String
 getIsValidString()
 {
   if (isValid())
@@ -637,7 +637,7 @@ getIsValidString()
   {
     wheelScrollingEnabled = enable;
   }
-  
+
   protected class AccessibleAWTScrollPane extends AccessibleAWTContainer
   {
     private static final long serialVersionUID = 6100703663886637L;
@@ -661,7 +661,7 @@ getIsValidString()
       accessibleContext = new AccessibleAWTScrollPane();
     return accessibleContext;
   }
-  
+
   /**
    * Generate a unique name for this <code>ScrollPane</code>.
    *
@@ -676,6 +676,5 @@ getIsValidString()
   {
     return next_scrollpane_number++;
   }
-  
-} // class ScrollPane 
 
+} // class ScrollPane
diff --git a/libjava/classpath/java/awt/ScrollPaneAdjustable.java b/libjava/classpath/java/awt/ScrollPaneAdjustable.java
index ca61801..0f2986d 100644
--- a/libjava/classpath/java/awt/ScrollPaneAdjustable.java
+++ b/libjava/classpath/java/awt/ScrollPaneAdjustable.java
@@ -52,7 +52,7 @@ public class ScrollPaneAdjustable
   implements Adjustable, Serializable
 {
   private static final long serialVersionUID = -3359745691033257079L;
- 
+
   ScrollPane sp;
   int orientation;
   int value;
@@ -70,7 +70,7 @@ public class ScrollPaneAdjustable
     this.sp = sp;
     this.orientation = orientation;
   }
-  
+
   ScrollPaneAdjustable (ScrollPane sp, int orientation, int value, int minimum,
                         int maximum, int visibleAmount, int unitIncrement,
                         int blockIncrement)
@@ -84,21 +84,21 @@ public class ScrollPaneAdjustable
     this.unitIncrement = unitIncrement;
     this.blockIncrement = blockIncrement;
   }
-  
+
   public void addAdjustmentListener (AdjustmentListener listener)
   {
     if (listener == null)
       return;
     adjustmentListener = AWTEventMulticaster.add (adjustmentListener, listener);
   }
-  
+
   public void removeAdjustmentListener (AdjustmentListener listener)
   {
     if (listener == null)
       return;
     adjustmentListener = AWTEventMulticaster.remove (adjustmentListener, listener);
   }
-  
+
   public AdjustmentListener[] getAdjustmentListeners ()
   {
     return (AdjustmentListener[]) AWTEventMulticaster.getListeners
@@ -129,7 +129,7 @@ public class ScrollPaneAdjustable
   {
     return unitIncrement;
   }
-  
+
   public int getValue ()
   {
     return value;
@@ -144,10 +144,10 @@ public class ScrollPaneAdjustable
   {
     this.blockIncrement = blockIncrement;
   }
-    
+
   /**
    * This method should never be called.
-   * 
+   *
    * @param maximum The maximum value to be set.
    * @throws AWTError Always throws this error when called.
    */
@@ -158,7 +158,7 @@ public class ScrollPaneAdjustable
 
   /**
    * This method should never be called.
-   * 
+   *
    * @param minimum The minimum value to be set.
    * @throws AWTError Always throws this error when called.
    */
@@ -182,10 +182,10 @@ public class ScrollPaneAdjustable
     if (value > maximum)
       maximum = value;
   }
-  
+
   /**
    * This method should never be called.
-   * 
+   *
    * @param visibleAmount The visible amount to be set.
    * @throws AWTError Always throws this error when called.
    */
@@ -196,12 +196,12 @@ public class ScrollPaneAdjustable
 
   public String paramString ()
   {
-    return paramStringHelper() 
-         + ",[" + getMinimum() + ".." + getMaximum() 
-         + "],val=" + getValue() 
-         + ",vis=" + getVisibleAmount() 
+    return paramStringHelper()
+         + ",[" + getMinimum() + ".." + getMaximum()
+         + "],val=" + getValue()
+         + ",vis=" + getVisibleAmount()
          + ",unit=" + getUnitIncrement()
-         + ",block=" + getBlockIncrement() 
+         + ",block=" + getBlockIncrement()
          + ",isAdjusting=" + valueIsAdjusting;
   }
 
@@ -212,7 +212,7 @@ public class ScrollPaneAdjustable
     else
       return "vertical";
   }
-  
+
   public String toString()
   {
     return getClass().getName() + "[" + paramString() + "]";
@@ -237,6 +237,5 @@ public class ScrollPaneAdjustable
   {
     this.valueIsAdjusting = valueIsAdjusting;
   }
-  
-} // class ScrollPaneAdjustable
 
+} // class ScrollPaneAdjustable
diff --git a/libjava/classpath/java/awt/Scrollbar.java b/libjava/classpath/java/awt/Scrollbar.java
index 0cba512..4a9e36c 100644
--- a/libjava/classpath/java/awt/Scrollbar.java
+++ b/libjava/classpath/java/awt/Scrollbar.java
@@ -343,7 +343,7 @@ public class Scrollbar extends Component implements Accessible, Adjustable
   {
     if (visibleAmount <= 0)
       visibleAmount = 1;
-    
+
     if (maximum <= minimum)
       maximum = minimum + 1;
 
@@ -352,7 +352,7 @@ public class Scrollbar extends Component implements Accessible, Adjustable
 
     if (visibleAmount > maximum - minimum)
       visibleAmount = maximum - minimum;
-    
+
     // According to documentation, the actual maximum
     // value is (maximum - visibleAmount)
     if (value > maximum - visibleAmount)
@@ -367,7 +367,7 @@ public class Scrollbar extends Component implements Accessible, Adjustable
     this.value = value;
     this.visibleAmount = visibleAmount;
     this.minimum = minimum;
-    this.maximum = maximum;      
+    this.maximum = maximum;
   }
 
   /**
@@ -419,13 +419,13 @@ public class Scrollbar extends Component implements Accessible, Adjustable
   {
     if (lineIncrement < 0)
       throw new IllegalArgumentException("Unit increment less than zero.");
-    
+
     if (lineIncrement == 0)
       lineIncrement = 1;
-         
+
    if (lineIncrement == this.lineIncrement)
       return;
-    
+
     this.lineIncrement = lineIncrement;
 
     ScrollbarPeer peer = (ScrollbarPeer) getPeer();
@@ -485,7 +485,7 @@ public class Scrollbar extends Component implements Accessible, Adjustable
 
     if (pageIncrement == 0)
       pageIncrement = 1;
-    
+
     if (pageIncrement == this.pageIncrement)
       return;
 
@@ -570,25 +570,25 @@ public class Scrollbar extends Component implements Accessible, Adjustable
    */
   void dispatchEventImpl(AWTEvent e)
   {
-    if (e.id <= AdjustmentEvent.ADJUSTMENT_LAST 
-	&& e.id >= AdjustmentEvent.ADJUSTMENT_FIRST)
+    if (e.id <= AdjustmentEvent.ADJUSTMENT_LAST
+        && e.id >= AdjustmentEvent.ADJUSTMENT_FIRST)
       {
-	AdjustmentEvent ae = (AdjustmentEvent) e;
-	boolean adjusting = ae.getValueIsAdjusting();
-	if (adjusting)
-	  setValueIsAdjusting(true);
-	try
-	  {
-	    setValue(((AdjustmentEvent) e).getValue());
-	    if (adjustment_listeners != null 
-		|| (eventMask & AWTEvent.ADJUSTMENT_EVENT_MASK) != 0)
-	      processEvent(e);
-	  }
-	finally
-	  {
-	    if (adjusting)
-	      setValueIsAdjusting(false);
-	  }
+        AdjustmentEvent ae = (AdjustmentEvent) e;
+        boolean adjusting = ae.getValueIsAdjusting();
+        if (adjusting)
+          setValueIsAdjusting(true);
+        try
+          {
+            setValue(((AdjustmentEvent) e).getValue());
+            if (adjustment_listeners != null
+                || (eventMask & AWTEvent.ADJUSTMENT_EVENT_MASK) != 0)
+              processEvent(e);
+          }
+        finally
+          {
+            if (adjusting)
+              setValueIsAdjusting(false);
+          }
       }
     else
       super.dispatchEventImpl(e);
@@ -710,11 +710,11 @@ public class Scrollbar extends Component implements Accessible, Adjustable
     {
       AccessibleStateSet states = super.getAccessibleStateSet();
       if (getOrientation() == HORIZONTAL)
-	states.add(AccessibleState.HORIZONTAL);
+        states.add(AccessibleState.HORIZONTAL);
       else
-	states.add(AccessibleState.VERTICAL);
+        states.add(AccessibleState.VERTICAL);
       if (getValueIsAdjusting())
-	states.add(AccessibleState.BUSY);
+        states.add(AccessibleState.BUSY);
       return states;
     }
 
@@ -809,7 +809,7 @@ public class Scrollbar extends Component implements Accessible, Adjustable
     /* Create the context if this is the first request */
     if (accessibleContext == null)
       accessibleContext = new AccessibleAWTScrollBar();
-    
+
     return accessibleContext;
   }
 }
diff --git a/libjava/classpath/java/awt/Shape.java b/libjava/classpath/java/awt/Shape.java
index d76bbab..495a980 100644
--- a/libjava/classpath/java/awt/Shape.java
+++ b/libjava/classpath/java/awt/Shape.java
@@ -109,7 +109,7 @@ public interface Shape
    * Test if a high-precision rectangle intersects the shape. This is true
    * if any point in the rectangle is in the shape, with the caveat that the
    * operation may include high probability estimates when the actual
-   * calculation is prohibitively expensive. The {@link java.awt.geom.Area} 
+   * calculation is prohibitively expensive. The {@link java.awt.geom.Area}
    * class can be used for more precise answers.
    *
    * @param x the x coordinate of the rectangle
@@ -126,7 +126,7 @@ public interface Shape
    * Test if a high-precision rectangle intersects the shape. This is true
    * if any point in the rectangle is in the shape, with the caveat that the
    * operation may include high probability estimates when the actual
-   * calculation is prohibitively expensive. The {@link java.awt.geom.Area} 
+   * calculation is prohibitively expensive. The {@link java.awt.geom.Area}
    * class can be used for more precise answers.
    *
    * @param r the rectangle
@@ -141,7 +141,7 @@ public interface Shape
    * Test if a high-precision rectangle lies completely in the shape. This is
    * true if all points in the rectangle are in the shape, with the caveat
    * that the operation may include high probability estimates when the actual
-   * calculation is prohibitively expensive. The {@link java.awt.geom.Area} 
+   * calculation is prohibitively expensive. The {@link java.awt.geom.Area}
    * class can be used for more precise answers.
    *
    * @param x the x coordinate of the rectangle
@@ -158,7 +158,7 @@ public interface Shape
    * Test if a high-precision rectangle lies completely in the shape. This is
    * true if all points in the rectangle are in the shape, with the caveat
    * that the operation may include high probability estimates when the actual
-   * calculation is prohibitively expensive. The {@link java.awt.geom.Area} 
+   * calculation is prohibitively expensive. The {@link java.awt.geom.Area}
    * class can be used for more precise answers.
    *
    * @param r the rectangle
@@ -176,7 +176,7 @@ public interface Shape
    * not required, that the Shape isolate iterations from future changes to
    * the boundary, and document this fact.
    *
-   * @param transform an optional transform to apply to the 
+   * @param transform an optional transform to apply to the
    *                  iterator (<code>null</code> permitted).
    * @return a new iterator over the boundary
    * @since 1.2
@@ -195,11 +195,11 @@ public interface Shape
    * use. It is recommended, but not required, that the Shape isolate
    * iterations from future changes to the boundary, and document this fact.
    *
-   * @param transform an optional transform to apply to the 
+   * @param transform an optional transform to apply to the
    *                  iterator (<code>null</code> permitted).
    * @param flatness the maximum distance for deviation from the real boundary
    * @return a new iterator over the boundary
    * @since 1.2
    */
   PathIterator getPathIterator(AffineTransform transform, double flatness);
-} 
+}
diff --git a/libjava/classpath/java/awt/SystemColor.java b/libjava/classpath/java/awt/SystemColor.java
index 2ead74a..95bcaa6 100644
--- a/libjava/classpath/java/awt/SystemColor.java
+++ b/libjava/classpath/java/awt/SystemColor.java
@@ -444,7 +444,7 @@ public final class SystemColor extends Color implements Serializable
     if (context == null || color != context.color || !context.getColorModel().equals(cm))
       context = new ColorPaintContext(cm,color);
     return context;
-  }    
+  }
 
   /**
    * Returns a string describing this color. This is in the format
diff --git a/libjava/classpath/java/awt/TextArea.java b/libjava/classpath/java/awt/TextArea.java
index 30b278d..265f8c8 100644
--- a/libjava/classpath/java/awt/TextArea.java
+++ b/libjava/classpath/java/awt/TextArea.java
@@ -177,8 +177,8 @@ public class TextArea extends TextComponent implements java.io.Serializable
    * contains the specified text.  The TextArea can display the
    * specified number of rows and columns of text, without the need to
    * scroll.  This constructor allows specification of the scroll bar
-   * display policy.  The TextArea initially contains the specified text.  
-   * If text specified as <code>null<code>, it will be set to "". 
+   * display policy.  The TextArea initially contains the specified text.
+   * If text specified as <code>null<code>, it will be set to "".
    *
    * @param text The text to display in this text area (<code>null</code> permitted).
    * @param rows The number of rows in this text area.
@@ -200,7 +200,7 @@ public class TextArea extends TextComponent implements java.io.Serializable
       this.rows = 0;
     else
       this.rows = rows;
-    
+
     if (columns < 0)
       this.columns = 0;
     else
@@ -311,7 +311,7 @@ public class TextArea extends TextComponent implements java.io.Serializable
 
   /**
    * Retrieve the minimum size for this text area.
-   * 
+   *
    * @return The minimum size for this text area.
    *
    * @deprecated This method is deprecated in favor of
@@ -340,7 +340,7 @@ public class TextArea extends TextComponent implements java.io.Serializable
   {
     if (isMinimumSizeSet())
       return new Dimension(minSize);
-    
+
     TextAreaPeer peer = (TextAreaPeer) getPeer ();
     if (peer == null)
       return new Dimension (getWidth(), getHeight());
@@ -405,7 +405,7 @@ public class TextArea extends TextComponent implements java.io.Serializable
   {
     if (isPreferredSizeSet())
       return new Dimension(prefSize);
-    
+
     TextAreaPeer peer = (TextAreaPeer) getPeer ();
     if (peer == null)
       return new Dimension (getWidth(), getHeight());
@@ -459,7 +459,7 @@ public class TextArea extends TextComponent implements java.io.Serializable
     if (peer != null)
       peer.insert (str, peer.getText().length ());
     else
-      setText(getText() + str);   
+      setText(getText() + str);
   }
 
   /**
@@ -488,7 +488,7 @@ public class TextArea extends TextComponent implements java.io.Serializable
   {
     String tmp1 = null;
     String tmp2 = null;
-    
+
     TextAreaPeer peer = (TextAreaPeer) getPeer ();
 
     if (peer != null)
@@ -562,17 +562,17 @@ public class TextArea extends TextComponent implements java.io.Serializable
     switch (scrollbarVisibility)
       {
       case SCROLLBARS_BOTH:
-	sbVisibility = "both";
-	break;
+        sbVisibility = "both";
+        break;
       case SCROLLBARS_VERTICAL_ONLY:
-	sbVisibility = "vertical-only";
-	break;
+        sbVisibility = "vertical-only";
+        break;
       case SCROLLBARS_HORIZONTAL_ONLY:
-	sbVisibility = "horizontal-only";
-	break;
+        sbVisibility = "horizontal-only";
+        break;
       case SCROLLBARS_NONE:
-	sbVisibility = "none";
-	break;
+        sbVisibility = "none";
+        break;
       }
 
     String editable = "";
@@ -600,7 +600,7 @@ public class TextArea extends TextComponent implements java.io.Serializable
   {
     return next_text_number++;
   }
-  
+
   protected class AccessibleAWTTextArea extends AccessibleAWTTextComponent
   {
     private static final long serialVersionUID = 3472827823632144419L;
@@ -608,13 +608,13 @@ public class TextArea extends TextComponent implements java.io.Serializable
     protected AccessibleAWTTextArea()
     {
     }
-    
+
     public AccessibleStateSet getAccessibleStateSet()
     {
       return super.getAccessibleStateSet();
     }
   }
-  
+
   /**
    * Gets the AccessibleContext associated with this <code>TextArea</code>.
    * The context is created, if necessary.
diff --git a/libjava/classpath/java/awt/TextComponent.java b/libjava/classpath/java/awt/TextComponent.java
index 8fdd941..31ea3f5d 100644
--- a/libjava/classpath/java/awt/TextComponent.java
+++ b/libjava/classpath/java/awt/TextComponent.java
@@ -54,7 +54,7 @@ import javax.accessibility.AccessibleText;
 import javax.swing.text.AttributeSet;
 
 /**
- * This class provides common functionality for widgets than 
+ * This class provides common functionality for widgets than
  * contain text.
  *
  * @author Aaron M. Renn (arenn@urbanophile.com)
@@ -106,12 +106,12 @@ public class TextComponent extends Component
     {
       TextComponent.this.addTextListener(this);
     }
-    
+
     public AccessibleRole getAccessibleRole()
     {
       return AccessibleRole.TEXT;
     }
-    
+
     public AccessibleStateSet getAccessibleStateSet()
     {
       // TODO: Docs say PropertyChangeEvent will fire if this state changes.
@@ -121,12 +121,12 @@ public class TextComponent extends Component
         ss.add(AccessibleState.EDITABLE);
       return ss;
     }
-    
+
     public AccessibleText getAccessibleText()
     {
       return this;
     }
-    
+
     /* (non-Javadoc)
      * @see javax.accessibility.AccessibleText#getIndexAtPoint(java.awt.Point)
      */
@@ -169,26 +169,26 @@ public class TextComponent extends Component
       BreakIterator it = null;
       switch (part)
       {
-      	case CHARACTER:
-      	  return text.substring(index, index + 1);
-      	case WORD:
-      	  it = BreakIterator.getWordInstance();
-      	  break;
-      	case SENTENCE:
-      	  it = BreakIterator.getSentenceInstance();
-      	  break;
-      	default:
-      	  return null;
+        case CHARACTER:
+          return text.substring(index, index + 1);
+        case WORD:
+          it = BreakIterator.getWordInstance();
+          break;
+        case SENTENCE:
+          it = BreakIterator.getSentenceInstance();
+          break;
+        default:
+          return null;
       }
-  	  it.setText(text);
-  	  int start = index;
-  	  if (!it.isBoundary(index))
-  	    start = it.preceding(index); 
-  	  int end = it.following(index);
-  	  if (end == -1)
-  	    return text.substring(index);
-  	  else
-  	    return text.substring(index, end);
+          it.setText(text);
+          int start = index;
+          if (!it.isBoundary(index))
+            start = it.preceding(index);
+          int end = it.following(index);
+          if (end == -1)
+            return text.substring(index);
+          else
+            return text.substring(index, end);
     }
 
     /* (non-Javadoc)
@@ -200,30 +200,30 @@ public class TextComponent extends Component
       BreakIterator it = null;
       switch (part)
       {
-      	case CHARACTER:
-      	  return text.substring(index, index + 1);
-      	case WORD:
-      	  it = BreakIterator.getWordInstance();
-      	  break;
-      	case SENTENCE:
-      	  it = BreakIterator.getSentenceInstance();
-      	  break;
-      	default:
-      	  return null;
+        case CHARACTER:
+          return text.substring(index, index + 1);
+        case WORD:
+          it = BreakIterator.getWordInstance();
+          break;
+        case SENTENCE:
+          it = BreakIterator.getSentenceInstance();
+          break;
+        default:
+          return null;
       }
-  	  it.setText(text);
-  	  int start = index;
-  	  if (!it.isBoundary(index))
-  	    start = it.following(index);
-  	  // Make sure there was a complete unit.  I.e. if index is in the middle
-  	  // of a word, return null if there is no word after the that one.
-  	  if (start == -1)
-  	    return null;
-  	  int end = it.following(start);
-  	  if (end == -1)
-  	    return text.substring(index);
-  	  else
-  	    return text.substring(index, end);
+          it.setText(text);
+          int start = index;
+          if (!it.isBoundary(index))
+            start = it.following(index);
+          // Make sure there was a complete unit.  I.e. if index is in the middle
+          // of a word, return null if there is no word after the that one.
+          if (start == -1)
+            return null;
+          int end = it.following(start);
+          if (end == -1)
+            return text.substring(index);
+          else
+            return text.substring(index, end);
     }
 
     /* (non-Javadoc)
@@ -236,30 +236,30 @@ public class TextComponent extends Component
       BreakIterator it = null;
       switch (part)
       {
-      	case CHARACTER:
-      	  return text.substring(index - 1, index);
-      	case WORD:
-      	  it = BreakIterator.getWordInstance();
-      	  break;
-      	case SENTENCE:
-      	  it = BreakIterator.getSentenceInstance();
-      	  break;
-      	default:
-      	  return null;
+        case CHARACTER:
+          return text.substring(index - 1, index);
+        case WORD:
+          it = BreakIterator.getWordInstance();
+          break;
+        case SENTENCE:
+          it = BreakIterator.getSentenceInstance();
+          break;
+        default:
+          return null;
       }
-  	  it.setText(text);
-  	  int end = index;
-  	  if (!it.isBoundary(index))
-  	    end = it.preceding(index); 
-  	  // Make sure there was a complete unit.  I.e. if index is in the middle
-  	  // of a word, return null if there is no word before that one.
-  	  if (end == -1)
-  	    return null;
-  	  int start = it.preceding(end);
-  	  if (start == -1)
-  	    return text.substring(0, end);
-  	  else
-  	    return text.substring(start, end);
+          it.setText(text);
+          int end = index;
+          if (!it.isBoundary(index))
+            end = it.preceding(index);
+          // Make sure there was a complete unit.  I.e. if index is in the middle
+          // of a word, return null if there is no word before that one.
+          if (end == -1)
+            return null;
+          int start = it.preceding(end);
+          if (start == -1)
+            return text.substring(0, end);
+          else
+            return text.substring(start, end);
     }
 
     /* (non-Javadoc)
@@ -304,9 +304,9 @@ public class TextComponent extends Component
     public void textValueChanged(TextEvent event)
     {
       // TODO Auto-generated method stub
-      
+
     }
-    
+
   }
 
 
@@ -316,7 +316,7 @@ public class TextComponent extends Component
       this.text = "";
     else
       this.text = text;
-    
+
     this.editable = true;
   }
 
@@ -363,13 +363,13 @@ public class TextComponent extends Component
     String alltext = getText();
     int start = getSelectionStart();
     int end = getSelectionEnd();
-  
+
     return(alltext.substring(start, end));
   }
 
   /**
    * Returns the starting position of the selected text region.
-   * If the text is not selected then caret position is returned. 
+   * If the text is not selected then caret position is returned.
    *
    * @return The starting position of the selected text region.
    */
@@ -391,14 +391,14 @@ public class TextComponent extends Component
    */
   public synchronized void setSelectionStart(int selectionStart)
   {
-    select(selectionStart, 
-           (getSelectionEnd() < selectionStart) 
+    select(selectionStart,
+           (getSelectionEnd() < selectionStart)
                               ? selectionStart : getSelectionEnd());
   }
 
   /**
    * Returns the ending position of the selected text region.
-   * If the text is not selected, then caret position is returned 
+   * If the text is not selected, then caret position is returned
    *
    * @return The ending position of the selected text region.
    */
@@ -447,7 +447,7 @@ public class TextComponent extends Component
 
     this.selectionStart = selectionStart;
     this.selectionEnd = selectionEnd;
-    
+
     TextComponentPeer tcp = (TextComponentPeer) getPeer();
     if (tcp != null)
       tcp.select(selectionStart, selectionEnd);
@@ -489,7 +489,7 @@ public class TextComponent extends Component
   {
     if (caretPosition < 0)
       throw new IllegalArgumentException();
-  
+
     TextComponentPeer tcp = (TextComponentPeer) getPeer();
     if (tcp != null)
       tcp.setCaretPosition(caretPosition);
@@ -539,7 +539,7 @@ public class TextComponent extends Component
   {
     textListener = AWTEventMulticaster.add(textListener, listener);
 
-    enableEvents(AWTEvent.TEXT_EVENT_MASK);  
+    enableEvents(AWTEvent.TEXT_EVENT_MASK);
   }
 
   /**
@@ -557,7 +557,7 @@ public class TextComponent extends Component
    * Processes the specified event for this component.  Text events are
    * processed by calling the <code>processTextEvent()</code> method.
    * All other events are passed to the superclass method.
-   * 
+   *
    * @param event The event to process.
    */
   protected void processEvent(AWTEvent event)
@@ -585,13 +585,13 @@ public class TextComponent extends Component
 
   void dispatchEventImpl(AWTEvent e)
   {
-    if (e.id <= TextEvent.TEXT_LAST 
+    if (e.id <= TextEvent.TEXT_LAST
         && e.id >= TextEvent.TEXT_FIRST
-        && (textListener != null 
-	    || (eventMask & AWTEvent.TEXT_EVENT_MASK) != 0))
+        && (textListener != null
+            || (eventMask & AWTEvent.TEXT_EVENT_MASK) != 0))
       processEvent(e);
     else
-      super.dispatchEventImpl(e); 
+      super.dispatchEventImpl(e);
   }
 
   /**
@@ -642,7 +642,7 @@ public class TextComponent extends Component
     return accessibleContext;
   }
 
-  
+
   // Provide AccessibleAWTTextComponent access to several peer functions that
   // aren't publicly exposed.  This is package-private to avoid an accessor
   // method.
@@ -653,7 +653,7 @@ public class TextComponent extends Component
       return tcp.getIndexAtPoint(p.x, p.y);
     return -1;
   }
-  
+
   synchronized Rectangle getCharacterBounds(int i)
   {
     TextComponentPeer tcp = (TextComponentPeer) getPeer();
@@ -661,11 +661,11 @@ public class TextComponent extends Component
       return tcp.getCharacterBounds(i);
     return null;
   }
-  
+
   /**
    * All old mouse events for this component should
    * be ignored.
-   * 
+   *
    * @return true to ignore all old mouse events.
    */
   static boolean ignoreOldMouseEvents()
@@ -674,4 +674,3 @@ public class TextComponent extends Component
   }
 
 } // class TextComponent
-
diff --git a/libjava/classpath/java/awt/TextField.java b/libjava/classpath/java/awt/TextField.java
index b1df66f..5a58b44 100644
--- a/libjava/classpath/java/awt/TextField.java
+++ b/libjava/classpath/java/awt/TextField.java
@@ -54,13 +54,13 @@ import javax.accessibility.AccessibleStateSet;
  */
 public class TextField extends TextComponent
 {
-  
+
   /**
    * The number used to generate the name returned by getName.
    */
   private static transient long next_textfield_number;
 
-  
+
   private static final long serialVersionUID = -2966288784432217853L;
 
 
@@ -127,7 +127,7 @@ public class TextField extends TextComponent
   public TextField(String text, int columns)
   {
     super(text);
-  
+
     if (columns < 0)
       this.columns = 0;
     else
@@ -165,7 +165,7 @@ public class TextField extends TextComponent
   }
 
   /**
-   * Returns the character that is echoed to the screen when a text 
+   * Returns the character that is echoed to the screen when a text
    * field is protected (such as when a password is being entered).
    *
    * @return The echo character for this text field.
@@ -192,7 +192,7 @@ public class TextField extends TextComponent
    *
    * @param echoChar The new echo character.
    *
-   * @deprecated This method is deprecated in favor of 
+   * @deprecated This method is deprecated in favor of
    * <code>setEchoChar()</code>
    */
   public void setEchoCharacter(char echoChar)
@@ -259,14 +259,14 @@ public class TextField extends TextComponent
    *
    * @param columns The number of columns to get the minimum size for.
    *
-   * @deprecated This method is deprecated in favor of 
+   * @deprecated This method is deprecated in favor of
    * <code>getMinimumSize(int)</code>.
    */
   public Dimension minimumSize(int columns)
   {
     if (isMinimumSizeSet())
       return new Dimension(minSize);
-    
+
     TextFieldPeer peer = (TextFieldPeer) getPeer ();
     if (peer == null)
       return new Dimension(getWidth(), getHeight());
@@ -300,7 +300,7 @@ public class TextField extends TextComponent
    *
    * @return The preferred size for this text field.
    *
-   * @deprecated This method is deprecated in favor of 
+   * @deprecated This method is deprecated in favor of
    * <code>getPreferredSize()</code>.
    */
   public Dimension preferredSize()
@@ -314,18 +314,18 @@ public class TextField extends TextComponent
    *
    * @param columns The number of columns to get the preferred size for.
    *
-   * @deprecated This method is deprecated in favor of 
+   * @deprecated This method is deprecated in favor of
    * <code>getPreferredSize(int)</code>.
    */
   public Dimension preferredSize(int columns)
   {
     if (isPreferredSizeSet())
       return new Dimension(prefSize);
-    
+
     TextFieldPeer peer = (TextFieldPeer) getPeer ();
     if (peer == null)
       return new Dimension (getWidth(), getHeight());
-    
+
     return peer.getPreferredSize (columns);
   }
 
@@ -387,7 +387,7 @@ public class TextField extends TextComponent
    * are enabled on this object.  This will be true if any listeners
    * are registered, or if action events were specifically enabled
    * using <code>enableEvents()</code>.
-   * 
+   *
    * @param event The event to process.
    */
   protected void processActionEvent(ActionEvent event)
@@ -398,10 +398,10 @@ public class TextField extends TextComponent
 
   void dispatchEventImpl(AWTEvent e)
   {
-    if (e.id <= ActionEvent.ACTION_LAST 
+    if (e.id <= ActionEvent.ACTION_LAST
         && e.id >= ActionEvent.ACTION_FIRST
-        && (action_listeners != null 
-	    || (eventMask & AWTEvent.ACTION_EVENT_MASK) != 0))
+        && (action_listeners != null
+            || (eventMask & AWTEvent.ACTION_EVENT_MASK) != 0))
       processEvent(e);
     else
       super.dispatchEventImpl(e);
@@ -446,7 +446,7 @@ public class TextField extends TextComponent
   {
     return (ActionListener[]) getListeners (ActionListener.class);
   }
-  
+
   /**
    * Generate a unique name for this <code>TextField</code>.
    *
@@ -469,13 +469,13 @@ public class TextField extends TextComponent
     protected AccessibleAWTTextField()
     {
     }
-    
+
     public AccessibleStateSet getAccessibleStateSet()
     {
       return super.getAccessibleStateSet();
     }
   }
-  
+
   public AccessibleContext getAccessibleContext()
   {
     return new AccessibleAWTTextField();
diff --git a/libjava/classpath/java/awt/TexturePaint.java b/libjava/classpath/java/awt/TexturePaint.java
index 387ccb0..f88e77b 100644
--- a/libjava/classpath/java/awt/TexturePaint.java
+++ b/libjava/classpath/java/awt/TexturePaint.java
@@ -1,4 +1,4 @@
-/* TexturePaint.java -- 
+/* TexturePaint.java --
    Copyright (C) 2002 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -53,10 +53,10 @@ public class TexturePaint implements Paint
 {
   private final BufferedImage texture;
   private final Rectangle2D anchor;
-  
+
   /**
    * Constructor.
-   * 
+   *
    * @param texture - the texture
    * @param anchor - the shape
    */
@@ -68,7 +68,7 @@ public class TexturePaint implements Paint
 
   /**
    * Gets the texture image.
-   * 
+   *
    * @return the texture
    */
   public BufferedImage getImage()
@@ -78,7 +78,7 @@ public class TexturePaint implements Paint
 
   /**
    * Gets the shape anchor.
-   * 
+   *
    * @return the shape anchor
    */
   public Rectangle2D getAnchorRect()
@@ -88,12 +88,12 @@ public class TexturePaint implements Paint
 
   /**
    * Creates the context used to paint the texture.
-   * 
+   *
    * @param cm - the ColorModel that receives the Paint data. Used only as a hint.
    * @param deviceBounds - the device space being rendered.
    * @param userBounds - the user space being rendered
    * @param xform - the AffineTransform from user space into device space
-   * @param hints - a RenderingHints object that is used to specify how the 
+   * @param hints - a RenderingHints object that is used to specify how the
    * pattern is rendered
    * @return the paint context used to paint the texture
    */
@@ -108,7 +108,7 @@ public class TexturePaint implements Paint
 
   /**
    * Returns the transparency mode.
-   * 
+   *
    * @return the transparency mode.
    */
   public int getTransparency()
diff --git a/libjava/classpath/java/awt/Toolkit.java b/libjava/classpath/java/awt/Toolkit.java
index b12e9e1..6b1eb9d 100644
--- a/libjava/classpath/java/awt/Toolkit.java
+++ b/libjava/classpath/java/awt/Toolkit.java
@@ -124,7 +124,7 @@ public abstract class Toolkit
   /** The toolkit properties. */
   private static Properties props = new Properties();
 
-  protected final Map<String,Object> desktopProperties = 
+  protected final Map<String,Object> desktopProperties =
     new Hashtable<String,Object>();
 
   protected final PropertyChangeSupport desktopPropsSupport
@@ -150,19 +150,19 @@ public abstract class Toolkit
   }
 
   /**
-   * 
+   *
    * @param target
    * @return
    * @throws HeadlessException
    */
   protected abstract DesktopPeer createDesktopPeer(Desktop target)
     throws HeadlessException;
-  
+
   /**
    * Creates a peer object for the specified <code>Button</code>.
    *
    * @param target The <code>Button</code> to create the peer for.
-   * 
+   *
    * @return The peer for the specified <code>Button</code> object.
    *
    * @exception HeadlessException If GraphicsEnvironment.isHeadless() is true.
@@ -353,7 +353,7 @@ public abstract class Toolkit
   protected abstract MenuItemPeer createMenuItem(MenuItem target);
 
   /**
-   * Returns a MouseInfoPeer. 
+   * Returns a MouseInfoPeer.
    * The default implementation of this method throws
    * UnsupportedOperationException.
    *
@@ -493,7 +493,7 @@ public abstract class Toolkit
    * Returns the dimensions of the screen in pixels.
    *
    * @return The dimensions of the screen in pixels.
-   * 
+   *
    * @exception HeadlessException If GraphicsEnvironment.isHeadless() is true.
    */
   public abstract Dimension getScreenSize();
@@ -521,7 +521,7 @@ public abstract class Toolkit
    * Returns the color model of the screen.
    *
    * @return The color model of the screen.
-   * 
+   *
    * @exception HeadlessException If GraphicsEnvironment.isHeadless() is true.
    */
   public abstract ColorModel getColorModel();
@@ -815,7 +815,7 @@ public abstract class Toolkit
   {
     if (AWTUtilities.isValidKey(keyCode))
       throw new UnsupportedOperationException
-	("cannot get locking state of key code " + keyCode);
+        ("cannot get locking state of key code " + keyCode);
 
     throw new IllegalArgumentException("invalid key code " + keyCode);
   }
@@ -835,7 +835,7 @@ public abstract class Toolkit
         && keyCode != KeyEvent.VK_NUM_LOCK
         && keyCode != KeyEvent.VK_SCROLL_LOCK)
       throw new IllegalArgumentException();
-    
+
     throw new UnsupportedOperationException();
   }
 
@@ -915,7 +915,7 @@ public abstract class Toolkit
    * Returns whether Toolkit supports this state for Frames.
    *
    * @exception HeadlessException If GraphicsEnvironment.isHeadless() is true.
-   * 
+   *
    * @since 1.4
    */
   public boolean isFrameStateSupported(int state)
diff --git a/libjava/classpath/java/awt/Window.java b/libjava/classpath/java/awt/Window.java
index 2a59375..986d130 100644
--- a/libjava/classpath/java/awt/Window.java
+++ b/libjava/classpath/java/awt/Window.java
@@ -73,7 +73,7 @@ public class Window extends Container implements Accessible
   private String warningString = null;
   private int windowSerializedDataVersion = 0; // FIXME
   /** @since 1.2 */
-  // private FocusManager focusMgr;  // FIXME: what is this?  
+  // private FocusManager focusMgr;  // FIXME: what is this?
   /** @since 1.2 */
   private int state = 0;
   /** @since 1.4 */
@@ -92,7 +92,7 @@ public class Window extends Container implements Accessible
 
   // This is package-private to avoid an accessor method.
   transient Component windowFocusOwner;
-  
+
   /*
    * The number used to generate the name returned by getName.
    */
@@ -106,7 +106,7 @@ public class Window extends Container implements Accessible
     {
       return AccessibleRole.WINDOW;
     }
-    
+
     public AccessibleStateSet getAccessibleStateSet()
     {
       AccessibleStateSet states = super.getAccessibleStateSet();
@@ -116,7 +116,7 @@ public class Window extends Container implements Accessible
     }
   }
 
-  /** 
+  /**
    * This (package access) constructor is used by subclasses that want
    * to build windows that do not have parents.  Eg. toplevel
    * application frames.  Subclasses cannot call super(null), since
@@ -129,7 +129,7 @@ public class Window extends Container implements Accessible
     // cycle roots.
     focusCycleRoot = true;
     setLayout(new BorderLayout());
-    
+
     GraphicsEnvironment g = GraphicsEnvironment.getLocalGraphicsEnvironment();
     graphicsConfig = g.getDefaultScreenDevice().getDefaultConfiguration();
   }
@@ -157,7 +157,7 @@ public class Window extends Container implements Accessible
 
   /**
    * Initializes a new instance of <code>Window</code> with the specified
-   * parent.  The window will initially be invisible.   
+   * parent.  The window will initially be invisible.
    *
    * @exception IllegalArgumentException If the owner's GraphicsConfiguration
    * is not from a screen device, or if owner is null; this exception is always
@@ -169,10 +169,10 @@ public class Window extends Container implements Accessible
   {
     this (owner, owner.getGraphicsConfiguration ());
   }
-  
+
   /**
    * Initializes a new instance of <code>Window</code> with the specified
-   * parent.  The window will initially be invisible.   
+   * parent.  The window will initially be invisible.
    *
    * @exception IllegalArgumentException If owner is null or if gc is not from a
    * screen device; this exception is always thrown when
@@ -186,10 +186,10 @@ public class Window extends Container implements Accessible
 
     synchronized (getTreeLock())
       {
-	if (owner == null)
-	  throw new IllegalArgumentException ("owner must not be null");
+        if (owner == null)
+          throw new IllegalArgumentException ("owner must not be null");
 
-	parent = owner;
+        parent = owner;
         owner.ownedWindows.add(new WeakReference(this));
       }
 
@@ -312,18 +312,18 @@ public class Window extends Container implements Accessible
     // Hide visible owned windows.
     synchronized (getTreeLock ())
       {
-	Iterator e = ownedWindows.iterator();
-	while(e.hasNext())
-	  {
-	    Window w = (Window)(((Reference) e.next()).get());
-	    if (w != null)
-	      {
-		if (w.isVisible() && w.getPeer() != null)
-		  w.getPeer().setVisible(false);
-	      }
-     	    else
-	      e.remove();
-	  }
+        Iterator e = ownedWindows.iterator();
+        while(e.hasNext())
+          {
+            Window w = (Window)(((Reference) e.next()).get());
+            if (w != null)
+              {
+                if (w.isVisible() && w.getPeer() != null)
+                  w.getPeer().setVisible(false);
+              }
+            else
+              e.remove();
+          }
       }
     super.hide();
   }
@@ -338,30 +338,30 @@ public class Window extends Container implements Accessible
 
     synchronized (getTreeLock ())
       {
-	Iterator e = ownedWindows.iterator();
-	while(e.hasNext())
-	  {
-	    Window w = (Window)(((Reference) e.next()).get());
-	    if (w != null)
-	      w.dispose();
-	    else
-	      // Remove null weak reference from ownedWindows.
-	      e.remove();
-	  }
-
-	for (int i = 0; i < ncomponents; ++i)
-	  component[i].removeNotify();
-	this.removeNotify();
-
-	// Post WINDOW_CLOSED from here.
-	if (windowListener != null
-	    || (eventMask & AWTEvent.WINDOW_EVENT_MASK) != 0)
-	  {
-	    WindowEvent ev = new WindowEvent(this,
-	                                     WindowEvent.WINDOW_CLOSED);
-	    Toolkit tk = Toolkit.getDefaultToolkit();
-	    tk.getSystemEventQueue().postEvent(ev);
-	  }
+        Iterator e = ownedWindows.iterator();
+        while(e.hasNext())
+          {
+            Window w = (Window)(((Reference) e.next()).get());
+            if (w != null)
+              w.dispose();
+            else
+              // Remove null weak reference from ownedWindows.
+              e.remove();
+          }
+
+        for (int i = 0; i < ncomponents; ++i)
+          component[i].removeNotify();
+        this.removeNotify();
+
+        // Post WINDOW_CLOSED from here.
+        if (windowListener != null
+            || (eventMask & AWTEvent.WINDOW_EVENT_MASK) != 0)
+          {
+            WindowEvent ev = new WindowEvent(this,
+                                             WindowEvent.WINDOW_CLOSED);
+            Toolkit tk = Toolkit.getDefaultToolkit();
+            tk.getSystemEventQueue().postEvent(ev);
+          }
       }
   }
 
@@ -376,9 +376,9 @@ public class Window extends Container implements Accessible
   {
     if (peer != null)
       {
-	if( alwaysOnTop )
-	  setAlwaysOnTop( false );
-	( (WindowPeer) peer ).toBack();
+        if( alwaysOnTop )
+          setAlwaysOnTop( false );
+        ( (WindowPeer) peer ).toBack();
       }
   }
 
@@ -397,12 +397,12 @@ public class Window extends Container implements Accessible
    *
    * @return The toolkit used to create this window.
    *
-   * @specnote Unlike Component.getToolkit, this implementation always 
+   * @specnote Unlike Component.getToolkit, this implementation always
    *           returns the value of Toolkit.getDefaultToolkit().
    */
   public Toolkit getToolkit()
   {
-    return Toolkit.getDefaultToolkit();    
+    return Toolkit.getDefaultToolkit();
   }
 
   /**
@@ -455,28 +455,28 @@ public class Window extends Container implements Accessible
     Window [] trimmedList;
     synchronized (getTreeLock ())
       {
-	// Windows with non-null weak references in ownedWindows.
-	Window [] validList = new Window [ownedWindows.size()];
-
-	Iterator e = ownedWindows.iterator();
-	int numValid = 0;
-	while (e.hasNext())
-	  {
-	    Window w = (Window)(((Reference) e.next()).get());
-	    if (w != null)
-	      validList[numValid++] = w;
-	    else
-	      // Remove null weak reference from ownedWindows.
-	      e.remove();
-	  }
-
-	if (numValid != validList.length)
-	  {
-	    trimmedList = new Window [numValid];
-	    System.arraycopy (validList, 0, trimmedList, 0, numValid);
-	  }
-	else
-	  trimmedList = validList;
+        // Windows with non-null weak references in ownedWindows.
+        Window [] validList = new Window [ownedWindows.size()];
+
+        Iterator e = ownedWindows.iterator();
+        int numValid = 0;
+        while (e.hasNext())
+          {
+            Window w = (Window)(((Reference) e.next()).get());
+            if (w != null)
+              validList[numValid++] = w;
+            else
+              // Remove null weak reference from ownedWindows.
+              e.remove();
+          }
+
+        if (numValid != validList.length)
+          {
+            trimmedList = new Window [numValid];
+            System.arraycopy (validList, 0, trimmedList, 0, numValid);
+          }
+        else
+          trimmedList = validList;
       }
     return trimmedList;
   }
@@ -531,7 +531,7 @@ public class Window extends Container implements Accessible
       AWTEventMulticaster.getListeners(windowFocusListener,
                                        WindowFocusListener.class);
   }
-  
+
   /**
    * Returns an array of all the window state listeners registered on this
    * window.
@@ -557,7 +557,7 @@ public class Window extends Container implements Accessible
                                                        wfl);
       }
   }
-  
+
   /**
    * Adds the specified listener to this window.
    *
@@ -569,10 +569,10 @@ public class Window extends Container implements Accessible
       {
         newEventsOnly = true;
         windowStateListener = AWTEventMulticaster.add (windowStateListener,
-                                                       wsl);  
+                                                       wsl);
       }
   }
-  
+
   /**
    * Removes the specified listener from this window.
    */
@@ -580,7 +580,7 @@ public class Window extends Container implements Accessible
   {
     windowFocusListener = AWTEventMulticaster.remove (windowFocusListener, wfl);
   }
-  
+
   /**
    * Removes the specified listener from this window.
    *
@@ -697,7 +697,7 @@ public class Window extends Container implements Accessible
   /**
    * Identifies if this window is active.  The active window is a Frame or
    * Dialog that has focus or owns the active window.
-   *  
+   *
    * @return true if active, else false.
    * @since 1.4
    */
@@ -710,7 +710,7 @@ public class Window extends Container implements Accessible
   /**
    * Identifies if this window is focused.  A window is focused if it is the
    * focus owner or it contains the focus owner.
-   * 
+   *
    * @return true if focused, else false.
    * @since 1.4
    */
@@ -719,7 +719,7 @@ public class Window extends Container implements Accessible
     KeyboardFocusManager manager = KeyboardFocusManager.getCurrentKeyboardFocusManager ();
     return manager.getFocusedWindow() == this;
   }
-  
+
   /**
    * Returns the child window that has focus if this window is active.
    * This method returns <code>null</code> if this window is not active
@@ -804,7 +804,7 @@ public class Window extends Container implements Accessible
   {
     int x = 0;
     int y = 0;
-    
+
     if (c == null || !c.isShowing())
       {
         GraphicsEnvironment ge = GraphicsEnvironment.getLocalGraphicsEnvironment();
@@ -820,7 +820,7 @@ public class Window extends Container implements Accessible
 
         x = c.getLocationOnScreen().x;
         y = c.getLocationOnScreen().y;
-        
+
         // If bottom of component is cut off, window placed
         // on the left or the right side of component
         if ((y + cHeight) > screenSize.height)
@@ -853,7 +853,7 @@ public class Window extends Container implements Accessible
               x = 0;
             else
               x += (cWidth - width) / 2;
-            
+
             y += (cHeight - height) / 2;
           }
         else
@@ -892,9 +892,9 @@ public class Window extends Container implements Accessible
     WindowBltBufferStrategy(int numBuffers, boolean accelerated)
     {
       super(numBuffers,
-	    new BufferCapabilities(new ImageCapabilities(accelerated),
-				   new ImageCapabilities(accelerated),
-				   BufferCapabilities.FlipContents.COPIED));
+            new BufferCapabilities(new ImageCapabilities(accelerated),
+                                   new ImageCapabilities(accelerated),
+                                   BufferCapabilities.FlipContents.COPIED));
     }
   }
 
@@ -915,9 +915,9 @@ public class Window extends Container implements Accessible
       throws AWTException
     {
       super(numBuffers,
-	    new BufferCapabilities(new ImageCapabilities(true),
-				   new ImageCapabilities(true),
-				   BufferCapabilities.FlipContents.COPIED));
+            new BufferCapabilities(new ImageCapabilities(true),
+                                   new ImageCapabilities(true),
+                                   BufferCapabilities.FlipContents.COPIED));
     }
   }
 
@@ -948,18 +948,18 @@ public class Window extends Container implements Accessible
   {
     if (numBuffers < 1)
       throw new IllegalArgumentException("Window.createBufferStrategy: number"
-					 + " of buffers is less than one");
+                                         + " of buffers is less than one");
 
     if (!isDisplayable())
       throw new IllegalStateException("Window.createBufferStrategy: window is"
-				      + " not displayable");
+                                      + " not displayable");
 
     BufferStrategy newStrategy = null;
 
     // try a flipping strategy
     try
       {
-	newStrategy = new WindowFlipBufferStrategy(numBuffers);
+        newStrategy = new WindowFlipBufferStrategy(numBuffers);
       }
     catch (AWTException e)
       {
@@ -996,11 +996,11 @@ public class Window extends Container implements Accessible
   {
     if (numBuffers < 1)
       throw new IllegalArgumentException("Window.createBufferStrategy: number"
-					 + " of buffers is less than one");
+                                         + " of buffers is less than one");
 
     if (caps == null)
       throw new IllegalArgumentException("Window.createBufferStrategy:"
-					 + " capabilities object is null");
+                                         + " capabilities object is null");
 
     // a flipping strategy was requested
     if (caps.isPageFlipping())
@@ -1040,7 +1040,7 @@ public class Window extends Container implements Accessible
     ResourceBundle rb = ResourceBundle.getBundle(rbName, Locale.getDefault(),
       ClassLoader.getSystemClassLoader());
     if (rb != null)
-      applyResourceBundle(rb);    
+      applyResourceBundle(rb);
   }
 
   /**
@@ -1057,7 +1057,7 @@ public class Window extends Container implements Accessible
     return accessibleContext;
   }
 
-  /** 
+  /**
    * Get graphics configuration.  The implementation for Window will
    * not ask any parent containers, since Window is a toplevel
    * window and not actually embedded in the parent component.
@@ -1083,17 +1083,17 @@ public class Window extends Container implements Accessible
           case WindowEvent.WINDOW_GAINED_FOCUS:
             windowFocusListener.windowGainedFocus (event);
             break;
-            
+
           case WindowEvent.WINDOW_LOST_FOCUS:
             windowFocusListener.windowLostFocus (event);
             break;
-            
+
           default:
             break;
           }
       }
   }
-  
+
   /**
    * @since 1.4
    */
@@ -1122,10 +1122,10 @@ public class Window extends Container implements Accessible
 
     return false;
   }
-  
+
   /**
    * Returns the value of the focusableWindowState property.
-   * 
+   *
    * @since 1.4
    */
   public boolean getFocusableWindowState ()
@@ -1135,17 +1135,17 @@ public class Window extends Container implements Accessible
 
   /**
    * Sets the value of the focusableWindowState property.
-   * 
+   *
    * @since 1.4
    */
   public void setFocusableWindowState (boolean focusableWindowState)
   {
     this.focusableWindowState = focusableWindowState;
   }
-  
+
   /**
    * Check whether this Container is a focus cycle root.
-   * Returns always <code>true</code> as Windows are the 
+   * Returns always <code>true</code> as Windows are the
    * root of the focus cycle.
    *
    * @return Always <code>true</code>.
@@ -1161,7 +1161,7 @@ public class Window extends Container implements Accessible
    * Set whether or not this Container is the root of a focus
    * traversal cycle. Windows are the root of the focus cycle
    * and therefore this method does nothing.
-   * 
+   *
    * @param focusCycleRoot ignored.
    *
    * @since 1.4
@@ -1201,7 +1201,7 @@ public class Window extends Container implements Accessible
    * Sets the always-on-top state of this window (if supported).
    *
    * Setting a window to always-on-top means it will not be obscured
-   * by any other windows (with the exception of other always-on-top 
+   * by any other windows (with the exception of other always-on-top
    * windows). Not all platforms may support this.
    *
    * If an window's always-on-top status is changed to false, the window
@@ -1220,14 +1220,14 @@ public class Window extends Container implements Accessible
 
     if( this.alwaysOnTop == alwaysOnTop )
       return;
-    
+
     if( alwaysOnTop )
       toFront();
 
     firePropertyChange("alwaysOnTop", this.alwaysOnTop, alwaysOnTop );
     this.alwaysOnTop = alwaysOnTop;
 
-    if (peer != null) 
+    if (peer != null)
       ( (WindowPeer) peer).updateAlwaysOnTop();
     else
       System.out.println("Null peer?!");
diff --git a/libjava/classpath/java/awt/color/ICC_ColorSpace.java b/libjava/classpath/java/awt/color/ICC_ColorSpace.java
index b50048c..ac636fb 100644
--- a/libjava/classpath/java/awt/color/ICC_ColorSpace.java
+++ b/libjava/classpath/java/awt/color/ICC_ColorSpace.java
@@ -212,7 +212,7 @@ public class ICC_ColorSpace extends ColorSpace
    */
   public float getMinValue(int idx)
   {
-    // FIXME: Not 100% certain of this. 
+    // FIXME: Not 100% certain of this.
     if (type == ColorSpace.TYPE_Lab && (idx == 1 || idx == 2))
       return -128f;
 
@@ -236,10 +236,10 @@ public class ICC_ColorSpace extends ColorSpace
       return 1 + 32767 / 32768f;
     else if (type == ColorSpace.TYPE_Lab)
       {
-	if (idx == 0)
-	  return 100;
-	if (idx == 1 || idx == 2)
-	  return 127;
+        if (idx == 0)
+          return 100;
+        if (idx == 1 || idx == 2)
+          return 127;
       }
     if (idx < 0 || idx >= nComponents)
       throw new IllegalArgumentException();
@@ -255,28 +255,28 @@ public class ICC_ColorSpace extends ColorSpace
     switch (profile.isPredefined())
       {
       case CS_sRGB:
-	converter = new SrgbConverter();
-	break;
+        converter = new SrgbConverter();
+        break;
       case CS_CIEXYZ:
-	converter = new CieXyzConverter();
-	break;
+        converter = new CieXyzConverter();
+        break;
       case CS_GRAY:
-	converter = new GrayScaleConverter();
-	break;
+        converter = new GrayScaleConverter();
+        break;
       case CS_LINEAR_RGB:
-	converter = new LinearRGBConverter();
-	break;
+        converter = new LinearRGBConverter();
+        break;
       case CS_PYCC:
-	converter = new PyccConverter();
-	break;
+        converter = new PyccConverter();
+        break;
       default:
-	if (profile instanceof ICC_ProfileRGB)
-	  converter = new RgbProfileConverter((ICC_ProfileRGB) profile);
-	else if (profile instanceof ICC_ProfileGray)
-	  converter = new GrayProfileConverter((ICC_ProfileGray) profile);
-	else
-	  converter = new ClutProfileConverter(profile);
-	break;
+        if (profile instanceof ICC_ProfileRGB)
+          converter = new RgbProfileConverter((ICC_ProfileRGB) profile);
+        else if (profile instanceof ICC_ProfileGray)
+          converter = new GrayProfileConverter((ICC_ProfileGray) profile);
+        else
+          converter = new ClutProfileConverter(profile);
+        break;
       }
     return converter;
   }
@@ -293,8 +293,8 @@ public class ICC_ColorSpace extends ColorSpace
     invDiffMinMax = diffMinMax = null;
     for (int i = 0; i < nComponents; i++)
       {
-	minVal[i] = getMinValue(i);
-	maxVal[i] = getMaxValue(i);
+        minVal[i] = getMinValue(i);
+        maxVal[i] = getMaxValue(i);
       }
     needScaleInit = true;
   }
diff --git a/libjava/classpath/java/awt/color/ICC_Profile.java b/libjava/classpath/java/awt/color/ICC_Profile.java
index e2efb3a..0eef22e 100644
--- a/libjava/classpath/java/awt/color/ICC_Profile.java
+++ b/libjava/classpath/java/awt/color/ICC_Profile.java
@@ -114,7 +114,7 @@ public class ICC_Profile implements Serializable
   /**
    * Color space signatures
    */
-  public static final int icSigXYZData = 0x58595A20; // 'XYZ ' 
+  public static final int icSigXYZData = 0x58595A20; // 'XYZ '
   public static final int icSigLabData = 0x4C616220; // 'Lab '
   public static final int icSigLuvData = 0x4C757620; // 'Luv '
   public static final int icSigYCbCrData = 0x59436272; // 'YCbr'
@@ -151,50 +151,50 @@ public class ICC_Profile implements Serializable
   /**
    * Tag signatures
    */
-  public static final int icSigAToB0Tag = 0x41324230; // 'A2B0' 
-  public static final int icSigAToB1Tag = 0x41324231; // 'A2B1' 
-  public static final int icSigAToB2Tag = 0x41324232; // 'A2B2' 
-  public static final int icSigBlueColorantTag = 0x6258595A; // 'bXYZ' 
-  public static final int icSigBlueTRCTag = 0x62545243; // 'bTRC' 
-  public static final int icSigBToA0Tag = 0x42324130; // 'B2A0' 
-  public static final int icSigBToA1Tag = 0x42324131; // 'B2A1' 
-  public static final int icSigBToA2Tag = 0x42324132; // 'B2A2' 
-  public static final int icSigCalibrationDateTimeTag = 0x63616C74; // 'calt' 
-  public static final int icSigCharTargetTag = 0x74617267; // 'targ' 
-  public static final int icSigCopyrightTag = 0x63707274; // 'cprt' 
-  public static final int icSigCrdInfoTag = 0x63726469; // 'crdi' 
-  public static final int icSigDeviceMfgDescTag = 0x646D6E64; // 'dmnd' 
-  public static final int icSigDeviceModelDescTag = 0x646D6464; // 'dmdd' 
-  public static final int icSigDeviceSettingsTag = 0x64657673; // 'devs' 
-  public static final int icSigGamutTag = 0x67616D74; // 'gamt' 
-  public static final int icSigGrayTRCTag = 0x6b545243; // 'kTRC' 
-  public static final int icSigGreenColorantTag = 0x6758595A; // 'gXYZ' 
-  public static final int icSigGreenTRCTag = 0x67545243; // 'gTRC' 
-  public static final int icSigLuminanceTag = 0x6C756d69; // 'lumi' 
-  public static final int icSigMeasurementTag = 0x6D656173; // 'meas' 
-  public static final int icSigMediaBlackPointTag = 0x626B7074; // 'bkpt' 
-  public static final int icSigMediaWhitePointTag = 0x77747074; // 'wtpt' 
-  public static final int icSigNamedColor2Tag = 0x6E636C32; // 'ncl2' 
-  public static final int icSigOutputResponseTag = 0x72657370; // 'resp' 
-  public static final int icSigPreview0Tag = 0x70726530; // 'pre0' 
-  public static final int icSigPreview1Tag = 0x70726531; // 'pre1' 
-  public static final int icSigPreview2Tag = 0x70726532; // 'pre2' 
-  public static final int icSigProfileDescriptionTag = 0x64657363; // 'desc' 
-  public static final int icSigProfileSequenceDescTag = 0x70736571; // 'pseq' 
-  public static final int icSigPs2CRD0Tag = 0x70736430; // 'psd0' 
-  public static final int icSigPs2CRD1Tag = 0x70736431; // 'psd1' 
-  public static final int icSigPs2CRD2Tag = 0x70736432; // 'psd2' 
-  public static final int icSigPs2CRD3Tag = 0x70736433; // 'psd3' 
-  public static final int icSigPs2CSATag = 0x70733273; // 'ps2s' 
-  public static final int icSigPs2RenderingIntentTag = 0x70733269; // 'ps2i' 
-  public static final int icSigRedColorantTag = 0x7258595A; // 'rXYZ' 
-  public static final int icSigRedTRCTag = 0x72545243; // 'rTRC' 
-  public static final int icSigScreeningDescTag = 0x73637264; // 'scrd' 
-  public static final int icSigScreeningTag = 0x7363726E; // 'scrn' 
-  public static final int icSigTechnologyTag = 0x74656368; // 'tech' 
-  public static final int icSigUcrBgTag = 0x62666420; // 'bfd ' 
-  public static final int icSigViewingCondDescTag = 0x76756564; // 'vued' 
-  public static final int icSigViewingConditionsTag = 0x76696577; // 'view' 
+  public static final int icSigAToB0Tag = 0x41324230; // 'A2B0'
+  public static final int icSigAToB1Tag = 0x41324231; // 'A2B1'
+  public static final int icSigAToB2Tag = 0x41324232; // 'A2B2'
+  public static final int icSigBlueColorantTag = 0x6258595A; // 'bXYZ'
+  public static final int icSigBlueTRCTag = 0x62545243; // 'bTRC'
+  public static final int icSigBToA0Tag = 0x42324130; // 'B2A0'
+  public static final int icSigBToA1Tag = 0x42324131; // 'B2A1'
+  public static final int icSigBToA2Tag = 0x42324132; // 'B2A2'
+  public static final int icSigCalibrationDateTimeTag = 0x63616C74; // 'calt'
+  public static final int icSigCharTargetTag = 0x74617267; // 'targ'
+  public static final int icSigCopyrightTag = 0x63707274; // 'cprt'
+  public static final int icSigCrdInfoTag = 0x63726469; // 'crdi'
+  public static final int icSigDeviceMfgDescTag = 0x646D6E64; // 'dmnd'
+  public static final int icSigDeviceModelDescTag = 0x646D6464; // 'dmdd'
+  public static final int icSigDeviceSettingsTag = 0x64657673; // 'devs'
+  public static final int icSigGamutTag = 0x67616D74; // 'gamt'
+  public static final int icSigGrayTRCTag = 0x6b545243; // 'kTRC'
+  public static final int icSigGreenColorantTag = 0x6758595A; // 'gXYZ'
+  public static final int icSigGreenTRCTag = 0x67545243; // 'gTRC'
+  public static final int icSigLuminanceTag = 0x6C756d69; // 'lumi'
+  public static final int icSigMeasurementTag = 0x6D656173; // 'meas'
+  public static final int icSigMediaBlackPointTag = 0x626B7074; // 'bkpt'
+  public static final int icSigMediaWhitePointTag = 0x77747074; // 'wtpt'
+  public static final int icSigNamedColor2Tag = 0x6E636C32; // 'ncl2'
+  public static final int icSigOutputResponseTag = 0x72657370; // 'resp'
+  public static final int icSigPreview0Tag = 0x70726530; // 'pre0'
+  public static final int icSigPreview1Tag = 0x70726531; // 'pre1'
+  public static final int icSigPreview2Tag = 0x70726532; // 'pre2'
+  public static final int icSigProfileDescriptionTag = 0x64657363; // 'desc'
+  public static final int icSigProfileSequenceDescTag = 0x70736571; // 'pseq'
+  public static final int icSigPs2CRD0Tag = 0x70736430; // 'psd0'
+  public static final int icSigPs2CRD1Tag = 0x70736431; // 'psd1'
+  public static final int icSigPs2CRD2Tag = 0x70736432; // 'psd2'
+  public static final int icSigPs2CRD3Tag = 0x70736433; // 'psd3'
+  public static final int icSigPs2CSATag = 0x70733273; // 'ps2s'
+  public static final int icSigPs2RenderingIntentTag = 0x70733269; // 'ps2i'
+  public static final int icSigRedColorantTag = 0x7258595A; // 'rXYZ'
+  public static final int icSigRedTRCTag = 0x72545243; // 'rTRC'
+  public static final int icSigScreeningDescTag = 0x73637264; // 'scrd'
+  public static final int icSigScreeningTag = 0x7363726E; // 'scrn'
+  public static final int icSigTechnologyTag = 0x74656368; // 'tech'
+  public static final int icSigUcrBgTag = 0x62666420; // 'bfd '
+  public static final int icSigViewingCondDescTag = 0x76756564; // 'vued'
+  public static final int icSigViewingConditionsTag = 0x76696577; // 'view'
   public static final int icSigChromaticityTag = 0x6368726D; // 'chrm'
 
   /**
@@ -430,10 +430,10 @@ public class ICC_Profile implements Serializable
     int bytesLeft = totalBytes;
     while (bytesLeft > 0)
       {
-    	int read = in.read(data,
+        int read = in.read(data,
                            ProfileHeader.HEADERSIZE + (totalBytes - bytesLeft),
                            bytesLeft);
-    	bytesLeft -= read;
+        bytesLeft -= read;
       }
 
     return getInstance(data);
@@ -540,9 +540,9 @@ public class ICC_Profile implements Serializable
     Enumeration e = tagTable.elements();
     while (e.hasMoreElements())
       {
-	TagEntry tag = (TagEntry) e.nextElement();
-	System.arraycopy(tag.getData(), 0, 
-			 data, tag.getOffset(), tag.getSize());
+        TagEntry tag = (TagEntry) e.nextElement();
+        System.arraycopy(tag.getData(), 0,
+                         data, tag.getOffset(), tag.getSize());
       }
     return data;
   }
@@ -582,8 +582,8 @@ public class ICC_Profile implements Serializable
       header = new ProfileHeader(data);
     else
       {
-	TagEntry t = new TagEntry(tagSignature, data);
-	tagTable.put(t.hashKey(), t);
+        TagEntry t = new TagEntry(tagSignature, data);
+        tagTable.put(t.hashKey(), t);
       }
   }
 
@@ -592,7 +592,7 @@ public class ICC_Profile implements Serializable
    */
   public int getNumComponents()
   {
-    int[] lookup = 
+    int[] lookup =
                    {
                      ColorSpace.TYPE_RGB, 3, ColorSpace.TYPE_CMY, 3,
                      ColorSpace.TYPE_CMYK, 4, ColorSpace.TYPE_GRAY, 1,
@@ -610,7 +610,7 @@ public class ICC_Profile implements Serializable
                    };
     for (int i = 0; i < lookup.length; i += 2)
       if (header.getColorSpace() == lookup[i])
-	return lookup[i + 1];
+        return lookup[i + 1];
     return 3; // should never happen.
   }
 
@@ -640,24 +640,24 @@ public class ICC_Profile implements Serializable
 
     if (data != null)
       {
-	header = new ProfileHeader(data);
-	tagTable = createTagTable(data);
-	profileID = -1; // Not a predefined color space
+        header = new ProfileHeader(data);
+        tagTable = createTagTable(data);
+        profileID = -1; // Not a predefined color space
       }
 
     if (predef != null)
       {
-	predef = predef.intern();
-	if (predef.equals("CS_sRGB"))
-	  createProfile(ColorSpace.CS_sRGB);
-	if (predef.equals("CS_LINEAR_RGB"))
-	  createProfile(ColorSpace.CS_LINEAR_RGB);
-	if (predef.equals("CS_CIEXYZ"))
-	  createProfile(ColorSpace.CS_CIEXYZ);
-	if (predef.equals("CS_GRAY"))
-	  createProfile(ColorSpace.CS_GRAY);
-	if (predef.equals("CS_PYCC"))
-	  createProfile(ColorSpace.CS_PYCC);
+        predef = predef.intern();
+        if (predef.equals("CS_sRGB"))
+          createProfile(ColorSpace.CS_sRGB);
+        if (predef.equals("CS_LINEAR_RGB"))
+          createProfile(ColorSpace.CS_LINEAR_RGB);
+        if (predef.equals("CS_CIEXYZ"))
+          createProfile(ColorSpace.CS_CIEXYZ);
+        if (predef.equals("CS_GRAY"))
+          createProfile(ColorSpace.CS_GRAY);
+        if (predef.equals("CS_PYCC"))
+          createProfile(ColorSpace.CS_PYCC);
       }
   }
 
@@ -682,9 +682,9 @@ public class ICC_Profile implements Serializable
       s.writeObject("CS_PYCC");
     else
       {
-	s.writeObject(null); // null string
-	s.writeObject(getData()); // data
-	return;
+        s.writeObject(null); // null string
+        s.writeObject(getData()); // data
+        return;
       }
     s.writeObject(null); // null data
   }
@@ -702,16 +702,16 @@ public class ICC_Profile implements Serializable
     Hashtable tagTable = new Hashtable();
     for (int i = 0; i < nTags; i++)
       {
-	TagEntry te = new TagEntry(buf.getInt(tagTableOffset
-	                                      + i * TagEntry.entrySize + 4),
-	                           buf.getInt(tagTableOffset
-	                                      + i * TagEntry.entrySize + 8),
-	                           buf.getInt(tagTableOffset
-	                                      + i * TagEntry.entrySize + 12),
-	                           data);
-
-	if (tagTable.put(te.hashKey(), te) != null)
-	  throw new IllegalArgumentException("Duplicate tag in profile:" + te);
+        TagEntry te = new TagEntry(buf.getInt(tagTableOffset
+                                              + i * TagEntry.entrySize + 4),
+                                   buf.getInt(tagTableOffset
+                                              + i * TagEntry.entrySize + 8),
+                                   buf.getInt(tagTableOffset
+                                              + i * TagEntry.entrySize + 12),
+                                   data);
+
+        if (tagTable.put(te.hashKey(), te) != null)
+          throw new IllegalArgumentException("Duplicate tag in profile:" + te);
       }
     return tagTable;
   }
@@ -724,7 +724,7 @@ public class ICC_Profile implements Serializable
   {
     int totalSize = ProfileHeader.HEADERSIZE; // size of header
 
-    int tagTableSize = 4 + tagTable.size() * TagEntry.entrySize; // size of tag table	
+    int tagTableSize = 4 + tagTable.size() * TagEntry.entrySize; // size of tag table
     if ((tagTableSize & 0x0003) != 0)
       tagTableSize += 4 - (tagTableSize & 0x0003); // pad
     totalSize += tagTableSize;
@@ -732,10 +732,10 @@ public class ICC_Profile implements Serializable
     Enumeration e = tagTable.elements();
     while (e.hasMoreElements())
       { // tag data
-	int tagSize = ((TagEntry) e.nextElement()).getSize();
-	if ((tagSize & 0x0003) != 0)
-	  tagSize += 4 - (tagSize & 0x0003); // pad
-	totalSize += tagSize;
+        int tagSize = ((TagEntry) e.nextElement()).getSize();
+        if ((tagSize & 0x0003) != 0)
+          tagSize += 4 - (tagSize & 0x0003); // pad
+        totalSize += tagSize;
       }
     return totalSize;
   }
@@ -747,7 +747,7 @@ public class ICC_Profile implements Serializable
   {
     int tagTableSize = 4 + tagTable.size() * TagEntry.entrySize;
     if ((tagTableSize & 0x0003) != 0)
-      tagTableSize += 4 - (tagTableSize & 0x0003); // pad 
+      tagTableSize += 4 - (tagTableSize & 0x0003); // pad
 
     int offset = 4;
     int tagOffset = ProfileHeader.HEADERSIZE + tagTableSize;
@@ -757,16 +757,16 @@ public class ICC_Profile implements Serializable
     Enumeration e = tagTable.elements();
     while (e.hasMoreElements())
       {
-	TagEntry tag = (TagEntry) e.nextElement();
-	buf.putInt(offset, tag.getSignature());
-	buf.putInt(offset + 4, tagOffset);
-	buf.putInt(offset + 8, tag.getSize());
-	tag.setOffset(tagOffset);
-	int tagSize = tag.getSize();
-	if ((tagSize & 0x0003) != 0)
-	  tagSize += 4 - (tagSize & 0x0003); // pad	    
-	tagOffset += tagSize;
-	offset += 12;
+        TagEntry tag = (TagEntry) e.nextElement();
+        buf.putInt(offset, tag.getSignature());
+        buf.putInt(offset + 4, tagOffset);
+        buf.putInt(offset + 8, tag.getSize());
+        tag.setOffset(tagOffset);
+        int tagSize = tag.getSize();
+        if ((tagSize & 0x0003) != 0)
+          tagSize += 4 - (tagSize & 0x0003); // pad
+        tagOffset += tagSize;
+        offset += 12;
       }
     return buf.array();
   }
@@ -838,15 +838,15 @@ public class ICC_Profile implements Serializable
     int count = buf.getInt(8);
     if (count == 0)
       {
-	curve = new short[1];
-	curve[0] = 0x0100; // 1.00 in u8fixed8
-	return curve;
+        curve = new short[1];
+        curve[0] = 0x0100; // 1.00 in u8fixed8
+        return curve;
       }
     if (count == 1)
       {
-	curve = new short[1];
-	curve[0] = buf.getShort(12); // other u8fixed8 gamma
-	return curve;
+        curve = new short[1];
+        curve[0] = buf.getShort(12); // other u8fixed8 gamma
+        return curve;
       }
     curve = new short[count];
     for (int i = 0; i < count; i++)
@@ -917,11 +917,11 @@ public class ICC_Profile implements Serializable
     byte[] data;
     try
       {
-	data = text.getBytes("US-ASCII");
+        data = text.getBytes("US-ASCII");
       }
     catch (UnsupportedEncodingException e)
       {
-	data = new byte[length]; // shouldn't happen
+        data = new byte[length]; // shouldn't happen
       }
 
     buf.putInt(0, (int) 0x74657874); // 'text'
@@ -940,17 +940,17 @@ public class ICC_Profile implements Serializable
     int length = text.length();
     ByteBuffer buf = ByteBuffer.allocate(90 + length + 1);
     buf.putInt(0, (int) 0x64657363); // 'desc'
-    buf.putInt(4, 0); // reserved 
+    buf.putInt(4, 0); // reserved
     buf.putInt(8, length + 1); // ASCII length, including null termination
     byte[] data;
 
     try
       {
-	data = text.getBytes("US-ASCII");
+        data = text.getBytes("US-ASCII");
       }
     catch (UnsupportedEncodingException e)
       {
-	data = new byte[length]; // shouldn't happen
+        data = new byte[length]; // shouldn't happen
       }
 
     for (int i = 0; i < length; i++)
@@ -999,7 +999,7 @@ public class ICC_Profile implements Serializable
     buf.putInt(4, 0); // reserved
     buf.putInt(8, trc.length); // number of points
 
-    // put the curve values 
+    // put the curve values
     for (int i = 0; i < trc.length; i++)
       buf.putShort(12 + i * 2, (short) (trc[i] * 65535f));
 
@@ -1049,31 +1049,31 @@ public class ICC_Profile implements Serializable
     for (int channel = 0; channel < 3; channel++)
       for (int i = 0; i < nInEntries; i++)
         {
-	  short n = (short) ((i << 8) | i); // assumes 256 entries
-	  buf.putShort(52 + (channel * nInEntries + i) * 2, n);
+          short n = (short) ((i << 8) | i); // assumes 256 entries
+          buf.putShort(52 + (channel * nInEntries + i) * 2, n);
         }
     int clutOffset = 52 + nInEntries * nIn * 2;
 
     for (int x = 0; x < gridpoints; x++)
       for (int y = 0; y < gridpoints; y++)
-	for (int z = 0; z < gridpoints; z++)
-	  {
-	    int offset = clutOffset + z * 2 * nOut + y * gridpoints * 2 * nOut
-	                 + x * gridpoints * gridpoints * 2 * nOut;
-	    double xf = ((double) x) / ((double) gridpoints - 1.0);
-	    double yf = ((double) y) / ((double) gridpoints - 1.0);
-	    double zf = ((double) z) / ((double) gridpoints - 1.0);
-	    buf.putShort(offset, (short) (xf * 65535.0));
-	    buf.putShort(offset + 2, (short) (yf * 65535.0));
-	    buf.putShort(offset + 4, (short) (zf * 65535.0));
-	  }
+        for (int z = 0; z < gridpoints; z++)
+          {
+            int offset = clutOffset + z * 2 * nOut + y * gridpoints * 2 * nOut
+                         + x * gridpoints * gridpoints * 2 * nOut;
+            double xf = ((double) x) / ((double) gridpoints - 1.0);
+            double yf = ((double) y) / ((double) gridpoints - 1.0);
+            double zf = ((double) z) / ((double) gridpoints - 1.0);
+            buf.putShort(offset, (short) (xf * 65535.0));
+            buf.putShort(offset + 2, (short) (yf * 65535.0));
+            buf.putShort(offset + 4, (short) (zf * 65535.0));
+          }
 
     for (int channel = 0; channel < 3; channel++)
       for (int i = 0; i < nOutEntries; i++)
         {
-	  short n = (short) ((i << 8) | i); // assumes 256 entries
-	  buf.putShort(clutOffset + clutSize + (channel * nOutEntries + i) * 2,
-	               n);
+          short n = (short) ((i << 8) | i); // assumes 256 entries
+          buf.putShort(clutOffset + clutSize + (channel * nOutEntries + i) * 2,
+                       n);
         }
 
     return buf.array();
@@ -1091,22 +1091,22 @@ public class ICC_Profile implements Serializable
     switch (colorSpace)
       {
       case ColorSpace.CS_sRGB:
-	createRGBProfile();
-	return;
+        createRGBProfile();
+        return;
       case ColorSpace.CS_LINEAR_RGB:
-	createLinearRGBProfile();
-	return;
+        createLinearRGBProfile();
+        return;
       case ColorSpace.CS_CIEXYZ:
-	createCIEProfile();
-	return;
+        createCIEProfile();
+        return;
       case ColorSpace.CS_GRAY:
-	createGrayProfile();
-	return;
+        createGrayProfile();
+        return;
       case ColorSpace.CS_PYCC:
-	createPyccProfile();
-	return;
+        createPyccProfile();
+        return;
       default:
-	throw new IllegalArgumentException("Not a predefined color space!");
+        throw new IllegalArgumentException("Not a predefined color space!");
       }
   }
 
@@ -1139,10 +1139,10 @@ public class ICC_Profile implements Serializable
     float[] in = new float[3];
     for (int i = 0; i < TRC_POINTS; i++)
       {
-	in[0] = in[1] = in[2] = ((float) i) / ((float) TRC_POINTS - 1);
-	in = cs.fromRGB(in);
-	// Note this value is the same for all components.
-	points[i] = in[0];
+        in[0] = in[1] = in[2] = ((float) i) / ((float) TRC_POINTS - 1);
+        in = cs.fromRGB(in);
+        // Note this value is the same for all components.
+        points[i] = in[0];
       }
 
     setData(icSigRedColorantTag, makeXYZData(r));
diff --git a/libjava/classpath/java/awt/color/ICC_ProfileGray.java b/libjava/classpath/java/awt/color/ICC_ProfileGray.java
index 3b5948d..f85533c 100644
--- a/libjava/classpath/java/awt/color/ICC_ProfileGray.java
+++ b/libjava/classpath/java/awt/color/ICC_ProfileGray.java
@@ -41,7 +41,7 @@ package java.awt.color;
 /**
  * ICC_ProfileGray - a special case of ICC_Profiles.
  *
- * The ICC_Profile.getInstance() method will return an instance of the 
+ * The ICC_Profile.getInstance() method will return an instance of the
  * ICC_ProfileGray subclass when all the following conditions are met:
  * The device color space of the profile is TYPE_GRAY.
  * The profile contains a gray TRCTag.
@@ -52,7 +52,7 @@ package java.awt.color;
  * linearGray = grayTRC[deviceGray]
  *
  * Note that if the profile contains a CLUT for the color space conversion,
- * it should be used instead, and the TRC information ignored. 
+ * it should be used instead, and the TRC information ignored.
  *
  * @author Sven de Marothy
  * @since 1.2
diff --git a/libjava/classpath/java/awt/color/ICC_ProfileRGB.java b/libjava/classpath/java/awt/color/ICC_ProfileRGB.java
index 0039332..cfdbf6e 100644
--- a/libjava/classpath/java/awt/color/ICC_ProfileRGB.java
+++ b/libjava/classpath/java/awt/color/ICC_ProfileRGB.java
@@ -41,7 +41,7 @@ package java.awt.color;
 /**
  * ICC_ProfileRGB - a special case of ICC_Profiles.
  *
- * The ICC_Profile.getInstance() method will return an instance of the 
+ * The ICC_Profile.getInstance() method will return an instance of the
  * ICC_ProfileRGB subclass when all the following conditions are met:
  * The device color space of the profile is TYPE_RGB.
  * The profile contains red, green and blue ColorantTags.
@@ -54,17 +54,17 @@ package java.awt.color;
  * linearG = greenTRC[deviceG]
  * linearB = blueTRC[deviceB]
  * TRC curves are either a single gamma value, or a 1-dimensional lookup table.
- * 
+ *
  * Followed by the matrix transform:
  * PCS = M*linear
  *
  * Where PCS is the vector of profile color space (must be XYZ) coordinates,
- * linear is the vector of linear RGB coordinates, and the matrix M is 
+ * linear is the vector of linear RGB coordinates, and the matrix M is
  * constructed from the ColorantTags, where the columns are red, green and
  * blue respectively, and the rows are X, Y and Z.
  *
  * Note that if the profile contains a CLUT for the color space conversion,
- * it should be used instead, and the TRC information ignored. 
+ * it should be used instead, and the TRC information ignored.
  *
  * @author Sven de Marothy
  * @since 1.2
@@ -131,7 +131,7 @@ public class ICC_ProfileRGB extends ICC_Profile
     float[][] mat = new float[3][3];
     for (int i = 0; i < 3; i++)
       for (int j = 0; j < 3; j++)
-	mat[i][j] = matrix[i][j];
+        mat[i][j] = matrix[i][j];
     return mat;
   }
 
@@ -146,16 +146,16 @@ public class ICC_ProfileRGB extends ICC_Profile
     switch (component)
       {
       case REDCOMPONENT:
-	data = getCurve(icSigRedTRCTag);
-	break;
+        data = getCurve(icSigRedTRCTag);
+        break;
       case GREENCOMPONENT:
-	data = getCurve(icSigGreenTRCTag);
-	break;
+        data = getCurve(icSigGreenTRCTag);
+        break;
       case BLUECOMPONENT:
-	data = getCurve(icSigBlueTRCTag);
-	break;
+        data = getCurve(icSigBlueTRCTag);
+        break;
       default:
-	throw new IllegalArgumentException("Not a valid component");
+        throw new IllegalArgumentException("Not a valid component");
       }
     if (data == null)
       throw new IllegalArgumentException("Error reading TRC");
@@ -181,16 +181,16 @@ public class ICC_ProfileRGB extends ICC_Profile
     switch (component)
       {
       case REDCOMPONENT:
-	data = getCurve(icSigRedTRCTag);
-	break;
+        data = getCurve(icSigRedTRCTag);
+        break;
       case GREENCOMPONENT:
-	data = getCurve(icSigGreenTRCTag);
-	break;
+        data = getCurve(icSigGreenTRCTag);
+        break;
       case BLUECOMPONENT:
-	data = getCurve(icSigBlueTRCTag);
-	break;
+        data = getCurve(icSigBlueTRCTag);
+        break;
       default:
-	throw new IllegalArgumentException("Not a valid component");
+        throw new IllegalArgumentException("Not a valid component");
       }
     if (data == null)
       throw new IllegalArgumentException("Error reading TRC");
@@ -218,9 +218,9 @@ public class ICC_ProfileRGB extends ICC_Profile
       throw new IllegalArgumentException("Error reading colorant tags!");
     for (int i = 0; i < 3; i++)
       {
-	mat[i][0] = r[i];
-	mat[i][1] = g[i];
-	mat[i][2] = b[i];
+        mat[i][0] = r[i];
+        mat[i][1] = g[i];
+        mat[i][2] = b[i];
       }
     return mat;
   }
diff --git a/libjava/classpath/java/awt/datatransfer/Clipboard.java b/libjava/classpath/java/awt/datatransfer/Clipboard.java
index 2029e2c..d0a1d3a 100644
--- a/libjava/classpath/java/awt/datatransfer/Clipboard.java
+++ b/libjava/classpath/java/awt/datatransfer/Clipboard.java
@@ -111,43 +111,43 @@ public class Clipboard
    * @exception IllegalStateException If the clipboard is currently unavailable
    */
   public synchronized void setContents(Transferable contents,
-				       ClipboardOwner owner)
+                                       ClipboardOwner owner)
   {
     Transferable oldContents = getContents(null);
     this.contents = contents;
     if (this.owner != owner)
       {
-	ClipboardOwner oldOwner = this.owner;
-	this.owner = owner;
-	if (oldOwner != null)
-	  oldOwner.lostOwnership(this, oldContents);
+        ClipboardOwner oldOwner = this.owner;
+        this.owner = owner;
+        if (oldOwner != null)
+          oldOwner.lostOwnership(this, oldContents);
       }
 
     FlavorListener[] fs = getFlavorListeners();
     if (fs.length > 0)
       {
-	// We are a bit optimistic here. We assume DataFlavors will be
-	// given in the same order. If the number of flavors is
-	// different or the order of the DataFlavors in the list then
-	// fire a change event.
-	boolean newFlavors = ((contents != null && oldContents == null)
-			      || (contents == null && oldContents != null));
-	if (!newFlavors && contents != null && oldContents != null)
-	  {
-	    DataFlavor[] df1 = contents.getTransferDataFlavors();
-	    DataFlavor[] df2 = oldContents.getTransferDataFlavors();
-	    newFlavors = df1.length != df2.length;
-	    
-	    for (int i = 0; !newFlavors && i < df1.length; i++)
-	      newFlavors = !df1[i].equals(df2[i]);
-	  }
-
-	if (newFlavors)
-	  {
-	    FlavorEvent e = new FlavorEvent(this);
-	    for (int i = 0; i < fs.length; i++)
-	      fs[i].flavorsChanged(e);
-	  }
+        // We are a bit optimistic here. We assume DataFlavors will be
+        // given in the same order. If the number of flavors is
+        // different or the order of the DataFlavors in the list then
+        // fire a change event.
+        boolean newFlavors = ((contents != null && oldContents == null)
+                              || (contents == null && oldContents != null));
+        if (!newFlavors && contents != null && oldContents != null)
+          {
+            DataFlavor[] df1 = contents.getTransferDataFlavors();
+            DataFlavor[] df2 = oldContents.getTransferDataFlavors();
+            newFlavors = df1.length != df2.length;
+
+            for (int i = 0; !newFlavors && i < df1.length; i++)
+              newFlavors = !df1[i].equals(df2[i]);
+          }
+
+        if (newFlavors)
+          {
+            FlavorEvent e = new FlavorEvent(this);
+            for (int i = 0; i < fs.length; i++)
+              fs[i].flavorsChanged(e);
+          }
       }
   }
 
@@ -165,7 +165,7 @@ public class Clipboard
     DataFlavor[] fs = getAvailableDataFlavors();
     for (int i = 0; i < fs.length; i++)
       if (flavor.equals(fs[i]))
-	return true;
+        return true;
 
     return false;
   }
@@ -187,7 +187,7 @@ public class Clipboard
 
     synchronized(listeners)
       {
-	listeners.add(listener);
+        listeners.add(listener);
       }
   }
 
@@ -198,7 +198,7 @@ public class Clipboard
 
     synchronized(listeners)
       {
-	listeners.remove(listener);
+        listeners.remove(listener);
       }
   }
 
@@ -206,8 +206,8 @@ public class Clipboard
   {
     synchronized(listeners)
       {
-	return (FlavorListener[])
-	  listeners.toArray(new FlavorListener[listeners.size()]);
+        return (FlavorListener[])
+          listeners.toArray(new FlavorListener[listeners.size()]);
       }
   }
 }
diff --git a/libjava/classpath/java/awt/datatransfer/ClipboardOwner.java b/libjava/classpath/java/awt/datatransfer/ClipboardOwner.java
index df75825..b98059a 100644
--- a/libjava/classpath/java/awt/datatransfer/ClipboardOwner.java
+++ b/libjava/classpath/java/awt/datatransfer/ClipboardOwner.java
@@ -52,6 +52,5 @@ public interface ClipboardOwner
    * @param clipboard The clipboard for which ownership was lost.
    * @param contents The contents of the clipboard which are no longer owned.
    */
-  void lostOwnership (Clipboard clipboard, Transferable contents); 
+  void lostOwnership (Clipboard clipboard, Transferable contents);
 }
-
diff --git a/libjava/classpath/java/awt/datatransfer/DataFlavor.java b/libjava/classpath/java/awt/datatransfer/DataFlavor.java
index baaf43d..e547704 100644
--- a/libjava/classpath/java/awt/datatransfer/DataFlavor.java
+++ b/libjava/classpath/java/awt/datatransfer/DataFlavor.java
@@ -74,24 +74,24 @@ public class DataFlavor implements java.io.Externalizable, Cloneable
    * @deprecated The charset unicode is platform specific and InputStream
    * deals with bytes not chars. Use <code>getRederForText()</code>.
    */
-  public static final DataFlavor plainTextFlavor = 
+  public static final DataFlavor plainTextFlavor =
     new DataFlavor("text/plain; charset=unicode; class=java.io.InputStream",
                    "plain unicode text");
 
   /**
    * This is the data flavor used for transferring Java strings.  The
-   * MIME type is "application/x-java-serialized-object" and the 
+   * MIME type is "application/x-java-serialized-object" and the
    * representation class is <code>java.lang.String</code>.
    */
-  public static final DataFlavor stringFlavor = 
+  public static final DataFlavor stringFlavor =
     new DataFlavor(java.lang.String.class, "Java Unicode String");
 
   /**
    * This is a data flavor used for transferring lists of files.  The
-   * representation type is a <code>java.util.List</code>, with each 
+   * representation type is a <code>java.util.List</code>, with each
    * element of the list being a <code>java.io.File</code>.
    */
-  public static final DataFlavor javaFileListFlavor = 
+  public static final DataFlavor javaFileListFlavor =
     new DataFlavor("application/x-java-file-list; class=java.util.List",
                    "Java File List");
 
@@ -99,7 +99,7 @@ public class DataFlavor implements java.io.Externalizable, Cloneable
    * This is an image flavor used for transferring images.  The
    * representation type is a <code>java.awt.Image</code>.
    */
-  public static final DataFlavor imageFlavor = 
+  public static final DataFlavor imageFlavor =
     new DataFlavor(java.awt.Image.class, "Java Image");
 
   /**
@@ -127,20 +127,20 @@ public class DataFlavor implements java.io.Externalizable, Cloneable
   /*
    * Instance Variables
    */
-  
+
   // The MIME type for this flavor
   private MimeType mimeType;
-  
+
   // The representation class for this flavor
   private Class<?> representationClass;
-  
+
   // The human readable name of this flavor
   private String humanPresentableName;
 
   /*
    * Static Methods
    */
-  
+
   /**
    * This method attempts to load the named class.  The following class
    * loaders are searched in order: the bootstrap class loader, the
@@ -154,7 +154,7 @@ public class DataFlavor implements java.io.Externalizable, Cloneable
    * @exception ClassNotFoundException If the class cannot be loaded.
    */
   protected static final Class<?> tryToLoadClass(String className,
-						 ClassLoader classLoader)
+                                                 ClassLoader classLoader)
     throws ClassNotFoundException
   {
     // Bootstrap
@@ -164,37 +164,37 @@ public class DataFlavor implements java.io.Externalizable, Cloneable
       }
     catch(ClassNotFoundException cnfe)
       {
-	// Ignored.
+        // Ignored.
       }
-  
+
     // System
     try
       {
-	ClassLoader loader = ClassLoader.getSystemClassLoader();
+        ClassLoader loader = ClassLoader.getSystemClassLoader();
         return Class.forName(className, true, loader);
       }
     catch(ClassNotFoundException cnfe)
       {
-	// Ignored.
+        // Ignored.
       }
- 
+
     // Context
     try
       {
-	ClassLoader loader = Thread.currentThread().getContextClassLoader();
+        ClassLoader loader = Thread.currentThread().getContextClassLoader();
         return Class.forName(className, true, loader);
       }
     catch(ClassNotFoundException cnfe)
       {
-	// Ignored.
+        // Ignored.
       }
- 
+
     if (classLoader != null)
       return Class.forName(className, true, classLoader);
 
     throw new ClassNotFoundException(className);
   }
-  
+
   /**
    * XXX - Currently returns <code>plainTextFlavor</code>.
    */
@@ -202,7 +202,7 @@ public class DataFlavor implements java.io.Externalizable, Cloneable
   {
     return plainTextFlavor;
   }
-  
+
   /**
    * Selects the best supported text flavor on this implementation.
    * Returns <code>null</code> when none of the given flavors is liked.
@@ -213,19 +213,19 @@ public class DataFlavor implements java.io.Externalizable, Cloneable
    * class which is (a subclass of) <code>InputStream</code> and has a
    * primary MIME type of "text" and has an supported encoding.
    */
-  public static final DataFlavor 
+  public static final DataFlavor
     selectBestTextFlavor(DataFlavor[] availableFlavors)
   {
     for(int i = 0; i < availableFlavors.length; i++)
       {
         DataFlavor df = availableFlavors[i];
         Class c = df.representationClass;
-  
+
         // A Reader or String is good.
         if ((Reader.class.isAssignableFrom(c))
            || (String.class.isAssignableFrom(c)))
       return df;
-  
+
         // A InputStream is good if the mime primary type is "text"
         if ((InputStream.class.isAssignableFrom(c))
            && ("text".equals(df.getPrimaryType())))
@@ -246,7 +246,7 @@ public class DataFlavor implements java.io.Externalizable, Cloneable
               return df;
           }
       }
-  
+
     // Nothing found
     return null;
   }
@@ -255,14 +255,14 @@ public class DataFlavor implements java.io.Externalizable, Cloneable
   /*
    * Constructors
    */
-  
+
   /**
    * Empty public constructor needed for externalization.
    * Should not be used for normal instantiation.
    */
   public DataFlavor()
   {
-    // Used for deserialization only, nothing to do here. 
+    // Used for deserialization only, nothing to do here.
   }
 
   /**
@@ -312,7 +312,7 @@ public class DataFlavor implements java.io.Externalizable, Cloneable
    * specified cannot be loaded.
    * @exception ClassNotFoundException If the class is not loaded.
    */
-  public DataFlavor(String mimeType, String humanPresentableName, 
+  public DataFlavor(String mimeType, String humanPresentableName,
                    ClassLoader classLoader)
     throws ClassNotFoundException
   {
@@ -444,7 +444,7 @@ public class DataFlavor implements java.io.Externalizable, Cloneable
   public String getHumanPresentableName()
   {
     return(humanPresentableName);
-  } 
+  }
 
   /**
    * Returns the primary MIME type for this flavor.
@@ -478,7 +478,7 @@ public class DataFlavor implements java.io.Externalizable, Cloneable
   {
     if ("humanPresentableName".equals(paramName))
       return getHumanPresentableName();
-  
+
     return mimeType.getParameter(paramName);
   }
 
@@ -529,7 +529,7 @@ public class DataFlavor implements java.io.Externalizable, Cloneable
    *
    * @param flavor The flavor to test against.
    *
-   * @return <code>true</code> if the flavor's MIME type is equal to this 
+   * @return <code>true</code> if the flavor's MIME type is equal to this
    * object's MIME type, <code>false</code> otherwise.
    */
   public final boolean isMimeTypeEqual(DataFlavor flavor)
@@ -619,9 +619,9 @@ public class DataFlavor implements java.io.Externalizable, Cloneable
     if (getPrimaryType().equals(javaFileListFlavor.getPrimaryType())
         && getSubType().equals(javaFileListFlavor.getSubType())
         && javaFileListFlavor.representationClass
-	   .isAssignableFrom(representationClass))
+           .isAssignableFrom(representationClass))
       return true;
-  
+
     return false ;
   }
 
@@ -681,19 +681,19 @@ public class DataFlavor implements java.io.Externalizable, Cloneable
       if (! isRepresentationClassCharBuffer()
           && ! isRepresentationClassReader()
           && representationClass != java.lang.String.class
-	  && ! (representationClass.isArray()
-	        && representationClass.getComponentType() == Character.TYPE))
-	{
-	  String charset = getParameter("charset");
-	  String otherset = flavor.getParameter("charset");
-	  String defaultset = Charset.defaultCharset().name();
-
-	  if (charset == null || charset.equals(defaultset))
+          && ! (representationClass.isArray()
+                && representationClass.getComponentType() == Character.TYPE))
+        {
+          String charset = getParameter("charset");
+          String otherset = flavor.getParameter("charset");
+          String defaultset = Charset.defaultCharset().name();
+
+          if (charset == null || charset.equals(defaultset))
             return (otherset == null || otherset.equals(defaultset));
 
-	  return charset.equals(otherset);
-	}
-  
+          return charset.equals(otherset);
+        }
+
     return true;
   }
 
@@ -718,7 +718,7 @@ public class DataFlavor implements java.io.Externalizable, Cloneable
   {
     if (! (obj instanceof DataFlavor))
       return false;
-  
+
     return equals((DataFlavor) obj);
   }
 
@@ -780,7 +780,7 @@ public class DataFlavor implements java.io.Externalizable, Cloneable
    * the MIME type string unchanged.
    *
    * @param type The MIME type.
-   * 
+   *
    * @return The MIME type.
    *
    * @deprecated
@@ -797,7 +797,7 @@ public class DataFlavor implements java.io.Externalizable, Cloneable
    *
    * @exception IOException If an error occurs.
    */
-  public void writeExternal(ObjectOutput stream) 
+  public void writeExternal(ObjectOutput stream)
     throws IOException
   {
     if (mimeType != null)
@@ -821,7 +821,7 @@ public class DataFlavor implements java.io.Externalizable, Cloneable
    * @exception ClassNotFoundException If the class for an object being restored
    * cannot be found.
    */
-  public void readExternal(ObjectInput stream) 
+  public void readExternal(ObjectInput stream)
     throws IOException, ClassNotFoundException
   {
     mimeType = (MimeType) stream.readObject();
@@ -913,13 +913,13 @@ public class DataFlavor implements java.io.Externalizable, Cloneable
   {
       if (!transferable.isDataFlavorSupported(this))
           throw new UnsupportedFlavorException(this);
-  
+
       if (Reader.class.isAssignableFrom(representationClass))
           return (Reader)transferable.getTransferData(this);
-  
+
       if (String.class.isAssignableFrom(representationClass))
           return new StringReader((String)transferable.getTransferData(this));
-  
+
       if (InputStream.class.isAssignableFrom(representationClass)
           && "text".equals(getPrimaryType()))
         {
@@ -929,7 +929,7 @@ public class DataFlavor implements java.io.Externalizable, Cloneable
               encoding = "us-ascii";
           return new InputStreamReader(in, encoding);
         }
-  
+
       throw new UnsupportedFlavorException(this);
   }
 
@@ -965,7 +965,7 @@ public class DataFlavor implements java.io.Externalizable, Cloneable
   {
     return Reader.class.isAssignableFrom(representationClass);
   }
-  
+
   /**
    * Returns whether this <code>DataFlavor</code> is a valid text flavor for
    * this implementation of the Java platform. Only flavors equivalent to
@@ -975,12 +975,12 @@ public class DataFlavor implements java.io.Externalizable, Cloneable
    * If this flavor supports the charset parameter, it must be equivalent to
    * <code>DataFlavor.stringFlavor</code>, or its representation must be
    * <code>java.io.Reader</code>, <code>java.lang.String</code>,
-   * <code>java.nio.CharBuffer</code>, <code>java.io.InputStream</code> or 
+   * <code>java.nio.CharBuffer</code>, <code>java.io.InputStream</code> or
    * <code>java.nio.ByteBuffer</code>,
-   * If the representation is <code>java.io.InputStream</code> or 
-   * <code>java.nio.ByteBuffer</code>, then this flavor's <code>charset</code> 
-   * parameter must be supported by this implementation of the Java platform. 
-   * If a charset is not specified, then the platform default charset, which 
+   * If the representation is <code>java.io.InputStream</code> or
+   * <code>java.nio.ByteBuffer</code>, then this flavor's <code>charset</code>
+   * parameter must be supported by this implementation of the Java platform.
+   * If a charset is not specified, then the platform default charset, which
    * is always supported, is assumed.
    * <p>
    * If this flavor does not support the charset parameter, its
@@ -996,16 +996,16 @@ public class DataFlavor implements java.io.Externalizable, Cloneable
    * @since 1.4
    */
   public boolean isFlavorTextType() {
-    // FIXME: I'm not 100% sure if this implementation does the same like sun's does    
+    // FIXME: I'm not 100% sure if this implementation does the same like sun's does
     if(equals(DataFlavor.stringFlavor) || getPrimaryType().equals("text"))
       {
         String charset = getParameter("charset");
         Class c = getRepresentationClass();
-        if(charset != null) 
-          {            
-            if(Reader.class.isAssignableFrom(c) 
-                || CharBuffer.class.isAssignableFrom(c) 
-                || String.class.isAssignableFrom(c)) 
+        if(charset != null)
+          {
+            if(Reader.class.isAssignableFrom(c)
+                || CharBuffer.class.isAssignableFrom(c)
+                || String.class.isAssignableFrom(c))
               {
                 return true;
               }
@@ -1024,4 +1024,3 @@ public class DataFlavor implements java.io.Externalizable, Cloneable
     return false;
   }
 } // class DataFlavor
-
diff --git a/libjava/classpath/java/awt/datatransfer/FlavorEvent.java b/libjava/classpath/java/awt/datatransfer/FlavorEvent.java
index 38b4818..8a292f8 100644
--- a/libjava/classpath/java/awt/datatransfer/FlavorEvent.java
+++ b/libjava/classpath/java/awt/datatransfer/FlavorEvent.java
@@ -45,7 +45,7 @@ import java.util.EventObject;
  * Fired by a ClipBoard for registered FlavorListeners.
  *
  * @author Mark J. Wielaard (mark@klomp.org)
- * 
+ *
  * @since 1.5
  */
 public class FlavorEvent extends EventObject
diff --git a/libjava/classpath/java/awt/datatransfer/FlavorListener.java b/libjava/classpath/java/awt/datatransfer/FlavorListener.java
index 31b164d..eb388aa 100644
--- a/libjava/classpath/java/awt/datatransfer/FlavorListener.java
+++ b/libjava/classpath/java/awt/datatransfer/FlavorListener.java
@@ -1,4 +1,4 @@
-/* FlavorListener -- Interface for tagging an interest in FlavorEvents. 
+/* FlavorListener -- Interface for tagging an interest in FlavorEvents.
    Copyright (C) 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
diff --git a/libjava/classpath/java/awt/datatransfer/MimeType.java b/libjava/classpath/java/awt/datatransfer/MimeType.java
index 8d2dcc0..143e870 100644
--- a/libjava/classpath/java/awt/datatransfer/MimeType.java
+++ b/libjava/classpath/java/awt/datatransfer/MimeType.java
@@ -124,7 +124,7 @@ class MimeType
    * Returns the parameter for the <code>key</code>.
    *
    * @param key the parameter key
-   * 
+   *
    * @return the parameter for the <code>key</code>
    */
   String getParameter(String key)
diff --git a/libjava/classpath/java/awt/datatransfer/StringSelection.java b/libjava/classpath/java/awt/datatransfer/StringSelection.java
index b74f2fa..4b64cda 100644
--- a/libjava/classpath/java/awt/datatransfer/StringSelection.java
+++ b/libjava/classpath/java/awt/datatransfer/StringSelection.java
@@ -55,7 +55,7 @@ public class StringSelection implements Transferable, ClipboardOwner
 
 // List of flavors we support
 // XXX: DataFlavor.plainTextFlavor is deprecated.
-static final DataFlavor[] supported_flavors 
+static final DataFlavor[] supported_flavors
    = { DataFlavor.stringFlavor,
        DataFlavor.plainTextFlavor };
 
@@ -154,5 +154,4 @@ lostOwnership(Clipboard clipboard, Transferable contents)
   // FIXME: What does this do?
 }
 
-} // class StringSelection 
-
+} // class StringSelection
diff --git a/libjava/classpath/java/awt/datatransfer/SystemFlavorMap.java b/libjava/classpath/java/awt/datatransfer/SystemFlavorMap.java
index 7f296b5..65c14c1 100644
--- a/libjava/classpath/java/awt/datatransfer/SystemFlavorMap.java
+++ b/libjava/classpath/java/awt/datatransfer/SystemFlavorMap.java
@@ -67,30 +67,30 @@ import java.util.WeakHashMap;
 public final class SystemFlavorMap implements FlavorMap, FlavorTable
 {
   /**
-   * The map which maps the thread's <code>ClassLoaders</code> to 
+   * The map which maps the thread's <code>ClassLoaders</code> to
    * <code>SystemFlavorMaps</code>.
    */
   private static final Map systemFlavorMaps = new WeakHashMap();
-  
+
   /**
    * Constant which is used to prefix encode Java MIME types.
    */
   private static final String GNU_JAVA_MIME_PREFIX = "gnu.java:";
-  
+
   /**
-   * This map maps native <code>String</code>s to lists of 
+   * This map maps native <code>String</code>s to lists of
    * <code>DataFlavor</code>s
    */
   private HashMap<String,List<DataFlavor>> nativeToFlavorMap =
     new HashMap<String,List<DataFlavor>>();
-  
+
   /**
-   * This map maps <code>DataFlavor</code>s to lists of native 
+   * This map maps <code>DataFlavor</code>s to lists of native
    * <code>String</code>s
    */
   private HashMap<DataFlavor, List<String>> flavorToNativeMap =
     new HashMap<DataFlavor, List<String>>();
-  
+
   /**
    * Private constructor.
    */
@@ -152,7 +152,7 @@ public final class SystemFlavorMap implements FlavorMap, FlavorTable
             // Check valid mime type.
             MimeType type = new MimeType(mime);
             DataFlavor flav = new DataFlavor(mime);
-            
+
             List<DataFlavor> flavs = nativeToFlavorMap.get(nat);
             if (flavs == null)
               {
@@ -207,7 +207,7 @@ public final class SystemFlavorMap implements FlavorMap, FlavorTable
    * @return A <code>Map</code> of data flavors to native type names.
    */
   public Map<String, DataFlavor> getFlavorsForNatives (String[] natives)
-  { 
+  {
     return new HashMap<String, DataFlavor>();
   }
 
@@ -219,18 +219,18 @@ public final class SystemFlavorMap implements FlavorMap, FlavorTable
   {
     ClassLoader classLoader = Thread.currentThread()
         .getContextClassLoader();
-    
-    //if ContextClassLoader not set, use system default 
+
+    //if ContextClassLoader not set, use system default
     if (classLoader == null)
       {
         classLoader = ClassLoader.getSystemClassLoader();
       }
-    
+
     synchronized(systemFlavorMaps)
       {
-        FlavorMap map = (FlavorMap) 
+        FlavorMap map = (FlavorMap)
             systemFlavorMaps.get(classLoader);
-        if (map == null) 
+        if (map == null)
           {
             map = new SystemFlavorMap();
             systemFlavorMaps.put(classLoader, map);
@@ -268,7 +268,7 @@ public final class SystemFlavorMap implements FlavorMap, FlavorTable
 
   /**
    * Encodes a <code>DataFlavor</code> for use as a <code>String</code>
-   * native. The format of an encoded <code>DataFlavor</code> is 
+   * native. The format of an encoded <code>DataFlavor</code> is
    * implementation-dependent. The only restrictions are:
    * <ul>
    * <li>The encoded representation is <code>null</code> if and only if the
@@ -313,7 +313,7 @@ public final class SystemFlavorMap implements FlavorMap, FlavorTable
    * Decodes a <code>String</code> native for use as a Java MIME type.
    *
    * @param name the <code>String</code> to decode
-   * @return the decoded Java MIME type, or <code>null</code> if nat 
+   * @return the decoded Java MIME type, or <code>null</code> if nat
    *         is not an encoded <code>String</code> native
    */
   public static String decodeJavaMIMEType (String name)
@@ -322,7 +322,7 @@ public final class SystemFlavorMap implements FlavorMap, FlavorTable
       {
         return name.substring(GNU_JAVA_MIME_PREFIX.length());
       }
-    else 
+    else
       return null;
   }
 
@@ -334,27 +334,27 @@ public final class SystemFlavorMap implements FlavorMap, FlavorTable
     throws ClassNotFoundException
   {
     String javaMIMEType = decodeJavaMIMEType (name);
-    
+
     if (javaMIMEType != null)
       return new DataFlavor (javaMIMEType);
     else
       return null;
   }
 
-  /** 
-   * Returns a List of <code>DataFlavors</code> to which the specified 
-   * <code>String</code> native can be translated by the data transfer 
-   * subsystem. The <code>List</code> will be sorted from best 
-   * <code>DataFlavor</code> to worst. That is, the first <code>DataFlavor 
-   * </code> will best reflect data in the specified native to a Java 
-   * application. 
+  /**
+   * Returns a List of <code>DataFlavors</code> to which the specified
+   * <code>String</code> native can be translated by the data transfer
+   * subsystem. The <code>List</code> will be sorted from best
+   * <code>DataFlavor</code> to worst. That is, the first <code>DataFlavor
+   * </code> will best reflect data in the specified native to a Java
+   * application.
    * <p>
-   * If the specified native is previously unknown to the data transfer 
-   * subsystem, and that native has been properly encoded, then invoking 
-   * this method will establish a mapping in both directions between the 
-   * specified native and a DataFlavor whose MIME type is a decoded 
+   * If the specified native is previously unknown to the data transfer
+   * subsystem, and that native has been properly encoded, then invoking
+   * this method will establish a mapping in both directions between the
+   * specified native and a DataFlavor whose MIME type is a decoded
    * version of the native.
-   */ 
+   */
   public List<DataFlavor> getFlavorsForNative(String nat)
   {
     List<DataFlavor> ret = new ArrayList<DataFlavor>();
@@ -402,7 +402,7 @@ public final class SystemFlavorMap implements FlavorMap, FlavorTable
       }
     return ret;
   }
-  
+
   /**
    * Adds a mapping from a single <code>String</code> native to a single
    * <code>DataFlavor</code>. Unlike <code>getFlavorsForNative</code>, the
@@ -421,13 +421,13 @@ public final class SystemFlavorMap implements FlavorMap, FlavorTable
    * @see #addUnencodedNativeForFlavor
    * @since 1.4
    */
-  public synchronized void addFlavorForUnencodedNative(String nativeStr, 
+  public synchronized void addFlavorForUnencodedNative(String nativeStr,
                                                        DataFlavor flavor)
   {
     if ((nativeStr == null) || (flavor == null))
       throw new NullPointerException();
     List<DataFlavor> flavors = nativeToFlavorMap.get(nativeStr);
-    if (flavors == null) 
+    if (flavors == null)
       {
         flavors = new ArrayList<DataFlavor>();
         nativeToFlavorMap.put(nativeStr, flavors);
@@ -438,7 +438,7 @@ public final class SystemFlavorMap implements FlavorMap, FlavorTable
           flavors.add(flavor);
       }
   }
-  
+
   /**
    * Adds a mapping from the specified <code>DataFlavor</code> (and all
    * <code>DataFlavor</code>s equal to the specified <code>DataFlavor</code>)
@@ -446,7 +446,7 @@ public final class SystemFlavorMap implements FlavorMap, FlavorTable
    * Unlike <code>getNativesForFlavor</code>, the mapping will only be
    * established in one direction, and the native will not be encoded. To
    * establish a two-way mapping, call
-   * <code>addFlavorForUnencodedNative</code> as well. The new mapping will 
+   * <code>addFlavorForUnencodedNative</code> as well. The new mapping will
    * be of lower priority than any existing mapping.
    * This method has no effect if a mapping from the specified or equal
    * <code>DataFlavor</code> to the specified <code>String</code> native
@@ -460,12 +460,12 @@ public final class SystemFlavorMap implements FlavorMap, FlavorTable
    * @since 1.4
    */
   public synchronized void addUnencodedNativeForFlavor(DataFlavor flavor,
-                                                       String nativeStr) 
+                                                       String nativeStr)
   {
     if ((nativeStr == null) || (flavor == null))
       throw new NullPointerException();
     List<String> natives = flavorToNativeMap.get(flavor);
-    if (natives == null) 
+    if (natives == null)
       {
         natives = new ArrayList<String>();
         flavorToNativeMap.put(flavor, natives);
@@ -476,11 +476,11 @@ public final class SystemFlavorMap implements FlavorMap, FlavorTable
           natives.add(nativeStr);
       }
   }
-  
+
   /**
    * Discards the current mappings for the specified <code>DataFlavor</code>
    * and all <code>DataFlavor</code>s equal to the specified
-   * <code>DataFlavor</code>, and creates new mappings to the 
+   * <code>DataFlavor</code>, and creates new mappings to the
    * specified <code>String</code> natives.
    * Unlike <code>getNativesForFlavor</code>, the mappings will only be
    * established in one direction, and the natives will not be encoded. To
@@ -492,7 +492,7 @@ public final class SystemFlavorMap implements FlavorMap, FlavorTable
    * If the array contains several elements that reference equal
    * <code>String</code> natives, this method will establish new mappings
    * for the first of those elements and ignore the rest of them.
-   * <p> 
+   * <p>
    * It is recommended that client code not reset mappings established by the
    * data transfer subsystem. This method should only be used for
    * application-level mappings.
@@ -506,18 +506,18 @@ public final class SystemFlavorMap implements FlavorMap, FlavorTable
    * @since 1.4
    */
   public synchronized void setNativesForFlavor(DataFlavor flavor,
-                                               String[] natives) 
+                                               String[] natives)
   {
     if ((natives == null) || (flavor == null))
       throw new NullPointerException();
-    
+
     flavorToNativeMap.remove(flavor);
-    for (int i = 0; i < natives.length; i++) 
+    for (int i = 0; i < natives.length; i++)
       {
         addUnencodedNativeForFlavor(flavor, natives[i]);
       }
   }
-  
+
   /**
    * Discards the current mappings for the specified <code>String</code>
    * native, and creates new mappings to the specified
@@ -546,13 +546,13 @@ public final class SystemFlavorMap implements FlavorMap, FlavorTable
    * @since 1.4
    */
   public synchronized void setFlavorsForNative(String nativeStr,
-                                               DataFlavor[] flavors) 
+                                               DataFlavor[] flavors)
   {
     if ((nativeStr == null) || (flavors == null))
       throw new NullPointerException();
-    
+
     nativeToFlavorMap.remove(nativeStr);
-    for (int i = 0; i < flavors.length; i++) 
+    for (int i = 0; i < flavors.length; i++)
       {
         addFlavorForUnencodedNative(nativeStr, flavors[i]);
       }
diff --git a/libjava/classpath/java/awt/datatransfer/Transferable.java b/libjava/classpath/java/awt/datatransfer/Transferable.java
index 8075392..99239fc 100644
--- a/libjava/classpath/java/awt/datatransfer/Transferable.java
+++ b/libjava/classpath/java/awt/datatransfer/Transferable.java
@@ -80,4 +80,3 @@ public interface Transferable
     throws UnsupportedFlavorException, IOException;
 
 } // interface Transferable
-
diff --git a/libjava/classpath/java/awt/datatransfer/UnsupportedFlavorException.java b/libjava/classpath/java/awt/datatransfer/UnsupportedFlavorException.java
index 1c1da03..0ca17b2 100644
--- a/libjava/classpath/java/awt/datatransfer/UnsupportedFlavorException.java
+++ b/libjava/classpath/java/awt/datatransfer/UnsupportedFlavorException.java
@@ -62,4 +62,4 @@ public class UnsupportedFlavorException extends Exception
   {
     super(flavor == null ? null : flavor.getHumanPresentableName());
   }
-} // class UnsupportedFlavorException 
+} // class UnsupportedFlavorException
diff --git a/libjava/classpath/java/awt/dnd/Autoscroll.java b/libjava/classpath/java/awt/dnd/Autoscroll.java
index ba4d447..094063c 100644
--- a/libjava/classpath/java/awt/dnd/Autoscroll.java
+++ b/libjava/classpath/java/awt/dnd/Autoscroll.java
@@ -67,4 +67,3 @@ public interface Autoscroll
   void autoscroll (Point location);
 
 } // interface Autoscroll
-
diff --git a/libjava/classpath/java/awt/dnd/DnDEventMulticaster.java b/libjava/classpath/java/awt/dnd/DnDEventMulticaster.java
index d9f5ec0..30594c2 100644
--- a/libjava/classpath/java/awt/dnd/DnDEventMulticaster.java
+++ b/libjava/classpath/java/awt/dnd/DnDEventMulticaster.java
@@ -47,7 +47,7 @@ class DnDEventMulticaster extends AWTEventMulticaster
   {
     super (a, b);
   }
-  
+
   public static DragSourceListener add (DragSourceListener a,
                                         DragSourceListener b)
   {
@@ -59,7 +59,7 @@ class DnDEventMulticaster extends AWTEventMulticaster
   {
     return (DragSourceMotionListener) addInternal (a, b);
   }
-  
+
   public static DragSourceListener remove (DragSourceListener a,
                                            DragSourceListener b)
   {
diff --git a/libjava/classpath/java/awt/dnd/DragGestureEvent.java b/libjava/classpath/java/awt/dnd/DragGestureEvent.java
index 2a22abb..e127a7d 100644
--- a/libjava/classpath/java/awt/dnd/DragGestureEvent.java
+++ b/libjava/classpath/java/awt/dnd/DragGestureEvent.java
@@ -87,67 +87,67 @@ public class DragGestureEvent extends EventObject
 
   /**
    * Returns the source casted as a DragGestureRecognizer.
-   * 
+   *
    * @return the source casted as a DragGestureRecognizer.
    */
   public DragGestureRecognizer getSourceAsDragGestureRecognizer()
   {
     return (DragGestureRecognizer) getSource();
   }
-  
+
   /**
    * Returns the Component corresponding to this.
-   * 
+   *
    * @return the Component corresponding to this.
    */
   public Component getComponent()
   {
     return component;
   }
-  
+
   /**
    * Gets the DragSource corresponding to this.
-   * 
+   *
    * @return the DragSource corresponding to this.
    */
   public DragSource getDragSource()
   {
     return dragSource;
   }
-  
+
   /**
    * Returns the origin of the drag.
-   * 
+   *
    * @return the origin of the drag.
    */
   public Point getDragOrigin()
   {
     return origin;
   }
-  
+
   /**
    * Gets an iterator representation of the List of events.
-   * 
+   *
    * @return an iterator representation of the List of events.
    */
   public Iterator<InputEvent> iterator()
   {
     return events.iterator();
   }
-  
+
   /**
    * Gets an array representation of the List of events.
-   * 
+   *
    * @return an array representation of the List of events.
    */
   public Object[] toArray()
   {
     return events.toArray();
   }
-  
+
   /**
    * Gets an array representation of the List of events.
-   * 
+   *
    * @param array - the array to store the events in.
    * @return an array representation of the List of events.
    */
@@ -158,17 +158,17 @@ public class DragGestureEvent extends EventObject
 
   /**
    * Gets the user's preferred action.
-   * 
+   *
    * @return the user's preferred action.
    */
   public int getDragAction()
   {
     return action;
   }
-  
+
   /**
    * Get the event that triggered this gesture.
-   * 
+   *
    * @return the event that triggered this gesture.
    */
   public InputEvent getTriggerEvent()
diff --git a/libjava/classpath/java/awt/dnd/DragGestureRecognizer.java b/libjava/classpath/java/awt/dnd/DragGestureRecognizer.java
index fb37b4f..c41402c 100644
--- a/libjava/classpath/java/awt/dnd/DragGestureRecognizer.java
+++ b/libjava/classpath/java/awt/dnd/DragGestureRecognizer.java
@@ -164,7 +164,7 @@ public abstract class DragGestureRecognizer implements Serializable
   {
     if(dragGestureListener != null)
       dragGestureListener.dragGestureRecognized
-	(new DragGestureEvent(this, dragAction, p, events));
+        (new DragGestureEvent(this, dragAction, p, events));
     resetRecognizer();
   }
 
diff --git a/libjava/classpath/java/awt/dnd/DragSource.java b/libjava/classpath/java/awt/dnd/DragSource.java
index cd4a93a..af8b376 100644
--- a/libjava/classpath/java/awt/dnd/DragSource.java
+++ b/libjava/classpath/java/awt/dnd/DragSource.java
@@ -74,7 +74,7 @@ public class DragSource implements Serializable
   private transient FlavorMap flavorMap = SystemFlavorMap.getDefaultFlavorMap ();
   private transient DragSourceListener dragSourceListener;
   private transient DragSourceMotionListener dragSourceMotionListener;
-  
+
   private static DragSource ds;
   private DragSourceContextPeer peer;
   private DragSourceContext context;
@@ -95,7 +95,7 @@ public class DragSource implements Serializable
 
   /**
    * Gets the default drag source.
-   * 
+   *
    * @exception HeadlessException If GraphicsEnvironment.isHeadless() is true.
    */
   public static DragSource getDefaultDragSource()
@@ -139,14 +139,14 @@ public class DragSource implements Serializable
     // This function sends the same message to the context, which then forwards
     // it to the peer, passing itself as a parameter. Now, the native system has
     // access to the Transferable through the context.
-    
+
     try
       {
         flavorMap = map;
-        
+
         if (peer == null)
           peer = Toolkit.getDefaultToolkit().createDragSourceContextPeer(trigger);
-        
+
         if (context == null)
           context = createDragSourceContext(peer, trigger,
                                                             dragCursor,
@@ -210,7 +210,7 @@ public class DragSource implements Serializable
   /**
    * Creates the DragSourceContext to handle this drag.
    *
-   * @exception IllegalArgumentException 
+   * @exception IllegalArgumentException
    * @exception NullPointerException If dscp, dgl, dragImage or t is null.
    */
   protected DragSourceContext
@@ -225,16 +225,16 @@ public class DragSource implements Serializable
   {
     return flavorMap;
   }
-  
+
   public <T extends DragGestureRecognizer> T
-		    createDragGestureRecognizer(Class<T> recognizer,
-						Component c,
-						int actions,
-						DragGestureListener dgl)
+                    createDragGestureRecognizer(Class<T> recognizer,
+                                                Component c,
+                                                int actions,
+                                                DragGestureListener dgl)
   {
     return (T) Toolkit.getDefaultToolkit().createDragGestureRecognizer(recognizer,
-								       this, c,
-								       actions, dgl);
+                                                                       this, c,
+                                                                       actions, dgl);
   }
 
   public DragGestureRecognizer createDefaultDragGestureRecognizer(Component c,
@@ -301,20 +301,20 @@ public class DragSource implements Serializable
   {
     if (listenerType == DragSourceListener.class)
       return DnDEventMulticaster.getListeners (dragSourceListener,
-					       listenerType);
+                                               listenerType);
 
     if (listenerType == DragSourceMotionListener.class)
       return DnDEventMulticaster.getListeners (dragSourceMotionListener,
-					       listenerType);
+                                               listenerType);
 
     // Return an empty EventListener array.
     return (T[]) new EventListener [0];
   }
-  
+
   /**
    * TODO
    * @return TODO
-   * 
+   *
    * @since 1.5
    */
   public static int getDragThreshold()
diff --git a/libjava/classpath/java/awt/dnd/DragSourceContext.java b/libjava/classpath/java/awt/dnd/DragSourceContext.java
index ed1cbaa..e21b4fd 100644
--- a/libjava/classpath/java/awt/dnd/DragSourceContext.java
+++ b/libjava/classpath/java/awt/dnd/DragSourceContext.java
@@ -72,7 +72,7 @@ public class DragSourceContext
   private int sourceActions;
   private Image image;
   private Point offset;
-  
+
   /**
    * Initializes a drag source context.
    *
@@ -81,13 +81,13 @@ public class DragSourceContext
    * or if the source actions for the DragGestureRecognizer associated with the
    * trigger event are equal to DnDConstants.ACTION_NONE.
    * @exception NullPointerException If peer, trans or trigger is null or if the
-   * image is not null but the offset is. 
+   * image is not null but the offset is.
    */
   public DragSourceContext (DragSourceContextPeer peer,
                             DragGestureEvent trigger, Cursor cursor,
                             Image image, Point offset, Transferable trans,
                             DragSourceListener dsl)
-  {    
+  {
     if (peer == null
         || trigger == null || trans == null
         || (image != null && offset == null))
@@ -108,7 +108,7 @@ public class DragSourceContext
     this.transferable = trans;
     this.dragSourceListener = dsl;
     this.sourceActions = trigger.getSourceAsDragGestureRecognizer().getSourceActions();
-    
+
     setCursor(cursor);
     updateCurrentCursor(trigger.getDragAction(), sourceActions, DEFAULT);
   }
@@ -116,7 +116,7 @@ public class DragSourceContext
   /**
    * Returns the DragSource object associated with the
    * DragGestureEvent.
-   * 
+   *
    * @return the DragSource associated with the trigger.
    */
   public DragSource getDragSource()
@@ -126,7 +126,7 @@ public class DragSourceContext
 
   /**
    * Returns the component associated with this.
-   * 
+   *
    * @return the component associated with the trigger.
    */
   public Component getComponent()
@@ -136,7 +136,7 @@ public class DragSourceContext
 
   /**
    * Gets the trigger associated with this.
-   * 
+   *
    * @return the trigger.
    */
   public DragGestureEvent getTrigger()
@@ -146,7 +146,7 @@ public class DragSourceContext
 
   /**
    * Returns the source actions for the DragGestureRecognizer.
-   * 
+   *
    * @return the source actions for DragGestureRecognizer.
    */
   public int getSourceActions()
@@ -158,7 +158,7 @@ public class DragSourceContext
 
   /**
    * Sets the cursor for this drag operation to the specified cursor.
-   * 
+   *
    * @param cursor c - the Cursor to use, or null to use the default drag
    *          cursor.
    */
@@ -175,7 +175,7 @@ public class DragSourceContext
   /**
    * Returns the current cursor or null if the default
    * drag cursor is used.
-   * 
+   *
    * @return the current cursor or null.
    */
   public Cursor getCursor()
@@ -215,57 +215,57 @@ public class DragSourceContext
   /**
    * Calls dragEnter on the listeners registered with this
    * and with the DragSource.
-   * 
+   *
    * @param e - the DragSourceDragEvent
    */
   public void dragEnter(DragSourceDragEvent e)
   {
     if (dragSourceListener != null)
       dragSourceListener.dragEnter(e);
-    
+
     DragSource ds = getDragSource();
     DragSourceListener[] dsl = ds.getDragSourceListeners();
     for (int i = 0; i < dsl.length; i++)
       dsl[i].dragEnter(e);
-    
+
     updateCurrentCursor(e.getDropAction(), e.getTargetActions(), ENTER);
   }
 
   /**
    * Calls dragOver on the listeners registered with this
    * and with the DragSource.
-   * 
+   *
    * @param e - the DragSourceDragEvent
    */
   public void dragOver(DragSourceDragEvent e)
   {
     if (dragSourceListener != null)
       dragSourceListener.dragOver(e);
-    
+
     DragSource ds = getDragSource();
     DragSourceListener[] dsl = ds.getDragSourceListeners();
     for (int i = 0; i < dsl.length; i++)
       dsl[i].dragOver(e);
-    
+
     updateCurrentCursor(e.getDropAction(), e.getTargetActions(), OVER);
   }
-  
+
   /**
    * Calls dragExit on the listeners registered with this
    * and with the DragSource.
-   * 
+   *
    * @param e - the DragSourceEvent
    */
   public void dragExit(DragSourceEvent e)
   {
     if (dragSourceListener != null)
       dragSourceListener.dragExit(e);
-    
+
     DragSource ds = getDragSource();
     DragSourceListener[] dsl = ds.getDragSourceListeners();
     for (int i = 0; i < dsl.length; i++)
       dsl[i].dragExit(e);
-    
+
     updateCurrentCursor(DnDConstants.ACTION_NONE, DnDConstants.ACTION_NONE,
                         DEFAULT);
   }
@@ -273,33 +273,33 @@ public class DragSourceContext
   /**
    * Calls dropActionChanged on the listeners registered with this
    * and with the DragSource.
-   * 
+   *
    * @param e - the DragSourceDragEvent
    */
   public void dropActionChanged(DragSourceDragEvent e)
   {
     if (dragSourceListener != null)
       dragSourceListener.dropActionChanged(e);
-    
+
     DragSource ds = getDragSource();
     DragSourceListener[] dsl = ds.getDragSourceListeners();
     for (int i = 0; i < dsl.length; i++)
       dsl[i].dropActionChanged(e);
-    
+
     updateCurrentCursor(e.getDropAction(), e.getTargetActions(), CHANGED);
   }
 
   /**
    * Calls dragDropEnd on the listeners registered with this
    * and with the DragSource.
-   * 
+   *
    * @param e - the DragSourceDropEvent
    */
   public void dragDropEnd(DragSourceDropEvent e)
   {
     if (dragSourceListener != null)
       dragSourceListener.dragDropEnd(e);
-    
+
     DragSource ds = getDragSource();
     DragSourceListener[] dsl = ds.getDragSourceListeners();
     for (int i = 0; i < dsl.length; i++)
@@ -308,7 +308,7 @@ public class DragSourceContext
 
   /**
    * Calls dragMouseMoved on the listeners registered with the DragSource.
-   * 
+   *
    * @param e - the DragSourceDragEvent
    */
   public void dragMouseMoved(DragSourceDragEvent e)
@@ -321,7 +321,7 @@ public class DragSourceContext
 
   /**
    * Returns the Transferable set with this object.
-   * 
+   *
    * @return the transferable.
    */
   public Transferable getTransferable()
@@ -333,7 +333,7 @@ public class DragSourceContext
    * This function sets the drag cursor for the specified operation, actions and
    * status if the default drag cursor is active. Otherwise, the cursor is not
    * updated in any way.
-   * 
+   *
    * @param dropOp - the current operation.
    * @param targetAct - the supported actions.
    * @param status - the status of the cursor (constant).
@@ -370,7 +370,7 @@ public class DragSourceContext
                   newCursor = DragSource.DefaultCopyDrop;
               }
           }
-        
+
         if (cursor == null || ! cursor.equals(newCursor))
           {
             cursor = newCursor;
diff --git a/libjava/classpath/java/awt/dnd/DragSourceDropEvent.java b/libjava/classpath/java/awt/dnd/DragSourceDropEvent.java
index 7621262..4df9849 100644
--- a/libjava/classpath/java/awt/dnd/DragSourceDropEvent.java
+++ b/libjava/classpath/java/awt/dnd/DragSourceDropEvent.java
@@ -60,7 +60,7 @@ public class DragSourceDropEvent extends DragSourceEvent
     this.dropAction = 0;
     this.dropSuccess = false;
   }
-  
+
   public DragSourceDropEvent (DragSourceContext context, int dropAction,
                               boolean dropSuccess)
   {
diff --git a/libjava/classpath/java/awt/dnd/DragSourceEvent.java b/libjava/classpath/java/awt/dnd/DragSourceEvent.java
index c5cd42a..c9e18d7 100644
--- a/libjava/classpath/java/awt/dnd/DragSourceEvent.java
+++ b/libjava/classpath/java/awt/dnd/DragSourceEvent.java
@@ -50,7 +50,7 @@ public class DragSourceEvent extends EventObject
    * Compatible with JDK 1.2+
    */
   private static final long serialVersionUID = -763287114604032641L;
-  
+
   private final boolean locationSpecified;
   private final int x;
   private final int y;
diff --git a/libjava/classpath/java/awt/dnd/DropTarget.java b/libjava/classpath/java/awt/dnd/DropTarget.java
index 63be5ac..e5180d0 100644
--- a/libjava/classpath/java/awt/dnd/DropTarget.java
+++ b/libjava/classpath/java/awt/dnd/DropTarget.java
@@ -1,4 +1,4 @@
-/* DropTarget.java -- 
+/* DropTarget.java --
    Copyright (C) 2002, 2003, 2004  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -164,7 +164,7 @@ public class DropTarget
   private DropTargetListener dropTargetListener;
   private DropTarget.DropTargetAutoScroller autoscroller;
   private boolean active = true;
-    
+
   /**
    * Creates a <code>DropTarget</code> object.
    *
@@ -175,7 +175,7 @@ public class DropTarget
   {
     this (null, DnDConstants.ACTION_COPY_OR_MOVE, null, true, null);
   }
-  
+
   /**
    * Creates a <code>DropTarget</code> object.
    *
@@ -186,7 +186,7 @@ public class DropTarget
   {
     this (c, DnDConstants.ACTION_COPY_OR_MOVE, dtl, true, null);
   }
-  
+
   /**
    * Creates a <code>DropTarget</code> object.
    *
@@ -197,7 +197,7 @@ public class DropTarget
   {
     this (c, i, dtl, true, null);
   }
-  
+
   /**
    * Creates a <code>DropTarget</code> object.
    *
@@ -208,7 +208,7 @@ public class DropTarget
   {
     this (c, i, dtl, b, null);
   }
-  
+
   /**
    * Creates a <code>DropTarget</code> object.
    *
@@ -224,14 +224,14 @@ public class DropTarget
     setComponent(c);
     setDefaultActions(i);
     dropTargetListener = dtl;
-    
+
     if (fm == null)
       flavorMap = SystemFlavorMap.getDefaultFlavorMap();
     else
       flavorMap = fm;
-    
+
     setActive (b);
-    
+
     if (c != null)
       c.setDropTarget(this);
   }
@@ -284,7 +284,7 @@ public class DropTarget
 
   /**
    * Adds a new <code>DropTargetListener</code>.
-   * 
+   *
    * @exception TooManyListenersException Sun's JDK does not, despite
    * documentation, throw this exception here when you install an additional
    * <code>DropTargetListener</code>.  So to be compatible, we do the same
@@ -295,13 +295,13 @@ public class DropTarget
   {
     if (dtl == null)
       return;
-    
+
     if (dtl.equals(this))
       throw new IllegalArgumentException();
-    
+
     if (dropTargetListener != null)
       throw new TooManyListenersException();
-    
+
     dropTargetListener = dtl;
   }
 
@@ -397,7 +397,7 @@ public class DropTarget
   {
     if (dropTargetContext == null)
       dropTargetContext = createDropTargetContext ();
-    
+
     return dropTargetContext;
   }
 
@@ -405,7 +405,7 @@ public class DropTarget
   {
     if (dropTargetContext == null)
       dropTargetContext = new DropTargetContext (this);
-    
+
     return dropTargetContext;
   }
 
diff --git a/libjava/classpath/java/awt/dnd/DropTargetContext.java b/libjava/classpath/java/awt/dnd/DropTargetContext.java
index d970e2e..4c21a6e 100644
--- a/libjava/classpath/java/awt/dnd/DropTargetContext.java
+++ b/libjava/classpath/java/awt/dnd/DropTargetContext.java
@@ -66,7 +66,7 @@ public class DropTargetContext implements Serializable
       this.transferable = t;
       this.isLocal = local;
     }
-    
+
     public DataFlavor[] getTransferDataFlavors()
     {
       return transferable.getTransferDataFlavors();
@@ -156,7 +156,7 @@ public class DropTargetContext implements Serializable
   protected void rejectDrop ()
   {
     if (dtcp != null)
-      dtcp.rejectDrop();    
+      dtcp.rejectDrop();
   }
 
   protected DataFlavor[] getCurrentDataFlavors ()
@@ -181,7 +181,7 @@ public class DropTargetContext implements Serializable
    *
    * @exception InvalidDnDOperationException If a drag is not outstanding.
    */
-  protected Transferable getTransferable() 
+  protected Transferable getTransferable()
     throws InvalidDnDOperationException
   {
     // FIXME: Implement this
diff --git a/libjava/classpath/java/awt/dnd/DropTargetDragEvent.java b/libjava/classpath/java/awt/dnd/DropTargetDragEvent.java
index 58feb43..21c9e2b3 100644
--- a/libjava/classpath/java/awt/dnd/DropTargetDragEvent.java
+++ b/libjava/classpath/java/awt/dnd/DropTargetDragEvent.java
@@ -89,10 +89,10 @@ public class DropTargetDragEvent extends DropTargetEvent
                          | DnDConstants.ACTION_COPY_OR_MOVE
                          | DnDConstants.ACTION_LINK
                          | DnDConstants.ACTION_REFERENCE;
-    
+
     if (~(srcActions ^ srcActionsMask) != 0)
       throw new IllegalArgumentException ();
-    
+
     this.dropAction = dropAction;
     this.srcActions = srcActions;
     this.location = location;
@@ -107,12 +107,12 @@ public class DropTargetDragEvent extends DropTargetEvent
   {
     return context.getCurrentDataFlavors ();
   }
-  
+
   public List<DataFlavor> getCurrentDataFlavorsAsList ()
   {
     return context.getCurrentDataFlavorsAsList ();
   }
-  
+
   public int getDropAction()
   {
     return dropAction & ((DropTargetContext) source).getTargetActions();
@@ -137,12 +137,12 @@ public class DropTargetDragEvent extends DropTargetEvent
   {
     context.rejectDrag ();
   }
-  
+
   /**
    * TODO
-   * 
+   *
    * @return
-   * 
+   *
    * @since 1.5
    */
   public Transferable getTransferable()
diff --git a/libjava/classpath/java/awt/dnd/DropTargetDropEvent.java b/libjava/classpath/java/awt/dnd/DropTargetDropEvent.java
index dd85ef7..333f8c6 100644
--- a/libjava/classpath/java/awt/dnd/DropTargetDropEvent.java
+++ b/libjava/classpath/java/awt/dnd/DropTargetDropEvent.java
@@ -56,7 +56,7 @@ public class DropTargetDropEvent extends DropTargetEvent
   private final int actions;
   private final Point location;
   private final boolean isLocalTx;
-  
+
   /**
    * Initializes a <code>DropTargetDropEvent</code>. By default this constructor
    * assumes that the target is not int same JVM.
@@ -103,16 +103,16 @@ public class DropTargetDropEvent extends DropTargetEvent
                       | DnDConstants.ACTION_COPY_OR_MOVE
                       | DnDConstants.ACTION_LINK
                       | DnDConstants.ACTION_REFERENCE;
-    
+
     if (~(actions ^ actionsMask) != 0)
       throw new IllegalArgumentException();
-    
+
     this.dropAction = dropAction;
     this.actions = actions;
     this.location = location;
     this.isLocalTx = isLocalTx;
   }
-  
+
   public Point getLocation()
   {
     return location;
diff --git a/libjava/classpath/java/awt/dnd/DropTargetEvent.java b/libjava/classpath/java/awt/dnd/DropTargetEvent.java
index cb2aec6..fc599a9 100644
--- a/libjava/classpath/java/awt/dnd/DropTargetEvent.java
+++ b/libjava/classpath/java/awt/dnd/DropTargetEvent.java
@@ -1,4 +1,4 @@
-/* DropTarget.java -- 
+/* DropTarget.java --
    Copyright (C) 2002 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -54,7 +54,7 @@ public class DropTargetEvent extends EventObject
     super (context);
     this.context = context;
   }
-  
+
   public DropTargetContext getDropTargetContext ()
   {
     return context;
diff --git a/libjava/classpath/java/awt/dnd/MouseDragGestureRecognizer.java b/libjava/classpath/java/awt/dnd/MouseDragGestureRecognizer.java
index 9a2a7bc..08a2ac0 100644
--- a/libjava/classpath/java/awt/dnd/MouseDragGestureRecognizer.java
+++ b/libjava/classpath/java/awt/dnd/MouseDragGestureRecognizer.java
@@ -45,7 +45,7 @@ import java.awt.event.MouseMotionListener;
 /**
  * @author Michael Koch (konqueror@gmx.de)
  */
-public abstract class MouseDragGestureRecognizer 
+public abstract class MouseDragGestureRecognizer
   extends DragGestureRecognizer
   implements MouseListener, MouseMotionListener
 {
@@ -53,7 +53,7 @@ public abstract class MouseDragGestureRecognizer
    * Creates a <code>MouseDragGestureRecognizer</code> object.
    */
   protected MouseDragGestureRecognizer (DragSource ds, Component c, int act,
-		                        DragGestureListener dgl)
+                                        DragGestureListener dgl)
   {
     super (ds, c, act, dgl);
   }
diff --git a/libjava/classpath/java/awt/dnd/peer/DropTargetContextPeer.java b/libjava/classpath/java/awt/dnd/peer/DropTargetContextPeer.java
index 6eae29b..2f4da5f 100644
--- a/libjava/classpath/java/awt/dnd/peer/DropTargetContextPeer.java
+++ b/libjava/classpath/java/awt/dnd/peer/DropTargetContextPeer.java
@@ -45,11 +45,11 @@ import java.awt.dnd.InvalidDnDOperationException;
 
 
 /**
- * Used to control state of recipient protocol from the 
+ * Used to control state of recipient protocol from the
  * <code>DropTargetListener</code>.  Occurs when a <code>Component</code>
- * with an associated <code>DropTarget</code> and visible geometry is first 
+ * with an associated <code>DropTarget</code> and visible geometry is first
  * intersected by a logical cursor.
- * 
+ *
  * @author Michael Koch (konqueror@gmx.de)
  */
 public interface DropTargetContextPeer
diff --git a/libjava/classpath/java/awt/event/AWTEventListener.java b/libjava/classpath/java/awt/event/AWTEventListener.java
index 079a91d..3f30df4 100644
--- a/libjava/classpath/java/awt/event/AWTEventListener.java
+++ b/libjava/classpath/java/awt/event/AWTEventListener.java
@@ -62,4 +62,4 @@ public interface AWTEventListener extends EventListener
    * @param event the AWTEvent that was dispatched
    */
   void eventDispatched(AWTEvent event);
-} // interface AWTEventListener 
+} // interface AWTEventListener
diff --git a/libjava/classpath/java/awt/event/ActionEvent.java b/libjava/classpath/java/awt/event/ActionEvent.java
index 937d2cf..776ab04 100644
--- a/libjava/classpath/java/awt/event/ActionEvent.java
+++ b/libjava/classpath/java/awt/event/ActionEvent.java
@@ -205,8 +205,8 @@ public class ActionEvent extends AWTEvent
   public String paramString()
   {
     CPStringBuilder s = new CPStringBuilder(id == ACTION_PERFORMED
-					    ? "ACTION_PERFORMED,cmd="
-					    : "unknown type,cmd=");
+                                            ? "ACTION_PERFORMED,cmd="
+                                            : "unknown type,cmd=");
     s.append(actionCommand).append(",when=").append(when).append(",modifiers");
     int len = s.length();
     s.setLength(len + 1);
@@ -225,4 +225,4 @@ public class ActionEvent extends AWTEvent
     s.setCharAt(len, '=');
     return s.toString();
   }
-} // class ActionEvent 
+} // class ActionEvent
diff --git a/libjava/classpath/java/awt/event/ComponentAdapter.java b/libjava/classpath/java/awt/event/ComponentAdapter.java
index 6b4893f..cb1c0da 100644
--- a/libjava/classpath/java/awt/event/ComponentAdapter.java
+++ b/libjava/classpath/java/awt/event/ComponentAdapter.java
@@ -94,4 +94,4 @@ public abstract class ComponentAdapter implements ComponentListener
   public void componentHidden(ComponentEvent event)
   {
   }
-} // class ComponentAdapter 
+} // class ComponentAdapter
diff --git a/libjava/classpath/java/awt/event/ComponentEvent.java b/libjava/classpath/java/awt/event/ComponentEvent.java
index 156a3e2..3fd8685 100644
--- a/libjava/classpath/java/awt/event/ComponentEvent.java
+++ b/libjava/classpath/java/awt/event/ComponentEvent.java
@@ -117,12 +117,12 @@ public class ComponentEvent extends AWTEvent
   public String paramString()
   {
     CPStringBuilder s = new CPStringBuilder();
-    
+
     // Unlike Sun, we don't throw NullPointerException or ClassCastException
     // when source was illegally changed.
     if (id == COMPONENT_MOVED)
       s.append("COMPONENT_MOVED ");
-    else if (id == COMPONENT_RESIZED) 
+    else if (id == COMPONENT_RESIZED)
       s.append("COMPONENT_RESIZED ");
     else if (id == COMPONENT_SHOWN)
       s.append("COMPONENT_SHOWN ");
@@ -138,5 +138,5 @@ public class ComponentEvent extends AWTEvent
 
     return s.toString();
   }
-  
+
 } // class ComponentEvent
diff --git a/libjava/classpath/java/awt/event/InputEvent.java b/libjava/classpath/java/awt/event/InputEvent.java
index b9dad32..241630c 100644
--- a/libjava/classpath/java/awt/event/InputEvent.java
+++ b/libjava/classpath/java/awt/event/InputEvent.java
@@ -306,7 +306,7 @@ public abstract class InputEvent extends ComponentEvent
   }
 
   /**
-   * This method returns the old-style modifiers in effect for this event. 
+   * This method returns the old-style modifiers in effect for this event.
    * Note that this is ambiguous between button2 and alt, and between
    * button3 and meta. Also, code which generated these modifiers tends to
    * only list the modifier that just changed, even if others were down at
diff --git a/libjava/classpath/java/awt/event/InputMethodEvent.java b/libjava/classpath/java/awt/event/InputMethodEvent.java
index e0be40d..1542bcc 100644
--- a/libjava/classpath/java/awt/event/InputMethodEvent.java
+++ b/libjava/classpath/java/awt/event/InputMethodEvent.java
@@ -278,7 +278,7 @@ public class InputMethodEvent extends AWTEvent
         while (--j >= 0)
           s.append(text.setIndex(i++));
         s.append("\", ").append(committedCharacterCount)
-          .append(" characters committed, caret: ");          
+          .append(" characters committed, caret: ");
       }
     s.append(caret == null ? (Object) "no caret" : caret).append(", ")
       .append(visiblePosition == null ? (Object) "no visible position"
diff --git a/libjava/classpath/java/awt/event/InvocationEvent.java b/libjava/classpath/java/awt/event/InvocationEvent.java
index 6f39d6b..afa09de 100644
--- a/libjava/classpath/java/awt/event/InvocationEvent.java
+++ b/libjava/classpath/java/awt/event/InvocationEvent.java
@@ -108,11 +108,11 @@ public class InvocationEvent extends AWTEvent implements ActiveEvent
 
   /**
    * This is the caught Throwable thrown in the <code>run()</code> method.
-   * It is null if throwables are ignored, the run method hasn't completed, 
+   * It is null if throwables are ignored, the run method hasn't completed,
    * or there were no throwables thrown.
    */
   private Throwable throwable;
-  
+
   /**
    * The timestamp when this event was created.
    *
@@ -202,9 +202,9 @@ public class InvocationEvent extends AWTEvent implements ActiveEvent
     Object o = notifier;
     if (o != null)
       synchronized(o)
-	{
-	  o.notifyAll();
-	}
+        {
+          o.notifyAll();
+        }
   }
 
   /**
@@ -230,7 +230,7 @@ public class InvocationEvent extends AWTEvent implements ActiveEvent
   {
     return throwable;
   }
-  
+
   /**
    * Gets the timestamp of when this event was created.
    *
diff --git a/libjava/classpath/java/awt/event/KeyEvent.java b/libjava/classpath/java/awt/event/KeyEvent.java
index bb7ed4c..a2b1dc9 100644
--- a/libjava/classpath/java/awt/event/KeyEvent.java
+++ b/libjava/classpath/java/awt/event/KeyEvent.java
@@ -1104,7 +1104,7 @@ public class KeyEvent extends InputEvent
    */
   private boolean isProxyActive;
 
-
+
   /**
    * Initializes a new instance of <code>KeyEvent</code> with the specified
    * information. Note that an invalid id leads to unspecified results.
diff --git a/libjava/classpath/java/awt/event/MouseEvent.java b/libjava/classpath/java/awt/event/MouseEvent.java
index 86a584c..64142ec 100644
--- a/libjava/classpath/java/awt/event/MouseEvent.java
+++ b/libjava/classpath/java/awt/event/MouseEvent.java
@@ -293,8 +293,8 @@ public class MouseEvent extends InputEvent
     // release event.
     if (id == MOUSE_RELEASED)
       this.modifiersEx &= ~(BUTTON1_DOWN_MASK
-			    | BUTTON2_DOWN_MASK
-			    | BUTTON3_DOWN_MASK);
+                            | BUTTON2_DOWN_MASK
+                            | BUTTON3_DOWN_MASK);
 
     this.absX = absX;
     this.absY = absY;
@@ -469,10 +469,10 @@ public class MouseEvent extends InputEvent
     // FIXME: need a mauve test for this method
     if (modifiersEx != 0)
       s.append(",extModifiers=").append(getModifiersExText(modifiersEx));
-    
+
     s.append(",clickCount=").append(clickCount);
     s.append(",consumed=").append(consumed);
-    
+
     return s.toString();
   }
 
diff --git a/libjava/classpath/java/awt/event/MouseListener.java b/libjava/classpath/java/awt/event/MouseListener.java
index 4508019..735ca6b 100644
--- a/libjava/classpath/java/awt/event/MouseListener.java
+++ b/libjava/classpath/java/awt/event/MouseListener.java
@@ -85,7 +85,7 @@ public interface MouseListener extends EventListener
    */
   void mouseEntered(MouseEvent event);
 
-  /** 
+  /**
    * This method is called when the mouse exits a component.
    *
    * @param event the <code>MouseEvent</code> for the exit
diff --git a/libjava/classpath/java/awt/event/MouseWheelEvent.java b/libjava/classpath/java/awt/event/MouseWheelEvent.java
index d1d22d2..1ca9465 100644
--- a/libjava/classpath/java/awt/event/MouseWheelEvent.java
+++ b/libjava/classpath/java/awt/event/MouseWheelEvent.java
@@ -135,7 +135,7 @@ public class MouseWheelEvent extends MouseEvent
    * @param wheelRotation the number of rotation "clicks"
    * @throws IllegalArgumentException if source is null
    * @see MouseEvent#MouseEvent(Component, int, long, int, int, int, int,
-   *      boolean) 
+   *      boolean)
    */
   public MouseWheelEvent(Component source, int id, long when, int modifiers,
                          int x, int y, int clickCount, boolean popupTrigger,
diff --git a/libjava/classpath/java/awt/event/WindowEvent.java b/libjava/classpath/java/awt/event/WindowEvent.java
index 1298e1a..b52fefc 100644
--- a/libjava/classpath/java/awt/event/WindowEvent.java
+++ b/libjava/classpath/java/awt/event/WindowEvent.java
@@ -49,7 +49,7 @@ import java.awt.Window;
  * are three listeners, for three types of events: WindowListeners deal with
  * the lifecycle of a window, WindowStateListeners deal with window state
  * like maximization, and WindowFocusListeners deal with focus switching to
- * or from a window. 
+ * or from a window.
  *
  * @author Aaron M. Renn (arenn@urbanophile.com)
  * @see WindowAdapter
diff --git a/libjava/classpath/java/awt/font/FontRenderContext.java b/libjava/classpath/java/awt/font/FontRenderContext.java
index c25bae3..8d530ec 100644
--- a/libjava/classpath/java/awt/font/FontRenderContext.java
+++ b/libjava/classpath/java/awt/font/FontRenderContext.java
@@ -48,7 +48,7 @@ public class FontRenderContext
   private AffineTransform affineTransform;
   private boolean isAntiAliased;
   private boolean usesFractionalMetrics;
- 
+
   /**
    * Construct a new <code>FontRenderContext</code>.
    */
@@ -56,7 +56,7 @@ public class FontRenderContext
   {
     // Do nothing here.
   }
- 
+
   /**
    * Construct a new <code>FontRenderContext</code>.
    */
@@ -68,7 +68,7 @@ public class FontRenderContext
       {
         this.affineTransform = new AffineTransform (tx);
       }
-    
+
     this.isAntiAliased = isAntiAliased;
     this.usesFractionalMetrics = usesFractionalMetrics;
   }
@@ -135,4 +135,3 @@ public class FontRenderContext
     return usesFractionalMetrics;
   }
 }
- 
diff --git a/libjava/classpath/java/awt/font/GlyphJustificationInfo.java b/libjava/classpath/java/awt/font/GlyphJustificationInfo.java
index 5f45fd5..cfa64f0 100644
--- a/libjava/classpath/java/awt/font/GlyphJustificationInfo.java
+++ b/libjava/classpath/java/awt/font/GlyphJustificationInfo.java
@@ -47,7 +47,7 @@ public final class GlyphJustificationInfo
   public static final int PRIORITY_WHITESPACE = 1;
   public static final int PRIORITY_INTERCHAR = 2;
   public static final int PRIORITY_NONE = 3;
-  
+
   public final float weight;
   public final int growPriority;
   public final boolean growAbsorb;
@@ -57,7 +57,7 @@ public final class GlyphJustificationInfo
   public final boolean shrinkAbsorb;
   public final float shrinkLeftLimit;
   public final float shrinkRightLimit;
-	
+
   public GlyphJustificationInfo (float weight, boolean growAbsorb,
                                  int growPriority, float growLeftLimit,
                                  float growRightLimit, boolean shrinkAbsorb,
diff --git a/libjava/classpath/java/awt/font/GlyphMetrics.java b/libjava/classpath/java/awt/font/GlyphMetrics.java
index 0a78d30..b41b7f4 100644
--- a/libjava/classpath/java/awt/font/GlyphMetrics.java
+++ b/libjava/classpath/java/awt/font/GlyphMetrics.java
@@ -50,13 +50,13 @@ public final class GlyphMetrics
   public static final byte LIGATURE = 1;
   public static final byte STANDARD = 0;
   public static final byte WHITESPACE = 4;
- 
+
   private boolean horizontal;
   private float advanceX;
   private float advanceY;
   private Rectangle2D bounds;
   private byte glyphType;
-  
+
   public GlyphMetrics (boolean horizontal, float advanceX, float advanceY,
                        Rectangle2D bounds, byte glyphType)
   {
@@ -66,7 +66,7 @@ public final class GlyphMetrics
     this.bounds = bounds;
     this.glyphType = glyphType;
   }
-  
+
   public GlyphMetrics (float advance, Rectangle2D bounds, byte glyphType)
   {
     this (true, advance, advance, bounds, glyphType);
diff --git a/libjava/classpath/java/awt/font/GlyphVector.java b/libjava/classpath/java/awt/font/GlyphVector.java
index f4cb01b..4a87f4c 100644
--- a/libjava/classpath/java/awt/font/GlyphVector.java
+++ b/libjava/classpath/java/awt/font/GlyphVector.java
@@ -69,12 +69,12 @@ public abstract class GlyphVector implements Cloneable
   public abstract Font getFont ();
 
   public abstract FontRenderContext getFontRenderContext ();
-    
+
   public int getGlyphCharIndex (int glyphIndex)
   {
     return glyphIndex;
   }
-    
+
   public int[] getGlyphCharIndices(int beginGlyphIndex, int numEntries,
                                    int[] codeReturn)
   {
@@ -85,10 +85,10 @@ public abstract class GlyphVector implements Cloneable
     int j = beginGlyphIndex;
     while (j < numEntries)
       codeReturn[i++] = getGlyphCharIndex(j++);
-    
+
     return codeReturn;
   }
-    
+
   public abstract int getGlyphCode (int glyphIndex);
 
   public abstract int[] getGlyphCodes (int beginGlyphIndex, int numEntries,
@@ -106,7 +106,7 @@ public abstract class GlyphVector implements Cloneable
   public Shape getGlyphOutline(int glyphIndex, float x, float y)
   {
     Shape s = getGlyphOutline(glyphIndex);
-    
+
     // This is the only way to translate the origin of a shape
     AffineTransform at = AffineTransform.getTranslateInstance(x, y);
     return at.createTransformedShape(s);
@@ -117,12 +117,12 @@ public abstract class GlyphVector implements Cloneable
   {
     Rectangle bounds = new Rectangle();
     Rectangle2D rect = getGlyphVisualBounds(index).getBounds2D();
-    
+
     bounds.x = (int) (rect.getX() + x);
     bounds.y = (int) (rect.getY() + y);
     bounds.width = (int) rect.getMaxX() - bounds.x;
     bounds.height = (int) rect.getMaxY() - bounds.y;
-    
+
     return bounds;
   }
 
@@ -144,7 +144,7 @@ public abstract class GlyphVector implements Cloneable
   public abstract Rectangle2D getLogicalBounds ();
 
   public abstract int getNumGlyphs ();
-  
+
   public abstract Shape getOutline ();
 
   public abstract Shape getOutline (float x, float y);
@@ -154,12 +154,12 @@ public abstract class GlyphVector implements Cloneable
   {
     Rectangle bounds = new Rectangle();
     Rectangle2D rect = getVisualBounds();
-    
+
     bounds.x = (int) (rect.getX() + x);
     bounds.y = (int) (rect.getY() + y);
     bounds.width = (int) rect.getMaxX() - bounds.x;
     bounds.height = (int) rect.getMaxY() - bounds.y;
-    
+
     return bounds;
   }
 
diff --git a/libjava/classpath/java/awt/font/GraphicAttribute.java b/libjava/classpath/java/awt/font/GraphicAttribute.java
index 19f781b..edf0c20 100644
--- a/libjava/classpath/java/awt/font/GraphicAttribute.java
+++ b/libjava/classpath/java/awt/font/GraphicAttribute.java
@@ -43,7 +43,7 @@ import java.awt.geom.Rectangle2D;
 
 /**
  * This class represents a graphic embedded in text.
- * 
+ *
  * @author Michael Koch
  * @author Lillian Angel (langel at redhat dot com)
  */
@@ -59,7 +59,7 @@ public abstract class GraphicAttribute
 
   /**
    * Constructor.
-   * 
+   *
    * @param alignment - the alignment to use for the graphic
    */
   protected GraphicAttribute(int alignment)
@@ -71,7 +71,7 @@ public abstract class GraphicAttribute
 
   /**
    * Draws the graphic.
-   * 
+   *
    * @param graphics - the graphics configuration to use
    * @param x - the x location
    * @param y - the y location
@@ -81,7 +81,7 @@ public abstract class GraphicAttribute
   /**
    * Gets the distance from the origin of its graphic to the right side of the
    * bounds of its graphic.
-   * 
+   *
    * @return the advance
    */
   public abstract float getAdvance();
@@ -89,21 +89,21 @@ public abstract class GraphicAttribute
   /**
    * Gets the positive distance from the origin of its graphic to the top of
    * bounds.
-   * 
+   *
    * @return the ascent
    */
   public abstract float getAscent();
 
   /**
    * Gets the distance from the origin of its graphic to the bottom of the bounds.
-   * 
+   *
    * @return the descent
    */
   public abstract float getDescent();
 
   /**
    * Gets the alignment.
-   * 
+   *
    * @return the alignment
    */
   public final int getAlignment()
@@ -114,7 +114,7 @@ public abstract class GraphicAttribute
   /**
    * Returns a Rectangle2D that encloses the rendered area.
    * Default bounds is the rectangle (0, -ascent, advance, ascent+descent).
-   * 
+   *
    * @return the bounds of the rendered area
    */
   public Rectangle2D getBounds()
@@ -125,7 +125,7 @@ public abstract class GraphicAttribute
 
   /**
    * Returns the justification information for this object.
-   * 
+   *
    * @return the justification information
    */
   public GlyphJustificationInfo getJustificationInfo()
diff --git a/libjava/classpath/java/awt/font/ImageGraphicAttribute.java b/libjava/classpath/java/awt/font/ImageGraphicAttribute.java
index 3e4fdcf..63fff41 100644
--- a/libjava/classpath/java/awt/font/ImageGraphicAttribute.java
+++ b/libjava/classpath/java/awt/font/ImageGraphicAttribute.java
@@ -45,7 +45,7 @@ import java.awt.geom.Rectangle2D;
 /**
  * This is an implementation of GraphicAttribute which draws images in a
  * TextLayout.
- * 
+ *
  * @author Lillian Angel
  * @author Michael Koch
  */
@@ -58,7 +58,7 @@ public final class ImageGraphicAttribute
 
   /**
    * Constucts an instance from the specified Image. The origin is at (0, 0).
-   * 
+   *
    * @param image - image to construct from.
    * @param alignment - the alignment
    */
@@ -70,7 +70,7 @@ public final class ImageGraphicAttribute
   /**
    * Constucts an instance from the specified Image. The origin is at (originX,
    * originY).
-   * 
+   *
    * @param image - image to construct from
    * @param alignment - the alignment
    * @param originX - x point of origin
@@ -88,10 +88,10 @@ public final class ImageGraphicAttribute
   /**
    * Draws the image at the specified location, relative to the
    * origin.
-   * 
+   *
    * @param g - the graphics to use to render the image
    * @param x - the x location
-   * @param y - the y location 
+   * @param y - the y location
    */
   public void draw(Graphics2D g, float x, float y)
   {
@@ -100,7 +100,7 @@ public final class ImageGraphicAttribute
 
   /**
    * Compares this to the specified Object
-   * 
+   *
    * @param obj - the object to compare
    * @return true if the obj and this are equivalent
    */
@@ -115,7 +115,7 @@ public final class ImageGraphicAttribute
   /**
    * Compares this to the ImageGraphicAttribute given, by
    * comparing all fields and values.
-   * 
+   *
    * @param rhs - the ImageGraphicAttribute to compare
    * @return true if the object given is equivalent to this
    */
@@ -128,13 +128,13 @@ public final class ImageGraphicAttribute
                               && (this.getDescent() == rhs.getDescent())
                               && (this.hashCode() == rhs.hashCode())
                               && (this.image.equals(rhs.image))
-                              && (this.originX == rhs.originX) 
+                              && (this.originX == rhs.originX)
                               && (this.originY == rhs.originY)));
   }
 
   /**
    * Returns distance from the origin to the right edge of the image of this.
-   * 
+   *
    * @return the advance
    */
   public float getAdvance()
@@ -144,7 +144,7 @@ public final class ImageGraphicAttribute
 
   /**
    * Returns the the distance from the top of the image to the origin of this.
-   * 
+   *
    * @return the ascent.
    */
   public float getAscent()
@@ -154,7 +154,7 @@ public final class ImageGraphicAttribute
 
   /**
    * Gets the bounds of the object rendered, relative to the position.
-   * 
+   *
    * @return the bounds of the object rendered, relative to the position.
    */
   public Rectangle2D getBounds()
@@ -167,7 +167,7 @@ public final class ImageGraphicAttribute
 
   /**
    * Returns the distance from the origin to the bottom of the image.
-   * 
+   *
    * @return the descent
    */
   public float getDescent()
@@ -177,7 +177,7 @@ public final class ImageGraphicAttribute
 
   /**
    * Gets the hash code for this image.
-   * 
+   *
    * @return the hash code
    */
   public int hashCode()
diff --git a/libjava/classpath/java/awt/font/LineBreakMeasurer.java b/libjava/classpath/java/awt/font/LineBreakMeasurer.java
index 278bc84..d11f20d 100644
--- a/libjava/classpath/java/awt/font/LineBreakMeasurer.java
+++ b/libjava/classpath/java/awt/font/LineBreakMeasurer.java
@@ -45,17 +45,17 @@ public final class LineBreakMeasurer
 {
   private AttributedCharacterIterator text;
   private int position;
-  private TextMeasurer tm; 
+  private TextMeasurer tm;
   private int numChars;
 
-  public LineBreakMeasurer(AttributedCharacterIterator text, 
-			   BreakIterator breakIter, FontRenderContext frc)
+  public LineBreakMeasurer(AttributedCharacterIterator text,
+                           BreakIterator breakIter, FontRenderContext frc)
   {
     this( text, frc );
   }
 
-  public LineBreakMeasurer(AttributedCharacterIterator text, 
-			   FontRenderContext frc)
+  public LineBreakMeasurer(AttributedCharacterIterator text,
+                           FontRenderContext frc)
   {
     this.text = text;
     position = 0;
@@ -63,15 +63,15 @@ public final class LineBreakMeasurer
     tm = new TextMeasurer( text, frc );
   }
 
-  public void deleteChar(AttributedCharacterIterator newParagraph, 
-			 int deletePos)
+  public void deleteChar(AttributedCharacterIterator newParagraph,
+                         int deletePos)
   {
     tm.deleteChar( newParagraph, deletePos );
     position = 0;
   }
 
-  public void insertChar(AttributedCharacterIterator newParagraph, 
-			 int insertPos)
+  public void insertChar(AttributedCharacterIterator newParagraph,
+                         int insertPos)
   {
     tm.insertChar( newParagraph, insertPos );
     position = 0;
@@ -82,8 +82,8 @@ public final class LineBreakMeasurer
     return nextLayout( wrappingWidth, numChars, false );
   }
 
-  public TextLayout nextLayout(float wrappingWidth, int offsetLimit, 
-			       boolean requireNextWord)
+  public TextLayout nextLayout(float wrappingWidth, int offsetLimit,
+                               boolean requireNextWord)
   {
     int next = nextOffset( wrappingWidth, offsetLimit, requireNextWord );
     TextLayout tl = tm.getLayout( position, next );
@@ -96,8 +96,8 @@ public final class LineBreakMeasurer
     return nextOffset( wrappingWidth, numChars, false );
   }
 
-  public int nextOffset(float wrappingWidth, int offsetLimit, 
-			boolean requireNextWord)
+  public int nextOffset(float wrappingWidth, int offsetLimit,
+                        boolean requireNextWord)
   {
     int guessOffset = tm.getLineBreakIndex(position, wrappingWidth);
     if( offsetLimit > numChars )
@@ -105,8 +105,8 @@ public final class LineBreakMeasurer
 
     if( guessOffset > offsetLimit )
       {
-	text.setIndex( offsetLimit );
-	return offsetLimit;
+        text.setIndex( offsetLimit );
+        return offsetLimit;
       }
 
     text.setIndex( guessOffset );
@@ -117,18 +117,18 @@ public final class LineBreakMeasurer
 
     // Otherwise jump forward or backward to the last such char.
     if( !requireNextWord )
-      while( !Character.isWhitespace( text.previous() ) && 
-	     guessOffset > position )
-	guessOffset--; 
+      while( !Character.isWhitespace( text.previous() ) &&
+             guessOffset > position )
+        guessOffset--;
     else
-      while( !Character.isWhitespace( text.next() ) && 
-	     guessOffset < offsetLimit )
-	guessOffset++;
-    
+      while( !Character.isWhitespace( text.next() ) &&
+             guessOffset < offsetLimit )
+        guessOffset++;
+
     if( guessOffset > offsetLimit )
       {
-	text.setIndex( offsetLimit );
-	return offsetLimit;
+        text.setIndex( offsetLimit );
+        return offsetLimit;
       }
 
     text.setIndex( guessOffset );
@@ -146,4 +146,3 @@ public final class LineBreakMeasurer
     return position;
   }
 }
-
diff --git a/libjava/classpath/java/awt/font/LineMetrics.java b/libjava/classpath/java/awt/font/LineMetrics.java
index 3c45ad1..d43fd98 100644
--- a/libjava/classpath/java/awt/font/LineMetrics.java
+++ b/libjava/classpath/java/awt/font/LineMetrics.java
@@ -44,24 +44,24 @@ package java.awt.font;
 public abstract class LineMetrics
 {
   public abstract float getAscent();
-  
+
   public abstract int getBaselineIndex();
-  
+
   public abstract float[] getBaselineOffsets();
-  
+
   public abstract float getDescent();
-  
+
   public abstract float getHeight();
-  
+
   public abstract float getLeading();
-  
+
   public abstract int getNumChars();
-  
+
   public abstract float getStrikethroughOffset();
-  
+
   public abstract float getStrikethroughThickness();
-  
+
   public abstract float getUnderlineOffset();
-  
+
   public abstract float getUnderlineThickness();
 }
diff --git a/libjava/classpath/java/awt/font/MultipleMaster.java b/libjava/classpath/java/awt/font/MultipleMaster.java
index 57417ea..1be44bd 100644
--- a/libjava/classpath/java/awt/font/MultipleMaster.java
+++ b/libjava/classpath/java/awt/font/MultipleMaster.java
@@ -46,16 +46,16 @@ import java.awt.Font;
 public interface MultipleMaster
 {
   Font deriveMMFont (float[] axes);
-  
+
   Font deriveMMFont (float[] glyphWidths, float avgStemWidth,
                      float typicalCapHeight, float typicalXHeight,
                      float italicAngle);
-  
+
   float[] getDesignAxisDefaults();
-  
+
   String[] getDesignAxisNames();
-  
+
   float[] getDesignAxisRanges();
-  
+
   int getNumDesignAxes();
 }
diff --git a/libjava/classpath/java/awt/font/OpenType.java b/libjava/classpath/java/awt/font/OpenType.java
index ece3279..e992d07 100644
--- a/libjava/classpath/java/awt/font/OpenType.java
+++ b/libjava/classpath/java/awt/font/OpenType.java
@@ -94,18 +94,18 @@ public interface OpenType
   int TAG_VDMX = 1447316824;
   int TAG_VHEA = 1986553185;
   int TAG_VMTX = 1986884728;
-  
+
   byte[] getFontTable (int sfntTag);
-  
+
   byte[] getFontTable (int sfntTag, int offset, int count);
-  
+
   byte[] getFontTable (String strSfntTag);
-  
+
   byte[] getFontTable (String strSfntTag, int offset, int count);
-  
+
   int getFontTableSize (int sfntTag);
-  
+
   int getFontTableSize (String strSfntTag);
-  
+
   int getVersion ();
 }
diff --git a/libjava/classpath/java/awt/font/ShapeGraphicAttribute.java b/libjava/classpath/java/awt/font/ShapeGraphicAttribute.java
index 0681497..8d68916 100644
--- a/libjava/classpath/java/awt/font/ShapeGraphicAttribute.java
+++ b/libjava/classpath/java/awt/font/ShapeGraphicAttribute.java
@@ -44,24 +44,24 @@ import java.awt.geom.Rectangle2D;
 
 /**
  * This is an implementation of GraphicAttribute that draws shapes in a TextLayout.
- * 
+ *
  * @author Lillian Angel (langel at redhat dot com)
  */
 public final class ShapeGraphicAttribute extends GraphicAttribute
 {
   /** True if the shape should be filled. */
   public static final boolean FILL = false;
-  
+
   /** True if the shape should be stroked with a 1-pixel wide stroke. */
   public static final boolean STROKE = true;
 
   private Shape shape;
   private boolean stroke;
   private Rectangle2D bounds;
-  
+
   /**
    * Constructor.
-   * 
+   *
    * @param shape - the Shape to render. The Shape is rendered with its origin.
    * @param alignment - the alignment
    * @param stroke - true if the Shape should be stroked; false if the Shape
@@ -77,7 +77,7 @@ public final class ShapeGraphicAttribute extends GraphicAttribute
 
   /**
    * Draws the graphic at the given location.
-   * 
+   *
    * @param graphics - the graphics to use.
    * @param x - the x location to draw at.
    * @param y - the y location to draw at.
@@ -94,7 +94,7 @@ public final class ShapeGraphicAttribute extends GraphicAttribute
 
   /**
    * Compares this ShapeGraphicAttribute to obj.
-   * 
+   *
    * @param obj - the object to compare.
    */
   public boolean equals(Object obj)
@@ -107,7 +107,7 @@ public final class ShapeGraphicAttribute extends GraphicAttribute
 
   /**
    * Compares this ShapeGraphicAttribute to rhs.
-   * 
+   *
    * @param rhs - the ShapeGraphicAttribute to compare.
    */
   public boolean equals(ShapeGraphicAttribute rhs)
@@ -118,14 +118,14 @@ public final class ShapeGraphicAttribute extends GraphicAttribute
                             && getAdvance() == rhs.getAdvance()
                             && getAscent() == rhs.getAscent()
                             && getBounds().equals(rhs.getBounds())
-                            && getDescent() == rhs.getDescent() 
+                            && getDescent() == rhs.getDescent()
                             && hashCode() == rhs.hashCode()));
   }
 
   /**
    * Gets the distance from the origin of its Shape to the right side of the
    * bounds of its Shape.
-   * 
+   *
    * @return the advance
    */
   public float getAdvance()
@@ -136,7 +136,7 @@ public final class ShapeGraphicAttribute extends GraphicAttribute
   /**
    * Gets the positive distance from the origin of its Shape to the top of
    * bounds.
-   * 
+   *
    * @return the ascent
    */
   public float getAscent()
@@ -146,7 +146,7 @@ public final class ShapeGraphicAttribute extends GraphicAttribute
 
   /**
    * Gets the distance from the origin of its Shape to the bottom of the bounds.
-   * 
+   *
    * @return the descent
    */
   public float getDescent()
@@ -156,7 +156,7 @@ public final class ShapeGraphicAttribute extends GraphicAttribute
 
   /**
    * Returns a Rectangle2D that encloses all of the bits drawn by this shape.
-   * 
+   *
    * @return the bounds of the shape.
    */
   public Rectangle2D getBounds()
@@ -169,13 +169,13 @@ public final class ShapeGraphicAttribute extends GraphicAttribute
         bounds.width++;
         bounds.height++;
       }
-    
+
     return bounds;
   }
 
   /**
    * Gets the hash code.
-   * 
+   *
    * @return the hash code.
    */
   public int hashCode()
diff --git a/libjava/classpath/java/awt/font/TextAttribute.java b/libjava/classpath/java/awt/font/TextAttribute.java
index 6f5ed59..bfade21 100644
--- a/libjava/classpath/java/awt/font/TextAttribute.java
+++ b/libjava/classpath/java/awt/font/TextAttribute.java
@@ -48,197 +48,197 @@ import java.text.AttributedCharacterIterator;
 public final class TextAttribute extends AttributedCharacterIterator.Attribute
 {
   private static final long serialVersionUID = 7744112784117861702L;
-  
+
   /** A key for the background paint attribute. */
   public static final TextAttribute BACKGROUND =
     new TextAttribute("background");
-  
+
   /** A key for the BIDI_EMBEDDING attribute. */
   public static final TextAttribute BIDI_EMBEDDING =
     new TextAttribute("bidi_embedding");
-  
+
   /** A key for the CHAR_REPLACEMENT attribute. */
   public static final TextAttribute CHAR_REPLACEMENT =
     new TextAttribute("char_replacement");
-  
+
   /** A key for the FAMILY attribute. */
   public static final TextAttribute FAMILY = new TextAttribute("family");
-  
+
   /** A key for the font attribute. */
   public static final TextAttribute FONT = new TextAttribute("font");
-  
+
   /** A key for the foreground paint attribute. */
-  public static final TextAttribute FOREGROUND = 
+  public static final TextAttribute FOREGROUND =
     new TextAttribute("foreground");
-  
+
   /** A key for the INPUT_METHOD_HIGHLIGHT attribute. */
   public static final TextAttribute INPUT_METHOD_HIGHLIGHT =
     new TextAttribute("input method highlight");
-  
+
   /** A key for the INPUT_METHOD_UNDERLINE attribute. */
   public static final TextAttribute INPUT_METHOD_UNDERLINE =
     new TextAttribute("input method underline");
-  
+
   /** A key for the text justification attribute. */
   public static final TextAttribute JUSTIFICATION =
     new TextAttribute("justification");
-  
-  /** 
+
+  /**
    * A value that can be used with the {@link #JUSTIFICATION} attribute to
-   * indicate full justification of the text. 
+   * indicate full justification of the text.
    */
   public static final Float JUSTIFICATION_FULL = new Float(1.0);
-  
-  /** 
+
+  /**
    * A value that can be used with the {@link #JUSTIFICATION} attribute to
-   * indicate no justification of the text. 
+   * indicate no justification of the text.
    */
   public static final Float JUSTIFICATION_NONE = new Float(0.0);
-  
+
   /** A key for the NUMERIC_SHAPING attribute. */
   public static final TextAttribute NUMERIC_SHAPING =
     new TextAttribute("numeric_shaping");
-  
+
   /** A key for the POSTURE attribute. */
   public static final TextAttribute POSTURE = new TextAttribute("posture");
-  
+
   /** A value that can be used with the {@link #POSTURE} attribute. */
   public static final Float POSTURE_OBLIQUE = new Float(0.2);
-  
+
   /** A value that can be used with the {@link #POSTURE} attribute. */
   public static final Float POSTURE_REGULAR = new Float(0.0);
-  
+
   /** A key for the RUN_DIRECTION attribute. */
   public static final TextAttribute RUN_DIRECTION =
     new TextAttribute("run_direction");
-  
+
   /** A value that can be used with the {@link #RUN_DIRECTION} attribute. */
   public static final Boolean RUN_DIRECTION_LTR = Boolean.FALSE;
-  
+
   /** A value that can be used with the {@link #RUN_DIRECTION} attribute. */
   public static final Boolean RUN_DIRECTION_RTL = Boolean.TRUE;
-  
+
   /** A key for the text size attribute. */
   public static final TextAttribute SIZE = new TextAttribute("size");
-  
+
   /** A key for the STRIKETHROUGH attribute. */
   public static final TextAttribute STRIKETHROUGH =
     new TextAttribute("strikethrough");
-  
+
   /** A value that can be used with the {@link #STRIKETHROUGH} attribute. */
   public static final Boolean STRIKETHROUGH_ON = Boolean.TRUE;
-  
+
   /** A key for the SUPERSCRIPT attribute. */
   public static final TextAttribute SUPERSCRIPT =
     new TextAttribute("superscript");
-  
+
   /** A value that can be used with the {@link #SUPERSCRIPT} attribute. */
   public static final Integer SUPERSCRIPT_SUB = new Integer(-1);
-  
+
   /** A value that can be used with the {@link #SUPERSCRIPT} attribute. */
   public static final Integer SUPERSCRIPT_SUPER = new Integer(1);
-  
+
   /** A key for the SWAP_COLORS attribute. */
   public static final TextAttribute SWAP_COLORS =
     new TextAttribute("swap_colors");
-  
+
   /** A value that can be used with the {@link #SWAP_COLORS} attribute. */
   public static final Boolean SWAP_COLORS_ON = Boolean.TRUE;
-  
+
   /** A key for the TRANFORM attribute. */
   public static final TextAttribute TRANSFORM = new TextAttribute("transform");
-  
+
   /** A key for the UNDERLINE attribute. */
   public static final TextAttribute UNDERLINE = new TextAttribute("underline");
-  
+
   /** A value that can be used with the {@link #UNDERLINE} attribute. */
   public static final Integer UNDERLINE_LOW_DASHED = new Integer(5);
-  
+
   /** A value that can be used with the {@link #UNDERLINE} attribute. */
   public static final Integer UNDERLINE_LOW_DOTTED = new Integer(3);
-  
+
   /** A value that can be used with the {@link #UNDERLINE} attribute. */
   public static final Integer UNDERLINE_LOW_GRAY = new Integer(4);
-  
+
   /** A value that can be used with the {@link #UNDERLINE} attribute. */
   public static final Integer UNDERLINE_LOW_ONE_PIXEL = new Integer(1);
-  
+
   /** A value that can be used with the {@link #UNDERLINE} attribute. */
   public static final Integer UNDERLINE_LOW_TWO_PIXEL = new Integer(2);
-  
+
   /** A value that can be used with the {@link #UNDERLINE} attribute. */
   public static final Integer UNDERLINE_ON = new Integer(0);
-  
+
   /** A key for the WEIGHT attribute. */
   public static final TextAttribute WEIGHT = new TextAttribute("weight");
-  
+
   /** A value that can be used with the {@link #WEIGHT} attribute. */
   public static final Float WEIGHT_BOLD = new Float(2.0);
-  
+
   /** A value that can be used with the {@link #WEIGHT} attribute. */
   public static final Float WEIGHT_DEMIBOLD = new Float(1.75);
-  
+
   /** A value that can be used with the {@link #WEIGHT} attribute. */
   public static final Float WEIGHT_DEMILIGHT = new Float(0.875);
-  
+
   /** A value that can be used with the {@link #WEIGHT} attribute. */
   public static final Float WEIGHT_EXTRA_LIGHT = new Float(0.5);
-  
+
   /** A value that can be used with the {@link #WEIGHT} attribute. */
   public static final Float WEIGHT_EXTRABOLD = new Float(2.5);
-  
+
   /** A value that can be used with the {@link #WEIGHT} attribute. */
   public static final Float WEIGHT_HEAVY = new Float(2.25);
-  
+
   /** A value that can be used with the {@link #WEIGHT} attribute. */
   public static final Float WEIGHT_LIGHT = new Float(0.75);
-  
+
   /** A value that can be used with the {@link #WEIGHT} attribute. */
   public static final Float WEIGHT_MEDIUM = new Float(1.5);
-  
+
   /** A value that can be used with the {@link #WEIGHT} attribute. */
   public static final Float WEIGHT_REGULAR = new Float(1.0);
-  
+
   /** A value that can be used with the {@link #WEIGHT} attribute. */
   public static final Float WEIGHT_SEMIBOLD = new Float(1.25);
-  
+
   /** A value that can be used with the {@link #WEIGHT} attribute. */
   public static final Float WEIGHT_ULTRABOLD = new Float(2.75);
-  
+
   /** A key for the WIDTH attribute. */
   public static final TextAttribute WIDTH = new TextAttribute("width");
-  
+
   /** A value that can be used with the {@link #WIDTH} attribute. */
   public static final Float WIDTH_CONDENSED = new Float(0.75);
-  
+
   /** A value that can be used with the {@link #WIDTH} attribute. */
   public static final Float WIDTH_EXTENDED = new Float(1.5);
-  
+
   /** A value that can be used with the {@link #WIDTH} attribute. */
   public static final Float WIDTH_REGULAR = new Float(1.0);
-  
+
   /** A value that can be used with the {@link #WIDTH} attribute. */
   public static final Float WIDTH_SEMI_CONDENSED = new Float(0.875);
-  
+
   /** A value that can be used with the {@link #WIDTH} attribute. */
   public static final Float WIDTH_SEMI_EXTENDED = new Float(1.25);
-          
+
   /**
    * Creates a new attribute.
-   * 
+   *
    * @param name  the name.
    */
   protected TextAttribute(String name)
   {
     super(name);
   }
-  
+
   /**
    * After deserialization, this method ensures that only one instance of
    * each attribute is used.
-   * 
+   *
    * @return The (single) attribute instance.
-   * 
+   *
    * @throws InvalidObjectException if the attribute is not recognised.
    */
   protected Object readResolve()
diff --git a/libjava/classpath/java/awt/font/TextHitInfo.java b/libjava/classpath/java/awt/font/TextHitInfo.java
index f6fee1a..17479b0 100644
--- a/libjava/classpath/java/awt/font/TextHitInfo.java
+++ b/libjava/classpath/java/awt/font/TextHitInfo.java
@@ -1,4 +1,4 @@
-/* TextHitInfo.java -- 
+/* TextHitInfo.java --
    Copyright (C) 2002, 2005  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -44,13 +44,13 @@ public final class TextHitInfo
 {
   private int charIndex;
   private boolean leadingEdge;
-  
+
   TextHitInfo (int charIndex, boolean leadingEdge)
   {
     this.charIndex = charIndex;
     this.leadingEdge = leadingEdge;
   }
-  
+
   public int getCharIndex()
   {
     return charIndex;
@@ -75,7 +75,7 @@ public final class TextHitInfo
   {
     if(obj instanceof TextHitInfo)
       return this.equals((TextHitInfo) obj);
-    
+
     return false;
   }
 
@@ -83,7 +83,7 @@ public final class TextHitInfo
   {
     if (hitInfo == null)
       return false;
-    
+
     return (charIndex == hitInfo.getCharIndex ())
             && (leadingEdge == hitInfo.isLeadingEdge ());
   }
diff --git a/libjava/classpath/java/awt/font/TextLayout.java b/libjava/classpath/java/awt/font/TextLayout.java
index 4346ab9..c4f1742 100644
--- a/libjava/classpath/java/awt/font/TextLayout.java
+++ b/libjava/classpath/java/awt/font/TextLayout.java
@@ -134,7 +134,7 @@ public final class TextLayout implements Cloneable
    * performance.
    */
   private float totalAdvance = -1F;
-  
+
   /**
    * The cached natural bounds.
    */
@@ -188,7 +188,7 @@ public final class TextLayout implements Cloneable
   /**
    * Constructs a TextLayout.
    */
-  public TextLayout (String str, Font font, FontRenderContext frc) 
+  public TextLayout (String str, Font font, FontRenderContext frc)
   {
     this.frc = frc;
     string = str.toCharArray();
@@ -201,28 +201,28 @@ public final class TextLayout implements Cloneable
 
     if (Bidi.requiresBidi(string, offset, offset + length))
       {
-	bidi = new Bidi(str, leftToRight ? Bidi.DIRECTION_LEFT_TO_RIGHT
+        bidi = new Bidi(str, leftToRight ? Bidi.DIRECTION_LEFT_TO_RIGHT
                                          : Bidi.DIRECTION_RIGHT_TO_LEFT );
-	int rc = bidi.getRunCount();
-	byte[] table = new byte[ rc ];
-	for(int i = 0; i < table.length; i++)
-	  table[i] = (byte)bidi.getRunLevel(i);
+        int rc = bidi.getRunCount();
+        byte[] table = new byte[ rc ];
+        for(int i = 0; i < table.length; i++)
+          table[i] = (byte)bidi.getRunLevel(i);
 
         runs = new Run[rc];
-	for(int i = 0; i < rc; i++)
-	  {
-	    int start = bidi.getRunStart(i);
-	    int end = bidi.getRunLimit(i);
-	    if(start != end) // no empty runs.
-	      {
-	        GlyphVector gv = font.layoutGlyphVector(frc,
+        for(int i = 0; i < rc; i++)
+          {
+            int start = bidi.getRunStart(i);
+            int end = bidi.getRunLimit(i);
+            if(start != end) // no empty runs.
+              {
+                GlyphVector gv = font.layoutGlyphVector(frc,
                                                         string, start, end,
                            ((table[i] & 1) == 0) ? Font.LAYOUT_LEFT_TO_RIGHT
                                                  : Font.LAYOUT_RIGHT_TO_LEFT );
                 runs[i] = new Run(gv, font, start, end);
               }
-	  }
-	Bidi.reorderVisually( table, 0, runs, 0, runs.length );
+          }
+        Bidi.reorderVisually( table, 0, runs, 0, runs.length );
         // Clean up null runs.
         ArrayList cleaned = new ArrayList(rc);
         for (int i = 0; i < rc; i++)
@@ -239,7 +239,7 @@ public final class TextLayout implements Cloneable
                                      leftToRight ? Font.LAYOUT_LEFT_TO_RIGHT
                                                  : Font.LAYOUT_RIGHT_TO_LEFT );
         Run run = new Run(gv, font, 0, length);
-	runs = new Run[]{ run };
+        runs = new Run[]{ run };
       }
     setCharIndices();
     setupMappings();
@@ -247,8 +247,8 @@ public final class TextLayout implements Cloneable
   }
 
   public TextLayout (String string,
-		     Map<? extends AttributedCharacterIterator.Attribute, ?> attributes,
-		     FontRenderContext frc)  
+                     Map<? extends AttributedCharacterIterator.Attribute, ?> attributes,
+                     FontRenderContext frc)
   {
     this( string, new Font( attributes ), frc );
   }
@@ -261,7 +261,7 @@ public final class TextLayout implements Cloneable
 
   /**
    * Package-private constructor to make a textlayout from an existing one.
-   * This is used by TextMeasurer for returning sub-layouts, and it 
+   * This is used by TextMeasurer for returning sub-layouts, and it
    * saves a lot of time in not having to relayout the text.
    */
   TextLayout(TextLayout t, int startIndex, int endIndex)
@@ -284,14 +284,14 @@ public final class TextLayout implements Cloneable
     for( int i = 0; i < nRuns; i++ )
       {
         Run run = t.runs[i + startingRun];
-	GlyphVector gv = run.glyphVector;
+        GlyphVector gv = run.glyphVector;
         Font font = run.font;
-	// Copy only the relevant parts of the first and last runs.
-	int beginGlyphIndex = (i > 0) ? 0 : t.charIndices[startIndex][1];
-	int numEntries = ( i < nRuns - 1) ? gv.getNumGlyphs() : 
-	  1 + t.charIndices[endIndex - 1][1] - beginGlyphIndex;
-	
-	int[] codes = gv.getGlyphCodes(beginGlyphIndex, numEntries, null);
+        // Copy only the relevant parts of the first and last runs.
+        int beginGlyphIndex = (i > 0) ? 0 : t.charIndices[startIndex][1];
+        int numEntries = ( i < nRuns - 1) ? gv.getNumGlyphs() :
+          1 + t.charIndices[endIndex - 1][1] - beginGlyphIndex;
+
+        int[] codes = gv.getGlyphCodes(beginGlyphIndex, numEntries, null);
         gv = font.createGlyphVector(frc, codes);
         runs[i] = new Run(gv, font, run.runStart - startIndex,
                           run.runEnd - startIndex);
@@ -311,7 +311,7 @@ public final class TextLayout implements Cloneable
     int currentChar = 0;
     for(int run = 0; run < runs.length; run++)
       {
-	currentChar = -1;
+        currentChar = -1;
         Run current = runs[run];
         GlyphVector gv = current.glyphVector;
         for( int gi = 0; gi < gv.getNumGlyphs(); gi++)
@@ -366,7 +366,7 @@ public final class TextLayout implements Cloneable
   {
     CPStringBuilder sb = new CPStringBuilder();
     int idx = iter.getIndex();
-    for(char c = iter.first(); c != CharacterIterator.DONE; c = iter.next()) 
+    for(char c = iter.first(); c != CharacterIterator.DONE; c = iter.next())
       sb.append(c);
     iter.setIndex( idx );
     return sb.toString();
@@ -377,13 +377,13 @@ public final class TextLayout implements Cloneable
     Font f = (Font)iter.getAttribute(TextAttribute.FONT);
     if( f == null )
       {
-	int size;
-	Float i = (Float)iter.getAttribute(TextAttribute.SIZE);
-	if( i != null )
-	  size = (int)i.floatValue();
-	else
-	  size = 14;
-	f = new Font("Dialog", Font.PLAIN, size );
+        int size;
+        Float i = (Float)iter.getAttribute(TextAttribute.SIZE);
+        if( i != null )
+          size = (int)i.floatValue();
+        else
+          size = 14;
+        f = new Font("Dialog", Font.PLAIN, size );
       }
     return f;
   }
@@ -400,21 +400,21 @@ public final class TextLayout implements Cloneable
     leftToRight = true;
     while( i < endOffs && !gotDirection )
       switch( Character.getDirectionality(string[i++]) )
-	{
-	case Character.DIRECTIONALITY_LEFT_TO_RIGHT:
-	case Character.DIRECTIONALITY_LEFT_TO_RIGHT_EMBEDDING:
-	case Character.DIRECTIONALITY_LEFT_TO_RIGHT_OVERRIDE:
-	  gotDirection = true;
-	  break;
-	  
-	case Character.DIRECTIONALITY_RIGHT_TO_LEFT:
-	case Character.DIRECTIONALITY_RIGHT_TO_LEFT_ARABIC:
-	case Character.DIRECTIONALITY_RIGHT_TO_LEFT_EMBEDDING:
-	case Character.DIRECTIONALITY_RIGHT_TO_LEFT_OVERRIDE:
-	  leftToRight = false;
-	  gotDirection = true;
-	  break;
-	}
+        {
+        case Character.DIRECTIONALITY_LEFT_TO_RIGHT:
+        case Character.DIRECTIONALITY_LEFT_TO_RIGHT_EMBEDDING:
+        case Character.DIRECTIONALITY_LEFT_TO_RIGHT_OVERRIDE:
+          gotDirection = true;
+          break;
+
+        case Character.DIRECTIONALITY_RIGHT_TO_LEFT:
+        case Character.DIRECTIONALITY_RIGHT_TO_LEFT_ARABIC:
+        case Character.DIRECTIONALITY_RIGHT_TO_LEFT_EMBEDDING:
+        case Character.DIRECTIONALITY_RIGHT_TO_LEFT_OVERRIDE:
+          leftToRight = false;
+          gotDirection = true;
+          break;
+        }
     determineWhiteSpace();
   }
 
@@ -422,14 +422,14 @@ public final class TextLayout implements Cloneable
   {
     // Determine if there's whitespace in the thing.
     // Ignore trailing chars.
-    int i = offset + length - 1; 
+    int i = offset + length - 1;
     hasWhitespace = false;
     while( i >= offset && Character.isWhitespace( string[i] ) )
       i--;
     // Check the remaining chars
     while( i >= offset )
       if( Character.isWhitespace( string[i--] ) )
-	hasWhitespace = true;
+        hasWhitespace = true;
   }
 
   protected Object clone ()
@@ -437,8 +437,8 @@ public final class TextLayout implements Cloneable
     return new TextLayout( this, 0, length);
   }
 
-  public void draw (Graphics2D g2, float x, float y) 
-  {    
+  public void draw (Graphics2D g2, float x, float y)
+  {
     for(int i = 0; i < runs.length; i++)
       {
         Run run = runs[i];
@@ -464,7 +464,7 @@ public final class TextLayout implements Cloneable
     // Compare all glyph vectors.
     for( int i = 0; i < runs.length; i++ )
       if( !runs[i].equals( tl.runs[i] ) )
-	return false;
+        return false;
     return true;
   }
 
@@ -501,46 +501,46 @@ public final class TextLayout implements Cloneable
   public Shape getBlackBoxBounds (int firstEndpoint, int secondEndpoint)
   {
     if( secondEndpoint - firstEndpoint <= 0 )
-      return new Rectangle2D.Float(); // Hmm? 
+      return new Rectangle2D.Float(); // Hmm?
 
     if( firstEndpoint < 0 || secondEndpoint > getCharacterCount())
       return new Rectangle2D.Float();
 
     GeneralPath gp = new GeneralPath();
-    
+
     int ri = charIndices[ firstEndpoint ][0];
     int gi = charIndices[ firstEndpoint ][1];
 
     double advance = 0;
-   
+
     for( int i = 0; i < ri; i++ )
       {
         Run run = runs[i];
         GlyphVector gv = run.glyphVector;
         advance += gv.getLogicalBounds().getWidth();
       }
-    
+
     for( int i = ri; i <= charIndices[ secondEndpoint - 1 ][0]; i++ )
       {
         Run run = runs[i];
         GlyphVector gv = run.glyphVector;
-	int dg;
-	if( i == charIndices[ secondEndpoint - 1 ][0] )
-	  dg = charIndices[ secondEndpoint - 1][1];
-	else
-	  dg = gv.getNumGlyphs() - 1;
-
-	for( int j = 0; j <= dg; j++ )
-	  {
-	    Rectangle2D r2 = (gv.getGlyphVisualBounds( j )).
-	      getBounds2D();
-	    Point2D p = gv.getGlyphPosition( j );
-	    r2.setRect( advance + r2.getX(), r2.getY(), 
-			r2.getWidth(), r2.getHeight() );
-	    gp.append(r2, false);
-	  }
-
-	advance += gv.getLogicalBounds().getWidth();
+        int dg;
+        if( i == charIndices[ secondEndpoint - 1 ][0] )
+          dg = charIndices[ secondEndpoint - 1][1];
+        else
+          dg = gv.getNumGlyphs() - 1;
+
+        for( int j = 0; j <= dg; j++ )
+          {
+            Rectangle2D r2 = (gv.getGlyphVisualBounds( j )).
+              getBounds2D();
+            Point2D p = gv.getGlyphPosition( j );
+            r2.setRect( advance + r2.getX(), r2.getY(),
+                        r2.getWidth(), r2.getHeight() );
+            gp.append(r2, false);
+          }
+
+        advance += gv.getLogicalBounds().getWidth();
       }
     return gp;
   }
@@ -564,7 +564,7 @@ public final class TextLayout implements Cloneable
     boolean leading = hit.isLeadingEdge();
     // For the boundary cases we return the boundary runs.
     Run run;
-    
+
     if (index >= length)
       {
         info[0] = getAdvance();
@@ -710,15 +710,15 @@ public final class TextLayout implements Cloneable
 
   public Shape getLogicalHighlightShape (int firstEndpoint, int secondEndpoint)
   {
-    return getLogicalHighlightShape( firstEndpoint, secondEndpoint, 
-				     getBounds() );
+    return getLogicalHighlightShape( firstEndpoint, secondEndpoint,
+                                     getBounds() );
   }
 
   public Shape getLogicalHighlightShape (int firstEndpoint, int secondEndpoint,
                                          Rectangle2D bounds)
   {
     if( secondEndpoint - firstEndpoint <= 0 )
-      return new Rectangle2D.Float(); // Hmm? 
+      return new Rectangle2D.Float(); // Hmm?
 
     if( firstEndpoint < 0 || secondEndpoint > getCharacterCount())
       return new Rectangle2D.Float();
@@ -728,7 +728,7 @@ public final class TextLayout implements Cloneable
     int gi = charIndices[ firstEndpoint ][1];
 
     double advance = 0;
-   
+
     for( int i = 0; i < ri; i++ )
       advance += runs[i].glyphVector.getLogicalBounds().getWidth();
 
@@ -736,24 +736,24 @@ public final class TextLayout implements Cloneable
       {
         Run run = runs[i];
         GlyphVector gv = run.glyphVector;
-	int dg; // last index in this run to use.
-	if( i == charIndices[ secondEndpoint - 1 ][0] )
-	  dg = charIndices[ secondEndpoint - 1][1];
-	else
-	  dg = gv.getNumGlyphs() - 1;
-
-	for(; gi <= dg; gi++ )
-	  {
-	    Rectangle2D r2 = (gv.getGlyphLogicalBounds( gi )).
-	      getBounds2D();
-	    if( r == null )
-	      r = r2;
-	    else
-	      r = r.createUnion(r2);
-	  }
-	gi = 0; // reset glyph index into run for next run.
-
-	advance += gv.getLogicalBounds().getWidth();
+        int dg; // last index in this run to use.
+        if( i == charIndices[ secondEndpoint - 1 ][0] )
+          dg = charIndices[ secondEndpoint - 1][1];
+        else
+          dg = gv.getNumGlyphs() - 1;
+
+        for(; gi <= dg; gi++ )
+          {
+            Rectangle2D r2 = (gv.getGlyphLogicalBounds( gi )).
+              getBounds2D();
+            if( r == null )
+              r = r2;
+            else
+              r = r.createUnion(r2);
+          }
+        gi = 0; // reset glyph index into run for next run.
+
+        advance += gv.getLogicalBounds().getWidth();
       }
 
     return r;
@@ -901,9 +901,9 @@ public final class TextLayout implements Cloneable
     for(int i = 0; i < runs.length; i++)
       {
         GlyphVector gv = runs[i].glyphVector;
-	gp.append( gv.getOutline( x, 0f ), false );
-	Rectangle2D r = gv.getLogicalBounds();
-	x += r.getWidth();
+        gp.append( gv.getOutline( x, 0f ), false );
+        Rectangle2D r = gv.getLogicalBounds();
+        x += r.getWidth();
       }
     if( tx != null )
       gp.transform( tx );
@@ -935,22 +935,22 @@ public final class TextLayout implements Cloneable
     int lastNonWSChar = j - lastRun;
     j = 0;
     while( runs[ runs.length - 1 ].glyphVector.getGlyphCharIndex( j )
-	   <= lastNonWSChar )
+           <= lastNonWSChar )
       {
-	totalAdvance += runs[ runs.length - 1 ].glyphVector
+        totalAdvance += runs[ runs.length - 1 ].glyphVector
                                                .getGlyphLogicalBounds( j )
                                                .getBounds2D().getWidth();
-	j ++;
+        j ++;
       }
-    
+
     return totalAdvance;
   }
 
   public Shape getVisualHighlightShape (TextHitInfo firstEndpoint,
                                         TextHitInfo secondEndpoint)
   {
-    return getVisualHighlightShape( firstEndpoint, secondEndpoint, 
-				    getBounds() );
+    return getVisualHighlightShape( firstEndpoint, secondEndpoint,
+                                    getBounds() );
   }
 
   public Shape getVisualHighlightShape (TextHitInfo firstEndpoint,
@@ -1102,17 +1102,17 @@ public final class TextLayout implements Cloneable
       {
       Run current = runs[run];
       for(int i = 0; i < current.glyphVector.getNumGlyphs(); i++ )
-	{
-	  int cindex = current.runStart
+        {
+          int cindex = current.runStart
                        + current.glyphVector.getGlyphCharIndex( i );
-	  if( Character.isWhitespace( string[cindex] ) )
-	    //	      && cindex < lastNWS )
-	    {
-	      wsglyphs[ nglyphs * 2 ] = run;
-	      wsglyphs[ nglyphs * 2 + 1] = i;
-	      nglyphs++;
-	    }
-	}
+          if( Character.isWhitespace( string[cindex] ) )
+            //        && cindex < lastNWS )
+            {
+              wsglyphs[ nglyphs * 2 ] = run;
+              wsglyphs[ nglyphs * 2 + 1] = i;
+              nglyphs++;
+            }
+        }
       }
     deltaW = deltaW / nglyphs; // Change in width per whitespace glyph
     double w = 0;
@@ -1394,8 +1394,8 @@ public final class TextLayout implements Cloneable
     }
 
     public TextHitInfo getStrongCaret(TextHitInfo hit1,
-				      TextHitInfo hit2,
-				      TextLayout layout)
+                                      TextHitInfo hit2,
+                                      TextLayout layout)
     {
       byte l1 = layout.getCharacterLevel(hit1.getCharIndex());
       byte l2 = layout.getCharacterLevel(hit2.getCharIndex());
@@ -1418,5 +1418,3 @@ public final class TextLayout implements Cloneable
     }
   }
 }
-
-
diff --git a/libjava/classpath/java/awt/font/TextMeasurer.java b/libjava/classpath/java/awt/font/TextMeasurer.java
index f4430bf..e443e8b 100644
--- a/libjava/classpath/java/awt/font/TextMeasurer.java
+++ b/libjava/classpath/java/awt/font/TextMeasurer.java
@@ -43,7 +43,7 @@ import java.awt.Shape;
 
 /**
  * TextMeasurer is a small utility class for measuring the length of laid-out
- * text objects. 
+ * text objects.
  *
  * @author Sven de Marothy
  * @since 1.3
@@ -57,9 +57,9 @@ public final class TextMeasurer implements Cloneable
 
   /**
    * Creates a TextMeasurer from a given text in the form of an
-   * <code>AttributedCharacterIterator</code> and a 
+   * <code>AttributedCharacterIterator</code> and a
    * <code>FontRenderContext</code>.
-   */  
+   */
   public TextMeasurer (AttributedCharacterIterator text, FontRenderContext frc)
   {
     this.text = text;
@@ -139,22 +139,22 @@ public final class TextMeasurer implements Cloneable
    *
    * @param start - the starting index.
    * @param maxAdvance - the maximum advance allowed.
-   * @return the index of the first character beyond maxAdvance, or the 
+   * @return the index of the first character beyond maxAdvance, or the
    * index of the last character + 1.
    */
   public int getLineBreakIndex (int start, float maxAdvance)
-  {   
+  {
     if( start < 0 )
       throw new IllegalArgumentException("Start parameter must be > 0.");
 
     double remainingLength = getAdvanceBetween( start, numChars );
-    
+
     int guessOffset = (int)( ( (double)maxAdvance / (double)remainingLength)
-			     * ( (double)numChars - (double)start ) );
+                             * ( (double)numChars - (double)start ) );
     guessOffset += start;
     if( guessOffset > numChars )
       guessOffset = numChars;
-    
+
     double guessLength = getAdvanceBetween( start, guessOffset );
     boolean makeSmaller = ( guessLength > maxAdvance );
     int inc = makeSmaller ? -1 : 1;
@@ -162,19 +162,19 @@ public final class TextMeasurer implements Cloneable
 
     do
       {
-	guessOffset = guessOffset + inc;
-	if( guessOffset <= start || guessOffset > numChars )
-	  {
-	    keepGoing = false;
-	  }
-	else
-	  {
-	    guessLength = getAdvanceBetween( start, guessOffset );
-	    if( makeSmaller && ( guessLength <= maxAdvance) )	  
-	      keepGoing = false;
-	    if( !makeSmaller && ( guessLength >= maxAdvance) )
-	      keepGoing = false;
-	  }
+        guessOffset = guessOffset + inc;
+        if( guessOffset <= start || guessOffset > numChars )
+          {
+            keepGoing = false;
+          }
+        else
+          {
+            guessLength = getAdvanceBetween( start, guessOffset );
+            if( makeSmaller && ( guessLength <= maxAdvance) )
+              keepGoing = false;
+            if( !makeSmaller && ( guessLength >= maxAdvance) )
+              keepGoing = false;
+          }
       }
     while( keepGoing );
 
diff --git a/libjava/classpath/java/awt/font/TransformAttribute.java b/libjava/classpath/java/awt/font/TransformAttribute.java
index 977cafa..56d15bb 100644
--- a/libjava/classpath/java/awt/font/TransformAttribute.java
+++ b/libjava/classpath/java/awt/font/TransformAttribute.java
@@ -43,12 +43,12 @@ import java.io.Serializable;
 
 /**
  * This class provides a mechanism for using an {@link AffineTransform} as
- * an <i>immutable</i> attribute (for example, in the 
- * {@link java.text.AttributedString} class).  Any transform passed to 
+ * an <i>immutable</i> attribute (for example, in the
+ * {@link java.text.AttributedString} class).  Any transform passed to
  * this class is copied before being stored, and any transform handed out
- * by this class is a copy of the stored transform.  In this way, it is 
+ * by this class is a copy of the stored transform.  In this way, it is
  * not possible to modify the stored transform.
- * 
+ *
  * @author Michael Koch
  */
 public final class TransformAttribute implements Serializable
@@ -56,16 +56,16 @@ public final class TransformAttribute implements Serializable
   private static final long serialVersionUID = 3356247357827709530L;
 
   private AffineTransform affineTransform;
-  
+
   /**
    * Creates a new attribute that contains a copy of the given transform.
-   * 
+   *
    * @param transform  the transform (<code>null</code> not permitted).
-   * 
-   * @throws IllegalArgumentException if <code>transform</code> is 
+   *
+   * @throws IllegalArgumentException if <code>transform</code> is
    *         <code>null</code>.
    */
-  public TransformAttribute (AffineTransform transform) 
+  public TransformAttribute (AffineTransform transform)
   {
     if (transform == null)
       {
@@ -76,7 +76,7 @@ public final class TransformAttribute implements Serializable
 
   /**
    * Returns a copy of the transform contained by this attribute.
-   * 
+   *
    * @return A copy of the transform.
    */
   public AffineTransform getTransform ()
@@ -87,10 +87,10 @@ public final class TransformAttribute implements Serializable
   /**
    * Returns <code>true</code> if the transform contained by this attribute is
    * an identity transform, and <code>false</code> otherwise.
-   * 
+   *
    * @return <code>true</code> if the transform contained by this attribute is
    * an identity transform, and <code>false</code> otherwise.
-   * 
+   *
    * @since 1.4
    */
   public boolean isIdentity ()
diff --git a/libjava/classpath/java/awt/geom/AffineTransform.java b/libjava/classpath/java/awt/geom/AffineTransform.java
index 5bc51dd..42590ef 100644
--- a/libjava/classpath/java/awt/geom/AffineTransform.java
+++ b/libjava/classpath/java/awt/geom/AffineTransform.java
@@ -57,7 +57,7 @@ import java.io.Serializable;
  * [ 1 ]   [  0   0   1  ] [ 1 ]   [          1          ]
  * </pre>
  * The bottom row of the matrix is constant, so a transform can be uniquely
- * represented (as in {@link #toString()}) by 
+ * represented (as in {@link #toString()}) by
  * "[[m00, m01, m02], [m10, m11, m12]]".
  *
  * @author Tom Tromey (tromey@cygnus.com)
@@ -450,7 +450,7 @@ public class AffineTransform implements Cloneable, Serializable
    * tx.translate(-x, -y);
    * </pre>
    *
-   * <p>The resulting matrix is: 
+   * <p>The resulting matrix is:
    * <pre>
    * [ cos(theta) -sin(theta) x-x*cos+y*sin ]
    * [ sin(theta)  cos(theta) y-x*sin-y*cos ]
@@ -521,7 +521,7 @@ public class AffineTransform implements Cloneable, Serializable
    * TYPE_*_ROTATIONs, and the mutually exclusive TYPE_*_SCALEs.
    *
    * @return The type.
-   * 
+   *
    * @see #TYPE_IDENTITY
    * @see #TYPE_TRANSLATION
    * @see #TYPE_UNIFORM_SCALE
@@ -825,7 +825,7 @@ public class AffineTransform implements Cloneable, Serializable
    * tx.translate(-x, -y);
    * </pre>
    *
-   * <p>The resulting matrix is: 
+   * <p>The resulting matrix is:
    * <pre>
    * [ cos(theta) -sin(theta) x-x*cos+y*sin ]
    * [ sin(theta)  cos(theta) y-x*sin-y*cos ]
@@ -1002,19 +1002,19 @@ public class AffineTransform implements Cloneable, Serializable
    * if getDeterminant() has a non-zero value.
    *
    * The inverse is calculated as:
-   * 
+   *
    * <pre>
    *
    * Let A be the matrix for which we want to find the inverse:
    *
    * A = [ m00 m01 m02 ]
    *     [ m10 m11 m12 ]
-   *     [ 0   0   1   ] 
+   *     [ 0   0   1   ]
    *
    *
-   *                 1    
-   * inverse (A) =  ---   x  adjoint(A) 
-   *                det 
+   *                 1
+   * inverse (A) =  ---   x  adjoint(A)
+   *                det
    *
    *
    *
@@ -1043,14 +1043,14 @@ public class AffineTransform implements Cloneable, Serializable
     double det = getDeterminant();
     if (det == 0)
       throw new NoninvertibleTransformException("can't invert transform");
-    
+
     double im00 = m11 / det;
     double im10 = -m10 / det;
     double im01 = -m01 / det;
     double im11 = m00 / det;
     double im02 = (m01 * m12 - m02 * m11) / det;
     double im12 = (-m00 * m12 + m10 * m02) / det;
-    
+
     return new AffineTransform (im00, im10, im01, im11, im02, im12);
   }
 
@@ -1335,13 +1335,13 @@ public class AffineTransform implements Cloneable, Serializable
    * which only stores points in float precision.
    *
    * @param src the shape source to transform
-   * @return the shape, transformed by this, <code>null</code> if src is 
+   * @return the shape, transformed by this, <code>null</code> if src is
    * <code>null</code>.
    * @see GeneralPath#transform(AffineTransform)
    */
   public Shape createTransformedShape(Shape src)
   {
-    if(src == null) 
+    if(src == null)
       return null;
     GeneralPath p = new GeneralPath(src);
     p.transform(this);
@@ -1413,12 +1413,12 @@ public class AffineTransform implements Cloneable, Serializable
    */
   public int hashCode()
   {
-    long l = Double.doubleToLongBits(m00); 
-    l = l * 31 + Double.doubleToLongBits(m01); 
-    l = l * 31 + Double.doubleToLongBits(m02); 
-    l = l * 31 + Double.doubleToLongBits(m10); 
-    l = l * 31 + Double.doubleToLongBits(m11); 
-    l = l * 31 + Double.doubleToLongBits(m12); 
+    long l = Double.doubleToLongBits(m00);
+    l = l * 31 + Double.doubleToLongBits(m01);
+    l = l * 31 + Double.doubleToLongBits(m02);
+    l = l * 31 + Double.doubleToLongBits(m10);
+    l = l * 31 + Double.doubleToLongBits(m11);
+    l = l * 31 + Double.doubleToLongBits(m12);
     return (int) ((l >> 32) ^ l);
   }
 
diff --git a/libjava/classpath/java/awt/geom/Arc2D.java b/libjava/classpath/java/awt/geom/Arc2D.java
index eb9a160..928c5cf 100644
--- a/libjava/classpath/java/awt/geom/Arc2D.java
+++ b/libjava/classpath/java/awt/geom/Arc2D.java
@@ -254,9 +254,9 @@ public abstract class Arc2D extends RectangularShape
     if ((p2.getX() - p1.getX()) * (p3.getY() - p1.getY())
         - (p3.getX() - p1.getX()) * (p2.getY() - p1.getY()) > 0)
       {
-	Point2D p = p3;
-	p3 = p1;
-	p1 = p;
+        Point2D p = p3;
+        p3 = p1;
+        p1 = p;
       }
 
     // normalized tangent vectors
@@ -277,7 +277,7 @@ public abstract class Arc2D extends RectangularShape
     if (theta2 < theta1)
       theta2 += 2 * Math.PI;
 
-    // Vectors of the lines, not normalized, note we change 
+    // Vectors of the lines, not normalized, note we change
     // the direction of line 2.
     dx1 = p1.getX() - p2.getX();
     dy1 = p1.getY() - p2.getY();
@@ -478,8 +478,8 @@ public abstract class Arc2D extends RectangularShape
 
     if (extent < 0)
       {
-	end = start;
-	start += extent;
+        end = start;
+        start += extent;
       }
 
     start %= 360;
@@ -539,15 +539,15 @@ public abstract class Arc2D extends RectangularShape
 
     if (Math.abs(extent) > 180)
       {
-	if (containsAngle(angle))
-	  return true;
-	return sgn > 0;
+        if (containsAngle(angle))
+          return true;
+        return sgn > 0;
       }
     else
       {
-	if (! containsAngle(angle))
-	  return false;
-	return sgn < 0;
+        if (! containsAngle(angle))
+          return false;
+        return sgn < 0;
       }
   }
 
@@ -587,11 +587,11 @@ public abstract class Arc2D extends RectangularShape
 
     if (getArcType() != CHORD)
       {
-	// check intersections against the pie radii
-	if (rect.intersectsLine(mx, my, x1, y1))
-	  return true;
-	if (rect.intersectsLine(mx, my, x2, y2))
-	  return true;
+        // check intersections against the pie radii
+        if (rect.intersectsLine(mx, my, x1, y1))
+          return true;
+        if (rect.intersectsLine(mx, my, x2, y2))
+          return true;
       }
     else// check the chord
     if (rect.intersectsLine(x1, y1, x2, y2))
@@ -606,46 +606,46 @@ public abstract class Arc2D extends RectangularShape
     dx = a * Math.sqrt(1 - ((dy * dy) / (b * b)));
     if (! java.lang.Double.isNaN(dx))
       {
-	if (mx + dx >= x && mx + dx <= x + w
-	    && containsAngle(Math.toDegrees(Math.atan2(-dy, dx))))
-	  return true;
-	if (mx - dx >= x && mx - dx <= x + w
-	    && containsAngle(Math.toDegrees(Math.atan2(-dy, -dx))))
-	  return true;
+        if (mx + dx >= x && mx + dx <= x + w
+            && containsAngle(Math.toDegrees(Math.atan2(-dy, dx))))
+          return true;
+        if (mx - dx >= x && mx - dx <= x + w
+            && containsAngle(Math.toDegrees(Math.atan2(-dy, -dx))))
+          return true;
       }
     dy = (y + h) - my;
     dx = a * Math.sqrt(1 - ((dy * dy) / (b * b)));
     if (! java.lang.Double.isNaN(dx))
       {
-	if (mx + dx >= x && mx + dx <= x + w
-	    && containsAngle(Math.toDegrees(Math.atan2(-dy, dx))))
-	  return true;
-	if (mx - dx >= x && mx - dx <= x + w
-	    && containsAngle(Math.toDegrees(Math.atan2(-dy, -dx))))
-	  return true;
+        if (mx + dx >= x && mx + dx <= x + w
+            && containsAngle(Math.toDegrees(Math.atan2(-dy, dx))))
+          return true;
+        if (mx - dx >= x && mx - dx <= x + w
+            && containsAngle(Math.toDegrees(Math.atan2(-dy, -dx))))
+          return true;
       }
     dx = x - mx;
     dy = b * Math.sqrt(1 - ((dx * dx) / (a * a)));
     if (! java.lang.Double.isNaN(dy))
       {
-	if (my + dy >= y && my + dy <= y + h
-	    && containsAngle(Math.toDegrees(Math.atan2(-dy, dx))))
-	  return true;
-	if (my - dy >= y && my - dy <= y + h
-	    && containsAngle(Math.toDegrees(Math.atan2(dy, dx))))
-	  return true;
+        if (my + dy >= y && my + dy <= y + h
+            && containsAngle(Math.toDegrees(Math.atan2(-dy, dx))))
+          return true;
+        if (my - dy >= y && my - dy <= y + h
+            && containsAngle(Math.toDegrees(Math.atan2(dy, dx))))
+          return true;
       }
 
     dx = (x + w) - mx;
     dy = b * Math.sqrt(1 - ((dx * dx) / (a * a)));
     if (! java.lang.Double.isNaN(dy))
       {
-	if (my + dy >= y && my + dy <= y + h
-	    && containsAngle(Math.toDegrees(Math.atan2(-dy, dx))))
-	  return true;
-	if (my - dy >= y && my - dy <= y + h
-	    && containsAngle(Math.toDegrees(Math.atan2(dy, dx))))
-	  return true;
+        if (my + dy >= y && my + dy <= y + h
+            && containsAngle(Math.toDegrees(Math.atan2(-dy, dx))))
+          return true;
+        if (my - dy >= y && my - dy <= y + h
+            && containsAngle(Math.toDegrees(Math.atan2(dy, dx))))
+          return true;
       }
 
     // Check whether the arc is contained within the box
@@ -687,12 +687,12 @@ public abstract class Arc2D extends RectangularShape
     double y2 = my - b * Math.sin(Math.toRadians(getAngleStart() + extent));
     if (getArcType() != CHORD)
       {
-	// check intersections against the pie radii
-	if (rect.intersectsLine(mx, my, x1, y1))
-	  return false;
+        // check intersections against the pie radii
+        if (rect.intersectsLine(mx, my, x1, y1))
+          return false;
 
-	if (rect.intersectsLine(mx, my, x2, y2))
-	  return false;
+        if (rect.intersectsLine(mx, my, x2, y2))
+          return false;
       }
     else if (rect.intersectsLine(x1, y1, x2, y2))
       return false;
@@ -782,17 +782,17 @@ public abstract class Arc2D extends RectangularShape
 
       type = a.type;
       if (w < 0 || h < 0)
-	limit = -1;
+        limit = -1;
       else if (extent == 0)
-	limit = type;
+        limit = type;
       else if (Math.abs(extent) <= Math.PI / 2.0)
-	limit = type + 1;
+        limit = type + 1;
       else if (Math.abs(extent) <= Math.PI)
-	limit = type + 2;
+        limit = type + 2;
       else if (Math.abs(extent) <= 3.0 * (Math.PI / 2.0))
-	limit = type + 3;
+        limit = type + 3;
       else
-	limit = type + 4;
+        limit = type + 4;
     }
 
     /**
@@ -855,7 +855,7 @@ public abstract class Arc2D extends RectangularShape
       double[] double_coords = new double[6];
       int code = currentSegment(double_coords);
       for (int i = 0; i < 6; ++i)
-	coords[i] = (float) double_coords[i];
+        coords[i] = (float) double_coords[i];
       return code;
     }
 
@@ -875,27 +875,27 @@ public abstract class Arc2D extends RectangularShape
       double ymid = y + ry;
 
       if (current > limit)
-	throw new NoSuchElementException("arc iterator out of bounds");
+        throw new NoSuchElementException("arc iterator out of bounds");
 
       if (current == 0)
         {
-	  coords[0] = xmid + rx * Math.cos(start);
-	  coords[1] = ymid - ry * Math.sin(start);
-	  if (xform != null)
-	    xform.transform(coords, 0, coords, 0, 1);
-	  return SEG_MOVETO;
+          coords[0] = xmid + rx * Math.cos(start);
+          coords[1] = ymid - ry * Math.sin(start);
+          if (xform != null)
+            xform.transform(coords, 0, coords, 0, 1);
+          return SEG_MOVETO;
         }
 
       if (type != OPEN && current == limit)
-	return SEG_CLOSE;
+        return SEG_CLOSE;
 
       if ((current == limit - 1) && (type == PIE))
         {
-	  coords[0] = xmid;
-	  coords[1] = ymid;
-	  if (xform != null)
-	    xform.transform(coords, 0, coords, 0, 1);
-	  return SEG_LINETO;
+          coords[0] = xmid;
+          coords[1] = ymid;
+          if (xform != null)
+            xform.transform(coords, 0, coords, 0, 1);
+          return SEG_LINETO;
         }
 
       // note that this produces a cubic approximation of the arc segment,
@@ -916,7 +916,7 @@ public abstract class Arc2D extends RectangularShape
           curr_begin = start - (current - 1) * quad;
           curr_extent = Math.max((start + extent) - curr_begin, -quad);
         }
-      
+
       double portion_of_a_quadrant = Math.abs(curr_extent / quad);
 
       double x0 = xmid + rx * Math.cos(curr_begin);
@@ -942,7 +942,7 @@ public abstract class Arc2D extends RectangularShape
         cvec[1] = len;
       else
         cvec[1] = -len;
-      
+
       trans.scale(rx, ry);
       trans.rotate(angle);
       trans.transform(cvec, 0, cvec, 0, 1);
@@ -956,7 +956,7 @@ public abstract class Arc2D extends RectangularShape
         cvec[1] = -len;
       else
         cvec[1] = len;
-      
+
       trans.rotate(curr_extent);
       trans.transform(cvec, 0, cvec, 0, 1);
       coords[2] = x1 + cvec[0];
@@ -967,7 +967,7 @@ public abstract class Arc2D extends RectangularShape
       coords[5] = y1;
 
       if (xform != null)
-	xform.transform(coords, 0, coords, 0, 3);
+        xform.transform(coords, 0, coords, 0, 3);
 
       return SEG_CUBICTO;
     }
diff --git a/libjava/classpath/java/awt/geom/Area.java b/libjava/classpath/java/awt/geom/Area.java
index ad20b53..a1eaf63 100644
--- a/libjava/classpath/java/awt/geom/Area.java
+++ b/libjava/classpath/java/awt/geom/Area.java
@@ -126,9 +126,9 @@ public class Area implements Shape, Cloneable
    * of non-self-intersecting subpaths, and any inner paths which
    * are found redundant in accordance with the Shape's winding rule
    * will not be included.
-   * 
+   *
    * @param s  the shape (<code>null</code> not permitted).
-   * 
+   *
    * @throws NullPointerException if <code>s</code> is <code>null</code>.
    */
   public Area(Shape s)
@@ -144,7 +144,7 @@ public class Area implements Shape, Cloneable
     // delete empty paths
     for (int i = 0; i < p.size(); i++)
       if (((Segment) p.elementAt(i)).getSignedArea() == 0.0)
-	p.remove(i--);
+        p.remove(i--);
 
     /*
      * Resolve self intersecting paths into non-intersecting
@@ -162,19 +162,19 @@ public class Area implements Shape, Cloneable
 
     for (int i = 0; i < p.size(); i++)
       {
-	Segment path = (Segment) p.elementAt(i);
-	createNodesSelf(path);
+        Segment path = (Segment) p.elementAt(i);
+        createNodesSelf(path);
       }
 
     if (p.size() > 1)
       {
-	for (int i = 0; i < p.size() - 1; i++)
-	  for (int j = i + 1; j < p.size(); j++)
-	    {
-	      Segment path1 = (Segment) p.elementAt(i);
-	      Segment path2 = (Segment) p.elementAt(j);
-	      createNodes(path1, path2);
-	    }
+        for (int i = 0; i < p.size() - 1; i++)
+          for (int j = i + 1; j < p.size(); j++)
+            {
+              Segment path1 = (Segment) p.elementAt(i);
+              Segment path2 = (Segment) p.elementAt(j);
+              createNodes(path1, path2);
+            }
       }
 
     // we have intersecting points.
@@ -182,13 +182,13 @@ public class Area implements Shape, Cloneable
 
     for (int i = 0; i < p.size(); i++)
       {
-	Segment path = v = (Segment) p.elementAt(i);
-	do
-	  {
-	    segments.add(v);
-	    v = v.next;
-	  }
-	while (v != path);
+        Segment path = v = (Segment) p.elementAt(i);
+        do
+          {
+            segments.add(v);
+            v = v.next;
+          }
+        while (v != path);
       }
 
     paths = weilerAtherton(segments);
@@ -219,12 +219,12 @@ public class Area implements Shape, Cloneable
 
     for (int i = 0; i < pathA.size(); i++)
       {
-	Segment a = (Segment) pathA.elementAt(i);
-	for (int j = 0; j < pathB.size(); j++)
-	  {
-	    Segment b = (Segment) pathB.elementAt(j);
-	    nNodes += createNodes(a, b);
-	  }
+        Segment a = (Segment) pathA.elementAt(i);
+        for (int j = 0; j < pathB.size(); j++)
+          {
+            Segment b = (Segment) pathB.elementAt(j);
+            nNodes += createNodes(a, b);
+          }
       }
 
     Vector paths = new Vector();
@@ -237,28 +237,28 @@ public class Area implements Shape, Cloneable
     // segments of A oustide B and all B outside A
     for (int i = 0; i < pathA.size(); i++)
       {
-	v = (Segment) pathA.elementAt(i);
-	Segment path = v;
-	do
-	  {
-	    if (v.isSegmentOutside(area))
-	      segments.add(v);
-	    v = v.next;
-	  }
-	while (v != path);
+        v = (Segment) pathA.elementAt(i);
+        Segment path = v;
+        do
+          {
+            if (v.isSegmentOutside(area))
+              segments.add(v);
+            v = v.next;
+          }
+        while (v != path);
       }
 
     for (int i = 0; i < pathB.size(); i++)
       {
-	v = (Segment) pathB.elementAt(i);
-	Segment path = v;
-	do
-	  {
-	    if (v.isSegmentOutside(this))
-	      segments.add(v);
-	    v = v.next;
-	  }
-	while (v != path);
+        v = (Segment) pathB.elementAt(i);
+        Segment path = v;
+        do
+          {
+            if (v.isSegmentOutside(this))
+              segments.add(v);
+            v = v.next;
+          }
+        while (v != path);
       }
 
     paths = weilerAtherton(segments);
@@ -277,8 +277,8 @@ public class Area implements Shape, Cloneable
 
     if (equals(area))
       {
-	reset();
-	return;
+        reset();
+        return;
       }
 
     Vector pathA = new Vector();
@@ -299,12 +299,12 @@ public class Area implements Shape, Cloneable
     // create nodes
     for (int i = 0; i < pathA.size(); i++)
       {
-	Segment a = (Segment) pathA.elementAt(i);
-	for (int j = 0; j < pathB.size(); j++)
-	  {
-	    Segment b = (Segment) pathB.elementAt(j);
-	    nNodes += createNodes(a, b);
-	  }
+        Segment a = (Segment) pathA.elementAt(i);
+        for (int j = 0; j < pathB.size(); j++)
+          {
+            Segment b = (Segment) pathB.elementAt(j);
+            nNodes += createNodes(a, b);
+          }
       }
 
     Vector paths = new Vector();
@@ -318,43 +318,43 @@ public class Area implements Shape, Cloneable
     // and the segments before and after any node
     for (int i = 0; i < pathA.size(); i++)
       {
-	Segment v = (Segment) pathA.elementAt(i);
-	Segment path = v;
-	if (v.isSegmentOutside(area) && v.node == null)
-	  segments.add(v);
-	boolean node = false;
-	do
-	  {
-	    if ((v.node != null || node))
-	      {
-		node = (v.node != null);
-		if (v.isSegmentOutside(area))
-		  segments.add(v);
-	      }
-	    v = v.next;
-	  }
-	while (v != path);
+        Segment v = (Segment) pathA.elementAt(i);
+        Segment path = v;
+        if (v.isSegmentOutside(area) && v.node == null)
+          segments.add(v);
+        boolean node = false;
+        do
+          {
+            if ((v.node != null || node))
+              {
+                node = (v.node != null);
+                if (v.isSegmentOutside(area))
+                  segments.add(v);
+              }
+            v = v.next;
+          }
+        while (v != path);
       }
 
     for (int i = 0; i < pathB.size(); i++)
       {
-	Segment v = (Segment) pathB.elementAt(i);
-	Segment path = v;
-	if (! v.isSegmentOutside(this) && v.node == null)
-	  segments.add(v);
-	v = v.next;
-	boolean node = false;
-	do
-	  {
-	    if ((v.node != null || node))
-	      {
-		node = (v.node != null);
-		if (! v.isSegmentOutside(this))
-		  segments.add(v);
-	      }
-	    v = v.next;
-	  }
-	while (v != path);
+        Segment v = (Segment) pathB.elementAt(i);
+        Segment path = v;
+        if (! v.isSegmentOutside(this) && v.node == null)
+          segments.add(v);
+        v = v.next;
+        boolean node = false;
+        do
+          {
+            if ((v.node != null || node))
+              {
+                node = (v.node != null);
+                if (! v.isSegmentOutside(this))
+                  segments.add(v);
+              }
+            v = v.next;
+          }
+        while (v != path);
       }
 
     paths = weilerAtherton(segments);
@@ -370,8 +370,8 @@ public class Area implements Shape, Cloneable
   {
     if (isEmpty() || area.isEmpty())
       {
-	reset();
-	return;
+        reset();
+        return;
       }
     if (equals(area))
       return;
@@ -390,12 +390,12 @@ public class Area implements Shape, Cloneable
     // create nodes
     for (int i = 0; i < pathA.size(); i++)
       {
-	Segment a = (Segment) pathA.elementAt(i);
-	for (int j = 0; j < pathB.size(); j++)
-	  {
-	    Segment b = (Segment) pathB.elementAt(j);
-	    nNodes += createNodes(a, b);
-	  }
+        Segment a = (Segment) pathA.elementAt(i);
+        for (int j = 0; j < pathB.size(); j++)
+          {
+            Segment b = (Segment) pathB.elementAt(j);
+            nNodes += createNodes(a, b);
+          }
       }
 
     Vector paths = new Vector();
@@ -410,43 +410,43 @@ public class Area implements Shape, Cloneable
     // and the segments before and after any node
     for (int i = 0; i < pathA.size(); i++)
       {
-	Segment v = (Segment) pathA.elementAt(i);
-	Segment path = v;
-	if (! v.isSegmentOutside(area) && v.node == null)
-	  segments.add(v);
-	boolean node = false;
-	do
-	  {
-	    if ((v.node != null || node))
-	      {
-		node = (v.node != null);
-		if (! v.isSegmentOutside(area))
-		  segments.add(v);
-	      }
-	    v = v.next;
-	  }
-	while (v != path);
+        Segment v = (Segment) pathA.elementAt(i);
+        Segment path = v;
+        if (! v.isSegmentOutside(area) && v.node == null)
+          segments.add(v);
+        boolean node = false;
+        do
+          {
+            if ((v.node != null || node))
+              {
+                node = (v.node != null);
+                if (! v.isSegmentOutside(area))
+                  segments.add(v);
+              }
+            v = v.next;
+          }
+        while (v != path);
       }
 
     for (int i = 0; i < pathB.size(); i++)
       {
-	Segment v = (Segment) pathB.elementAt(i);
-	Segment path = v;
-	if (! v.isSegmentOutside(this) && v.node == null)
-	  segments.add(v);
-	v = v.next;
-	boolean node = false;
-	do
-	  {
-	    if ((v.node != null || node))
-	      {
-		node = (v.node != null);
-		if (! v.isSegmentOutside(this))
-		  segments.add(v);
-	      }
-	    v = v.next;
-	  }
-	while (v != path);
+        Segment v = (Segment) pathB.elementAt(i);
+        Segment path = v;
+        if (! v.isSegmentOutside(this) && v.node == null)
+          segments.add(v);
+        v = v.next;
+        boolean node = false;
+        do
+          {
+            if ((v.node != null || node))
+              {
+                node = (v.node != null);
+                if (! v.isSegmentOutside(this))
+                  segments.add(v);
+              }
+            v = v.next;
+          }
+        while (v != path);
       }
 
     paths = weilerAtherton(segments);
@@ -465,15 +465,15 @@ public class Area implements Shape, Cloneable
 
     if (isEmpty())
       {
-	Area B = (Area) area.clone();
-	solids = B.solids;
-	holes = B.holes;
-	return;
+        Area B = (Area) area.clone();
+        solids = B.solids;
+        holes = B.holes;
+        return;
       }
     if (equals(area))
       {
-	reset();
-	return;
+        reset();
+        return;
       }
 
     Vector pathA = new Vector();
@@ -493,12 +493,12 @@ public class Area implements Shape, Cloneable
 
     for (int i = 0; i < pathA.size(); i++)
       {
-	Segment a = (Segment) pathA.elementAt(i);
-	for (int j = 0; j < pathB.size(); j++)
-	  {
-	    Segment b = (Segment) pathB.elementAt(j);
-	    nNodes += createNodes(a, b);
-	  }
+        Segment a = (Segment) pathA.elementAt(i);
+        for (int j = 0; j < pathB.size(); j++)
+          {
+            Segment b = (Segment) pathB.elementAt(j);
+            nNodes += createNodes(a, b);
+          }
       }
 
     Vector paths = new Vector();
@@ -510,26 +510,26 @@ public class Area implements Shape, Cloneable
     // In an XOR operation, we operate on all segments
     for (int i = 0; i < pathA.size(); i++)
       {
-	v = (Segment) pathA.elementAt(i);
-	Segment path = v;
-	do
-	  {
-	    segments.add(v);
-	    v = v.next;
-	  }
-	while (v != path);
+        v = (Segment) pathA.elementAt(i);
+        Segment path = v;
+        do
+          {
+            segments.add(v);
+            v = v.next;
+          }
+        while (v != path);
       }
 
     for (int i = 0; i < pathB.size(); i++)
       {
-	v = (Segment) pathB.elementAt(i);
-	Segment path = v;
-	do
-	  {
-	    segments.add(v);
-	    v = v.next;
-	  }
-	while (v != path);
+        v = (Segment) pathB.elementAt(i);
+        Segment path = v;
+        do
+          {
+            segments.add(v);
+            v = v.next;
+          }
+        while (v != path);
       }
 
     paths = weilerAtherton(segments);
@@ -573,10 +573,10 @@ public class Area implements Shape, Cloneable
   {
     for (int i = 0; i < holes.size(); i++)
       if (! ((Segment) holes.elementAt(i)).isPolygonal())
-	return false;
+        return false;
     for (int i = 0; i < solids.size(); i++)
       if (! ((Segment) solids.elementAt(i)).isPolygonal())
-	return false;
+        return false;
     return true;
   }
 
@@ -607,23 +607,23 @@ public class Area implements Shape, Cloneable
     Segment s = path;
     do
       {
-	Segment s2 = s.next;
-	double d1 = (s.P2.getX() - s.P1.getX())*(s2.P2.getX() - s2.P1.getX())/
-	    ((s.P1.distance(s.P2)) * (s2.P1.distance(s2.P2)));
-	double d2 = (s.P2.getY() - s.P1.getY())*(s2.P2.getY() - s2.P1.getY())/ 
-	    ((s.P1.distance(s.P2)) * (s2.P1.distance(s2.P2)));
-	double dotproduct = d1 + d2;
-
-	// For some reason, only rectangles on the XY axis count.
-	if (d1 != 0 && d2 != 0)
-	  return false;
-
-	if (Math.abs(dotproduct) == 0) // 90 degree angle
-	  nCorners++;
-	else if ((Math.abs(1.0 - dotproduct) > 0)) // 0 degree angle?
-	  return false; // if not, return false
-
-	s = s.next;
+        Segment s2 = s.next;
+        double d1 = (s.P2.getX() - s.P1.getX())*(s2.P2.getX() - s2.P1.getX())/
+            ((s.P1.distance(s.P2)) * (s2.P1.distance(s2.P2)));
+        double d2 = (s.P2.getY() - s.P1.getY())*(s2.P2.getY() - s2.P1.getY())/
+            ((s.P1.distance(s.P2)) * (s2.P1.distance(s2.P2)));
+        double dotproduct = d1 + d2;
+
+        // For some reason, only rectangles on the XY axis count.
+        if (d1 != 0 && d2 != 0)
+          return false;
+
+        if (Math.abs(dotproduct) == 0) // 90 degree angle
+          nCorners++;
+        else if ((Math.abs(1.0 - dotproduct) > 0)) // 0 degree angle?
+          return false; // if not, return false
+
+        s = s.next;
       }
     while (s != path);
 
@@ -662,11 +662,11 @@ public class Area implements Shape, Cloneable
 
     for (int path = 0; path < solids.size(); path++)
       {
-	Rectangle2D r = ((Segment) solids.elementAt(path)).getPathBounds();
-	xmin = Math.min(r.getMinX(), xmin);
-	ymin = Math.min(r.getMinY(), ymin);
-	xmax = Math.max(r.getMaxX(), xmax);
-	ymax = Math.max(r.getMaxY(), ymax);
+        Rectangle2D r = ((Segment) solids.elementAt(path)).getPathBounds();
+        xmin = Math.min(r.getMinX(), xmin);
+        ymin = Math.min(r.getMinY(), ymin);
+        xmax = Math.max(r.getMaxX(), xmax);
+        ymax = Math.max(r.getMaxY(), ymax);
       }
 
     return (new Rectangle2D.Double(xmin, ymin, (xmax - xmin), (ymax - ymin)));
@@ -675,7 +675,7 @@ public class Area implements Shape, Cloneable
   /**
    * Returns the bounds of this object in Rectangle format.
    * Please note that this may lead to loss of precision.
-   * 
+   *
    * @return The bounds.
    * @see #getBounds2D()
    */
@@ -694,22 +694,22 @@ public class Area implements Shape, Cloneable
   {
     try
       {
-	Area clone = new Area();
-	for (int i = 0; i < solids.size(); i++)
-	  clone.solids.add(((Segment) solids.elementAt(i)).cloneSegmentList());
-	for (int i = 0; i < holes.size(); i++)
-	  clone.holes.add(((Segment) holes.elementAt(i)).cloneSegmentList());
-	return clone;
+        Area clone = new Area();
+        for (int i = 0; i < solids.size(); i++)
+          clone.solids.add(((Segment) solids.elementAt(i)).cloneSegmentList());
+        for (int i = 0; i < holes.size(); i++)
+          clone.holes.add(((Segment) holes.elementAt(i)).cloneSegmentList());
+        return clone;
       }
     catch (CloneNotSupportedException e)
       {
-	throw (Error) new InternalError().initCause(e); // Impossible
+        throw (Error) new InternalError().initCause(e); // Impossible
       }
   }
 
   /**
    * Compares two Areas.
-   * 
+   *
    * @param area  the area to compare against this area (<code>null</code>
    *              permitted).
    * @return <code>true</code> if the areas are equal, and <code>false</code>
@@ -739,14 +739,14 @@ public class Area implements Shape, Cloneable
 
     for (int i = 0; i < nPaths; i++)
       {
-	for (int j = 0; j < nPaths; j++)
-	  {
-	    Segment p1 = (Segment) pathA.elementAt(i);
-	    Segment p2 = (Segment) pathB.elementAt(j);
-	    if (! match[0][i] && ! match[1][j])
-	      if (p1.pathEquals(p2))
-		match[0][i] = match[1][j] = true;
-	  }
+        for (int j = 0; j < nPaths; j++)
+          {
+            Segment p1 = (Segment) pathA.elementAt(i);
+            Segment p2 = (Segment) pathB.elementAt(j);
+            if (! match[0][i] && ! match[1][j])
+              if (p1.pathEquals(p2))
+                match[0][i] = match[1][j] = true;
+          }
       }
 
     boolean result = true;
@@ -757,7 +757,7 @@ public class Area implements Shape, Cloneable
 
   /**
    * Transforms this area by the AffineTransform at.
-   * 
+   *
    * @param at  the transform.
    */
   public void transform(AffineTransform at)
@@ -770,8 +770,8 @@ public class Area implements Shape, Cloneable
     // Note that the orientation is not invariant under inversion
     if ((at.getType() & AffineTransform.TYPE_FLIP) != 0)
       {
-	setDirection(holes, false);
-	setDirection(solids, true);
+        setDirection(holes, false);
+        setDirection(solids, true);
       }
   }
 
@@ -801,11 +801,11 @@ public class Area implements Shape, Cloneable
     int n = 0;
     for (int i = 0; i < solids.size(); i++)
       if (((Segment) solids.elementAt(i)).contains(x, y))
-	n++;
+        n++;
 
     for (int i = 0; i < holes.size(); i++)
       if (((Segment) holes.elementAt(i)).contains(x, y))
-	n--;
+        n--;
 
     return (n != 0);
   }
@@ -814,7 +814,7 @@ public class Area implements Shape, Cloneable
    * Determines if the Point2D p is contained within this Area.
    *
    * @param p the point.
-   * @return <code>true</code> if the point is contained, <code>false</code> 
+   * @return <code>true</code> if the point is contained, <code>false</code>
    *         otherwise.
    * @throws NullPointerException if <code>p</code> is <code>null</code>.
    */
@@ -830,7 +830,7 @@ public class Area implements Shape, Cloneable
    *
    * This method should always produce the correct results, unlike for other
    * classes in geom.
-   * 
+   *
    * @param x the x-coordinate of the rectangle.
    * @param y the y-coordinate of the rectangle.
    * @param w the width of the the rectangle.
@@ -850,39 +850,39 @@ public class Area implements Shape, Cloneable
     // will mean the rectangle is not entirely contained.
     for (int i = 0; i < 4; i++)
       {
-	for (int path = 0; path < solids.size(); path++)
-	  {
-	    Segment v;
-	    Segment start;
-	    start = v = (Segment) solids.elementAt(path);
-	    do
-	      {
-		if (l[i].hasIntersections(v))
-		  return false;
-		v = v.next;
-	      }
-	    while (v != start);
-	  }
-	for (int path = 0; path < holes.size(); path++)
-	  {
-	    Segment v;
-	    Segment start;
-	    start = v = (Segment) holes.elementAt(path);
-	    do
-	      {
-		if (l[i].hasIntersections(v))
-		  return false;
-		v = v.next;
-	      }
-	    while (v != start);
-	  }
+        for (int path = 0; path < solids.size(); path++)
+          {
+            Segment v;
+            Segment start;
+            start = v = (Segment) solids.elementAt(path);
+            do
+              {
+                if (l[i].hasIntersections(v))
+                  return false;
+                v = v.next;
+              }
+            while (v != start);
+          }
+        for (int path = 0; path < holes.size(); path++)
+          {
+            Segment v;
+            Segment start;
+            start = v = (Segment) holes.elementAt(path);
+            do
+              {
+                if (l[i].hasIntersections(v))
+                  return false;
+                v = v.next;
+              }
+            while (v != start);
+          }
       }
 
     // Is any point inside?
     if (! contains(x, y))
       return false;
 
-    // Final hoop: Is the rectangle non-intersecting and inside, 
+    // Final hoop: Is the rectangle non-intersecting and inside,
     // but encloses a hole?
     Rectangle2D r = new Rectangle2D.Double(x, y, w, h);
     for (int path = 0; path < holes.size(); path++)
@@ -898,10 +898,10 @@ public class Area implements Shape, Cloneable
    *
    * This method should always produce the correct results, unlike for other
    * classes in geom.
-   * 
+   *
    * @param r the rectangle.
    * @return <code>true</code> if the rectangle is considered contained
-   * 
+   *
    * @throws NullPointerException if <code>r</code> is <code>null</code>.
    */
   public boolean contains(Rectangle2D r)
@@ -912,12 +912,12 @@ public class Area implements Shape, Cloneable
   /**
    * Determines if the rectangle specified by (x,y) as the upper-left
    * and with width w and height h intersects any part of this Area.
-   * 
+   *
    * @param x  the x-coordinate for the rectangle.
    * @param y  the y-coordinate for the rectangle.
    * @param w  the width of the rectangle.
    * @param h  the height of the rectangle.
-   * @return <code>true</code> if the rectangle intersects the area, 
+   * @return <code>true</code> if the rectangle intersects the area,
    *         <code>false</code> otherwise.
    */
   public boolean intersects(double x, double y, double w, double h)
@@ -934,32 +934,32 @@ public class Area implements Shape, Cloneable
     // Return true on any intersection
     for (int i = 0; i < 4; i++)
       {
-	for (int path = 0; path < solids.size(); path++)
-	  {
-	    Segment v;
-	    Segment start;
-	    start = v = (Segment) solids.elementAt(path);
-	    do
-	      {
-		if (l[i].hasIntersections(v))
-		  return true;
-		v = v.next;
-	      }
-	    while (v != start);
-	  }
-	for (int path = 0; path < holes.size(); path++)
-	  {
-	    Segment v;
-	    Segment start;
-	    start = v = (Segment) holes.elementAt(path);
-	    do
-	      {
-		if (l[i].hasIntersections(v))
-		  return true;
-		v = v.next;
-	      }
-	    while (v != start);
-	  }
+        for (int path = 0; path < solids.size(); path++)
+          {
+            Segment v;
+            Segment start;
+            start = v = (Segment) solids.elementAt(path);
+            do
+              {
+                if (l[i].hasIntersections(v))
+                  return true;
+                v = v.next;
+              }
+            while (v != start);
+          }
+        for (int path = 0; path < holes.size(); path++)
+          {
+            Segment v;
+            Segment start;
+            start = v = (Segment) holes.elementAt(path);
+            do
+              {
+                if (l[i].hasIntersections(v))
+                  return true;
+                v = v.next;
+              }
+            while (v != start);
+          }
       }
 
     // Non-intersecting, Is any point inside?
@@ -978,7 +978,7 @@ public class Area implements Shape, Cloneable
    * part of this Area.
    * @param r  the rectangle to test intersection with (<code>null</code>
    *           not permitted).
-   * @return <code>true</code> if the rectangle intersects the area, 
+   * @return <code>true</code> if the rectangle intersects the area,
    *         <code>false</code> otherwise.
    * @throws NullPointerException if <code>r</code> is <code>null</code>.
    */
@@ -990,7 +990,7 @@ public class Area implements Shape, Cloneable
   /**
    * Returns a PathIterator object defining the contour of this Area,
    * transformed by at.
-   * 
+   *
    * @param at  the transform.
    * @return A path iterator.
    */
@@ -1002,7 +1002,7 @@ public class Area implements Shape, Cloneable
   /**
    * Returns a flattened PathIterator object defining the contour of this
    * Area, transformed by at and with a defined flatness.
-   * 
+   *
    * @param at  the transform.
    * @param flatness the flatness.
    * @return A path iterator.
@@ -1013,7 +1013,7 @@ public class Area implements Shape, Cloneable
   }
 
   //---------------------------------------------------------------------
-  // Non-public methods and classes 
+  // Non-public methods and classes
 
   /**
    * Private pathiterator object.
@@ -1032,7 +1032,7 @@ public class Area implements Shape, Cloneable
 
       IteratorSegment()
       {
-	coords = new double[6];
+        coords = new double[6];
       }
     }
 
@@ -1052,27 +1052,27 @@ public class Area implements Shape, Cloneable
 
       for (int i = 0; i < allpaths.size(); i++)
         {
-	  Segment v = (Segment) allpaths.elementAt(i);
-	  Segment start = v;
-
-	  IteratorSegment is = new IteratorSegment();
-	  is.type = SEG_MOVETO;
-	  is.coords[0] = start.P1.getX();
-	  is.coords[1] = start.P1.getY();
-	  segments.add(is);
-
-	  do
-	    {
-	      is = new IteratorSegment();
-	      is.type = v.pathIteratorFormat(is.coords);
-	      segments.add(is);
-	      v = v.next;
-	    }
-	  while (v != start);
-
-	  is = new IteratorSegment();
-	  is.type = SEG_CLOSE;
-	  segments.add(is);
+          Segment v = (Segment) allpaths.elementAt(i);
+          Segment start = v;
+
+          IteratorSegment is = new IteratorSegment();
+          is.type = SEG_MOVETO;
+          is.coords[0] = start.P1.getX();
+          is.coords[1] = start.P1.getY();
+          segments.add(is);
+
+          do
+            {
+              is = new IteratorSegment();
+              is.type = v.pathIteratorFormat(is.coords);
+              segments.add(is);
+              v = v.next;
+            }
+          while (v != start);
+
+          is = new IteratorSegment();
+          is.type = SEG_CLOSE;
+          segments.add(is);
         }
     }
 
@@ -1080,10 +1080,10 @@ public class Area implements Shape, Cloneable
     {
       IteratorSegment s = (IteratorSegment) segments.elementAt(index);
       if (at != null)
-	at.transform(s.coords, 0, coords, 0, 3);
+        at.transform(s.coords, 0, coords, 0, 3);
       else
-	for (int i = 0; i < 6; i++)
-	  coords[i] = s.coords[i];
+        for (int i = 0; i < 6; i++)
+          coords[i] = s.coords[i];
       return (s.type);
     }
 
@@ -1093,13 +1093,13 @@ public class Area implements Shape, Cloneable
       double[] d = new double[6];
       if (at != null)
         {
-	  at.transform(s.coords, 0, d, 0, 3);
-	  for (int i = 0; i < 6; i++)
-	    coords[i] = (float) d[i];
+          at.transform(s.coords, 0, d, 0, 3);
+          for (int i = 0; i < 6; i++)
+            coords[i] = (float) d[i];
         }
       else
-	for (int i = 0; i < 6; i++)
-	  coords[i] = (float) s.coords[i];
+        for (int i = 0; i < 6; i++)
+          coords[i] = (float) s.coords[i];
       return (s.type);
     }
 
@@ -1134,22 +1134,22 @@ public class Area implements Shape, Cloneable
     Vector paths = new Vector();
     while (segments.size() > 0)
       {
-	// Iterate over the path
-	Segment start = (Segment) segments.elementAt(0);
-	Segment s = start;
-	do
-	  {
-	    segments.remove(s);
-	    if (s.node != null)
-	      { // switch over
-		s.next = s.node;
-		s.node = null;
-	      }
-	    s = s.next; // continue
-	  }
-	while (s != start);
-
-	paths.add(start);
+        // Iterate over the path
+        Segment start = (Segment) segments.elementAt(0);
+        Segment s = start;
+        do
+          {
+            segments.remove(s);
+            if (s.node != null)
+              { // switch over
+                s.next = s.node;
+                s.node = null;
+              }
+            s = s.next; // continue
+          }
+        while (s != start);
+
+        paths.add(start);
       }
     return paths;
   }
@@ -1230,30 +1230,30 @@ public class Area implements Shape, Cloneable
 
     if (flat1 && flat2)
       {
-	double xlk = c1.getP2().getX() - c1.getP1().getX();
-	double ylk = c1.getP2().getY() - c1.getP1().getY();
-
-	double xnm = c2.getP2().getX() - c2.getP1().getX();
-	double ynm = c2.getP2().getY() - c2.getP1().getY();
-
-	double xmk = c2.getP1().getX() - c1.getP1().getX();
-	double ymk = c2.getP1().getY() - c1.getP1().getY();
-	double det = xnm * ylk - ynm * xlk;
-
-	if (det + 1.0 == 1.0)
-	  return;
-
-	double detinv = 1.0 / det;
-	double s = (xnm * ymk - ynm * xmk) * detinv;
-	double t = (xlk * ymk - ylk * xmk) * detinv;
-	if ((s < 0.0) || (s > 1.0) || (t < 0.0) || (t > 1.0))
-	  return;
-
-	double[] temp = new double[2];
-	temp[0] = t1 + s * w1;
-	temp[1] = t2 + t * w1;
-	cc_intersections.add(temp);
-	return;
+        double xlk = c1.getP2().getX() - c1.getP1().getX();
+        double ylk = c1.getP2().getY() - c1.getP1().getY();
+
+        double xnm = c2.getP2().getX() - c2.getP1().getX();
+        double ynm = c2.getP2().getY() - c2.getP1().getY();
+
+        double xmk = c2.getP1().getX() - c1.getP1().getX();
+        double ymk = c2.getP1().getY() - c1.getP1().getY();
+        double det = xnm * ylk - ynm * xlk;
+
+        if (det + 1.0 == 1.0)
+          return;
+
+        double detinv = 1.0 / det;
+        double s = (xnm * ymk - ynm * xmk) * detinv;
+        double t = (xlk * ymk - ylk * xmk) * detinv;
+        if ((s < 0.0) || (s > 1.0) || (t < 0.0) || (t > 1.0))
+          return;
+
+        double[] temp = new double[2];
+        temp[0] = t1 + s * w1;
+        temp[1] = t2 + t * w1;
+        cc_intersections.add(temp);
+        return;
       }
 
     CubicCurve2D.Double c11 = new CubicCurve2D.Double();
@@ -1263,33 +1263,33 @@ public class Area implements Shape, Cloneable
 
     if (! flat1 && ! flat2)
       {
-	depth1--;
-	depth2--;
-	w1 = w1 * 0.5;
-	w2 = w2 * 0.5;
-	c1.subdivide(c11, c12);
-	c2.subdivide(c21, c22);
-	if (c11.getBounds2D().intersects(c21.getBounds2D()))
-	  recursiveSubdivide(c11, c21, depth1, depth2, t1, t2, w1, w2);
-	if (c11.getBounds2D().intersects(c22.getBounds2D()))
-	  recursiveSubdivide(c11, c22, depth1, depth2, t1, t2 + w2, w1, w2);
-	if (c12.getBounds2D().intersects(c21.getBounds2D()))
-	  recursiveSubdivide(c12, c21, depth1, depth2, t1 + w1, t2, w1, w2);
-	if (c12.getBounds2D().intersects(c22.getBounds2D()))
-	  recursiveSubdivide(c12, c22, depth1, depth2, t1 + w1, t2 + w2, w1, w2);
-	return;
+        depth1--;
+        depth2--;
+        w1 = w1 * 0.5;
+        w2 = w2 * 0.5;
+        c1.subdivide(c11, c12);
+        c2.subdivide(c21, c22);
+        if (c11.getBounds2D().intersects(c21.getBounds2D()))
+          recursiveSubdivide(c11, c21, depth1, depth2, t1, t2, w1, w2);
+        if (c11.getBounds2D().intersects(c22.getBounds2D()))
+          recursiveSubdivide(c11, c22, depth1, depth2, t1, t2 + w2, w1, w2);
+        if (c12.getBounds2D().intersects(c21.getBounds2D()))
+          recursiveSubdivide(c12, c21, depth1, depth2, t1 + w1, t2, w1, w2);
+        if (c12.getBounds2D().intersects(c22.getBounds2D()))
+          recursiveSubdivide(c12, c22, depth1, depth2, t1 + w1, t2 + w2, w1, w2);
+        return;
       }
 
     if (! flat1)
       {
-	depth1--;
-	c1.subdivide(c11, c12);
-	w1 = w1 * 0.5;
-	if (c11.getBounds2D().intersects(c2.getBounds2D()))
-	  recursiveSubdivide(c11, c2, depth1, depth2, t1, t2, w1, w2);
-	if (c12.getBounds2D().intersects(c2.getBounds2D()))
-	  recursiveSubdivide(c12, c2, depth1, depth2, t1 + w1, t2, w1, w2);
-	return;
+        depth1--;
+        c1.subdivide(c11, c12);
+        w1 = w1 * 0.5;
+        if (c11.getBounds2D().intersects(c2.getBounds2D()))
+          recursiveSubdivide(c11, c2, depth1, depth2, t1, t2, w1, w2);
+        if (c12.getBounds2D().intersects(c2.getBounds2D()))
+          recursiveSubdivide(c12, c2, depth1, depth2, t1 + w1, t2, w1, w2);
+        return;
       }
 
     depth2--;
@@ -1317,7 +1317,7 @@ public class Area implements Shape, Cloneable
    * This is a reasonably accurate method, although the recursion depth
    * is typically around 20, the bounding-box tests allow for significant
    * pruning of the subdivision tree.
-   * 
+   *
    * This is package-private to avoid an accessor method.
    */
   Intersection[] cubicCubicIntersect(CubicSegment curve1, CubicSegment curve2)
@@ -1339,9 +1339,9 @@ public class Area implements Shape, Cloneable
     Intersection[] results = new Intersection[cc_intersections.size()];
     for (int i = 0; i < cc_intersections.size(); i++)
       {
-	double[] temp = (double[]) cc_intersections.elementAt(i);
-	results[i] = new Intersection(curve1.evaluatePoint(temp[0]), temp[0],
-	                              temp[1]);
+        double[] temp = (double[]) cc_intersections.elementAt(i);
+        results[i] = new Intersection(curve1.evaluatePoint(temp[0]), temp[0],
+                                      temp[1]);
       }
     cc_intersections = null;
     return (results);
@@ -1390,21 +1390,21 @@ public class Area implements Shape, Cloneable
     // line on y axis
     if (dx == 0 || (dy / dx) > 1.0)
       {
-	double k = dx / dy;
-	x[0] -= lx0;
-	y[0] -= ly0;
-	y[0] *= k;
-	y[1] *= k;
-	y[2] *= k;
+        double k = dx / dy;
+        x[0] -= lx0;
+        y[0] -= ly0;
+        y[0] *= k;
+        y[1] *= k;
+        y[2] *= k;
       }
     else
       {
-	double k = dy / dx;
-	x[0] -= lx0;
-	y[0] -= ly0;
-	x[0] *= k;
-	x[1] *= k;
-	x[2] *= k;
+        double k = dy / dx;
+        x[0] -= lx0;
+        y[0] -= ly0;
+        x[0] *= k;
+        x[1] *= k;
+        x[2] *= k;
       }
 
     for (int i = 0; i < 3; i++)
@@ -1412,43 +1412,43 @@ public class Area implements Shape, Cloneable
 
     if ((nRoots = QuadCurve2D.solveQuadratic(r)) > 0)
       {
-	Intersection[] temp = new Intersection[nRoots];
-	int intersections = 0;
-	for (int i = 0; i < nRoots; i++)
-	  {
-	    double t = r[i];
-	    if (t >= 0.0 && t <= 1.0)
-	      {
-		Point2D p = c.evaluatePoint(t);
-
-		// if the line is on an axis, snap the point to that axis.
-		if (dx == 0)
-		  p.setLocation(lx0, p.getY());
-		if (dy == 0)
-		  p.setLocation(p.getX(), ly0);
-
-		if (p.getX() <= Math.max(lx0, lx1)
-		    && p.getX() >= Math.min(lx0, lx1)
-		    && p.getY() <= Math.max(ly0, ly1)
-		    && p.getY() >= Math.min(ly0, ly1))
-		  {
-		    double lineparameter = p.distance(l.P1) / l.P2.distance(l.P1);
-		    temp[i] = new Intersection(p, lineparameter, t);
-		    intersections++;
-		  }
-	      }
-	    else
-	      temp[i] = null;
-	  }
-	if (intersections == 0)
-	  return null;
-
-	Intersection[] rValues = new Intersection[intersections];
-
-	for (int i = 0; i < nRoots; i++)
-	  if (temp[i] != null)
-	    rValues[--intersections] = temp[i];
-	return (rValues);
+        Intersection[] temp = new Intersection[nRoots];
+        int intersections = 0;
+        for (int i = 0; i < nRoots; i++)
+          {
+            double t = r[i];
+            if (t >= 0.0 && t <= 1.0)
+              {
+                Point2D p = c.evaluatePoint(t);
+
+                // if the line is on an axis, snap the point to that axis.
+                if (dx == 0)
+                  p.setLocation(lx0, p.getY());
+                if (dy == 0)
+                  p.setLocation(p.getX(), ly0);
+
+                if (p.getX() <= Math.max(lx0, lx1)
+                    && p.getX() >= Math.min(lx0, lx1)
+                    && p.getY() <= Math.max(ly0, ly1)
+                    && p.getY() >= Math.min(ly0, ly1))
+                  {
+                    double lineparameter = p.distance(l.P1) / l.P2.distance(l.P1);
+                    temp[i] = new Intersection(p, lineparameter, t);
+                    intersections++;
+                  }
+              }
+            else
+              temp[i] = null;
+          }
+        if (intersections == 0)
+          return null;
+
+        Intersection[] rValues = new Intersection[intersections];
+
+        for (int i = 0; i < nRoots; i++)
+          if (temp[i] != null)
+            rValues[--intersections] = temp[i];
+        return (rValues);
       }
     return null;
   }
@@ -1457,7 +1457,7 @@ public class Area implements Shape, Cloneable
    * Returns the intersections between a line and a cubic segment
    * This is done through combining the line's equation with the
    * parametric form of the Bezier and solving the resulting quadratic.
-   * This is package-private to avoid an accessor method. 
+   * This is package-private to avoid an accessor method.
    */
   Intersection[] lineCubicIntersect(LineSegment l, CubicSegment c)
   {
@@ -1499,65 +1499,65 @@ public class Area implements Shape, Cloneable
     // line on y axis
     if (dx == 0 || (dy / dx) > 1.0)
       {
-	double k = dx / dy;
-	x[0] -= lx0;
-	y[0] -= ly0;
-	y[0] *= k;
-	y[1] *= k;
-	y[2] *= k;
-	y[3] *= k;
+        double k = dx / dy;
+        x[0] -= lx0;
+        y[0] -= ly0;
+        y[0] *= k;
+        y[1] *= k;
+        y[2] *= k;
+        y[3] *= k;
       }
     else
       {
-	double k = dy / dx;
-	x[0] -= lx0;
-	y[0] -= ly0;
-	x[0] *= k;
-	x[1] *= k;
-	x[2] *= k;
-	x[3] *= k;
+        double k = dy / dx;
+        x[0] -= lx0;
+        y[0] -= ly0;
+        x[0] *= k;
+        x[1] *= k;
+        x[2] *= k;
+        x[3] *= k;
       }
     for (int i = 0; i < 4; i++)
       r[i] = y[i] - x[i];
 
     if ((nRoots = CubicCurve2D.solveCubic(r)) > 0)
       {
-	Intersection[] temp = new Intersection[nRoots];
-	int intersections = 0;
-	for (int i = 0; i < nRoots; i++)
-	  {
-	    double t = r[i];
-	    if (t >= 0.0 && t <= 1.0)
-	      {
-		// if the line is on an axis, snap the point to that axis.
-		Point2D p = c.evaluatePoint(t);
-		if (dx == 0)
-		  p.setLocation(lx0, p.getY());
-		if (dy == 0)
-		  p.setLocation(p.getX(), ly0);
-
-		if (p.getX() <= Math.max(lx0, lx1)
-		    && p.getX() >= Math.min(lx0, lx1)
-		    && p.getY() <= Math.max(ly0, ly1)
-		    && p.getY() >= Math.min(ly0, ly1))
-		  {
-		    double lineparameter = p.distance(l.P1) / l.P2.distance(l.P1);
-		    temp[i] = new Intersection(p, lineparameter, t);
-		    intersections++;
-		  }
-	      }
-	    else
-	      temp[i] = null;
-	  }
-
-	if (intersections == 0)
-	  return null;
-
-	Intersection[] rValues = new Intersection[intersections];
-	for (int i = 0; i < nRoots; i++)
-	  if (temp[i] != null)
-	    rValues[--intersections] = temp[i];
-	return (rValues);
+        Intersection[] temp = new Intersection[nRoots];
+        int intersections = 0;
+        for (int i = 0; i < nRoots; i++)
+          {
+            double t = r[i];
+            if (t >= 0.0 && t <= 1.0)
+              {
+                // if the line is on an axis, snap the point to that axis.
+                Point2D p = c.evaluatePoint(t);
+                if (dx == 0)
+                  p.setLocation(lx0, p.getY());
+                if (dy == 0)
+                  p.setLocation(p.getX(), ly0);
+
+                if (p.getX() <= Math.max(lx0, lx1)
+                    && p.getX() >= Math.min(lx0, lx1)
+                    && p.getY() <= Math.max(ly0, ly1)
+                    && p.getY() >= Math.min(ly0, ly1))
+                  {
+                    double lineparameter = p.distance(l.P1) / l.P2.distance(l.P1);
+                    temp[i] = new Intersection(p, lineparameter, t);
+                    intersections++;
+                  }
+              }
+            else
+              temp[i] = null;
+          }
+
+        if (intersections == 0)
+          return null;
+
+        Intersection[] rValues = new Intersection[intersections];
+        for (int i = 0; i < nRoots; i++)
+          if (temp[i] != null)
+            rValues[--intersections] = temp[i];
+        return (rValues);
       }
     return null;
   }
@@ -1639,120 +1639,120 @@ public class Area implements Shape, Cloneable
 
     while (! pi.isDone())
       {
-	Segment v;
-	switch (pi.currentSegment(coords))
-	  {
-	  case PathIterator.SEG_MOVETO:
-	    if (subpath != null)
-	      { // close existing open path
-		current.next = new LineSegment(cx, cy, subpathx, subpathy);
-		current = current.next;
-		current.next = subpath;
-	      }
-	    subpath = null;
-	    subpathx = cx = coords[0];
-	    subpathy = cy = coords[1];
-	    break;
-
-	  // replace 'close' with a line-to.
-	  case PathIterator.SEG_CLOSE:
-	    if (subpath != null && (subpathx != cx || subpathy != cy))
-	      {
-		current.next = new LineSegment(cx, cy, subpathx, subpathy);
-		current = current.next;
-		current.next = subpath;
-		cx = subpathx;
-		cy = subpathy;
-		subpath = null;
-	      }
-	    else if (subpath != null)
-	      {
-		current.next = subpath;
-		subpath = null;
-	      }
-	    break;
-	  case PathIterator.SEG_LINETO:
-	    if (cx != coords[0] || cy != coords[1])
-	      {
-		v = new LineSegment(cx, cy, coords[0], coords[1]);
-		if (subpath == null)
-		  {
-		    subpath = current = v;
-		    paths.add(subpath);
-		  }
-		else
-		  {
-		    current.next = v;
-		    current = current.next;
-		  }
-		cx = coords[0];
-		cy = coords[1];
-	      }
-	    break;
-	  case PathIterator.SEG_QUADTO:
-	    v = new QuadSegment(cx, cy, coords[0], coords[1], coords[2],
-	                        coords[3]);
-	    if (subpath == null)
-	      {
-		subpath = current = v;
-		paths.add(subpath);
-	      }
-	    else
-	      {
-		current.next = v;
-		current = current.next;
-	      }
-	    cx = coords[2];
-	    cy = coords[3];
-	    break;
-	  case PathIterator.SEG_CUBICTO:
-	    v = new CubicSegment(cx, cy, coords[0], coords[1], coords[2],
-	                         coords[3], coords[4], coords[5]);
-	    if (subpath == null)
-	      {
-		subpath = current = v;
-		paths.add(subpath);
-	      }
-	    else
-	      {
-		current.next = v;
-		current = current.next;
-	      }
-
-	    // check if the cubic is self-intersecting
-	    double[] lpts = ((CubicSegment) v).getLoop();
-	    if (lpts != null)
-	      {
-		// if it is, break off the loop into its own path.
-		v.subdivideInsert(lpts[0]);
-		v.next.subdivideInsert((lpts[1] - lpts[0]) / (1.0 - lpts[0]));
-
-		CubicSegment loop = (CubicSegment) v.next;
-		v.next = loop.next;
-		loop.next = loop;
-
-		v.P2 = v.next.P1 = loop.P2 = loop.P1; // snap points
-		paths.add(loop);
-		current = v.next;
-	      }
-
-	    cx = coords[4];
-	    cy = coords[5];
-	    break;
-	  }
-	pi.next();
+        Segment v;
+        switch (pi.currentSegment(coords))
+          {
+          case PathIterator.SEG_MOVETO:
+            if (subpath != null)
+              { // close existing open path
+                current.next = new LineSegment(cx, cy, subpathx, subpathy);
+                current = current.next;
+                current.next = subpath;
+              }
+            subpath = null;
+            subpathx = cx = coords[0];
+            subpathy = cy = coords[1];
+            break;
+
+          // replace 'close' with a line-to.
+          case PathIterator.SEG_CLOSE:
+            if (subpath != null && (subpathx != cx || subpathy != cy))
+              {
+                current.next = new LineSegment(cx, cy, subpathx, subpathy);
+                current = current.next;
+                current.next = subpath;
+                cx = subpathx;
+                cy = subpathy;
+                subpath = null;
+              }
+            else if (subpath != null)
+              {
+                current.next = subpath;
+                subpath = null;
+              }
+            break;
+          case PathIterator.SEG_LINETO:
+            if (cx != coords[0] || cy != coords[1])
+              {
+                v = new LineSegment(cx, cy, coords[0], coords[1]);
+                if (subpath == null)
+                  {
+                    subpath = current = v;
+                    paths.add(subpath);
+                  }
+                else
+                  {
+                    current.next = v;
+                    current = current.next;
+                  }
+                cx = coords[0];
+                cy = coords[1];
+              }
+            break;
+          case PathIterator.SEG_QUADTO:
+            v = new QuadSegment(cx, cy, coords[0], coords[1], coords[2],
+                                coords[3]);
+            if (subpath == null)
+              {
+                subpath = current = v;
+                paths.add(subpath);
+              }
+            else
+              {
+                current.next = v;
+                current = current.next;
+              }
+            cx = coords[2];
+            cy = coords[3];
+            break;
+          case PathIterator.SEG_CUBICTO:
+            v = new CubicSegment(cx, cy, coords[0], coords[1], coords[2],
+                                 coords[3], coords[4], coords[5]);
+            if (subpath == null)
+              {
+                subpath = current = v;
+                paths.add(subpath);
+              }
+            else
+              {
+                current.next = v;
+                current = current.next;
+              }
+
+            // check if the cubic is self-intersecting
+            double[] lpts = ((CubicSegment) v).getLoop();
+            if (lpts != null)
+              {
+                // if it is, break off the loop into its own path.
+                v.subdivideInsert(lpts[0]);
+                v.next.subdivideInsert((lpts[1] - lpts[0]) / (1.0 - lpts[0]));
+
+                CubicSegment loop = (CubicSegment) v.next;
+                v.next = loop.next;
+                loop.next = loop;
+
+                v.P2 = v.next.P1 = loop.P2 = loop.P1; // snap points
+                paths.add(loop);
+                current = v.next;
+              }
+
+            cx = coords[4];
+            cy = coords[5];
+            break;
+          }
+        pi.next();
       }
 
     if (subpath != null)
       { // close any open path
-	if (subpathx != cx || subpathy != cy)
-	  {
-	    current.next = new LineSegment(cx, cy, subpathx, subpathy);
-	    current = current.next;
-	    current.next = subpath;
-	  }
-	else
-	  current.next = subpath;
+        if (subpathx != cx || subpathy != cy)
+          {
+            current.next = new LineSegment(cx, cy, subpathx, subpathy);
+            current = current.next;
+            current.next = subpath;
+          }
+        else
+          current.next = subpath;
       }
 
     if (paths.size() == 0)
@@ -1775,14 +1775,14 @@ public class Area implements Shape, Cloneable
 
     do
       {
-	do
-	  {
-	    nNodes += a.splitIntersections(b);
-	    b = b.next;
-	  }
-	while (b != B);
-
-	a = a.next; // move to the next segment
+        do
+          {
+            nNodes += a.splitIntersections(b);
+            b = b.next;
+          }
+        while (b != B);
+
+        a = a.next; // move to the next segment
       }
     while (a != A); // until one wrap.
 
@@ -1804,15 +1804,15 @@ public class Area implements Shape, Cloneable
 
     do
       {
-	Segment b = a.next;
-	do
-	  {
-	    if (b != a) // necessary
-	      nNodes += a.splitIntersections(b);
-	    b = b.next;
-	  }
-	while (b != A);
-	a = a.next; // move to the next segment
+        Segment b = a.next;
+        do
+          {
+            if (b != a) // necessary
+              nNodes += a.splitIntersections(b);
+            b = b.next;
+          }
+        while (b != A);
+        a = a.next; // move to the next segment
       }
     while (a != A); // until one wrap.
 
@@ -1841,39 +1841,39 @@ public class Area implements Shape, Cloneable
     // Find which path contains which, assign winding numbers
     for (int i = 0; i < npaths; i++)
       {
-	Segment pathA = (Segment) paths.elementAt(i);
-	pathA.nullNodes(); // remove any now-redundant nodes, in case.
-	int windingA = pathA.hasClockwiseOrientation() ? 1 : neg;
-
-	for (int j = 0; j < npaths; j++)
-	  if (i != j)
-	    {
-	      Segment pathB = (Segment) paths.elementAt(j);
-
-	      // A contains B
-	      if (bb[i].intersects(bb[j]))
-	        {
-		  Segment s = pathB.next;
-		  while (s.P1.getY() == s.P2.getY() && s != pathB)
-		    s = s.next;
-		  Point2D p = s.getMidPoint();
-		  if (pathA.contains(p.getX(), p.getY()))
-		    contains[i][j] = windingA;
-	        }
-	      else
-		// A does not contain B
-		contains[i][j] = 0;
-	    }
-	  else
-	    contains[i][j] = windingA; // i == j
+        Segment pathA = (Segment) paths.elementAt(i);
+        pathA.nullNodes(); // remove any now-redundant nodes, in case.
+        int windingA = pathA.hasClockwiseOrientation() ? 1 : neg;
+
+        for (int j = 0; j < npaths; j++)
+          if (i != j)
+            {
+              Segment pathB = (Segment) paths.elementAt(j);
+
+              // A contains B
+              if (bb[i].intersects(bb[j]))
+                {
+                  Segment s = pathB.next;
+                  while (s.P1.getY() == s.P2.getY() && s != pathB)
+                    s = s.next;
+                  Point2D p = s.getMidPoint();
+                  if (pathA.contains(p.getX(), p.getY()))
+                    contains[i][j] = windingA;
+                }
+              else
+                // A does not contain B
+                contains[i][j] = 0;
+            }
+          else
+            contains[i][j] = windingA; // i == j
       }
 
     for (int i = 0; i < npaths; i++)
       {
-	windingNumbers[i][0] = 0;
-	for (int j = 0; j < npaths; j++)
-	  windingNumbers[i][0] += contains[j][i];
-	windingNumbers[i][1] = contains[i][i];
+        windingNumbers[i][0] = 0;
+        for (int j = 0; j < npaths; j++)
+          windingNumbers[i][0] += contains[j][i];
+        windingNumbers[i][1] = contains[i][i];
       }
 
     Vector solids = new Vector();
@@ -1881,25 +1881,25 @@ public class Area implements Shape, Cloneable
 
     if (windingRule == PathIterator.WIND_NON_ZERO)
       {
-	for (int i = 0; i < npaths; i++)
-	  {
-	    if (windingNumbers[i][0] == 0)
-	      holes.add(paths.elementAt(i));
-	    else if (windingNumbers[i][0] - windingNumbers[i][1] == 0
-	             && Math.abs(windingNumbers[i][0]) == 1)
-	      solids.add(paths.elementAt(i));
-	  }
+        for (int i = 0; i < npaths; i++)
+          {
+            if (windingNumbers[i][0] == 0)
+              holes.add(paths.elementAt(i));
+            else if (windingNumbers[i][0] - windingNumbers[i][1] == 0
+                     && Math.abs(windingNumbers[i][0]) == 1)
+              solids.add(paths.elementAt(i));
+          }
       }
     else
       {
-	windingRule = PathIterator.WIND_NON_ZERO;
-	for (int i = 0; i < npaths; i++)
-	  {
-	    if ((windingNumbers[i][0] & 1) == 0)
-	      holes.add(paths.elementAt(i));
-	    else if ((windingNumbers[i][0] & 1) == 1)
-	      solids.add(paths.elementAt(i));
-	  }
+        windingRule = PathIterator.WIND_NON_ZERO;
+        for (int i = 0; i < npaths; i++)
+          {
+            if ((windingNumbers[i][0] & 1) == 0)
+              holes.add(paths.elementAt(i));
+            else if ((windingNumbers[i][0] & 1) == 1)
+              solids.add(paths.elementAt(i));
+          }
       }
 
     setDirection(holes, false);
@@ -1918,9 +1918,9 @@ public class Area implements Shape, Cloneable
     Segment v;
     for (int i = 0; i < paths.size(); i++)
       {
-	v = (Segment) paths.elementAt(i);
-	if (clockwise != v.hasClockwiseOrientation())
-	  v.reverseAll();
+        v = (Segment) paths.elementAt(i);
+        if (clockwise != v.hasClockwiseOrientation())
+          v.reverseAll();
       }
   }
 
@@ -2013,9 +2013,9 @@ public class Area implements Shape, Cloneable
       int crossings = 0;
       do
         {
-	  int n = v.rayCrossing(x, y);
-	  crossings += n;
-	  v = v.next;
+          int n = v.rayCrossing(x, y);
+          crossings += n;
+          v = v.next;
         }
       while (v != this);
       return ((crossings & 1) == 1);
@@ -2029,8 +2029,8 @@ public class Area implements Shape, Cloneable
       Segment v = this;
       do
         {
-	  v.node = null;
-	  v = v.next;
+          v.node = null;
+          v = v.next;
         }
       while (v != this);
     }
@@ -2043,8 +2043,8 @@ public class Area implements Shape, Cloneable
       Segment v = this;
       do
         {
-	  v.transform(at);
-	  v = v.next;
+          v.transform(at);
+          v = v.next;
         }
       while (v != this);
     }
@@ -2073,12 +2073,12 @@ public class Area implements Shape, Cloneable
       Segment v = this;
       do
         {
-	  Rectangle2D r = v.getBounds();
-	  xmin = Math.min(r.getMinX(), xmin);
-	  ymin = Math.min(r.getMinY(), ymin);
-	  xmax = Math.max(r.getMaxX(), xmax);
-	  ymax = Math.max(r.getMaxY(), ymax);
-	  v = v.next;
+          Rectangle2D r = v.getBounds();
+          xmin = Math.min(r.getMinX(), xmin);
+          ymin = Math.min(r.getMinY(), ymin);
+          xmax = Math.max(r.getMaxX(), xmax);
+          ymax = Math.max(r.getMaxY(), ymax);
+          v = v.next;
         }
       while (v != this);
 
@@ -2096,11 +2096,11 @@ public class Area implements Shape, Cloneable
       s = this;
       do
         {
-	  area += s.curveArea();
+          area += s.curveArea();
 
-	  area += s.P1.getX() * s.next.P1.getY()
-	  - s.P1.getY() * s.next.P1.getX();
-	  s = s.next;
+          area += s.P1.getX() * s.next.P1.getY()
+          - s.P1.getY() * s.next.P1.getX();
+          s = s.next;
         }
       while (s != this);
 
@@ -2117,11 +2117,11 @@ public class Area implements Shape, Cloneable
       Segment former = this;
       while (v != this)
         {
-	  v.reverseCoords();
-	  Segment vnext = v.next;
-	  v.next = former;
-	  former = v;
-	  v = vnext;
+          v.reverseCoords();
+          Segment vnext = v.next;
+          v.next = former;
+          former = v;
+          v = vnext;
         }
       next = former;
     }
@@ -2144,9 +2144,9 @@ public class Area implements Shape, Cloneable
       Segment v = this;
       do
         {
-	  if (! (v instanceof LineSegment))
-	    return false;
-	  v = v.next;
+          if (! (v instanceof LineSegment))
+            return false;
+          v = v.next;
         }
       while (v != this);
       return true;
@@ -2162,16 +2162,16 @@ public class Area implements Shape, Cloneable
 
       while (v != this)
         {
-	  list.add(v);
-	  v = v.next;
+          list.add(v);
+          v = v.next;
         }
 
       Segment clone = (Segment) this.clone();
       v = clone;
       for (int i = 0; i < list.size(); i++)
         {
-	  clone.next = (Segment) ((Segment) list.elementAt(i)).clone();
-	  clone = clone.next;
+          clone.next = (Segment) ((Segment) list.elementAt(i)).clone();
+          clone = clone.next;
         }
       clone.next = v;
       return v;
@@ -2187,7 +2187,7 @@ public class Area implements Shape, Cloneable
       Point2D p = i.p;
       if ((pointEquals(P1, p) || pointEquals(P2, p))
           && (pointEquals(b.P1, p) || pointEquals(b.P2, p)))
-	return 0;
+        return 0;
 
       subdivideInsert(i.ta);
       b.subdivideInsert(i.tb);
@@ -2212,69 +2212,69 @@ public class Area implements Shape, Cloneable
       Vector v = new Vector();
       for (int i = 0; i < x.length; i++)
         {
-	  Point2D p = x[i].p;
-	  if (! ((pointEquals(P1, p) || pointEquals(P2, p))
-	      && (pointEquals(b.P1, p) || pointEquals(b.P2, p))))
-	    v.add(x[i]);
+          Point2D p = x[i].p;
+          if (! ((pointEquals(P1, p) || pointEquals(P2, p))
+              && (pointEquals(b.P1, p) || pointEquals(b.P2, p))))
+            v.add(x[i]);
         }
 
       int nNodes = v.size();
       Intersection[] A = new Intersection[nNodes];
       Intersection[] B = new Intersection[nNodes];
       for (int i = 0; i < nNodes; i++)
-	A[i] = B[i] = (Intersection) v.elementAt(i);
+        A[i] = B[i] = (Intersection) v.elementAt(i);
 
       // Create two lists sorted by the parameter
       // Bubble sort, OK I suppose, since the number of intersections
       // cannot be larger than 9 (cubic-cubic worst case) anyway
       for (int i = 0; i < nNodes - 1; i++)
         {
-	  for (int j = i + 1; j < nNodes; j++)
-	    {
-	      if (A[i].ta > A[j].ta)
-	        {
-		  Intersection swap = A[i];
-		  A[i] = A[j];
-		  A[j] = swap;
-	        }
-	      if (B[i].tb > B[j].tb)
-	        {
-		  Intersection swap = B[i];
-		  B[i] = B[j];
-		  B[j] = swap;
-	        }
-	    }
+          for (int j = i + 1; j < nNodes; j++)
+            {
+              if (A[i].ta > A[j].ta)
+                {
+                  Intersection swap = A[i];
+                  A[i] = A[j];
+                  A[j] = swap;
+                }
+              if (B[i].tb > B[j].tb)
+                {
+                  Intersection swap = B[i];
+                  B[i] = B[j];
+                  B[j] = swap;
+                }
+            }
         }
       // subdivide a
       Segment s = this;
       for (int i = 0; i < nNodes; i++)
         {
-	  s.subdivideInsert(A[i].ta);
+          s.subdivideInsert(A[i].ta);
 
-	  // renormalize the parameters
-	  for (int j = i + 1; j < nNodes; j++)
-	    A[j].ta = (A[j].ta - A[i].ta) / (1.0 - A[i].ta);
+          // renormalize the parameters
+          for (int j = i + 1; j < nNodes; j++)
+            A[j].ta = (A[j].ta - A[i].ta) / (1.0 - A[i].ta);
 
-	  A[i].seg = s;
-	  s = s.next;
+          A[i].seg = s;
+          s = s.next;
         }
 
       // subdivide b, set nodes
       s = b;
       for (int i = 0; i < nNodes; i++)
         {
-	  s.subdivideInsert(B[i].tb);
+          s.subdivideInsert(B[i].tb);
 
-	  for (int j = i + 1; j < nNodes; j++)
-	    B[j].tb = (B[j].tb - B[i].tb) / (1.0 - B[i].tb);
+          for (int j = i + 1; j < nNodes; j++)
+            B[j].tb = (B[j].tb - B[i].tb) / (1.0 - B[i].tb);
 
-	  // set nodes
-	  B[i].seg.node = s.next; // node a -> b 
-	  s.node = B[i].seg.next; // node b -> a 
+          // set nodes
+          B[i].seg.node = s.next; // node a -> b
+          s.node = B[i].seg.next; // node b -> a
 
-	  // snap points
-	  B[i].seg.P2 = B[i].seg.next.P1 = s.P2 = s.next.P1 = B[i].p;
-	  s = s.next;
+          // snap points
+          B[i].seg.P2 = B[i].seg.next.P1 = s.P2 = s.next.P1 = B[i].p;
+          s = s.next;
         }
       return nNodes;
     }
@@ -2286,7 +2286,7 @@ public class Area implements Shape, Cloneable
     boolean pathEquals(Segment B)
     {
       if (! getPathBounds().equals(B.getPathBounds()))
-	return false;
+        return false;
 
       Segment startA = getTopLeft();
       Segment startB = B.getTopLeft();
@@ -2294,16 +2294,16 @@ public class Area implements Shape, Cloneable
       Segment b = startB;
       do
         {
-	  if (! a.equals(b))
-	    return false;
+          if (! a.equals(b))
+            return false;
 
-	  if (a instanceof LineSegment)
-	    a = ((LineSegment) a).lastCoLinear();
-	  if (b instanceof LineSegment)
-	    b = ((LineSegment) b).lastCoLinear();
+          if (a instanceof LineSegment)
+            a = ((LineSegment) a).lastCoLinear();
+          if (b instanceof LineSegment)
+            b = ((LineSegment) b).lastCoLinear();
 
-	  a = a.next;
-	  b = b.next;
+          a = a.next;
+          b = b.next;
         }
       while (a != startA && b != startB);
       return true;
@@ -2318,14 +2318,14 @@ public class Area implements Shape, Cloneable
       Segment tl = this;
       do
         {
-	  if (v.P1.getY() < tl.P1.getY())
-	    tl = v;
-	  else if (v.P1.getY() == tl.P1.getY())
-	    {
-	      if (v.P1.getX() < tl.P1.getX())
-		tl = v;
-	    }
-	  v = v.next;
+          if (v.P1.getY() < tl.P1.getY())
+            tl = v;
+          else if (v.P1.getY() == tl.P1.getY())
+            {
+              if (v.P1.getX() < tl.P1.getX())
+                tl = v;
+            }
+          v = v.next;
         }
       while (v != this);
       return tl;
@@ -2439,7 +2439,7 @@ public class Area implements Shape, Cloneable
       double y4 = b.P2.getY();
 
       if ((y1 - y3) * (x4 - x3) - (x1 - x3) * (y4 - y3) != 0.0)
-	return false;
+        return false;
 
       return ((x2 - x1) * (y4 - y3) - (y2 - y1) * (x4 - x3) == 0.0);
     }
@@ -2455,13 +2455,13 @@ public class Area implements Shape, Cloneable
 
       while (v instanceof LineSegment)
         {
-	  if (isCoLinear((LineSegment) v))
-	    {
-	      prev = v;
-	      v = v.next;
-	    }
-	  else
-	    return prev;
+          if (isCoLinear((LineSegment) v))
+            {
+              prev = v;
+              v = v.next;
+            }
+          else
+            return prev;
         }
       return prev;
     }
@@ -2474,12 +2474,12 @@ public class Area implements Shape, Cloneable
     boolean equals(Segment b)
     {
       if (! (b instanceof LineSegment))
-	return false;
+        return false;
       Point2D p1 = P1;
       Point2D p3 = b.P1;
 
       if (! p1.equals(p3))
-	return false;
+        return false;
 
       Point2D p2 = lastCoLinear().P2;
       Point2D p4 = ((LineSegment) b).lastCoLinear().P2;
@@ -2502,13 +2502,13 @@ public class Area implements Shape, Cloneable
     boolean hasIntersections(Segment b)
     {
       if (b instanceof LineSegment)
-	return (linesIntersect(this, (LineSegment) b) != null);
+        return (linesIntersect(this, (LineSegment) b) != null);
 
       if (b instanceof QuadSegment)
-	return (lineQuadIntersect(this, (QuadSegment) b) != null);
+        return (lineQuadIntersect(this, (QuadSegment) b) != null);
 
       if (b instanceof CubicSegment)
-	return (lineCubicIntersect(this, (CubicSegment) b) != null);
+        return (lineCubicIntersect(this, (CubicSegment) b) != null);
 
       return false;
     }
@@ -2521,27 +2521,27 @@ public class Area implements Shape, Cloneable
     {
       if (b instanceof LineSegment)
         {
-	  Intersection i = linesIntersect(this, (LineSegment) b);
+          Intersection i = linesIntersect(this, (LineSegment) b);
 
-	  if (i == null)
-	    return 0;
+          if (i == null)
+            return 0;
 
-	  return createNode(b, i);
+          return createNode(b, i);
         }
 
       Intersection[] x = null;
 
       if (b instanceof QuadSegment)
-	x = lineQuadIntersect(this, (QuadSegment) b);
+        x = lineQuadIntersect(this, (QuadSegment) b);
 
       if (b instanceof CubicSegment)
-	x = lineCubicIntersect(this, (CubicSegment) b);
+        x = lineCubicIntersect(this, (CubicSegment) b);
 
       if (x == null)
-	return 0;
+        return 0;
 
       if (x.length == 1)
-	return createNode(b, (Intersection) x[0]);
+        return createNode(b, (Intersection) x[0]);
 
       return createNodes(b, x);
     }
@@ -2569,20 +2569,20 @@ public class Area implements Shape, Cloneable
       double y1 = P2.getY() - y;
 
       if (y0 * y1 > 0)
-	return 0;
+        return 0;
 
       if (x0 < 0 && x1 < 0)
-	return 0;
+        return 0;
 
       if (y0 == 0.0)
-	y0 -= EPSILON;
+        y0 -= EPSILON;
 
       if (y1 == 0.0)
-	y1 -= EPSILON;
+        y1 -= EPSILON;
 
-      if (Line2D.linesIntersect(x0, y0, x1, y1, 
-				EPSILON, 0.0, Double.MAX_VALUE, 0.0))
-	return 1;
+      if (Line2D.linesIntersect(x0, y0, x1, y1,
+                                EPSILON, 0.0, Double.MAX_VALUE, 0.0))
+        return 1;
       return 0;
     }
   } // class LineSegment
@@ -2652,7 +2652,7 @@ public class Area implements Shape, Cloneable
     boolean equals(Segment b)
     {
       if (! (b instanceof QuadSegment))
-	return false;
+        return false;
 
       return (P1.equals(b.P1) && cp.equals(((QuadSegment) b).cp)
              && P2.equals(b.P2));
@@ -2700,25 +2700,25 @@ public class Area implements Shape, Cloneable
       r1 = 2 * (y2 - 2 * y1 + y0);
       if (r1 != 0.0)
         {
-	  double t = -r0 / r1;
-	  if (t > 0.0 && t < 1.0)
-	    {
-	      double y = evaluatePoint(t).getY();
-	      ymax = Math.max(y, ymax);
-	      ymin = Math.min(y, ymin);
-	    }
+          double t = -r0 / r1;
+          if (t > 0.0 && t < 1.0)
+            {
+              double y = evaluatePoint(t).getY();
+              ymax = Math.max(y, ymax);
+              ymin = Math.min(y, ymin);
+            }
         }
       r0 = 2 * (x1 - x0);
       r1 = 2 * (x2 - 2 * x1 + x0);
       if (r1 != 0.0)
         {
-	  double t = -r0 / r1;
-	  if (t > 0.0 && t < 1.0)
-	    {
-	      double x = evaluatePoint(t).getY();
-	      xmax = Math.max(x, xmax);
-	      xmin = Math.min(x, xmin);
-	    }
+          double t = -r0 / r1;
+          if (t > 0.0 && t < 1.0)
+            {
+              double x = evaluatePoint(t).getY();
+              xmax = Math.max(x, xmax);
+              xmin = Math.min(x, xmin);
+            }
         }
 
       return (new Rectangle2D.Double(xmin, ymin, xmax - xmin, ymax - ymin));
@@ -2785,23 +2785,23 @@ public class Area implements Shape, Cloneable
       /* check if curve may intersect X+ axis. */
       if ((x0 > 0.0 || x1 > 0.0 || x2 > 0.0) && (y0 * y1 <= 0 || y1 * y2 <= 0))
         {
-	  if (y0 == 0.0)
-	    y0 -= EPSILON;
-	  if (y2 == 0.0)
-	    y2 -= EPSILON;
-
-	  r[0] = y0;
-	  r[1] = 2 * (y1 - y0);
-	  r[2] = (y2 - 2 * y1 + y0);
-
-	  nRoots = QuadCurve2D.solveQuadratic(r);
-	  for (int i = 0; i < nRoots; i++)
-	    if (r[i] > 0.0f && r[i] < 1.0f)
-	      {
-		double t = r[i];
-		if (t * t * (x2 - 2 * x1 + x0) + 2 * t * (x1 - x0) + x0 > 0.0)
-		  nCrossings++;
-	      }
+          if (y0 == 0.0)
+            y0 -= EPSILON;
+          if (y2 == 0.0)
+            y2 -= EPSILON;
+
+          r[0] = y0;
+          r[1] = 2 * (y1 - y0);
+          r[2] = (y2 - 2 * y1 + y0);
+
+          nRoots = QuadCurve2D.solveQuadratic(r);
+          for (int i = 0; i < nRoots; i++)
+            if (r[i] > 0.0f && r[i] < 1.0f)
+              {
+                double t = r[i];
+                if (t * t * (x2 - 2 * x1 + x0) + 2 * t * (x1 - x0) + x0 > 0.0)
+                  nCrossings++;
+              }
         }
       return nCrossings;
     }
@@ -2825,27 +2825,27 @@ public class Area implements Shape, Cloneable
     int splitIntersections(Segment b)
     {
       if (b instanceof LineSegment)
-	return (b.splitIntersections(this));
+        return (b.splitIntersections(this));
 
       if (b instanceof CubicSegment)
-	return (b.splitIntersections(this));
+        return (b.splitIntersections(this));
 
       if (b instanceof QuadSegment)
         {
-	  // Use the cubic-cubic intersection routine for quads as well,
-	  // Since a quadratic can be exactly described as a cubic, this
-	  // should not be a problem; 
-	  // The recursion depth will be the same in any case.
-	  Intersection[] x = cubicCubicIntersect(getCubicSegment(),
-	                                         ((QuadSegment) b)
-	                                         .getCubicSegment());
-	  if (x == null)
-	    return 0;
-
-	  if (x.length == 1)
-	    return createNode(b, (Intersection) x[0]);
-
-	  return createNodes(b, x);
+          // Use the cubic-cubic intersection routine for quads as well,
+          // Since a quadratic can be exactly described as a cubic, this
+          // should not be a problem;
+          // The recursion depth will be the same in any case.
+          Intersection[] x = cubicCubicIntersect(getCubicSegment(),
+                                                 ((QuadSegment) b)
+                                                 .getCubicSegment());
+          if (x == null)
+            return 0;
+
+          if (x.length == 1)
+            return createNode(b, (Intersection) x[0]);
+
+          return createNodes(b, x);
         }
       return 0;
     }
@@ -2959,7 +2959,7 @@ public class Area implements Shape, Cloneable
     boolean equals(Segment b)
     {
       if (! (b instanceof CubicSegment))
-	return false;
+        return false;
 
       return (P1.equals(b.P1) && cp1.equals(((CubicSegment) b).cp1)
              && cp2.equals(((CubicSegment) b).cp2) && P2.equals(b.P2));
@@ -3015,13 +3015,13 @@ public class Area implements Shape, Cloneable
       int n = QuadCurve2D.solveQuadratic(r);
       for (int i = 0; i < n; i++)
         {
-	  double t = r[i];
-	  if (t > 0 && t < 1.0)
-	    {
-	      double y = evaluatePoint(t).getY();
-	      ymax = Math.max(y, ymax);
-	      ymin = Math.min(y, ymin);
-	    }
+          double t = r[i];
+          if (t > 0 && t < 1.0)
+            {
+              double y = evaluatePoint(t).getY();
+              ymax = Math.max(y, ymax);
+              ymin = Math.min(y, ymin);
+            }
         }
 
       r[0] = 3 * (x1 - x0);
@@ -3030,13 +3030,13 @@ public class Area implements Shape, Cloneable
       n = QuadCurve2D.solveQuadratic(r);
       for (int i = 0; i < n; i++)
         {
-	  double t = r[i];
-	  if (t > 0 && t < 1.0)
-	    {
-	      double x = evaluatePoint(t).getX();
-	      xmax = Math.max(x, xmax);
-	      xmin = Math.min(x, xmin);
-	    }
+          double t = r[i];
+          if (t > 0 && t < 1.0)
+            {
+              double x = evaluatePoint(t).getX();
+              xmax = Math.max(x, xmax);
+              xmin = Math.min(x, xmin);
+            }
         }
       return (new Rectangle2D.Double(xmin, ymin, (xmax - xmin), (ymax - ymin)));
     }
@@ -3078,38 +3078,38 @@ public class Area implements Shape, Cloneable
 
       // A qudratic
       if (R == 0.0 && T == 0.0)
-	return null;
+        return null;
 
       // true cubic
       if (R != 0.0 && T != 0.0)
         {
-	  A = 3 * (x2 + x0 - 2 * x1) / R;
-	  B = 3 * (x1 - x0) / R;
+          A = 3 * (x2 + x0 - 2 * x1) / R;
+          B = 3 * (x1 - x0) / R;
 
-	  double P = 3 * (y2 + y0 - 2 * y1) / T;
-	  double Q = 3 * (y1 - y0) / T;
+          double P = 3 * (y2 + y0 - 2 * y1) / T;
+          double Q = 3 * (y1 - y0) / T;
 
-	  if (A == P || Q == B)
-	    return null;
+          if (A == P || Q == B)
+            return null;
 
-	  k = (Q - B) / (A - P);
+          k = (Q - B) / (A - P);
         }
       else
         {
-	  if (R == 0.0)
-	    {
-	      // quadratic in x
-	      k = -(3 * (x1 - x0)) / (3 * (x2 + x0 - 2 * x1));
-	      A = 3 * (y2 + y0 - 2 * y1) / T;
-	      B = 3 * (y1 - y0) / T;
-	    }
-	  else
-	    {
-	      // quadratic in y
-	      k = -(3 * (y1 - y0)) / (3 * (y2 + y0 - 2 * y1));
-	      A = 3 * (x2 + x0 - 2 * x1) / R;
-	      B = 3 * (x1 - x0) / R;
-	    }
+          if (R == 0.0)
+            {
+              // quadratic in x
+              k = -(3 * (x1 - x0)) / (3 * (x2 + x0 - 2 * x1));
+              A = 3 * (y2 + y0 - 2 * y1) / T;
+              B = 3 * (y1 - y0) / T;
+            }
+          else
+            {
+              // quadratic in y
+              k = -(3 * (y1 - y0)) / (3 * (y2 + y0 - 2 * y1));
+              A = 3 * (x2 + x0 - 2 * x1) / R;
+              B = 3 * (x1 - x0) / R;
+            }
         }
 
       r[0] = -k * k * k - A * k * k - B * k;
@@ -3119,27 +3119,27 @@ public class Area implements Shape, Cloneable
 
       int n = CubicCurve2D.solveCubic(r);
       if (n != 3)
-	return null;
+        return null;
 
       // sort r
       double t;
       for (int i = 0; i < 2; i++)
-	for (int j = i + 1; j < 3; j++)
-	  if (r[j] < r[i])
-	    {
-	      t = r[i];
-	      r[i] = r[j];
-	      r[j] = t;
-	    }
+        for (int j = i + 1; j < 3; j++)
+          if (r[j] < r[i])
+            {
+              t = r[i];
+              r[i] = r[j];
+              r[j] = t;
+            }
 
       if (Math.abs(r[0] + r[2] - k) < 1E-13)
-	if (r[0] >= 0.0 && r[0] <= 1.0 && r[2] >= 0.0 && r[2] <= 1.0)
-	  if (evaluatePoint(r[0]).distance(evaluatePoint(r[2])) < PE_EPSILON * 10)
-	    { // we snap the points anyway
-	      results[0] = r[0];
-	      results[1] = r[2];
-	      return (results);
-	    }
+        if (r[0] >= 0.0 && r[0] <= 1.0 && r[2] >= 0.0 && r[2] <= 1.0)
+          if (evaluatePoint(r[0]).distance(evaluatePoint(r[2])) < PE_EPSILON * 10)
+            { // we snap the points anyway
+              results[0] = r[0];
+              results[1] = r[2];
+              return (results);
+            }
       return null;
     }
 
@@ -3195,28 +3195,28 @@ public class Area implements Shape, Cloneable
       if ((x0 > 0.0 || x1 > 0.0 || x2 > 0.0 || x3 > 0.0)
           && (y0 * y1 <= 0 || y1 * y2 <= 0 || y2 * y3 <= 0))
         {
-	  if (y0 == 0.0)
-	    y0 -= EPSILON;
-	  if (y3 == 0.0)
-	    y3 -= EPSILON;
-
-	  r[0] = y0;
-	  r[1] = 3 * (y1 - y0);
-	  r[2] = 3 * (y2 + y0 - 2 * y1);
-	  r[3] = y3 - 3 * y2 + 3 * y1 - y0;
-
-	  if ((nRoots = CubicCurve2D.solveCubic(r)) > 0)
-	    for (int i = 0; i < nRoots; i++)
-	      {
-		if (r[i] > 0.0 && r[i] < 1.0)
-		  {
-		    double t = r[i];
-		    if (-(t * t * t) * (x0 - 3 * x1 + 3 * x2 - x3)
-		        + 3 * t * t * (x0 - 2 * x1 + x2) + 3 * t * (x1 - x0)
-		        + x0 > 0.0)
-		      nCrossings++;
-		  }
-	      }
+          if (y0 == 0.0)
+            y0 -= EPSILON;
+          if (y3 == 0.0)
+            y3 -= EPSILON;
+
+          r[0] = y0;
+          r[1] = 3 * (y1 - y0);
+          r[2] = 3 * (y2 + y0 - 2 * y1);
+          r[3] = y3 - 3 * y2 + 3 * y1 - y0;
+
+          if ((nRoots = CubicCurve2D.solveCubic(r)) > 0)
+            for (int i = 0; i < nRoots; i++)
+              {
+                if (r[i] > 0.0 && r[i] < 1.0)
+                  {
+                    double t = r[i];
+                    if (-(t * t * t) * (x0 - 3 * x1 + 3 * x2 - x3)
+                        + 3 * t * t * (x0 - 2 * x1 + x2) + 3 * t * (x1 - x0)
+                        + x0 > 0.0)
+                      nCrossings++;
+                  }
+              }
         }
       return nCrossings;
     }
@@ -3241,21 +3241,21 @@ public class Area implements Shape, Cloneable
     int splitIntersections(Segment b)
     {
       if (b instanceof LineSegment)
-	return (b.splitIntersections(this));
+        return (b.splitIntersections(this));
 
       Intersection[] x = null;
 
       if (b instanceof QuadSegment)
-	x = cubicCubicIntersect(this, ((QuadSegment) b).getCubicSegment());
+        x = cubicCubicIntersect(this, ((QuadSegment) b).getCubicSegment());
 
       if (b instanceof CubicSegment)
-	x = cubicCubicIntersect(this, (CubicSegment) b);
+        x = cubicCubicIntersect(this, (CubicSegment) b);
 
       if (x == null)
-	return 0;
+        return 0;
 
       if (x.length == 1)
-	return createNode(b, x[0]);
+        return createNode(b, x[0]);
 
       return createNodes(b, x);
     }
diff --git a/libjava/classpath/java/awt/geom/CubicCurve2D.java b/libjava/classpath/java/awt/geom/CubicCurve2D.java
index d0d5598..5cb11fe 100644
--- a/libjava/classpath/java/awt/geom/CubicCurve2D.java
+++ b/libjava/classpath/java/awt/geom/CubicCurve2D.java
@@ -585,26 +585,26 @@ public abstract class CubicCurve2D implements Shape, Cloneable
 
     if (left != null)
       {
-	left[leftOff] = left_P1_x;
-	left[leftOff + 1] = left_P1_y;
-	left[leftOff + 2] = left_C1_x;
-	left[leftOff + 3] = left_C1_y;
-	left[leftOff + 4] = left_C2_x;
-	left[leftOff + 5] = left_C2_y;
-	left[leftOff + 6] = Mid_x;
-	left[leftOff + 7] = Mid_y;
+        left[leftOff] = left_P1_x;
+        left[leftOff + 1] = left_P1_y;
+        left[leftOff + 2] = left_C1_x;
+        left[leftOff + 3] = left_C1_y;
+        left[leftOff + 4] = left_C2_x;
+        left[leftOff + 5] = left_C2_y;
+        left[leftOff + 6] = Mid_x;
+        left[leftOff + 7] = Mid_y;
       }
 
     if (right != null)
       {
-	right[rightOff] = Mid_x;
-	right[rightOff + 1] = Mid_y;
-	right[rightOff + 2] = right_C1_x;
-	right[rightOff + 3] = right_C1_y;
-	right[rightOff + 4] = right_C2_x;
-	right[rightOff + 5] = right_C2_y;
-	right[rightOff + 6] = right_P2_x;
-	right[rightOff + 7] = right_P2_y;
+        right[rightOff] = Mid_x;
+        right[rightOff + 1] = Mid_y;
+        right[rightOff + 2] = right_C1_x;
+        right[rightOff + 3] = right_C1_y;
+        right[rightOff + 4] = right_C2_x;
+        right[rightOff + 5] = right_C2_y;
+        right[rightOff + 6] = right_P2_x;
+        right[rightOff + 7] = right_P2_y;
       }
   }
 
@@ -710,7 +710,7 @@ public abstract class CubicCurve2D implements Shape, Cloneable
     // The Java implementation is very similar to the GSL code, but
     // not a strict one-to-one copy. For example, GSL would sort the
     // result.
-    
+
     double a;
     double b;
     double c;
@@ -749,46 +749,46 @@ public abstract class CubicCurve2D implements Shape, Cloneable
 
     if (R == 0 && Q == 0)
       {
-	// The GNU Scientific Library would return three identical
-	// solutions in this case.
-	res[0] = -a / 3;
-	return 1;
+        // The GNU Scientific Library would return three identical
+        // solutions in this case.
+        res[0] = -a / 3;
+        return 1;
       }
 
     if (CR2 == CQ3)
       {
-	/* this test is actually R2 == Q3, written in a form suitable
-	   for exact computation with integers */
-	/* Due to finite precision some double roots may be missed, and
-	   considered to be a pair of complex roots z = x +/- epsilon i
-	   close to the real axis. */
-	double sqrtQ = Math.sqrt(Q);
-
-	if (R > 0)
-	  {
-	    res[0] = -2 * sqrtQ - a / 3;
-	    res[1] = sqrtQ - a / 3;
-	  }
-	else
-	  {
-	    res[0] = -sqrtQ - a / 3;
-	    res[1] = 2 * sqrtQ - a / 3;
-	  }
-	return 2;
+        /* this test is actually R2 == Q3, written in a form suitable
+           for exact computation with integers */
+        /* Due to finite precision some double roots may be missed, and
+           considered to be a pair of complex roots z = x +/- epsilon i
+           close to the real axis. */
+        double sqrtQ = Math.sqrt(Q);
+
+        if (R > 0)
+          {
+            res[0] = -2 * sqrtQ - a / 3;
+            res[1] = sqrtQ - a / 3;
+          }
+        else
+          {
+            res[0] = -sqrtQ - a / 3;
+            res[1] = 2 * sqrtQ - a / 3;
+          }
+        return 2;
       }
 
     if (CR2 < CQ3) /* equivalent to R2 < Q3 */
       {
-	double sqrtQ = Math.sqrt(Q);
-	double sqrtQ3 = sqrtQ * sqrtQ * sqrtQ;
-	double theta = Math.acos(R / sqrtQ3);
-	double norm = -2 * sqrtQ;
-	res[0] = norm * Math.cos(theta / 3) - a / 3;
-	res[1] = norm * Math.cos((theta + 2.0 * Math.PI) / 3) - a / 3;
-	res[2] = norm * Math.cos((theta - 2.0 * Math.PI) / 3) - a / 3;
-
-	// The GNU Scientific Library sorts the results. We don't.
-	return 3;
+        double sqrtQ = Math.sqrt(Q);
+        double sqrtQ3 = sqrtQ * sqrtQ * sqrtQ;
+        double theta = Math.acos(R / sqrtQ3);
+        double norm = -2 * sqrtQ;
+        res[0] = norm * Math.cos(theta / 3) - a / 3;
+        res[1] = norm * Math.cos((theta + 2.0 * Math.PI) / 3) - a / 3;
+        res[2] = norm * Math.cos((theta - 2.0 * Math.PI) / 3) - a / 3;
+
+        // The GNU Scientific Library sorts the results. We don't.
+        return 3;
       }
 
     double sgnR = (R >= 0 ? 1 : -1);
@@ -862,7 +862,7 @@ public abstract class CubicCurve2D implements Shape, Cloneable
   }
 
   /**
-   * Determines whether any part of a Rectangle2D is inside the area bounded 
+   * Determines whether any part of a Rectangle2D is inside the area bounded
    * by the curve and the straight line connecting its end points.
    * @see #intersects(double, double, double, double)
    */
@@ -902,7 +902,7 @@ public abstract class CubicCurve2D implements Shape, Cloneable
   }
 
   /**
-   * Determine whether a Rectangle2D is entirely inside the area that is 
+   * Determine whether a Rectangle2D is entirely inside the area that is
    * bounded by the curve and the straight line connecting its end points.
    *
    * <p><img src="doc-files/CubicCurve2D-5.png" width="350" height="180"
@@ -930,77 +930,77 @@ public abstract class CubicCurve2D implements Shape, Cloneable
   {
     return new PathIterator()
       {
-	/** Current coordinate. */
-	private int current = 0;
-
-	public int getWindingRule()
-	{
-	  return WIND_NON_ZERO;
-	}
-
-	public boolean isDone()
-	{
-	  return current >= 2;
-	}
-
-	public void next()
-	{
-	  current++;
-	}
-
-	public int currentSegment(float[] coords)
-	{
-	  int result;
-	  switch (current)
-	    {
-	    case 0:
-	      coords[0] = (float) getX1();
-	      coords[1] = (float) getY1();
-	      result = SEG_MOVETO;
-	      break;
-	    case 1:
-	      coords[0] = (float) getCtrlX1();
-	      coords[1] = (float) getCtrlY1();
-	      coords[2] = (float) getCtrlX2();
-	      coords[3] = (float) getCtrlY2();
-	      coords[4] = (float) getX2();
-	      coords[5] = (float) getY2();
-	      result = SEG_CUBICTO;
-	      break;
-	    default:
-	      throw new NoSuchElementException("cubic iterator out of bounds");
-	    }
-	  if (at != null)
-	    at.transform(coords, 0, coords, 0, 3);
-	  return result;
-	}
-
-	public int currentSegment(double[] coords)
-	{
-	  int result;
-	  switch (current)
-	    {
-	    case 0:
-	      coords[0] = getX1();
-	      coords[1] = getY1();
-	      result = SEG_MOVETO;
-	      break;
-	    case 1:
-	      coords[0] = getCtrlX1();
-	      coords[1] = getCtrlY1();
-	      coords[2] = getCtrlX2();
-	      coords[3] = getCtrlY2();
-	      coords[4] = getX2();
-	      coords[5] = getY2();
-	      result = SEG_CUBICTO;
-	      break;
-	    default:
-	      throw new NoSuchElementException("cubic iterator out of bounds");
-	    }
-	  if (at != null)
-	    at.transform(coords, 0, coords, 0, 3);
-	  return result;
-	}
+        /** Current coordinate. */
+        private int current = 0;
+
+        public int getWindingRule()
+        {
+          return WIND_NON_ZERO;
+        }
+
+        public boolean isDone()
+        {
+          return current >= 2;
+        }
+
+        public void next()
+        {
+          current++;
+        }
+
+        public int currentSegment(float[] coords)
+        {
+          int result;
+          switch (current)
+            {
+            case 0:
+              coords[0] = (float) getX1();
+              coords[1] = (float) getY1();
+              result = SEG_MOVETO;
+              break;
+            case 1:
+              coords[0] = (float) getCtrlX1();
+              coords[1] = (float) getCtrlY1();
+              coords[2] = (float) getCtrlX2();
+              coords[3] = (float) getCtrlY2();
+              coords[4] = (float) getX2();
+              coords[5] = (float) getY2();
+              result = SEG_CUBICTO;
+              break;
+            default:
+              throw new NoSuchElementException("cubic iterator out of bounds");
+            }
+          if (at != null)
+            at.transform(coords, 0, coords, 0, 3);
+          return result;
+        }
+
+        public int currentSegment(double[] coords)
+        {
+          int result;
+          switch (current)
+            {
+            case 0:
+              coords[0] = getX1();
+              coords[1] = getY1();
+              result = SEG_MOVETO;
+              break;
+            case 1:
+              coords[0] = getCtrlX1();
+              coords[1] = getCtrlY1();
+              coords[2] = getCtrlX2();
+              coords[3] = getCtrlY2();
+              coords[4] = getX2();
+              coords[5] = getY2();
+              result = SEG_CUBICTO;
+              break;
+            default:
+              throw new NoSuchElementException("cubic iterator out of bounds");
+            }
+          if (at != null)
+            at.transform(coords, 0, coords, 0, 3);
+          return result;
+        }
       };
   }
 
@@ -1018,11 +1018,11 @@ public abstract class CubicCurve2D implements Shape, Cloneable
   {
     try
       {
-	return super.clone();
+        return super.clone();
       }
     catch (CloneNotSupportedException e)
       {
-	throw (Error) new InternalError().initCause(e); // Impossible
+        throw (Error) new InternalError().initCause(e); // Impossible
       }
   }
 
@@ -1042,7 +1042,7 @@ public abstract class CubicCurve2D implements Shape, Cloneable
    *
    * A special-case not adressed in this code is self-intersections
    * of the curve, e.g. if the axis intersects the self-itersection,
-   * the degenerate roots of the polynomial will erroneously count as 
+   * the degenerate roots of the polynomial will erroneously count as
    * a single intersection of the curve, and not two.
    */
   private int getAxisIntersections(double x, double y, boolean useYaxis,
@@ -1064,48 +1064,48 @@ public abstract class CubicCurve2D implements Shape, Cloneable
 
     if (useYaxis)
       {
-	a0 = getY1() - y;
-	a1 = getCtrlY1() - y;
-	a2 = getCtrlY2() - y;
-	a3 = getY2() - y;
-	b0 = getX1() - x;
-	b1 = getCtrlX1() - x;
-	b2 = getCtrlX2() - x;
-	b3 = getX2() - x;
+        a0 = getY1() - y;
+        a1 = getCtrlY1() - y;
+        a2 = getCtrlY2() - y;
+        a3 = getY2() - y;
+        b0 = getX1() - x;
+        b1 = getCtrlX1() - x;
+        b2 = getCtrlX2() - x;
+        b3 = getX2() - x;
       }
     else
       {
-	a0 = getX1() - x;
-	a1 = getCtrlX1() - x;
-	a2 = getCtrlX2() - x;
-	a3 = getX2() - x;
-	b0 = getY1() - y;
-	b1 = getCtrlY1() - y;
-	b2 = getCtrlY2() - y;
-	b3 = getY2() - y;
+        a0 = getX1() - x;
+        a1 = getCtrlX1() - x;
+        a2 = getCtrlX2() - x;
+        a3 = getX2() - x;
+        b0 = getY1() - y;
+        b1 = getCtrlY1() - y;
+        b2 = getCtrlY2() - y;
+        b3 = getY2() - y;
       }
 
-    /* If the axis intersects a start/endpoint, shift it up by some small 
+    /* If the axis intersects a start/endpoint, shift it up by some small
        amount to guarantee the line is 'inside'
        If this is not done, bad behaviour may result for points on that axis.*/
     if (a0 == 0.0 || a3 == 0.0)
       {
-	double small = getFlatness() * EPSILON;
-	if (a0 == 0.0)
-	  a0 -= small;
-	if (a3 == 0.0)
-	  a3 -= small;
+        double small = getFlatness() * EPSILON;
+        if (a0 == 0.0)
+          a0 -= small;
+        if (a3 == 0.0)
+          a3 -= small;
       }
 
     if (useYaxis)
       {
-	if (Line2D.linesIntersect(b0, a0, b3, a3, EPSILON, 0.0, distance, 0.0))
-	  nCrossings++;
+        if (Line2D.linesIntersect(b0, a0, b3, a3, EPSILON, 0.0, distance, 0.0))
+          nCrossings++;
       }
     else
       {
-	if (Line2D.linesIntersect(a0, b0, a3, b3, 0.0, EPSILON, 0.0, distance))
-	  nCrossings++;
+        if (Line2D.linesIntersect(a0, b0, a3, b3, 0.0, EPSILON, 0.0, distance))
+          nCrossings++;
       }
 
     r[0] = a0;
@@ -1116,15 +1116,15 @@ public abstract class CubicCurve2D implements Shape, Cloneable
     if ((nRoots = solveCubic(r)) != 0)
       for (int i = 0; i < nRoots; i++)
         {
-	  double t = r[i];
-	  if (t >= 0.0 && t <= 1.0)
-	    {
-	      double crossing = -(t * t * t) * (b0 - 3 * b1 + 3 * b2 - b3)
-	                        + 3 * t * t * (b0 - 2 * b1 + b2)
-	                        + 3 * t * (b1 - b0) + b0;
-	      if (crossing > 0.0 && crossing <= distance)
-		nCrossings++;
-	    }
+          double t = r[i];
+          if (t >= 0.0 && t <= 1.0)
+            {
+              double crossing = -(t * t * t) * (b0 - 3 * b1 + 3 * b2 - b3)
+                                + 3 * t * t * (b0 - 2 * b1 + b2)
+                                + 3 * t * (b1 - b0) + b0;
+              if (crossing > 0.0 && crossing <= distance)
+                nCrossings++;
+            }
         }
 
     return (nCrossings);
diff --git a/libjava/classpath/java/awt/geom/Ellipse2D.java b/libjava/classpath/java/awt/geom/Ellipse2D.java
index e883077..3bbf2f0 100644
--- a/libjava/classpath/java/awt/geom/Ellipse2D.java
+++ b/libjava/classpath/java/awt/geom/Ellipse2D.java
@@ -101,7 +101,7 @@ public abstract class Ellipse2D extends RectangularShape
    * Note: An ellipse cannot be represented exactly in PathIterator
    * segments, the outline is thefore approximated with cubic
    * Bezier segments.
-   * 
+   *
    * @param at an optional transform.
    * @return A path iterator.
    */
@@ -242,7 +242,7 @@ public abstract class Ellipse2D extends RectangularShape
     /**
      * Returns <code>true</code> if the ellipse encloses no area, and
      * <code>false</code> otherwise.
-     * 
+     *
      * @return A boolean.
      */
     public boolean isEmpty()
@@ -368,7 +368,7 @@ public abstract class Ellipse2D extends RectangularShape
     /**
      * Returns <code>true</code> if the ellipse encloses no area, and
      * <code>false</code> otherwise.
-     * 
+     *
      * @return A boolean.
      */
     public boolean isEmpty()
diff --git a/libjava/classpath/java/awt/geom/FlatteningPathIterator.java b/libjava/classpath/java/awt/geom/FlatteningPathIterator.java
index b06e6cc..629936b 100644
--- a/libjava/classpath/java/awt/geom/FlatteningPathIterator.java
+++ b/libjava/classpath/java/awt/geom/FlatteningPathIterator.java
@@ -141,8 +141,8 @@ public class FlatteningPathIterator
    */
   private int[] recLevel;
 
-  
-  
+
+
   private final double[] scratch = new double[6];
 
 
@@ -387,7 +387,7 @@ public class FlatteningPathIterator
     }
 
     srcSegType = srcIter.currentSegment(scratch);
-    
+
     switch (srcSegType)
     {
     case PathIterator.SEG_CLOSE:
@@ -493,7 +493,7 @@ public class FlatteningPathIterator
            && (CubicCurve2D.getFlatnessSq(stack, sp) >= flatnessSq))
     {
       recLevel[stackSize] = recLevel[stackSize - 1] = ++level;
-      
+
       CubicCurve2D.subdivide(stack, sp, stack, sp - 6, stack, sp);
       ++stackSize;
       sp -= 6;
diff --git a/libjava/classpath/java/awt/geom/GeneralPath.java b/libjava/classpath/java/awt/geom/GeneralPath.java
index fa27d19..99f1905 100644
--- a/libjava/classpath/java/awt/geom/GeneralPath.java
+++ b/libjava/classpath/java/awt/geom/GeneralPath.java
@@ -61,11 +61,11 @@ import java.awt.Shape;
  *
  * <p>The NON_ZERO winding rule defines a point as inside a path if:
  * The path intersects the ray in an equal number of opposite directions.
- * Point <b>A</b> in the image is outside (one intersection in the 
+ * Point <b>A</b> in the image is outside (one intersection in the
  * &#x2019;up&#x2019;
- * direction, one in the &#x2019;down&#x2019; direction) Point <b>B</b> in 
+ * direction, one in the &#x2019;down&#x2019; direction) Point <b>B</b> in
  * the image is inside (one intersection &#x2019;down&#x2019;)
- * Point <b>C</b> in the image is inside (two intersections in the 
+ * Point <b>C</b> in the image is inside (two intersections in the
  * &#x2019;down&#x2019; direction)
  *
  * @see Line2D
@@ -135,9 +135,9 @@ public final class GeneralPath implements Shape, Cloneable
   /**
    * Constructs a GeneralPath with a specific winding rule
    * and the default initial capacity (20).
-   * @param rule the winding rule ({@link #WIND_NON_ZERO} or 
+   * @param rule the winding rule ({@link #WIND_NON_ZERO} or
    *     {@link #WIND_EVEN_ODD})
-   *     
+   *
    * @throws IllegalArgumentException if <code>rule</code> is not one of the
    *     listed values.
    */
@@ -150,10 +150,10 @@ public final class GeneralPath implements Shape, Cloneable
    * Constructs a GeneralPath with a specific winding rule
    * and the initial capacity. The initial capacity should be
    * the approximate number of path segments to be used.
-   * @param rule the winding rule ({@link #WIND_NON_ZERO} or 
+   * @param rule the winding rule ({@link #WIND_NON_ZERO} or
    *     {@link #WIND_EVEN_ODD})
    * @param capacity the inital capacity, in path segments
-   * 
+   *
    * @throws IllegalArgumentException if <code>rule</code> is not one of the
    *     listed values.
    */
@@ -172,9 +172,9 @@ public final class GeneralPath implements Shape, Cloneable
   /**
    * Constructs a GeneralPath from an arbitrary shape object.
    * The Shapes PathIterator path and winding rule will be used.
-   * 
+   *
    * @param s the shape (<code>null</code> not permitted).
-   * 
+   *
    * @throws NullPointerException if <code>shape</code> is <code>null</code>.
    */
   public GeneralPath(Shape s)
@@ -189,7 +189,7 @@ public final class GeneralPath implements Shape, Cloneable
 
   /**
    * Adds a new point to a path.
-   * 
+   *
    * @param x  the x-coordinate.
    * @param y  the y-coordinate.
    */
@@ -269,13 +269,13 @@ public final class GeneralPath implements Shape, Cloneable
   }
 
   /**
-   * Appends the segments of a Shape to the path. If <code>connect</code> is 
+   * Appends the segments of a Shape to the path. If <code>connect</code> is
    * true, the new path segments are connected to the existing one with a line.
    * The winding rule of the Shape is ignored.
-   * 
+   *
    * @param s  the shape (<code>null</code> not permitted).
    * @param connect  whether to connect the new shape to the existing path.
-   * 
+   *
    * @throws NullPointerException if <code>s</code> is <code>null</code>.
    */
   public void append(Shape s, boolean connect)
@@ -306,42 +306,42 @@ public final class GeneralPath implements Shape, Cloneable
     float[] f = new float[6];
     while (! iter.isDone())
       {
-	switch (iter.currentSegment(f))
-	  {
-	  case PathIterator.SEG_MOVETO:
-	    if (! connect || (index == 0))
-	      {
-		moveTo(f[0], f[1]);
-		break;
-	      }
-	    if ((index >= 1) && (types[index - 1] == PathIterator.SEG_CLOSE)
-	        && (f[0] == xpoints[index - 1])
-	        && (f[1] == ypoints[index - 1]))
-	      break;
-
-	  // Fall through.
-	  case PathIterator.SEG_LINETO:
-	    lineTo(f[0], f[1]);
-	    break;
-	  case PathIterator.SEG_QUADTO:
-	    quadTo(f[0], f[1], f[2], f[3]);
-	    break;
-	  case PathIterator.SEG_CUBICTO:
-	    curveTo(f[0], f[1], f[2], f[3], f[4], f[5]);
-	    break;
-	  case PathIterator.SEG_CLOSE:
-	    closePath();
-	    break;
-	  }
-
-	connect = false;
-	iter.next();
+        switch (iter.currentSegment(f))
+          {
+          case PathIterator.SEG_MOVETO:
+            if (! connect || (index == 0))
+              {
+                moveTo(f[0], f[1]);
+                break;
+              }
+            if ((index >= 1) && (types[index - 1] == PathIterator.SEG_CLOSE)
+                && (f[0] == xpoints[index - 1])
+                && (f[1] == ypoints[index - 1]))
+              break;
+
+          // Fall through.
+          case PathIterator.SEG_LINETO:
+            lineTo(f[0], f[1]);
+            break;
+          case PathIterator.SEG_QUADTO:
+            quadTo(f[0], f[1], f[2], f[3]);
+            break;
+          case PathIterator.SEG_CUBICTO:
+            curveTo(f[0], f[1], f[2], f[3], f[4], f[5]);
+            break;
+          case PathIterator.SEG_CLOSE:
+            closePath();
+            break;
+          }
+
+        connect = false;
+        iter.next();
       }
   }
 
   /**
    * Returns the path&#x2019;s current winding rule.
-   * 
+   *
    * @return {@link #WIND_EVEN_ODD} or {@link #WIND_NON_ZERO}.
    */
   public int getWindingRule()
@@ -350,11 +350,11 @@ public final class GeneralPath implements Shape, Cloneable
   }
 
   /**
-   * Sets the path&#x2019;s winding rule, which controls which areas are 
-   * considered &#x2019;inside&#x2019; or &#x2019;outside&#x2019; the path 
-   * on drawing. Valid rules are WIND_EVEN_ODD for an even-odd winding rule, 
+   * Sets the path&#x2019;s winding rule, which controls which areas are
+   * considered &#x2019;inside&#x2019; or &#x2019;outside&#x2019; the path
+   * on drawing. Valid rules are WIND_EVEN_ODD for an even-odd winding rule,
    * or WIND_NON_ZERO for a non-zero winding rule.
-   * 
+   *
    * @param rule  the rule ({@link #WIND_EVEN_ODD} or {@link #WIND_NON_ZERO}).
    */
   public void setWindingRule(int rule)
@@ -366,7 +366,7 @@ public final class GeneralPath implements Shape, Cloneable
 
   /**
    * Returns the current appending point of the path.
-   * 
+   *
    * @return The point.
    */
   public Point2D getCurrentPoint()
@@ -387,7 +387,7 @@ public final class GeneralPath implements Shape, Cloneable
 
   /**
    * Applies a transform to the path.
-   * 
+   *
    * @param xform  the transform (<code>null</code> not permitted).
    */
   public void transform(AffineTransform xform)
@@ -398,10 +398,10 @@ public final class GeneralPath implements Shape, Cloneable
     xform.getMatrix(m);
     for (int i = 0; i < index; i++)
       {
-	nx = m[0] * xpoints[i] + m[2] * ypoints[i] + m[4];
-	ny = m[1] * xpoints[i] + m[3] * ypoints[i] + m[5];
-	xpoints[i] = (float) nx;
-	ypoints[i] = (float) ny;
+        nx = m[0] * xpoints[i] + m[2] * ypoints[i] + m[4];
+        ny = m[1] * xpoints[i] + m[3] * ypoints[i] + m[5];
+        xpoints[i] = (float) nx;
+        ypoints[i] = (float) ny;
       }
   }
 
@@ -437,18 +437,18 @@ public final class GeneralPath implements Shape, Cloneable
 
     if (index > 0)
       {
-	x1 = x2 = xpoints[0];
-	y1 = y2 = ypoints[0];
+        x1 = x2 = xpoints[0];
+        y1 = y2 = ypoints[0];
       }
     else
       x1 = x2 = y1 = y2 = 0.0f;
 
     for (int i = 0; i < index; i++)
       {
-	x1 = Math.min(xpoints[i], x1);
-	y1 = Math.min(ypoints[i], y1);
-	x2 = Math.max(xpoints[i], x2);
-	y2 = Math.max(ypoints[i], y2);
+        x1 = Math.min(xpoints[i], x1);
+        y1 = Math.min(ypoints[i], y1);
+        x2 = Math.max(xpoints[i], x2);
+        y2 = Math.max(ypoints[i], y2);
       }
     return (new Rectangle2D.Float(x1, y1, x2 - x1, y2 - y1));
   }
@@ -563,11 +563,11 @@ public final class GeneralPath implements Shape, Cloneable
     /**
      * The number of coordinate values for each segment type.
      */
-    private static final int[] NUM_COORDS = { 
-                                            /* 0: SEG_MOVETO */ 1, 
-                                            /* 1: SEG_LINETO */ 1, 
-                                            /* 2: SEG_QUADTO */ 2, 
-                                            /* 3: SEG_CUBICTO */ 3, 
+    private static final int[] NUM_COORDS = {
+                                            /* 0: SEG_MOVETO */ 1,
+                                            /* 1: SEG_LINETO */ 1,
+                                            /* 2: SEG_QUADTO */ 2,
+                                            /* 3: SEG_CUBICTO */ 3,
                                             /* 4: SEG_CLOSE */ 0};
 
     /**
@@ -630,9 +630,9 @@ public final class GeneralPath implements Shape, Cloneable
        */
       seg = path.types[pos];
       if (seg == SEG_CLOSE)
-	pos++;
+        pos++;
       else
-	pos += NUM_COORDS[seg];
+        pos += NUM_COORDS[seg];
     }
 
     /**
@@ -647,17 +647,17 @@ public final class GeneralPath implements Shape, Cloneable
       numCoords = NUM_COORDS[seg];
       if (numCoords > 0)
         {
-	  for (int i = 0; i < numCoords; i++)
-	    {
-	      coords[i << 1] = path.xpoints[pos + i];
-	      coords[(i << 1) + 1] = path.ypoints[pos + i];
-	    }
-
-	  if (transform != null)
-	    transform.transform( /* src */
-	    coords, /* srcOffset */
-	    0, /* dest */ coords, /* destOffset */
-	    0, /* numPoints */ numCoords);
+          for (int i = 0; i < numCoords; i++)
+            {
+              coords[i << 1] = path.xpoints[pos + i];
+              coords[(i << 1) + 1] = path.ypoints[pos + i];
+            }
+
+          if (transform != null)
+            transform.transform( /* src */
+            coords, /* srcOffset */
+            0, /* dest */ coords, /* destOffset */
+            0, /* numPoints */ numCoords);
         }
       return seg;
     }
@@ -674,16 +674,16 @@ public final class GeneralPath implements Shape, Cloneable
       numCoords = NUM_COORDS[seg];
       if (numCoords > 0)
         {
-	  for (int i = 0; i < numCoords; i++)
-	    {
-	      coords[i << 1] = (double) path.xpoints[pos + i];
-	      coords[(i << 1) + 1] = (double) path.ypoints[pos + i];
-	    }
-	  if (transform != null)
-	    transform.transform( /* src */
-	    coords, /* srcOffset */
-	    0, /* dest */ coords, /* destOffset */
-	    0, /* numPoints */ numCoords);
+          for (int i = 0; i < numCoords; i++)
+            {
+              coords[i << 1] = (double) path.xpoints[pos + i];
+              coords[(i << 1) + 1] = (double) path.ypoints[pos + i];
+            }
+          if (transform != null)
+            transform.transform( /* src */
+            coords, /* srcOffset */
+            0, /* dest */ coords, /* destOffset */
+            0, /* numPoints */ numCoords);
         }
       return seg;
     }
@@ -710,7 +710,7 @@ public final class GeneralPath implements Shape, Cloneable
   }
 
   /**
-   * Creates a new shape of the same run-time type with the same contents 
+   * Creates a new shape of the same run-time type with the same contents
    * as this one.
    *
    * @return the clone
@@ -728,7 +728,7 @@ public final class GeneralPath implements Shape, Cloneable
   /**
    * Helper method - ensure the size of the data arrays,
    * otherwise, reallocate new ones twice the size
-   * 
+   *
    * @param size  the minimum array size.
    */
   private void ensureSize(int size)
@@ -749,7 +749,7 @@ public final class GeneralPath implements Shape, Cloneable
   }
 
   /**
-   * Helper method - Get the total number of intersections from (x,y) along 
+   * Helper method - Get the total number of intersections from (x,y) along
    * a given axis, within a given distance.
    */
   private int getAxisIntersections(double x, double y, boolean useYaxis,
@@ -763,21 +763,21 @@ public final class GeneralPath implements Shape, Cloneable
    */
   private int getWindingNumber(double x, double y)
   {
-    /* Evaluate the crossings from x,y to infinity on the y axis (arbitrary 
-       choice). Note that we don't actually use Double.INFINITY, since that's 
+    /* Evaluate the crossings from x,y to infinity on the y axis (arbitrary
+       choice). Note that we don't actually use Double.INFINITY, since that's
        slower, and may cause problems. */
     return (evaluateCrossings(x, y, true, true, BIG_VALUE));
   }
 
   /**
-   * Helper method - evaluates the number of intersections on an axis from 
+   * Helper method - evaluates the number of intersections on an axis from
    * the point (x,y) to the point (x,y+distance) or (x+distance,y).
    * @param x x coordinate.
    * @param y y coordinate.
-   * @param neg True if opposite-directed intersections should cancel, 
+   * @param neg True if opposite-directed intersections should cancel,
    * false to sum all intersections.
    * @param useYaxis Use the Y axis, false uses the X axis.
-   * @param distance Interval from (x,y) on the selected axis to find 
+   * @param distance Interval from (x,y) on the selected axis to find
    * intersections.
    */
   private int evaluateCrossings(double x, double y, boolean neg,
@@ -808,186 +808,185 @@ public final class GeneralPath implements Shape, Cloneable
       return (0);
     if (useYaxis)
       {
-	float[] swap1;
-	swap1 = ypoints;
-	ypoints = xpoints;
-	xpoints = swap1;
-	double swap2;
-	swap2 = y;
-	y = x;
-	x = swap2;
+        float[] swap1;
+        swap1 = ypoints;
+        ypoints = xpoints;
+        xpoints = swap1;
+        double swap2;
+        swap2 = y;
+        y = x;
+        x = swap2;
       }
 
     /* Get a value which is hopefully small but not insignificant relative
      the path. */
     epsilon = ypoints[0] * 1E-7;
 
-    if(epsilon == 0) 
+    if(epsilon == 0)
       epsilon = 1E-7;
 
     pos = 0;
     while (pos < index)
       {
-	switch (types[pos])
-	  {
-	  case PathIterator.SEG_MOVETO:
-	    if (pathStarted) // close old path
-	      {
-		x0 = cx;
-		y0 = cy;
-		x1 = firstx;
-		y1 = firsty;
-
-		if (y0 == 0.0)
-		  y0 -= epsilon;
-		if (y1 == 0.0)
-		  y1 -= epsilon;
-		if (Line2D.linesIntersect(x0, y0, x1, y1, 
-					  epsilon, 0.0, distance, 0.0))
-		  windingNumber += (y1 < y0) ? 1 : negative;
-
-		cx = firstx;
-		cy = firsty;
-	      }
-	    cx = firstx = xpoints[pos] - (float) x;
-	    cy = firsty = ypoints[pos++] - (float) y;
-	    pathStarted = true;
-	    break;
-	  case PathIterator.SEG_CLOSE:
-	    x0 = cx;
-	    y0 = cy;
-	    x1 = firstx;
-	    y1 = firsty;
-
-	    if (y0 == 0.0)
-	      y0 -= epsilon;
-	    if (y1 == 0.0)
-	      y1 -= epsilon;
-	    if (Line2D.linesIntersect(x0, y0, x1, y1, 
-				      epsilon, 0.0, distance, 0.0))
-	      windingNumber += (y1 < y0) ? 1 : negative;
-
-	    cx = firstx;
-	    cy = firsty;
-	    pos++;
-	    pathStarted = false;
-	    break;
-	  case PathIterator.SEG_LINETO:
-	    x0 = cx;
-	    y0 = cy;
-	    x1 = xpoints[pos] - (float) x;
-	    y1 = ypoints[pos++] - (float) y;
-
-	    if (y0 == 0.0)
-	      y0 -= epsilon;
-	    if (y1 == 0.0)
-	      y1 -= epsilon;
-	    if (Line2D.linesIntersect(x0, y0, x1, y1, 
-				      epsilon, 0.0, distance, 0.0))
-	      windingNumber += (y1 < y0) ? 1 : negative;
-
-	    cx = xpoints[pos - 1] - (float) x;
-	    cy = ypoints[pos - 1] - (float) y;
-	    break;
-	  case PathIterator.SEG_QUADTO:
-	    x0 = cx;
-	    y0 = cy;
-	    x1 = xpoints[pos] - x;
-	    y1 = ypoints[pos++] - y;
-	    x2 = xpoints[pos] - x;
-	    y2 = ypoints[pos++] - y;
-
-	    /* check if curve may intersect X+ axis. */
-	    if ((x0 > 0.0 || x1 > 0.0 || x2 > 0.0)
-	        && (y0 * y1 <= 0 || y1 * y2 <= 0))
-	      {
-		if (y0 == 0.0)
-		  y0 -= epsilon;
-		if (y2 == 0.0)
-		  y2 -= epsilon;
-
-		r[0] = y0;
-		r[1] = 2 * (y1 - y0);
-		r[2] = (y2 - 2 * y1 + y0);
-
-		/* degenerate roots (=tangent points) do not
-		   contribute to the winding number. */
-		if ((nRoots = QuadCurve2D.solveQuadratic(r)) == 2)
-		  for (int i = 0; i < nRoots; i++)
-		    {
-		      float t = (float) r[i];
-		      if (t > 0.0f && t < 1.0f)
-		        {
-			  double crossing = t * t * (x2 - 2 * x1 + x0)
-			                    + 2 * t * (x1 - x0) + x0;
-			  if (crossing >= 0.0 && crossing <= distance)
-			    windingNumber += (2 * t * (y2 - 2 * y1 + y0)
-			                   + 2 * (y1 - y0) < 0) ? 1 : negative;
-		        }
-		    }
-	      }
-
-	    cx = xpoints[pos - 1] - (float) x;
-	    cy = ypoints[pos - 1] - (float) y;
-	    break;
-	  case PathIterator.SEG_CUBICTO:
-	    x0 = cx;
-	    y0 = cy;
-	    x1 = xpoints[pos] - x;
-	    y1 = ypoints[pos++] - y;
-	    x2 = xpoints[pos] - x;
-	    y2 = ypoints[pos++] - y;
-	    x3 = xpoints[pos] - x;
-	    y3 = ypoints[pos++] - y;
-
-	    /* check if curve may intersect X+ axis. */
-	    if ((x0 > 0.0 || x1 > 0.0 || x2 > 0.0 || x3 > 0.0)
-	        && (y0 * y1 <= 0 || y1 * y2 <= 0 || y2 * y3 <= 0))
-	      {
-		if (y0 == 0.0)
-		  y0 -= epsilon;
-		if (y3 == 0.0)
-		  y3 -= epsilon;
-
-		r[0] = y0;
-		r[1] = 3 * (y1 - y0);
-		r[2] = 3 * (y2 + y0 - 2 * y1);
-		r[3] = y3 - 3 * y2 + 3 * y1 - y0;
-
-		if ((nRoots = CubicCurve2D.solveCubic(r)) != 0)
-		  for (int i = 0; i < nRoots; i++)
-		    {
-		      float t = (float) r[i];
-		      if (t > 0.0 && t < 1.0)
-		        {
-			  double crossing = -(t * t * t) * (x0 - 3 * x1
-			                    + 3 * x2 - x3)
-			                    + 3 * t * t * (x0 - 2 * x1 + x2)
-			                    + 3 * t * (x1 - x0) + x0;
-			  if (crossing >= 0 && crossing <= distance)
-			    windingNumber += (3 * t * t * (y3 + 3 * y1
-			                     - 3 * y2 - y0)
-			                     + 6 * t * (y0 - 2 * y1 + y2)
-			                   + 3 * (y1 - y0) < 0) ? 1 : negative;
-		        }
-		    }
-	      }
-
-	    cx = xpoints[pos - 1] - (float) x;
-	    cy = ypoints[pos - 1] - (float) y;
-	    break;
-	  }
+        switch (types[pos])
+          {
+          case PathIterator.SEG_MOVETO:
+            if (pathStarted) // close old path
+              {
+                x0 = cx;
+                y0 = cy;
+                x1 = firstx;
+                y1 = firsty;
+
+                if (y0 == 0.0)
+                  y0 -= epsilon;
+                if (y1 == 0.0)
+                  y1 -= epsilon;
+                if (Line2D.linesIntersect(x0, y0, x1, y1,
+                                          epsilon, 0.0, distance, 0.0))
+                  windingNumber += (y1 < y0) ? 1 : negative;
+
+                cx = firstx;
+                cy = firsty;
+              }
+            cx = firstx = xpoints[pos] - (float) x;
+            cy = firsty = ypoints[pos++] - (float) y;
+            pathStarted = true;
+            break;
+          case PathIterator.SEG_CLOSE:
+            x0 = cx;
+            y0 = cy;
+            x1 = firstx;
+            y1 = firsty;
+
+            if (y0 == 0.0)
+              y0 -= epsilon;
+            if (y1 == 0.0)
+              y1 -= epsilon;
+            if (Line2D.linesIntersect(x0, y0, x1, y1,
+                                      epsilon, 0.0, distance, 0.0))
+              windingNumber += (y1 < y0) ? 1 : negative;
+
+            cx = firstx;
+            cy = firsty;
+            pos++;
+            pathStarted = false;
+            break;
+          case PathIterator.SEG_LINETO:
+            x0 = cx;
+            y0 = cy;
+            x1 = xpoints[pos] - (float) x;
+            y1 = ypoints[pos++] - (float) y;
+
+            if (y0 == 0.0)
+              y0 -= epsilon;
+            if (y1 == 0.0)
+              y1 -= epsilon;
+            if (Line2D.linesIntersect(x0, y0, x1, y1,
+                                      epsilon, 0.0, distance, 0.0))
+              windingNumber += (y1 < y0) ? 1 : negative;
+
+            cx = xpoints[pos - 1] - (float) x;
+            cy = ypoints[pos - 1] - (float) y;
+            break;
+          case PathIterator.SEG_QUADTO:
+            x0 = cx;
+            y0 = cy;
+            x1 = xpoints[pos] - x;
+            y1 = ypoints[pos++] - y;
+            x2 = xpoints[pos] - x;
+            y2 = ypoints[pos++] - y;
+
+            /* check if curve may intersect X+ axis. */
+            if ((x0 > 0.0 || x1 > 0.0 || x2 > 0.0)
+                && (y0 * y1 <= 0 || y1 * y2 <= 0))
+              {
+                if (y0 == 0.0)
+                  y0 -= epsilon;
+                if (y2 == 0.0)
+                  y2 -= epsilon;
+
+                r[0] = y0;
+                r[1] = 2 * (y1 - y0);
+                r[2] = (y2 - 2 * y1 + y0);
+
+                /* degenerate roots (=tangent points) do not
+                   contribute to the winding number. */
+                if ((nRoots = QuadCurve2D.solveQuadratic(r)) == 2)
+                  for (int i = 0; i < nRoots; i++)
+                    {
+                      float t = (float) r[i];
+                      if (t > 0.0f && t < 1.0f)
+                        {
+                          double crossing = t * t * (x2 - 2 * x1 + x0)
+                                            + 2 * t * (x1 - x0) + x0;
+                          if (crossing >= 0.0 && crossing <= distance)
+                            windingNumber += (2 * t * (y2 - 2 * y1 + y0)
+                                           + 2 * (y1 - y0) < 0) ? 1 : negative;
+                        }
+                    }
+              }
+
+            cx = xpoints[pos - 1] - (float) x;
+            cy = ypoints[pos - 1] - (float) y;
+            break;
+          case PathIterator.SEG_CUBICTO:
+            x0 = cx;
+            y0 = cy;
+            x1 = xpoints[pos] - x;
+            y1 = ypoints[pos++] - y;
+            x2 = xpoints[pos] - x;
+            y2 = ypoints[pos++] - y;
+            x3 = xpoints[pos] - x;
+            y3 = ypoints[pos++] - y;
+
+            /* check if curve may intersect X+ axis. */
+            if ((x0 > 0.0 || x1 > 0.0 || x2 > 0.0 || x3 > 0.0)
+                && (y0 * y1 <= 0 || y1 * y2 <= 0 || y2 * y3 <= 0))
+              {
+                if (y0 == 0.0)
+                  y0 -= epsilon;
+                if (y3 == 0.0)
+                  y3 -= epsilon;
+
+                r[0] = y0;
+                r[1] = 3 * (y1 - y0);
+                r[2] = 3 * (y2 + y0 - 2 * y1);
+                r[3] = y3 - 3 * y2 + 3 * y1 - y0;
+
+                if ((nRoots = CubicCurve2D.solveCubic(r)) != 0)
+                  for (int i = 0; i < nRoots; i++)
+                    {
+                      float t = (float) r[i];
+                      if (t > 0.0 && t < 1.0)
+                        {
+                          double crossing = -(t * t * t) * (x0 - 3 * x1
+                                            + 3 * x2 - x3)
+                                            + 3 * t * t * (x0 - 2 * x1 + x2)
+                                            + 3 * t * (x1 - x0) + x0;
+                          if (crossing >= 0 && crossing <= distance)
+                            windingNumber += (3 * t * t * (y3 + 3 * y1
+                                             - 3 * y2 - y0)
+                                             + 6 * t * (y0 - 2 * y1 + y2)
+                                           + 3 * (y1 - y0) < 0) ? 1 : negative;
+                        }
+                    }
+              }
+
+            cx = xpoints[pos - 1] - (float) x;
+            cy = ypoints[pos - 1] - (float) y;
+            break;
+          }
       }
 
     // swap coordinates back
     if (useYaxis)
       {
-	float[] swap;
-	swap = ypoints;
-	ypoints = xpoints;
-	xpoints = swap;
+        float[] swap;
+        swap = ypoints;
+        ypoints = xpoints;
+        xpoints = swap;
       }
     return (windingNumber);
   }
 } // class GeneralPath
-
diff --git a/libjava/classpath/java/awt/geom/Line2D.java b/libjava/classpath/java/awt/geom/Line2D.java
index e15e7cf..c92aab0 100644
--- a/libjava/classpath/java/awt/geom/Line2D.java
+++ b/libjava/classpath/java/awt/geom/Line2D.java
@@ -238,55 +238,55 @@ public abstract class Line2D implements Shape, Cloneable
   /**
    * Computes twice the (signed) area of the triangle defined by the three
    * points.  This method is used for intersection testing.
-   * 
+   *
    * @param x1  the x-coordinate of the first point.
    * @param y1  the y-coordinate of the first point.
    * @param x2  the x-coordinate of the second point.
    * @param y2  the y-coordinate of the second point.
    * @param x3  the x-coordinate of the third point.
    * @param y3  the y-coordinate of the third point.
-   * 
+   *
    * @return Twice the area.
    */
   private static double area2(double x1, double y1,
                              double x2, double y2,
-                             double x3, double y3) 
+                             double x3, double y3)
   {
-    return (x2 - x1) * (y3 - y1) - (x3 - x1) * (y2 - y1);    
+    return (x2 - x1) * (y3 - y1) - (x3 - x1) * (y2 - y1);
   }
 
   /**
    * Returns <code>true</code> if (x3, y3) lies between (x1, y1) and (x2, y2),
-   * and false otherwise,  This test assumes that the three points are 
+   * and false otherwise,  This test assumes that the three points are
    * collinear, and is used for intersection testing.
-   * 
+   *
    * @param x1  the x-coordinate of the first point.
    * @param y1  the y-coordinate of the first point.
    * @param x2  the x-coordinate of the second point.
    * @param y2  the y-coordinate of the second point.
    * @param x3  the x-coordinate of the third point.
    * @param y3  the y-coordinate of the third point.
-   * 
+   *
    * @return A boolean.
    */
-  private static boolean between(double x1, double y1, 
-                                double x2, double y2, 
-                                double x3, double y3) 
+  private static boolean between(double x1, double y1,
+                                double x2, double y2,
+                                double x3, double y3)
   {
     if (x1 != x2) {
-      return (x1 <= x3 && x3 <= x2) || (x1 >= x3 && x3 >= x2);   
+      return (x1 <= x3 && x3 <= x2) || (x1 >= x3 && x3 >= x2);
     }
     else {
-      return (y1 <= y3 && y3 <= y2) || (y1 >= y3 && y3 >= y2);   
+      return (y1 <= y3 && y3 <= y2) || (y1 >= y3 && y3 >= y2);
     }
   }
 
   /**
-   * Test if the line segment (x1,y1)-&gt;(x2,y2) intersects the line segment 
+   * Test if the line segment (x1,y1)-&gt;(x2,y2) intersects the line segment
    * (x3,y3)-&gt;(x4,y4).
    *
    * @param x1 the first x coordinate of the first segment
-   * @param y1 the first y coordinate of the first segment 
+   * @param y1 the first y coordinate of the first segment
    * @param x2 the second x coordinate of the first segment
    * @param y2 the second y coordinate of the first segment
    * @param x3 the first x coordinate of the second segment
@@ -301,21 +301,21 @@ public abstract class Line2D implements Shape, Cloneable
                                       double x4, double y4)
   {
     double a1, a2, a3, a4;
-  
+
     // deal with special cases
-    if ((a1 = area2(x1, y1, x2, y2, x3, y3)) == 0.0) 
+    if ((a1 = area2(x1, y1, x2, y2, x3, y3)) == 0.0)
     {
       // check if p3 is between p1 and p2 OR
       // p4 is collinear also AND either between p1 and p2 OR at opposite ends
-      if (between(x1, y1, x2, y2, x3, y3)) 
+      if (between(x1, y1, x2, y2, x3, y3))
       {
         return true;
       }
-      else 
+      else
       {
-        if (area2(x1, y1, x2, y2, x4, y4) == 0.0) 
+        if (area2(x1, y1, x2, y2, x4, y4) == 0.0)
         {
-          return between(x3, y3, x4, y4, x1, y1) 
+          return between(x3, y3, x4, y4, x1, y1)
                  || between (x3, y3, x4, y4, x2, y2);
         }
         else {
@@ -323,13 +323,13 @@ public abstract class Line2D implements Shape, Cloneable
         }
       }
     }
-    else if ((a2 = area2(x1, y1, x2, y2, x4, y4)) == 0.0) 
+    else if ((a2 = area2(x1, y1, x2, y2, x4, y4)) == 0.0)
     {
       // check if p4 is between p1 and p2 (we already know p3 is not
       // collinear)
       return between(x1, y1, x2, y2, x4, y4);
     }
-  
+
     if ((a3 = area2(x3, y3, x4, y4, x1, y1)) == 0.0) {
       // check if p1 is between p3 and p4 OR
       // p2 is collinear also AND either between p1 and p2 OR at opposite ends
@@ -338,7 +338,7 @@ public abstract class Line2D implements Shape, Cloneable
       }
       else {
         if (area2(x3, y3, x4, y4, x2, y2) == 0.0) {
-          return between(x1, y1, x2, y2, x3, y3) 
+          return between(x1, y1, x2, y2, x3, y3)
                  || between (x1, y1, x2, y2, x4, y4);
         }
         else {
@@ -353,7 +353,7 @@ public abstract class Line2D implements Shape, Cloneable
     }
     else {  // test for regular intersection
       return ((a1 > 0.0) ^ (a2 > 0.0)) && ((a3 > 0.0) ^ (a4 > 0.0));
-    } 
+    }
   }
 
   /**
diff --git a/libjava/classpath/java/awt/geom/QuadCurve2D.java b/libjava/classpath/java/awt/geom/QuadCurve2D.java
index d247c79..62c829d 100644
--- a/libjava/classpath/java/awt/geom/QuadCurve2D.java
+++ b/libjava/classpath/java/awt/geom/QuadCurve2D.java
@@ -496,14 +496,14 @@ public abstract class QuadCurve2D implements Shape, Cloneable
 
     if (left != null)
       {
-	left[leftOff] = x1;
-	left[leftOff + 1] = y1;
+        left[leftOff] = x1;
+        left[leftOff + 1] = y1;
       }
 
     if (right != null)
       {
-	right[rightOff + 4] = x2;
-	right[rightOff + 5] = y2;
+        right[rightOff + 4] = x2;
+        right[rightOff + 5] = y2;
       }
 
     x1 = (x1 + xc) / 2;
@@ -515,18 +515,18 @@ public abstract class QuadCurve2D implements Shape, Cloneable
 
     if (left != null)
       {
-	left[leftOff + 2] = x1;
-	left[leftOff + 3] = y1;
-	left[leftOff + 4] = xc;
-	left[leftOff + 5] = yc;
+        left[leftOff + 2] = x1;
+        left[leftOff + 3] = y1;
+        left[leftOff + 4] = xc;
+        left[leftOff + 5] = yc;
       }
 
     if (right != null)
       {
-	right[rightOff] = xc;
-	right[rightOff + 1] = yc;
-	right[rightOff + 2] = x2;
-	right[rightOff + 3] = y2;
+        right[rightOff] = xc;
+        right[rightOff + 1] = yc;
+        right[rightOff + 2] = x2;
+        right[rightOff + 3] = y2;
       }
   }
 
@@ -643,11 +643,11 @@ public abstract class QuadCurve2D implements Shape, Cloneable
     // for linear functions.
     if (a == 0)
       {
-	if (b == 0)
-	  return -1;
+        if (b == 0)
+          return -1;
 
-	res[0] = -c / b;
-	return 1;
+        res[0] = -c / b;
+        return 1;
       }
 
     disc = b * b - 4 * a * c;
@@ -657,32 +657,32 @@ public abstract class QuadCurve2D implements Shape, Cloneable
 
     if (disc == 0)
       {
-	// The GNU Scientific Library returns two identical results here.
-	// We just return one.
-	res[0] = -0.5 * b / a;
-	return 1;
+        // The GNU Scientific Library returns two identical results here.
+        // We just return one.
+        res[0] = -0.5 * b / a;
+        return 1;
       }
 
     // disc > 0
     if (b == 0)
       {
-	double r;
+        double r;
 
-	r = Math.abs(0.5 * Math.sqrt(disc) / a);
-	res[0] = -r;
-	res[1] = r;
+        r = Math.abs(0.5 * Math.sqrt(disc) / a);
+        res[0] = -r;
+        res[1] = r;
       }
     else
       {
-	double sgnb;
-	double temp;
+        double sgnb;
+        double temp;
 
-	sgnb = (b > 0 ? 1 : -1);
-	temp = -0.5 * (b + sgnb * Math.sqrt(disc));
+        sgnb = (b > 0 ? 1 : -1);
+        temp = -0.5 * (b + sgnb * Math.sqrt(disc));
 
-	// The GNU Scientific Library sorts the result here. We don't.
-	res[0] = temp / a;
-	res[1] = c / temp;
+        // The GNU Scientific Library sorts the result here. We don't.
+        res[0] = temp / a;
+        res[1] = c / temp;
       }
     return 2;
   }
@@ -750,7 +750,7 @@ public abstract class QuadCurve2D implements Shape, Cloneable
   }
 
   /**
-   * Determines whether any part of a Rectangle2D is inside the area bounded 
+   * Determines whether any part of a Rectangle2D is inside the area bounded
    * by the curve and the straight line connecting its end points.
    * @see #intersects(double, double, double, double)
    */
@@ -790,7 +790,7 @@ public abstract class QuadCurve2D implements Shape, Cloneable
   }
 
   /**
-   * Determines whether a Rectangle2D is entirely inside the area that is 
+   * Determines whether a Rectangle2D is entirely inside the area that is
    * bounded by the curve and the straight line connecting its end points.
    * @see #contains(double, double, double, double)
    */
@@ -818,73 +818,73 @@ public abstract class QuadCurve2D implements Shape, Cloneable
   {
     return new PathIterator()
       {
-	/** Current coordinate. */
-	private int current = 0;
-
-	public int getWindingRule()
-	{
-	  return WIND_NON_ZERO;
-	}
-
-	public boolean isDone()
-	{
-	  return current >= 2;
-	}
-
-	public void next()
-	{
-	  current++;
-	}
-
-	public int currentSegment(float[] coords)
-	{
-	  int result;
-	  switch (current)
-	    {
-	    case 0:
-	      coords[0] = (float) getX1();
-	      coords[1] = (float) getY1();
-	      result = SEG_MOVETO;
-	      break;
-	    case 1:
-	      coords[0] = (float) getCtrlX();
-	      coords[1] = (float) getCtrlY();
-	      coords[2] = (float) getX2();
-	      coords[3] = (float) getY2();
-	      result = SEG_QUADTO;
-	      break;
-	    default:
-	      throw new NoSuchElementException("quad iterator out of bounds");
-	    }
-	  if (at != null)
-	    at.transform(coords, 0, coords, 0, 2);
-	  return result;
-	}
-
-	public int currentSegment(double[] coords)
-	{
-	  int result;
-	  switch (current)
-	    {
-	    case 0:
-	      coords[0] = getX1();
-	      coords[1] = getY1();
-	      result = SEG_MOVETO;
-	      break;
-	    case 1:
-	      coords[0] = getCtrlX();
-	      coords[1] = getCtrlY();
-	      coords[2] = getX2();
-	      coords[3] = getY2();
-	      result = SEG_QUADTO;
-	      break;
-	    default:
-	      throw new NoSuchElementException("quad iterator out of bounds");
-	    }
-	  if (at != null)
-	    at.transform(coords, 0, coords, 0, 2);
-	  return result;
-	}
+        /** Current coordinate. */
+        private int current = 0;
+
+        public int getWindingRule()
+        {
+          return WIND_NON_ZERO;
+        }
+
+        public boolean isDone()
+        {
+          return current >= 2;
+        }
+
+        public void next()
+        {
+          current++;
+        }
+
+        public int currentSegment(float[] coords)
+        {
+          int result;
+          switch (current)
+            {
+            case 0:
+              coords[0] = (float) getX1();
+              coords[1] = (float) getY1();
+              result = SEG_MOVETO;
+              break;
+            case 1:
+              coords[0] = (float) getCtrlX();
+              coords[1] = (float) getCtrlY();
+              coords[2] = (float) getX2();
+              coords[3] = (float) getY2();
+              result = SEG_QUADTO;
+              break;
+            default:
+              throw new NoSuchElementException("quad iterator out of bounds");
+            }
+          if (at != null)
+            at.transform(coords, 0, coords, 0, 2);
+          return result;
+        }
+
+        public int currentSegment(double[] coords)
+        {
+          int result;
+          switch (current)
+            {
+            case 0:
+              coords[0] = getX1();
+              coords[1] = getY1();
+              result = SEG_MOVETO;
+              break;
+            case 1:
+              coords[0] = getCtrlX();
+              coords[1] = getCtrlY();
+              coords[2] = getX2();
+              coords[3] = getY2();
+              result = SEG_QUADTO;
+              break;
+            default:
+              throw new NoSuchElementException("quad iterator out of bounds");
+            }
+          if (at != null)
+            at.transform(coords, 0, coords, 0, 2);
+          return result;
+        }
       };
   }
 
@@ -902,11 +902,11 @@ public abstract class QuadCurve2D implements Shape, Cloneable
   {
     try
       {
-	return super.clone();
+        return super.clone();
       }
     catch (CloneNotSupportedException e)
       {
-	throw (Error) new InternalError().initCause(e); // Impossible
+        throw (Error) new InternalError().initCause(e); // Impossible
       }
   }
 
@@ -940,34 +940,34 @@ public abstract class QuadCurve2D implements Shape, Cloneable
 
     if (useYaxis)
       {
-	a0 = getY1() - y;
-	a1 = getCtrlY() - y;
-	a2 = getY2() - y;
-	b0 = getX1() - x;
-	b1 = getCtrlX() - x;
-	b2 = getX2() - x;
+        a0 = getY1() - y;
+        a1 = getCtrlY() - y;
+        a2 = getY2() - y;
+        b0 = getX1() - x;
+        b1 = getCtrlX() - x;
+        b2 = getX2() - x;
       }
     else
       {
-	a0 = getX1() - x;
-	a1 = getCtrlX() - x;
-	a2 = getX2() - x;
-	b0 = getY1() - y;
-	b1 = getCtrlY() - y;
-	b2 = getY2() - y;
+        a0 = getX1() - x;
+        a1 = getCtrlX() - x;
+        a2 = getX2() - x;
+        b0 = getY1() - y;
+        b1 = getCtrlY() - y;
+        b2 = getY2() - y;
       }
 
-    /* If the axis intersects a start/endpoint, shift it up by some small 
+    /* If the axis intersects a start/endpoint, shift it up by some small
        amount to guarantee the line is 'inside'
        If this is not done,bad behaviour may result for points on that axis. */
     if (a0 == 0.0 || a2 == 0.0)
       {
-	double small = getFlatness() * EPSILON;
-	if (a0 == 0.0)
-	  a0 -= small;
+        double small = getFlatness() * EPSILON;
+        if (a0 == 0.0)
+          a0 -= small;
 
-	if (a2 == 0.0)
-	  a2 -= small;
+        if (a2 == 0.0)
+          a2 -= small;
       }
 
     r[0] = a0;
@@ -977,26 +977,26 @@ public abstract class QuadCurve2D implements Shape, Cloneable
     nRoots = solveQuadratic(r);
     for (int i = 0; i < nRoots; i++)
       {
-	double t = r[i];
-	if (t >= 0.0 && t <= 1.0)
-	  {
-	    double crossing = t * t * (b2 - 2 * b1 + b0) + 2 * t * (b1 - b0)
-	                      + b0;
-	    /* single root is always doubly degenerate in quads */
-	    if (crossing > 0 && crossing < distance)
-	      nCrossings += (nRoots == 1) ? 2 : 1;
-	  }
+        double t = r[i];
+        if (t >= 0.0 && t <= 1.0)
+          {
+            double crossing = t * t * (b2 - 2 * b1 + b0) + 2 * t * (b1 - b0)
+                              + b0;
+            /* single root is always doubly degenerate in quads */
+            if (crossing > 0 && crossing < distance)
+              nCrossings += (nRoots == 1) ? 2 : 1;
+          }
       }
 
     if (useYaxis)
       {
-	if (Line2D.linesIntersect(b0, a0, b2, a2, EPSILON, 0.0, distance, 0.0))
-	  nCrossings++;
+        if (Line2D.linesIntersect(b0, a0, b2, a2, EPSILON, 0.0, distance, 0.0))
+          nCrossings++;
       }
     else
       {
-	if (Line2D.linesIntersect(a0, b0, a2, b2, 0.0, EPSILON, 0.0, distance))
-	  nCrossings++;
+        if (Line2D.linesIntersect(a0, b0, a2, b2, 0.0, EPSILON, 0.0, distance))
+          nCrossings++;
       }
 
     return (nCrossings);
diff --git a/libjava/classpath/java/awt/geom/RectangularShape.java b/libjava/classpath/java/awt/geom/RectangularShape.java
index 3ee1615..68bc451 100644
--- a/libjava/classpath/java/awt/geom/RectangularShape.java
+++ b/libjava/classpath/java/awt/geom/RectangularShape.java
@@ -228,15 +228,15 @@ public abstract class RectangularShape implements Shape, Cloneable
   {
     if (x1 > x2)
       {
-	double t = x2;
-	x2 = x1;
-	x1 = t;
+        double t = x2;
+        x2 = x1;
+        x1 = t;
       }
     if (y1 > y2)
       {
-	double t = y2;
-	y2 = y1;
-	y1 = t;
+        double t = y2;
+        y2 = y1;
+        y1 = t;
       }
     setFrame(x1, y1, x2 - x1, y2 - y1);
   }
diff --git a/libjava/classpath/java/awt/geom/RoundRectangle2D.java b/libjava/classpath/java/awt/geom/RoundRectangle2D.java
index ac4d89f..19a7b42 100644
--- a/libjava/classpath/java/awt/geom/RoundRectangle2D.java
+++ b/libjava/classpath/java/awt/geom/RoundRectangle2D.java
@@ -45,29 +45,29 @@ package java.awt.geom;
  */
 public abstract class RoundRectangle2D extends RectangularShape
 {
-  /** 
+  /**
    * Return the arc height of this round rectangle.  The arc height and width
    * control the roundness of the corners of the rectangle.
-   * 
+   *
    * @return The arc height.
-   * 
+   *
    * @see #getArcWidth()
    */
   public abstract double getArcHeight();
 
-  /** 
+  /**
    * Return the arc width of this round rectangle.  The arc width and height
    * control the roundness of the corners of the rectangle.
-   * 
+   *
    * @return The arc width.
-   * 
+   *
    * @see #getArcHeight()
    */
   public abstract double getArcWidth();
 
-  /** 
+  /**
    * Set the values of this round rectangle.
-   * 
+   *
    * @param x The x coordinate
    * @param y The y coordinate
    * @param w The width
@@ -78,7 +78,7 @@ public abstract class RoundRectangle2D extends RectangularShape
   public abstract void setRoundRect(double x, double y, double w, double h,
                                     double arcWidth, double arcHeight);
 
-  /** 
+  /**
    * Create a RoundRectangle2D.  This is protected because this class
    * is abstract and cannot be instantiated.
    */
@@ -86,7 +86,7 @@ public abstract class RoundRectangle2D extends RectangularShape
   {
   }
 
-  /** 
+  /**
    * Return true if this object contains the specified point.
    * @param x The x coordinate
    * @param y The y coordinate
@@ -123,7 +123,7 @@ public abstract class RoundRectangle2D extends RectangularShape
     return dx * dx + dy * dy <= 1.0;
   }
 
-  /** 
+  /**
    * Return true if this object contains the specified rectangle
    * @param x The x coordinate
    * @param y The y coordinate
@@ -138,32 +138,32 @@ public abstract class RoundRectangle2D extends RectangularShape
            && contains(x + w, y));
   }
 
-  /** 
+  /**
    * Return a new path iterator which iterates over this rectangle.
-   * 
+   *
    * @param at An affine transform to apply to the object
    */
-  public PathIterator getPathIterator(final AffineTransform at) 
+  public PathIterator getPathIterator(final AffineTransform at)
   {
     double arcW = Math.min(getArcWidth(), getWidth());
     double arcH = Math.min(getArcHeight(), getHeight());
-    
+
     // check for special cases...
     if (arcW <= 0 || arcH <= 0)
       {
-        Rectangle2D r = new Rectangle2D.Double(getX(), getY(), getWidth(), 
+        Rectangle2D r = new Rectangle2D.Double(getX(), getY(), getWidth(),
                 getHeight());
         return r.getPathIterator(at);
       }
-    else if (arcW >= getWidth() && arcH >= getHeight()) 
+    else if (arcW >= getWidth() && arcH >= getHeight())
       {
-        Ellipse2D e = new Ellipse2D.Double(getX(), getY(), getWidth(), 
+        Ellipse2D e = new Ellipse2D.Double(getX(), getY(), getWidth(),
                 getHeight());
         return e.getPathIterator(at);
       }
-    
+
     // otherwise return the standard case...
-    return new PathIterator() 
+    return new PathIterator()
       {
         double x = getX();
         double y = getY();
@@ -175,7 +175,7 @@ public abstract class RoundRectangle2D extends RectangularShape
         PathIterator corner;
         int step = -1;
 
-        public int currentSegment(double[] coords) 
+        public int currentSegment(double[] coords)
         {
           if (corner != null) // steps 1, 3, 5 and 7
           {
@@ -184,7 +184,7 @@ public abstract class RoundRectangle2D extends RectangularShape
               r = SEG_LINETO;
             return r;
           }
-          if (step == -1) 
+          if (step == -1)
           {
             // move to the start position
             coords[0] = x + w - arcW / 2;
@@ -196,7 +196,7 @@ public abstract class RoundRectangle2D extends RectangularShape
             coords[0] = x + arcW / 2;
             coords[1] = y;
           }
-          else if (step == 2) 
+          else if (step == 2)
           {
             // left line
             coords[0] = x;
@@ -227,7 +227,7 @@ public abstract class RoundRectangle2D extends RectangularShape
               r = SEG_LINETO;
             return r;
           }
-          if (step == -1) 
+          if (step == -1)
           {
             // move to the start position
             coords[0] = (float) (x + w - arcW / 2);
@@ -239,7 +239,7 @@ public abstract class RoundRectangle2D extends RectangularShape
             coords[0] = (float) (x + arcW / 2);
             coords[1] = (float) y;
           }
-          else if (step == 2) 
+          else if (step == 2)
           {
             // left line
             coords[0] = (float) x;
@@ -270,7 +270,7 @@ public abstract class RoundRectangle2D extends RectangularShape
         return step >= 8;
       }
 
-      public void next() 
+      public void next()
       {
         if (corner != null)
           {
@@ -284,7 +284,7 @@ public abstract class RoundRectangle2D extends RectangularShape
         else
           {
             step++;
-            if (step == 1) 
+            if (step == 1)
               {
                 // create top left corner
                 arc.setArc(x, y, arcW, arcH, 90, 90, Arc2D.OPEN);
@@ -292,21 +292,21 @@ public abstract class RoundRectangle2D extends RectangularShape
               }
             else if (step == 3)
               {
-                // create bottom left corner  
-                arc.setArc(x, y + h - arcH, arcW, arcH, 180, 90, 
+                // create bottom left corner
+                arc.setArc(x, y + h - arcH, arcW, arcH, 180, 90,
                         Arc2D.OPEN);
                 corner = arc.getPathIterator(at);
               }
             else if (step == 5)
               {
-                // create bottom right corner  
+                // create bottom right corner
                 arc.setArc(x + w - arcW, y + h - arcH, arcW, arcH, 270, 90,
                         Arc2D.OPEN);
                 corner = arc.getPathIterator(at);
               }
             else if (step == 7)
               {
-                // create top right corner  
+                // create top right corner
                 arc.setArc(x + w - arcW, y, arcW, arcH, 0, 90, Arc2D.OPEN);
                 corner = arc.getPathIterator(at);
               }
@@ -315,7 +315,7 @@ public abstract class RoundRectangle2D extends RectangularShape
     };
   }
 
-  /** 
+  /**
    * Return true if the given rectangle intersects this shape.
    * @param x The x coordinate
    * @param y The y coordinate
@@ -329,7 +329,7 @@ public abstract class RoundRectangle2D extends RectangularShape
            || contains(x + w, y));
   }
 
-  /** 
+  /**
    * Set the boundary of this round rectangle.
    * @param x The x coordinate
    * @param y The y coordinate
@@ -342,7 +342,7 @@ public abstract class RoundRectangle2D extends RectangularShape
     setRoundRect(x, y, w, h, getArcWidth(), getArcHeight());
   }
 
-  /** 
+  /**
    * Set the values of this round rectangle to be the same as those
    * of the argument.
    * @param rr The round rectangle to copy
@@ -353,9 +353,9 @@ public abstract class RoundRectangle2D extends RectangularShape
                  rr.getArcWidth(), rr.getArcHeight());
   }
 
-  /** 
+  /**
    * A subclass of RoundRectangle which keeps its parameters as
-   * doubles.  
+   * doubles.
    */
   public static class Double extends RoundRectangle2D
   {
@@ -377,14 +377,14 @@ public abstract class RoundRectangle2D extends RectangularShape
     /** The height of this object.  */
     public double height;
 
-    /** 
-     * Construct a new instance, with all parameters set to 0.  
+    /**
+     * Construct a new instance, with all parameters set to 0.
      */
     public Double()
     {
     }
 
-    /** 
+    /**
      * Construct a new instance with the given arguments.
      * @param x The x coordinate
      * @param y The y coordinate
@@ -456,9 +456,9 @@ public abstract class RoundRectangle2D extends RectangularShape
     }
   } // class Double
 
-  /** 
+  /**
    * A subclass of RoundRectangle which keeps its parameters as
-   * floats.  
+   * floats.
    */
   public static class Float extends RoundRectangle2D
   {
@@ -480,14 +480,14 @@ public abstract class RoundRectangle2D extends RectangularShape
     /** The height of this object.  */
     public float height;
 
-    /** 
-     * Construct a new instance, with all parameters set to 0.  
+    /**
+     * Construct a new instance, with all parameters set to 0.
      */
     public Float()
     {
     }
 
-    /** 
+    /**
      * Construct a new instance with the given arguments.
      * @param x The x coordinate
      * @param y The y coordinate
@@ -549,14 +549,14 @@ public abstract class RoundRectangle2D extends RectangularShape
 
     /**
      * Sets the dimensions for this rounded rectangle.
-     * 
+     *
      * @param x  the x-coordinate of the top left corner.
      * @param y  the y-coordinate of the top left corner.
      * @param w  the width of the rectangle.
      * @param h  the height of the rectangle.
      * @param arcWidth  the arc width.
      * @param arcHeight  the arc height.
-     * 
+     *
      * @see #setRoundRect(double, double, double, double, double, double)
      */
     public void setRoundRect(float x, float y, float w, float h,
diff --git a/libjava/classpath/java/awt/im/InputContext.java b/libjava/classpath/java/awt/im/InputContext.java
index c2e09b6..8667272 100644
--- a/libjava/classpath/java/awt/im/InputContext.java
+++ b/libjava/classpath/java/awt/im/InputContext.java
@@ -146,7 +146,7 @@ public class InputContext
   private InputMethod im;
 
   /** Map of locales to the most recently selected input method. */
-  private final HashMap<Locale,InputMethod> recent 
+  private final HashMap<Locale,InputMethod> recent
     = new HashMap<Locale,InputMethod>();
 
   /** The list of acceptable character subsets. */
@@ -427,7 +427,7 @@ public class InputContext
    * method. Clients have to compare the result against known input method
    * control object types. If no input methods are available or the current
    * input method does not provide an input method control object, then null
-   * is returned. 
+   * is returned.
    *
    * @return the control object, or null
    */
diff --git a/libjava/classpath/java/awt/im/spi/InputMethodDescriptor.java b/libjava/classpath/java/awt/im/spi/InputMethodDescriptor.java
index d234e5c..ce40ab2 100644
--- a/libjava/classpath/java/awt/im/spi/InputMethodDescriptor.java
+++ b/libjava/classpath/java/awt/im/spi/InputMethodDescriptor.java
@@ -111,4 +111,3 @@ public interface InputMethodDescriptor
   InputMethod createInputMethod() throws Exception;
 
 } // interface InputMethodDescriptor
-
diff --git a/libjava/classpath/java/awt/image/AffineTransformOp.java b/libjava/classpath/java/awt/image/AffineTransformOp.java
index df9db7d..460804f9 100644
--- a/libjava/classpath/java/awt/image/AffineTransformOp.java
+++ b/libjava/classpath/java/awt/image/AffineTransformOp.java
@@ -1,4 +1,4 @@
-/* AffineTransformOp.java --  This class performs affine 
+/* AffineTransformOp.java --  This class performs affine
    transformation between two images or rasters in 2 dimensions.
    Copyright (C) 2004, 2006 Free Software Foundation
 
@@ -51,19 +51,19 @@ import java.util.Arrays;
 /**
  * AffineTransformOp performs matrix-based transformations (translations,
  * scales, flips, rotations, and shears).
- * 
+ *
  * If interpolation is required, nearest neighbour, bilinear, and bicubic
  * methods are available.
  *
- * @author Olga Rodimina (rodimina@redhat.com) 
+ * @author Olga Rodimina (rodimina@redhat.com)
  * @author Francis Kung (fkung@redhat.com)
  */
 public class AffineTransformOp implements BufferedImageOp, RasterOp
 {
     public static final int TYPE_NEAREST_NEIGHBOR = 1;
-    
+
     public static final int TYPE_BILINEAR = 2;
-    
+
     /**
      * @since 1.5.0
      */
@@ -71,13 +71,13 @@ public class AffineTransformOp implements BufferedImageOp, RasterOp
 
     private AffineTransform transform;
     private RenderingHints hints;
-    
+
     /**
      * Construct AffineTransformOp with the given xform and interpolationType.
      * Interpolation type can be TYPE_BILINEAR, TYPE_BICUBIC or
      * TYPE_NEAREST_NEIGHBOR.
      *
-     * @param xform AffineTransform that will applied to the source image 
+     * @param xform AffineTransform that will applied to the source image
      * @param interpolationType type of interpolation used
      * @throws ImagingOpException if the transform matrix is noninvertible
      */
@@ -90,12 +90,12 @@ public class AffineTransformOp implements BufferedImageOp, RasterOp
       switch (interpolationType)
       {
       case TYPE_BILINEAR:
-        hints = new RenderingHints (RenderingHints.KEY_INTERPOLATION, 
+        hints = new RenderingHints (RenderingHints.KEY_INTERPOLATION,
                                     RenderingHints.VALUE_INTERPOLATION_BILINEAR);
         break;
       case TYPE_BICUBIC:
-        hints = new RenderingHints (RenderingHints.KEY_INTERPOLATION, 
-				    RenderingHints.VALUE_INTERPOLATION_BICUBIC);
+        hints = new RenderingHints (RenderingHints.KEY_INTERPOLATION,
+                                    RenderingHints.VALUE_INTERPOLATION_BICUBIC);
         break;
       default:
         hints = new RenderingHints (RenderingHints.KEY_INTERPOLATION,
@@ -105,7 +105,7 @@ public class AffineTransformOp implements BufferedImageOp, RasterOp
 
     /**
      * Construct AffineTransformOp with the given xform and rendering hints.
-     * 
+     *
      * @param xform AffineTransform that will applied to the source image
      * @param hints rendering hints that will be used during transformation
      * @throws ImagingOpException if the transform matrix is noninvertible
@@ -119,9 +119,9 @@ public class AffineTransformOp implements BufferedImageOp, RasterOp
     }
 
     /**
-     * Creates a new BufferedImage with the size equal to that of the 
-     * transformed image and the correct number of bands. The newly created 
-     * image is created with the specified ColorModel. 
+     * Creates a new BufferedImage with the size equal to that of the
+     * transformed image and the correct number of bands. The newly created
+     * image is created with the specified ColorModel.
      * If a ColorModel is not specified, an appropriate ColorModel is used.
      *
      * @param src the source image.
@@ -149,7 +149,7 @@ public class AffineTransformOp implements BufferedImageOp, RasterOp
     }
 
     /**
-     * Creates a new WritableRaster with the size equal to the transformed 
+     * Creates a new WritableRaster with the size equal to the transformed
      * source raster and correct number of bands .
      *
      * @param src the source raster.
@@ -159,18 +159,18 @@ public class AffineTransformOp implements BufferedImageOp, RasterOp
     public WritableRaster createCompatibleDestRaster (Raster src)
     {
       Rectangle2D rect = getBounds2D(src);
-      
-      if (rect.getWidth() == 0 || rect.getHeight() == 0) 
+
+      if (rect.getWidth() == 0 || rect.getHeight() == 0)
         throw new RasterFormatException("width or height is 0");
 
-      return src.createCompatibleWritableRaster((int) rect.getWidth(), 
+      return src.createCompatibleWritableRaster((int) rect.getWidth(),
                                                 (int) rect.getHeight());
     }
 
     /**
      * Transforms source image using transform specified at the constructor.
      * The resulting transformed image is stored in the destination image if one
-     * is provided; otherwise a new BufferedImage is created and returned. 
+     * is provided; otherwise a new BufferedImage is created and returned.
      *
      * @param src source image
      * @param dst destination image
@@ -218,7 +218,7 @@ public class AffineTransformOp implements BufferedImageOp, RasterOp
       if (src.getNumBands() != dst.getNumBands())
         throw new IllegalArgumentException("src and dst must have same number"
                                            + " of bands");
-      
+
       // Optimization for rasters that can be represented in the RGB colormodel:
       // wrap the rasters in images, and let Cairo do the transformation
       if (ColorModel.getRGBdefault().isCompatibleSampleModel(src.getSampleModel())
@@ -232,7 +232,7 @@ public class AffineTransformOp implements BufferedImageOp, RasterOp
                                                  src2, false, null);
           BufferedImage iDst = new BufferedImage(ColorModel.getRGBdefault(), dst,
                                                  false, null);
-  
+
           return filter(iSrc, iDst).getRaster();
         }
 
@@ -256,7 +256,7 @@ public class AffineTransformOp implements BufferedImageOp, RasterOp
       // Use an inverse transform to map each point in the destination to
       // a point in the source.  Note that, while all points in the destination
       // matrix are integers, this is not necessarily true for points in the
-      // source (hence why interpolation is required) 
+      // source (hence why interpolation is required)
       try
         {
           AffineTransform inverseTx = transform.createInverse();
@@ -271,18 +271,18 @@ public class AffineTransformOp implements BufferedImageOp, RasterOp
       // Different interpolation methods...
       if (hints.containsValue(RenderingHints.VALUE_INTERPOLATION_NEAREST_NEIGHBOR))
         filterNearest(src, dst, dstPts, srcPts);
-      
+
       else if (hints.containsValue(RenderingHints.VALUE_INTERPOLATION_BILINEAR))
         filterBilinear(src, dst, dstPts, srcPts);
-    
+
       else          // bicubic
         filterBicubic(src, dst, dstPts, srcPts);
 
-      return dst;  
+      return dst;
     }
 
     /**
-     * Transforms source image using transform specified at the constructor and 
+     * Transforms source image using transform specified at the constructor and
      * returns bounds of the transformed image.
      *
      * @param src image to be transformed
@@ -292,7 +292,7 @@ public class AffineTransformOp implements BufferedImageOp, RasterOp
     {
       return getBounds2D (src.getRaster());
     }
-   
+
     /**
      * Returns bounds of the transformed raster.
      *
@@ -313,18 +313,18 @@ public class AffineTransformOp implements BufferedImageOp, RasterOp
     {
       if (hints.containsValue(RenderingHints.VALUE_INTERPOLATION_BILINEAR))
         return TYPE_BILINEAR;
-      
+
       else if (hints.containsValue(RenderingHints.VALUE_INTERPOLATION_BICUBIC))
         return TYPE_BICUBIC;
-      
-      else 
+
+      else
         return TYPE_NEAREST_NEIGHBOR;
     }
 
-    /** 
-     * Returns location of the transformed source point. The resulting point 
+    /**
+     * Returns location of the transformed source point. The resulting point
      * is stored in the dstPt if one is specified.
-     *  
+     *
      * @param srcPt point to be transformed
      * @param dstPt destination point
      * @return the location of the transformed source point.
@@ -354,10 +354,10 @@ public class AffineTransformOp implements BufferedImageOp, RasterOp
     {
       return transform;
     }
-    
+
     /**
      * Perform nearest-neighbour filtering
-     * 
+     *
      * @param src the source raster
      * @param dst the destination raster
      * @param dpts array of points on the destination raster
@@ -367,14 +367,14 @@ public class AffineTransformOp implements BufferedImageOp, RasterOp
                                double[] pts)
     {
       Rectangle srcbounds = src.getBounds();
-  
+
       // For all points on the destination raster, copy the value from the
       // corrosponding (rounded) source point
       for (int i = 0; i < dpts.length; i += 2)
         {
           int srcX = (int) Math.round(pts[i]) + src.getMinX();
           int srcY = (int) Math.round(pts[i + 1]) + src.getMinY();
-          
+
           if (srcbounds.contains(srcX, srcY))
             dst.setDataElements((int) dpts[i] + dst.getMinX(),
                                 (int) dpts[i + 1] + dst.getMinY(),
@@ -384,7 +384,7 @@ public class AffineTransformOp implements BufferedImageOp, RasterOp
 
     /**
      * Perform bilinear filtering
-     * 
+     *
      * @param src the source raster
      * @param dst the destination raster
      * @param dpts array of points on the destination raster
@@ -394,26 +394,26 @@ public class AffineTransformOp implements BufferedImageOp, RasterOp
                               double[] pts)
     {
       Rectangle srcbounds = src.getBounds();
-  
+
       Object xyarr = null;
       Object xp1arr = null;
       Object yp1arr = null;
       Object xyp1arr = null;
-      
+
       double xy;
       double xp1;
       double yp1;
       double xyp1;
 
       double[] result = new double[src.getNumBands()];
-      
+
       // For all points in the destination raster, use bilinear interpolation
       // to find the value from the corrosponding source points
       for (int i = 0; i < dpts.length; i += 2)
         {
           int srcX = (int) Math.round(pts[i]) + src.getMinX();
           int srcY = (int) Math.round(pts[i + 1]) + src.getMinY();
-          
+
           if (srcbounds.contains(srcX, srcY))
             {
               // Corner case at the bottom or right edge; use nearest neighbour
@@ -422,7 +422,7 @@ public class AffineTransformOp implements BufferedImageOp, RasterOp
                 dst.setDataElements((int) dpts[i] + dst.getMinX(),
                                     (int) dpts[i + 1] + dst.getMinY(),
                                     src.getDataElements(srcX, srcY, null));
-  
+
               // Standard case, apply the bilinear formula
               else
                 {
@@ -448,11 +448,11 @@ public class AffineTransformOp implements BufferedImageOp, RasterOp
                       yp1arr = src.getPixel(x, y+1, (int[])yp1arr);
                       xyp1arr = src.getPixel(x+1, y+1, (int[])xyp1arr);
                     }
-                  // using 
+                  // using
                   // array[] pixels = src.getPixels(x, y, 2, 2, pixels);
                   // instead of doing four individual src.getPixel() calls
                   // should be faster, but benchmarking shows that it's not...
-                  
+
                   // Run interpolation for each band
                   for (int j = 0; j < src.getNumBands(); j++)
                     {
@@ -472,16 +472,16 @@ public class AffineTransformOp implements BufferedImageOp, RasterOp
                           yp1 = ((int[])yp1arr)[j];
                           xyp1 = ((int[])xyp1arr)[j];
                         }
-                      
-                      // If all four samples are identical, there's no need to 
+
+                      // If all four samples are identical, there's no need to
                       // calculate anything
                       if (xy == xp1 && xy == yp1 && xy == xyp1)
                         result[j] = xy;
-                      
+
                       // Run bilinear interpolation formula
                       else
-                        result[j] = (xy * (1-xdiff) + xp1 * xdiff) 
-                                      * (1-ydiff) 
+                        result[j] = (xy * (1-xdiff) + xp1 * xdiff)
+                                      * (1-ydiff)
                                     + (yp1 * (1-xdiff) + xyp1 * xdiff)
                                       * ydiff;
                     }
@@ -497,7 +497,7 @@ public class AffineTransformOp implements BufferedImageOp, RasterOp
     /**
      * Perform bicubic filtering
      * based on http://local.wasp.uwa.edu.au/~pbourke/colour/bicubic/
-     * 
+     *
      * @param src the source raster
      * @param dst the destination raster
      * @param dpts array of points on the destination raster
@@ -522,7 +522,7 @@ public class AffineTransformOp implements BufferedImageOp, RasterOp
               double dx = pts[i] + src.getMinX() - x;
               double dy = pts[i + 1] + src.getMinY() - y;
               Arrays.fill(result, 0);
-  
+
               for (int m = - 1; m < 3; m++)
                 for (int n = - 1; n < 3; n++)
                   {
@@ -597,7 +597,7 @@ public class AffineTransformOp implements BufferedImageOp, RasterOp
                           result[j] += ((int[])pixels)[j] * r1 * r2;
                       }
                   }
-  
+
               // Put it all together
               dst.setPixel((int)dpts[i] + dst.getMinX(),
                            (int)dpts[i+1] + dst.getMinY(),
diff --git a/libjava/classpath/java/awt/image/AreaAveragingScaleFilter.java b/libjava/classpath/java/awt/image/AreaAveragingScaleFilter.java
index 491a2f5..db2335f1 100644
--- a/libjava/classpath/java/awt/image/AreaAveragingScaleFilter.java
+++ b/libjava/classpath/java/awt/image/AreaAveragingScaleFilter.java
@@ -42,11 +42,11 @@ package java.awt.image;
  * This filter should produce images which do not have image artifacts
  * like broken lines which were originally unbroken.  The cost is of
  * course speed.  Using bi-linear interpolation here against 4 pixel
- * points should give the desired results although Sun does not 
+ * points should give the desired results although Sun does not
  * specify what the exact algorithm should be.
  * <br>
  *
- * @author C. Brian Jones (cbj@gnu.org) 
+ * @author C. Brian Jones (cbj@gnu.org)
  */
 public class AreaAveragingScaleFilter extends ReplicateScaleFilter
 {
@@ -54,7 +54,7 @@ public class AreaAveragingScaleFilter extends ReplicateScaleFilter
    * Construct an instance of <code>AreaAveragingScaleFilter</code> which
    * should be used in conjunction with a <code>FilteredImageSource</code>
    * object.
-   * 
+   *
    * @param width the width of the destination image
    * @param height the height of the destination image
    */
@@ -66,14 +66,14 @@ public class AreaAveragingScaleFilter extends ReplicateScaleFilter
    * The <code>ImageProducer</code> should call this method with a
    * bit mask of hints from any of <code>RANDOMPIXELORDER</code>,
    * <code>TOPDOWNLEFTRIGHT</code>, <code>COMPLETESCANLINES</code>,
-   * <code>SINGLEPASS</code>, <code>SINGLEFRAME</code> from the 
+   * <code>SINGLEPASS</code>, <code>SINGLEFRAME</code> from the
    * <code>ImageConsumer</code> interface.
    * <br>
-   * FIXME - more than likely Sun's implementation desires 
+   * FIXME - more than likely Sun's implementation desires
    * <code>TOPDOWNLEFTRIGHT</code> order and this method is overloaded here
    * in order to assure that mask is part of the hints added to
    * the consumer.
-   * 
+   *
    * @param flags a bit mask of hints
    * @see ImageConsumer
    */
@@ -86,7 +86,7 @@ public class AreaAveragingScaleFilter extends ReplicateScaleFilter
   /**
    * This function delivers a rectangle of pixels where any
    * pixel(m,n) is stored in the array as a <code>byte</code> at
-   * index (n * scansize + m + offset).  
+   * index (n * scansize + m + offset).
    *
    * @param x the x coordinate of the rectangle
    * @param y the y coordinate of the rectangle
@@ -97,8 +97,8 @@ public class AreaAveragingScaleFilter extends ReplicateScaleFilter
    * @param offset the index of the first pixels in the <code>pixels</code> array
    * @param scansize the width to use in extracting pixels from the <code>pixels</code> array
    */
-  public void setPixels(int x, int y, int w, int h, 
-			ColorModel model, byte[] pixels, int offset, int scansize)
+  public void setPixels(int x, int y, int w, int h,
+                        ColorModel model, byte[] pixels, int offset, int scansize)
   {
     double rx = ((double) srcWidth) / destWidth;
     double ry = ((double) srcHeight) / destHeight;
@@ -106,19 +106,19 @@ public class AreaAveragingScaleFilter extends ReplicateScaleFilter
     int destScansize = (int) Math.round(scansize / rx);
 
     byte[] destPixels = averagePixels(x, y, w, h,
-				      model, pixels, offset, scansize,
-				      rx, ry, destScansize);
+                                      model, pixels, offset, scansize,
+                                      rx, ry, destScansize);
 
     if (consumer != null)
       consumer.setPixels((int) Math.floor(x/rx), (int) Math.floor(y/ry),
-			 (int) Math.ceil(w/rx), (int) Math.ceil(h/ry),
-			 model, destPixels, 0, destScansize);
+                         (int) Math.ceil(w/rx), (int) Math.ceil(h/ry),
+                         model, destPixels, 0, destScansize);
   }
 
   /**
    * This function delivers a rectangle of pixels where any
    * pixel(m,n) is stored in the array as an <code>int</code> at
-   * index (n * scansize + m + offset).  
+   * index (n * scansize + m + offset).
    *
    * @param x the x coordinate of the rectangle
    * @param y the y coordinate of the rectangle
@@ -129,8 +129,8 @@ public class AreaAveragingScaleFilter extends ReplicateScaleFilter
    * @param offset the index of the first pixels in the <code>pixels</code> array
    * @param scansize the width to use in extracting pixels from the <code>pixels</code> array
    */
-  public void setPixels(int x, int y, int w, int h, 
-			ColorModel model, int[] pixels, int offset, int scansize)
+  public void setPixels(int x, int y, int w, int h,
+                        ColorModel model, int[] pixels, int offset, int scansize)
   {
     double rx = ((double) srcWidth) / destWidth;
     double ry = ((double) srcHeight) / destHeight;
@@ -138,17 +138,17 @@ public class AreaAveragingScaleFilter extends ReplicateScaleFilter
     int destScansize = (int) Math.round(scansize / rx);
 
     int[] destPixels = averagePixels(x, y, w, h,
-				     model, pixels, offset, scansize,
-				     rx, ry, destScansize);
+                                     model, pixels, offset, scansize,
+                                     rx, ry, destScansize);
 
     if (consumer != null)
       consumer.setPixels((int) Math.floor(x/rx), (int) Math.floor(y/ry),
-			 (int) Math.ceil(w/rx), (int) Math.ceil(h/ry),
-			 model, destPixels, 0, destScansize);
+                         (int) Math.ceil(w/rx), (int) Math.ceil(h/ry),
+                         model, destPixels, 0, destScansize);
   }
 
   /**
-   * This is a really terrible implementation, 
+   * This is a really terrible implementation,
    * since it uses the nearest-neighbor method. This filter is rarely used though.
    *
    * @param srcx, srcy - Source rectangle upper-left corner
@@ -161,9 +161,9 @@ public class AreaAveragingScaleFilter extends ReplicateScaleFilter
    * @param destScansize - Destination array scanline size.
    */
   private byte[] averagePixels(int srcx, int srcy, int srcw, int srch,
-			       ColorModel model, byte[] srcPixels,
-			       int srcOffset, int srcScansize,
-			       double rx, double ry, int destScansize)
+                               ColorModel model, byte[] srcPixels,
+                               int srcOffset, int srcScansize,
+                               double rx, double ry, int destScansize)
   {
     int destW = (int) Math.ceil(srcw/rx);
     int destH = (int) Math.ceil(srch/ry);
@@ -175,40 +175,40 @@ public class AreaAveragingScaleFilter extends ReplicateScaleFilter
 
     for(int x = 0; x < destW; x++)
       for(int y = 0; y < destH; y++)
-	{
-	  sx = (int) (x * rx);
-	  sy = (int) (y * ry);
-
-	  int r,g,b,a;
-	  r = g = b = a = 0;
-
-	  for(int i = 0; i < w; i++)
-	    {
-	      for(int j = 0; j < h; j++)
-		{
-		  int idx = srcx + sx + i + (srcy + sy + j)*srcScansize;
-		  r += model.getRed(srcPixels[ idx ]);
-		  g += model.getGreen(srcPixels[ idx ]);
-		  b += model.getBlue(srcPixels[ idx ]);
-		  a += model.getAlpha(srcPixels[ idx ]);
-		}
-	    }
-	    
-	  r = r / (w * h);
-	  g = g / (w * h);
-	  b = b / (w * h);
-	  a = a / (w * h);
-
-	  // Does this really work?
-	  destPixels[x + destScansize*y] = (byte)model.getDataElement
-	    (new int[]{r, g, b, a}, 0);
-	}
+        {
+          sx = (int) (x * rx);
+          sy = (int) (y * ry);
+
+          int r,g,b,a;
+          r = g = b = a = 0;
+
+          for(int i = 0; i < w; i++)
+            {
+              for(int j = 0; j < h; j++)
+                {
+                  int idx = srcx + sx + i + (srcy + sy + j)*srcScansize;
+                  r += model.getRed(srcPixels[ idx ]);
+                  g += model.getGreen(srcPixels[ idx ]);
+                  b += model.getBlue(srcPixels[ idx ]);
+                  a += model.getAlpha(srcPixels[ idx ]);
+                }
+            }
+
+          r = r / (w * h);
+          g = g / (w * h);
+          b = b / (w * h);
+          a = a / (w * h);
+
+          // Does this really work?
+          destPixels[x + destScansize*y] = (byte)model.getDataElement
+            (new int[]{r, g, b, a}, 0);
+        }
 
     return destPixels;
   }
 
   /**
-   * This is a really terrible implementation, 
+   * This is a really terrible implementation,
    * since it uses the nearest-neighbor method. This filter is rarely used though.
    *
    * @param srcx, srcy - Source rectangle upper-left corner
@@ -221,49 +221,48 @@ public class AreaAveragingScaleFilter extends ReplicateScaleFilter
    * @param destScansize - Destination array scanline size.
    */
   private int[] averagePixels(int srcx, int srcy, int srcw, int srch,
-			      ColorModel model, int[] srcPixels,
-			      int srcOffset, int srcScansize,
-			      double rx, double ry, int destScansize)
+                              ColorModel model, int[] srcPixels,
+                              int srcOffset, int srcScansize,
+                              double rx, double ry, int destScansize)
   {
     int destW = (int) Math.ceil(srcw/rx);
     int destH = (int) Math.ceil(srch/ry);
     int[] destPixels = new int[ destW * destH ];
     int sx, sy;
-    
+
     int w = (int)Math.ceil(rx);
     int h = (int)Math.ceil(ry);
-    
+
     for(int x = 0; x < destW; x++)
       for(int y = 0; y < destH; y++)
-	{
-	  sx = (int) (x * rx);
-	  sy = (int) (y * ry);
-	  
-	  int r,g,b,a;
-	  r = g = b = a = 0;
-	  
-	  for(int i = 0; i < w; i++)
-	    {
-	      for(int j = 0; j < h; j++)
-		{
-		  int idx = srcx + sx + i + (srcy + sy + j)*srcScansize;
-		  r += model.getRed(srcPixels[ idx ]);
-		  g += model.getGreen(srcPixels[ idx ]);
-		  b += model.getBlue(srcPixels[ idx ]);
-		  a += model.getAlpha(srcPixels[ idx ]);
-		}
-	    }
-	  
-	  r = r / (w * h);
-	  g = g / (w * h);
-	  b = b / (w * h);
-	  a = a / (w * h);
-
-	  destPixels[x + destScansize*y] = model.getDataElement
-	    (new int[]{r, g, b, a}, 0);
-	}
-    
+        {
+          sx = (int) (x * rx);
+          sy = (int) (y * ry);
+
+          int r,g,b,a;
+          r = g = b = a = 0;
+
+          for(int i = 0; i < w; i++)
+            {
+              for(int j = 0; j < h; j++)
+                {
+                  int idx = srcx + sx + i + (srcy + sy + j)*srcScansize;
+                  r += model.getRed(srcPixels[ idx ]);
+                  g += model.getGreen(srcPixels[ idx ]);
+                  b += model.getBlue(srcPixels[ idx ]);
+                  a += model.getAlpha(srcPixels[ idx ]);
+                }
+            }
+
+          r = r / (w * h);
+          g = g / (w * h);
+          b = b / (w * h);
+          a = a / (w * h);
+
+          destPixels[x + destScansize*y] = model.getDataElement
+            (new int[]{r, g, b, a}, 0);
+        }
+
     return destPixels;
   }
 }
-
diff --git a/libjava/classpath/java/awt/image/BandCombineOp.java b/libjava/classpath/java/awt/image/BandCombineOp.java
index d9ce16f..f3a6c57 100644
--- a/libjava/classpath/java/awt/image/BandCombineOp.java
+++ b/libjava/classpath/java/awt/image/BandCombineOp.java
@@ -44,29 +44,29 @@ import java.util.Arrays;
 
 /**
  * Filter Raster pixels by applying a matrix.
- * 
+ *
  * BandCombineOp applies a matrix to each pixel to produce new pixel values.
  * The width of the matrix must be the same or one more than the number of
  * bands in the source Raster.  If one more, the pixels in the source are
  * assumed to contain an implicit 1.0 at the end.
- * 
+ *
  * The rows of the matrix are multiplied by the pixel to produce the values
  * for the destination.  Therefore the destination Raster must contain the
  * same number of bands as the number of rows in the filter matrix.
- * 
+ *
  * This Op assumes that samples are integers; floating point sample types will
  * be rounded to their nearest integer value during filtering.
- * 
+ *
  * @author Jerry Quinn (jlquinn@optonline.net)
  */
 public class BandCombineOp implements RasterOp
 {
   private RenderingHints hints;
   private float[][] matrix;
-  
+
   /**
    * Construct a BandCombineOp.
-   * 
+   *
    * @param matrix The matrix to filter pixels with.
    * @param hints Rendering hints to apply.  Ignored.
    * @throws ArrayIndexOutOfBoundsException if the matrix is invalid
@@ -96,7 +96,7 @@ public class BandCombineOp implements RasterOp
    * by 1, i.e. added to the sum for that dest component. If dest is null, a
    * suitable Raster is created. This implementation uses
    * createCompatibleDestRaster.
-   * 
+   *
    * @param src The source Raster.
    * @param dest The destination Raster, or null.
    * @throws IllegalArgumentException if the destination raster is incompatible
@@ -122,7 +122,7 @@ public class BandCombineOp implements RasterOp
           // In case matrix rows have implicit translation
           spix[spix.length - 1] = 1;
           src.getPixel(x, y, spix);
-          
+
           // Do not re-calculate if pixel is identical to the last one
           // (ie, blocks of the same colour)
           if (!Arrays.equals(spix, spix2))
@@ -154,7 +154,7 @@ public class BandCombineOp implements RasterOp
    * Op. The number of bands in the source raster must equal the number of rows
    * in the op matrix, which must also be equal to either the number of columns
    * or (columns - 1) in the matrix.
-   * 
+   *
    * @param src The source raster.
    * @return A compatible raster.
    * @see java.awt.image.RasterOp#createCompatibleDestRaster(java.awt.image.Raster)
@@ -181,18 +181,18 @@ public class BandCombineOp implements RasterOp
   /**
    * Return corresponding destination point for source point.  Because this is
    * not a geometric operation, it simply returns a copy of the source.
-   * 
+   *
    * @param src The source point.
    * @param dst The destination point.
    * @return dst The destination point.
    * @see java.awt.image.RasterOp#getPoint2D(java.awt.geom.Point2D,
-   *java.awt.geom.Point2D) 
+   *java.awt.geom.Point2D)
    */
   public final Point2D getPoint2D(Point2D src, Point2D dst)
   {
     if (dst == null)
       return (Point2D)src.clone();
-    
+
     dst.setLocation(src);
     return dst;
   }
@@ -204,7 +204,7 @@ public class BandCombineOp implements RasterOp
   {
     return hints;
   }
-  
+
   /**
    * Return the matrix used in this operation.
    *
diff --git a/libjava/classpath/java/awt/image/BandedSampleModel.java b/libjava/classpath/java/awt/image/BandedSampleModel.java
index 94dbd8d..7df6c85 100644
--- a/libjava/classpath/java/awt/image/BandedSampleModel.java
+++ b/libjava/classpath/java/awt/image/BandedSampleModel.java
@@ -55,7 +55,7 @@ public final class BandedSampleModel extends ComponentSampleModel
   private int numberOfBits;
   private int numElems;
 
-  private static int[] createBankArray(int size) 
+  private static int[] createBankArray(int size)
   {
     int[] result = new int[size];
     for (int i = 0; i < size; i++)
@@ -65,7 +65,7 @@ public final class BandedSampleModel extends ComponentSampleModel
 
   /**
    * Creates a new <code>BandedSampleModel</code>.
-   * 
+   *
    * @param dataType  the data buffer type.
    * @param w  the width (in pixels).
    * @param h  the height (in pixels).
@@ -78,24 +78,24 @@ public final class BandedSampleModel extends ComponentSampleModel
 
   /**
    * Creates a new <code>BandedSampleModel</code>.
-   * 
+   *
    * @param dataType  the data buffer type.
    * @param w  the width (in pixels).
    * @param h  the height (in pixels).
-   * @param scanlineStride  the number of data elements from a pixel in one 
+   * @param scanlineStride  the number of data elements from a pixel in one
    *     row to the corresponding pixel in the next row.
    * @param bankIndices  the bank indices.
    * @param bandOffsets  the band offsets.
    */
   public BandedSampleModel(int dataType, int w, int h, int scanlineStride,
-			   int[] bankIndices, int[] bandOffsets)
+                           int[] bankIndices, int[] bandOffsets)
   {
     super(dataType, w, h, 1, scanlineStride, bankIndices, bandOffsets);
   }
-  
+
   /**
    * Creates a new data buffer that is compatible with this sample model.
-   * 
+   *
    * @return The new data buffer.
    */
   public DataBuffer createDataBuffer()
@@ -107,15 +107,15 @@ public final class BandedSampleModel extends ComponentSampleModel
   /**
    * Creates a new <code>SampleModel</code> that is compatible with this
    * model and has the specified width and height.
-   * 
+   *
    * @param w  the width (in pixels, must be greater than zero).
    * @param h  the height (in pixels, must be greater than zero).
-   * 
+   *
    * @return The new sample model.
-   * 
+   *
    * @throws IllegalArgumentException if <code>w</code> or <code>h</code> is
    *     not greater than zero.
-   * @throws IllegalArgumentException if <code>w * h</code> exceeds 
+   * @throws IllegalArgumentException if <code>w * h</code> exceeds
    *     <code>Integer.MAX_VALUE</code>.
    */
   public SampleModel createCompatibleSampleModel(int w, int h)
@@ -150,7 +150,7 @@ public final class BandedSampleModel extends ComponentSampleModel
         newoffsets[order[i]] = offset;
         offset += w * scanlineStride;
       }
-    
+
     return new BandedSampleModel(dataType, w, h, w, bankIndices, newoffsets);
   }
 
@@ -159,19 +159,19 @@ public final class BandedSampleModel extends ComponentSampleModel
   {
     if (bands.length > bankIndices.length)
       throw new
-	RasterFormatException("BandedSampleModel createSubsetSampleModel too"
-			      +" many bands");
+        RasterFormatException("BandedSampleModel createSubsetSampleModel too"
+                              +" many bands");
     int[] newoff = new int[bands.length];
     int[] newbanks = new int[bands.length];
     for (int i = 0; i < bands.length; i++)
       {
-	int b = bands[i];
-	newoff[i] = bandOffsets[b];
-	newbanks[i] = bankIndices[b];
+        int b = bands[i];
+        newoff[i] = bandOffsets[b];
+        newbanks[i] = bankIndices[b];
       }
 
     return new BandedSampleModel(dataType, width, height, scanlineStride,
-				 newbanks, newoff);
+                                 newbanks, newoff);
   }
 
   /**
@@ -180,15 +180,15 @@ public final class BandedSampleModel extends ComponentSampleModel
    * Extracts the pixel at x, y from data and stores samples into the array
    * obj.  If obj is null, a new array of getTransferType() is created.
    *
-   * @param x The x-coordinate of the pixel rectangle to store in 
+   * @param x The x-coordinate of the pixel rectangle to store in
    *     <code>obj</code>.
-   * @param y The y-coordinate of the pixel rectangle to store in 
+   * @param y The y-coordinate of the pixel rectangle to store in
    *     <code>obj</code>.
-   * @param obj The primitive array to store the pixels into or null to force 
+   * @param obj The primitive array to store the pixels into or null to force
    *     creation.
    * @param data The DataBuffer that is the source of the pixel data.
    * @return The primitive array containing the pixel data.
-   * @see java.awt.image.SampleModel#getDataElements(int, int, 
+   * @see java.awt.image.SampleModel#getDataElements(int, int,
    *     java.lang.Object, java.awt.image.DataBuffer)
    */
   public Object getDataElements(int x, int y, Object obj, DataBuffer data)
@@ -201,45 +201,45 @@ public final class BandedSampleModel extends ComponentSampleModel
     {
     case DataBuffer.TYPE_BYTE:
       {
-	byte[] b = (byte[]) obj;
-	if (b == null) b = new byte[numBands];
-	for (int i = 0; i < numBands; i++)
-	  b[i] = (byte)getSample(x, y, i, data);
-	return b;
+        byte[] b = (byte[]) obj;
+        if (b == null) b = new byte[numBands];
+        for (int i = 0; i < numBands; i++)
+          b[i] = (byte)getSample(x, y, i, data);
+        return b;
       }
     case DataBuffer.TYPE_SHORT:
     case DataBuffer.TYPE_USHORT:
       {
-	short[] b = (short[]) obj;
-	if (b == null) b = new short[numBands];
-	for (int i = 0; i < numBands; i++)
-	  b[i] = (short)getSample(x, y, i, data);
-	return b;
+        short[] b = (short[]) obj;
+        if (b == null) b = new short[numBands];
+        for (int i = 0; i < numBands; i++)
+          b[i] = (short)getSample(x, y, i, data);
+        return b;
       }
     case DataBuffer.TYPE_INT:
       {
-	int[] b = (int[]) obj;
-	if (b == null) b = new int[numBands];
-	for (int i = 0; i < numBands; i++)
-	  b[i] = getSample(x, y, i, data);
-	return b;
+        int[] b = (int[]) obj;
+        if (b == null) b = new int[numBands];
+        for (int i = 0; i < numBands; i++)
+          b[i] = getSample(x, y, i, data);
+        return b;
       }
     case DataBuffer.TYPE_FLOAT:
       {
-	float[] b = (float[]) obj;
-	if (b == null) b = new float[numBands];
-	for (int i = 0; i < numBands; i++)
-	  b[i] = getSampleFloat(x, y, i, data);
-	return b;
+        float[] b = (float[]) obj;
+        if (b == null) b = new float[numBands];
+        for (int i = 0; i < numBands; i++)
+          b[i] = getSampleFloat(x, y, i, data);
+        return b;
       }
     case DataBuffer.TYPE_DOUBLE:
       {
-	double[] b = (double[]) obj;
-	if (b == null) 
+        double[] b = (double[]) obj;
+        if (b == null)
           b = new double[numBands];
-	for (int i = 0; i < numBands; i++)
-	  b[i] = getSample(x, y, i, data);
-	return b;
+        for (int i = 0; i < numBands; i++)
+          b[i] = getSample(x, y, i, data);
+        return b;
       }
 
     default:
@@ -251,26 +251,26 @@ public final class BandedSampleModel extends ComponentSampleModel
   /**
    * Returns all the samples for the pixel at location <code>(x, y)</code>
    * stored in the specified data buffer.
-   * 
+   *
    * @param x  the x-coordinate.
    * @param y  the y-coordinate.
    * @param iArray  an array that will be populated with the sample values and
-   *   returned as the result.  The size of this array should be equal to the 
+   *   returned as the result.  The size of this array should be equal to the
    *   number of bands in the model.  If the array is <code>null</code>, a new
    *   array is created.
    * @param data  the data buffer (<code>null</code> not permitted).
-   * 
+   *
    * @return The samples for the specified pixel.
-   * 
+   *
    * @see #setPixel(int, int, int[], DataBuffer)
    */
   public int[] getPixel(int x, int y, int[] iArray, DataBuffer data)
   {
-    if (iArray == null) 
+    if (iArray == null)
       iArray = new int[numBands];
     for (int i = 0; i < numBands; i++)
       iArray[i] = getSample(x, y, i, data);
-	
+
     return iArray;
   }
 
@@ -296,43 +296,43 @@ public final class BandedSampleModel extends ComponentSampleModel
    * @return The primitive array containing the pixel data.
    */
   public int[] getPixels(int x, int y, int w, int h, int[] iArray,
-			 DataBuffer data)
+                         DataBuffer data)
   {
     if (x < 0 || y < 0)
       throw new ArrayIndexOutOfBoundsException(
           "x and y must not be less than 0.");
-    if (iArray == null) 
+    if (iArray == null)
       iArray = new int[w * h * numBands];
     int outOffset = 0;
     int maxX = x + w;
     int maxY = y + h;
     for (int yy = x; yy < maxY; yy++)
       {
-	for (int xx = x; xx < maxX; xx++)
-	  {
-	    for (int b = 0; b < numBands; b++)
-	      {
-		int offset = bandOffsets[b] + yy * scanlineStride + xx;
-		iArray[outOffset++] =
-		  data.getElem(bankIndices[b], offset);
-	      }
-	  }
+        for (int xx = x; xx < maxX; xx++)
+          {
+            for (int b = 0; b < numBands; b++)
+              {
+                int offset = bandOffsets[b] + yy * scanlineStride + xx;
+                iArray[outOffset++] =
+                  data.getElem(bankIndices[b], offset);
+              }
+          }
       }
-    return iArray;	
+    return iArray;
   }
 
   /**
-   * Returns a sample value for the pixel at (x, y) in the specified data 
+   * Returns a sample value for the pixel at (x, y) in the specified data
    * buffer.
-   * 
+   *
    * @param x  the x-coordinate of the pixel.
    * @param y  the y-coordinate of the pixel.
-   * @param b  the band (in the range <code>0</code> to 
+   * @param b  the band (in the range <code>0</code> to
    *     <code>getNumBands() - 1</code>).
    * @param data  the data buffer (<code>null</code> not permitted).
-   * 
+   *
    * @return The sample value.
-   * 
+   *
    * @throws NullPointerException if <code>data</code> is <code>null</code>.
    */
   public int getSample(int x, int y, int b, DataBuffer data)
@@ -340,21 +340,21 @@ public final class BandedSampleModel extends ComponentSampleModel
     int offset = bandOffsets[b] + y * scanlineStride + x;
     return data.getElem(bankIndices[b], offset);
   }
-  
+
   /**
-   * Returns a sample value for the pixel at (x, y) in the specified data 
+   * Returns a sample value for the pixel at (x, y) in the specified data
    * buffer.
-   * 
+   *
    * @param x  the x-coordinate of the pixel.
    * @param y  the y-coordinate of the pixel.
-   * @param b  the band (in the range <code>0</code> to 
+   * @param b  the band (in the range <code>0</code> to
    *     <code>getNumBands() - 1</code>).
    * @param data  the data buffer (<code>null</code> not permitted).
-   * 
+   *
    * @return The sample value.
-   * 
+   *
    * @throws NullPointerException if <code>data</code> is <code>null</code>.
-   * 
+   *
    * @see #getSample(int, int, int, DataBuffer)
    */
   public float getSampleFloat(int x, int y, int b, DataBuffer data)
@@ -362,21 +362,21 @@ public final class BandedSampleModel extends ComponentSampleModel
     int offset = bandOffsets[b] + y * scanlineStride + x;
     return data.getElemFloat(bankIndices[b], offset);
   }
-  
+
   /**
-   * Returns the sample value for the pixel at (x, y) in the specified data 
+   * Returns the sample value for the pixel at (x, y) in the specified data
    * buffer.
-   * 
+   *
    * @param x  the x-coordinate of the pixel.
    * @param y  the y-coordinate of the pixel.
-   * @param b  the band (in the range <code>0</code> to 
+   * @param b  the band (in the range <code>0</code> to
    *     <code>getNumBands() - 1</code>).
    * @param data  the data buffer (<code>null</code> not permitted).
-   * 
+   *
    * @return The sample value.
-   * 
+   *
    * @throws NullPointerException if <code>data</code> is <code>null</code>.
-   * 
+   *
    * @see #getSample(int, int, int, DataBuffer)
    */
   public double getSampleDouble(int x, int y, int b, DataBuffer data)
@@ -384,7 +384,7 @@ public final class BandedSampleModel extends ComponentSampleModel
     int offset = bandOffsets[b] + y * scanlineStride + x;
     return data.getElemDouble(bankIndices[b], offset);
   }
-  
+
   /**
    * Copy one band's samples from a region into an array.
    *
@@ -406,26 +406,26 @@ public final class BandedSampleModel extends ComponentSampleModel
    * @return The primitive array containing the pixel data.
    */
   public int[] getSamples(int x, int y, int w, int h, int b, int[] iArray,
-			  DataBuffer data)
+                          DataBuffer data)
   {
     if (x < 0 || y < 0)
       throw new ArrayIndexOutOfBoundsException(
           "x and y must not be less than 0.");
-    if (iArray == null) 
+    if (iArray == null)
       iArray = new int[w * h];
     int outOffset = 0;
     int maxX = x + w;
     int maxY = y + h;
     for (int yy = y; yy < maxY; yy++)
       {
-	for (int xx = x; xx < maxX; xx++)
-	  {
-	    int offset = bandOffsets[b] + yy * scanlineStride + xx;
-	    iArray[outOffset++] =
-	      data.getElem(bankIndices[b], offset);
-	  }
+        for (int xx = x; xx < maxX; xx++)
+          {
+            int offset = bandOffsets[b] + yy * scanlineStride + xx;
+            iArray[outOffset++] =
+              data.getElem(bankIndices[b], offset);
+          }
       }
-    return iArray;	
+    return iArray;
   }
 
   /**
@@ -443,186 +443,186 @@ public final class BandedSampleModel extends ComponentSampleModel
     int transferType = getTransferType();
     if (getTransferType() != data.getDataType())
       {
-	throw new IllegalArgumentException("transfer type ("+
-					   getTransferType()+"), "+
-					   "does not match data "+
-					   "buffer type (" +
-					   data.getDataType() +
-					   ").");
+        throw new IllegalArgumentException("transfer type ("+
+                                           getTransferType()+"), "+
+                                           "does not match data "+
+                                           "buffer type (" +
+                                           data.getDataType() +
+                                           ").");
       }
 
     int offset = y * scanlineStride + x;
-    
+
     try
       {
-	switch (transferType)
-	  {
-	  case DataBuffer.TYPE_BYTE:
-	    {
-	      DataBufferByte out = (DataBufferByte) data;
-	      byte[] in = (byte[]) obj;
-	      for (int i = 0; i < numBands; i++)
-		out.getData(bankIndices[i])[offset + bandOffsets[i]] = in[i];
-	      return;
-	    }
-	  case DataBuffer.TYPE_SHORT:
-	    {
-	      DataBufferShort out = (DataBufferShort) data;
-	      short[] in = (short[]) obj;
-	      for (int i = 0; i < numBands; i++)
-		out.getData(bankIndices[i])[offset + bandOffsets[i]] = in[i];
-	      return;
-	    }
-	  case DataBuffer.TYPE_USHORT:
-	    {
-	      DataBufferUShort out = (DataBufferUShort) data;
-	      short[] in = (short[]) obj;
-	      for (int i = 0; i < numBands; i++)
-		out.getData(bankIndices[i])[offset + bandOffsets[i]] = in[i];
-	      return;
-	    }
-	  case DataBuffer.TYPE_INT:
-	    {
-	      DataBufferInt out = (DataBufferInt) data;
-	      int[] in = (int[]) obj;
-	      for (int i = 0; i < numBands; i++)
-		out.getData(bankIndices[i])[offset + bandOffsets[i]] = in[i];
-	      return;
-	    }
-	  case DataBuffer.TYPE_FLOAT:
-	    {
-	      DataBufferFloat out = (DataBufferFloat) data;
-	      float[] in = (float[]) obj;
-	      for (int i = 0; i < numBands; i++)
-		out.getData(bankIndices[i])[offset + bandOffsets[i]] = in[i];
-	      return;
-	    }
-	  case DataBuffer.TYPE_DOUBLE:
-	    {
-	      DataBufferDouble out = (DataBufferDouble) data;
-	      double[] in = (double[]) obj;
-	      for (int i = 0; i < numBands; i++)
-		out.getData(bankIndices[i])[offset + bandOffsets[i]] = in[i];
-	      return;
-	    }
-	  default:
-	    throw new ClassCastException("Unsupported data type");
-	  }
+        switch (transferType)
+          {
+          case DataBuffer.TYPE_BYTE:
+            {
+              DataBufferByte out = (DataBufferByte) data;
+              byte[] in = (byte[]) obj;
+              for (int i = 0; i < numBands; i++)
+                out.getData(bankIndices[i])[offset + bandOffsets[i]] = in[i];
+              return;
+            }
+          case DataBuffer.TYPE_SHORT:
+            {
+              DataBufferShort out = (DataBufferShort) data;
+              short[] in = (short[]) obj;
+              for (int i = 0; i < numBands; i++)
+                out.getData(bankIndices[i])[offset + bandOffsets[i]] = in[i];
+              return;
+            }
+          case DataBuffer.TYPE_USHORT:
+            {
+              DataBufferUShort out = (DataBufferUShort) data;
+              short[] in = (short[]) obj;
+              for (int i = 0; i < numBands; i++)
+                out.getData(bankIndices[i])[offset + bandOffsets[i]] = in[i];
+              return;
+            }
+          case DataBuffer.TYPE_INT:
+            {
+              DataBufferInt out = (DataBufferInt) data;
+              int[] in = (int[]) obj;
+              for (int i = 0; i < numBands; i++)
+                out.getData(bankIndices[i])[offset + bandOffsets[i]] = in[i];
+              return;
+            }
+          case DataBuffer.TYPE_FLOAT:
+            {
+              DataBufferFloat out = (DataBufferFloat) data;
+              float[] in = (float[]) obj;
+              for (int i = 0; i < numBands; i++)
+                out.getData(bankIndices[i])[offset + bandOffsets[i]] = in[i];
+              return;
+            }
+          case DataBuffer.TYPE_DOUBLE:
+            {
+              DataBufferDouble out = (DataBufferDouble) data;
+              double[] in = (double[]) obj;
+              for (int i = 0; i < numBands; i++)
+                out.getData(bankIndices[i])[offset + bandOffsets[i]] = in[i];
+              return;
+            }
+          default:
+            throw new ClassCastException("Unsupported data type");
+          }
       }
     catch (ArrayIndexOutOfBoundsException aioobe)
       {
-	String msg = "While writing data elements" 
-      + ", x=" + x + ", y=" + y 
-      + ", width=" + width + ", height=" + height 
-      + ", scanlineStride=" + scanlineStride 
-      + ", offset=" + offset 
-      + ", data.getSize()=" + data.getSize() 
-      + ", data.getOffset()=" + data.getOffset() 
+        String msg = "While writing data elements"
+      + ", x=" + x + ", y=" + y
+      + ", width=" + width + ", height=" + height
+      + ", scanlineStride=" + scanlineStride
+      + ", offset=" + offset
+      + ", data.getSize()=" + data.getSize()
+      + ", data.getOffset()=" + data.getOffset()
       + ": " + aioobe;
-	throw new ArrayIndexOutOfBoundsException(msg);
+        throw new ArrayIndexOutOfBoundsException(msg);
       }
     }
 
   /**
    * Sets the samples for the pixel at (x, y) in the specified data buffer to
-   * the specified values. 
-   * 
+   * the specified values.
+   *
    * @param x  the x-coordinate of the pixel.
    * @param y  the y-coordinate of the pixel.
    * @param iArray  the sample values (<code>null</code> not permitted).
    * @param data  the data buffer (<code>null</code> not permitted).
-   * 
-   * @throws NullPointerException if either <code>iArray</code> or 
+   *
+   * @throws NullPointerException if either <code>iArray</code> or
    *     <code>data</code> is <code>null</code>.
    */
   public void setPixel(int x, int y, int[] iArray, DataBuffer data)
   {
     for (int b = 0; b < numBands; b++)
       data.setElem(bankIndices[b], bandOffsets[b] + y * scanlineStride + x,
-		   iArray[b]);
+                   iArray[b]);
   }
 
   /**
-   * Sets the sample values for the pixels in the region specified by 
+   * Sets the sample values for the pixels in the region specified by
    * (x, y, w, h) in the specified data buffer.  The array is
-   * ordered by pixels (that is, all the samples for the first pixel are 
+   * ordered by pixels (that is, all the samples for the first pixel are
    * grouped together, followed by all the samples for the second pixel, and so
-   * on). 
-   *  
+   * on).
+   *
    * @param x  the x-coordinate of the top-left pixel.
    * @param y  the y-coordinate of the top-left pixel.
    * @param w  the width of the region of pixels.
    * @param h  the height of the region of pixels.
    * @param iArray  the pixel sample values (<code>null</code> not permitted).
    * @param data  the data buffer (<code>null</code> not permitted).
-   * 
-   * @throws NullPointerException if either <code>iArray</code> or 
+   *
+   * @throws NullPointerException if either <code>iArray</code> or
    *     <code>data</code> is <code>null</code>.
    */
   public void setPixels(int x, int y, int w, int h, int[] iArray,
-			DataBuffer data)
+                        DataBuffer data)
   {
     int inOffset = 0;
     for (int hh = 0; hh < h; hh++)
       {
-	for (int ww = 0; ww < w; ww++)
-	  {
-	    int offset = y * scanlineStride + (x + ww);
-	    for (int b = 0; b < numBands; b++)
-	      data.setElem(bankIndices[b], bandOffsets[b] + offset,
-			   iArray[inOffset++]);
-	  }
-	y++;
+        for (int ww = 0; ww < w; ww++)
+          {
+            int offset = y * scanlineStride + (x + ww);
+            for (int b = 0; b < numBands; b++)
+              data.setElem(bankIndices[b], bandOffsets[b] + offset,
+                           iArray[inOffset++]);
+          }
+        y++;
       }
   }
 
   /**
    * Sets the sample value for band <code>b</code> of the pixel at location
    * <code>(x, y)</code> in the specified data buffer.
-   * 
+   *
    * @param x  the x-coordinate.
    * @param y  the y-coordinate.
    * @param b  the band index.
    * @param s  the sample value.
    * @param data  the data buffer (<code>null</code> not permitted).
-   * 
+   *
    * @see #getSample(int, int, int, DataBuffer)
    */
   public void setSample(int x, int y, int b, int s, DataBuffer data)
   {
     data.setElem(bankIndices[b], bandOffsets[b] + y * scanlineStride + x, s);
   }
-  
+
   /**
-   * Sets the sample value for a band for the pixel at (x, y) in the 
-   * specified data buffer. 
-   * 
+   * Sets the sample value for a band for the pixel at (x, y) in the
+   * specified data buffer.
+   *
    * @param x  the x-coordinate of the pixel.
    * @param y  the y-coordinate of the pixel.
-   * @param b  the band (in the range <code>0</code> to 
+   * @param b  the band (in the range <code>0</code> to
    *     <code>getNumBands() - 1</code>).
    * @param s  the sample value.
    * @param data  the data buffer (<code>null</code> not permitted).
-   * 
+   *
    * @throws NullPointerException if <code>data</code> is <code>null</code>.
    */
   public void setSample(int x, int y, int b, float s, DataBuffer data)
   {
-    data.setElemFloat(bankIndices[b], bandOffsets[b] + y * scanlineStride + x, 
+    data.setElemFloat(bankIndices[b], bandOffsets[b] + y * scanlineStride + x,
                       s);
   }
-  
+
   /**
-   * Sets the sample value for a band for the pixel at (x, y) in the 
-   * specified data buffer. 
-   * 
+   * Sets the sample value for a band for the pixel at (x, y) in the
+   * specified data buffer.
+   *
    * @param x  the x-coordinate of the pixel.
    * @param y  the y-coordinate of the pixel.
-   * @param b  the band (in the range <code>0</code> to 
+   * @param b  the band (in the range <code>0</code> to
    *     <code>getNumBands() - 1</code>).
    * @param s  the sample value.
    * @param data  the data buffer (<code>null</code> not permitted).
-   * 
+   *
    * @throws NullPointerException if <code>data</code> is <code>null</code>.
    */
   public void setSample(int x, int y, int b, double s, DataBuffer data)
@@ -630,25 +630,25 @@ public final class BandedSampleModel extends ComponentSampleModel
     data.setElemDouble(bankIndices[b], bandOffsets[b] + y * scanlineStride + x,
                        s);
   }
-  
+
   /**
-   * Sets the sample values for one band for the pixels in the region 
-   * specified by (x, y, w, h) in the specified data buffer. 
-   * 
+   * Sets the sample values for one band for the pixels in the region
+   * specified by (x, y, w, h) in the specified data buffer.
+   *
    * @param x  the x-coordinate of the top-left pixel.
    * @param y  the y-coordinate of the top-left pixel.
    * @param w  the width of the region of pixels.
    * @param h  the height of the region of pixels.
-   * @param b  the band (in the range <code>0</code> to 
+   * @param b  the band (in the range <code>0</code> to
    *     </code>getNumBands() - 1</code>).
    * @param iArray  the sample values (<code>null</code> not permitted).
    * @param data  the data buffer (<code>null</code> not permitted).
-   * 
-   * @throws NullPointerException if either <code>iArray</code> or 
+   *
+   * @throws NullPointerException if either <code>iArray</code> or
    *     <code>data</code> is <code>null</code>.
    */
   public void setSamples(int x, int y, int w, int h, int b, int[] iArray,
-			 DataBuffer data)
+                         DataBuffer data)
   {
     if (x < 0 || y < 0)
       throw new ArrayIndexOutOfBoundsException(
@@ -658,81 +658,81 @@ public final class BandedSampleModel extends ComponentSampleModel
     switch (getTransferType())
       {
       case DataBuffer.TYPE_BYTE:
-	{
-	  DataBufferByte out = (DataBufferByte) data;
-	  byte[] bank = out.getData(bankIndices[b]);
-	  for (int hh = 0; hh < h; hh++)
-	    {
-	      for (int ww = 0; ww < w; ww++)
-		{
-		  int offset = bandOffsets[b] + y * scanlineStride + (x + ww);
-		  bank[offset] = (byte)iArray[inOffset++];
-		}
-	      y++;
-	    }
-	  return;
-	}
+        {
+          DataBufferByte out = (DataBufferByte) data;
+          byte[] bank = out.getData(bankIndices[b]);
+          for (int hh = 0; hh < h; hh++)
+            {
+              for (int ww = 0; ww < w; ww++)
+                {
+                  int offset = bandOffsets[b] + y * scanlineStride + (x + ww);
+                  bank[offset] = (byte)iArray[inOffset++];
+                }
+              y++;
+            }
+          return;
+        }
       case DataBuffer.TYPE_SHORT:
-	{
-	  DataBufferShort out = (DataBufferShort) data;
-	  short[] bank = out.getData(bankIndices[b]);
-	  for (int hh = 0; hh < h; hh++)
-	    {
-	      for (int ww = 0; ww < w; ww++)
-		{
-		  int offset = bandOffsets[b] + y * scanlineStride + (x + ww);
-		  bank[offset] = (short)iArray[inOffset++];
-		}
-	      y++;
-	    }
-	  return;
-	}
+        {
+          DataBufferShort out = (DataBufferShort) data;
+          short[] bank = out.getData(bankIndices[b]);
+          for (int hh = 0; hh < h; hh++)
+            {
+              for (int ww = 0; ww < w; ww++)
+                {
+                  int offset = bandOffsets[b] + y * scanlineStride + (x + ww);
+                  bank[offset] = (short)iArray[inOffset++];
+                }
+              y++;
+            }
+          return;
+        }
       case DataBuffer.TYPE_USHORT:
-	{
-	  DataBufferShort out = (DataBufferShort) data;
-	  short[] bank = out.getData(bankIndices[b]);
-	  for (int hh = 0; hh < h; hh++)
-	    {
-	      for (int ww = 0; ww < w; ww++)
-		{
-		  int offset = bandOffsets[b] + y * scanlineStride + (x + ww);
-		  bank[offset] = (short)iArray[inOffset++];
-		}
-	      y++;
-	    }
-	  return;
-	}
+        {
+          DataBufferShort out = (DataBufferShort) data;
+          short[] bank = out.getData(bankIndices[b]);
+          for (int hh = 0; hh < h; hh++)
+            {
+              for (int ww = 0; ww < w; ww++)
+                {
+                  int offset = bandOffsets[b] + y * scanlineStride + (x + ww);
+                  bank[offset] = (short)iArray[inOffset++];
+                }
+              y++;
+            }
+          return;
+        }
       case DataBuffer.TYPE_INT:
-	{
-	  DataBufferInt out = (DataBufferInt) data;
-	  int[] bank = out.getData(bankIndices[b]);
-	  for (int hh = 0; hh < h; hh++)
-	    {
-	      for (int ww = 0; ww < w; ww++)
-		{
-		  int offset = bandOffsets[b] + y * scanlineStride + (x + ww);
-		  bank[offset] = iArray[inOffset++];
-		}
-	      y++;
-	    }
-	  return;
-	}
+        {
+          DataBufferInt out = (DataBufferInt) data;
+          int[] bank = out.getData(bankIndices[b]);
+          for (int hh = 0; hh < h; hh++)
+            {
+              for (int ww = 0; ww < w; ww++)
+                {
+                  int offset = bandOffsets[b] + y * scanlineStride + (x + ww);
+                  bank[offset] = iArray[inOffset++];
+                }
+              y++;
+            }
+          return;
+        }
       case DataBuffer.TYPE_FLOAT:
       case DataBuffer.TYPE_DOUBLE:
-	break;
+        break;
       default:
-	throw new ClassCastException("Unsupported data type");
+        throw new ClassCastException("Unsupported data type");
       }
 
     // Default implementation probably slower for float and double
     for (int hh = 0; hh < h; hh++)
       {
-	for (int ww = 0; ww < w; ww++)
-	  {
-	    int offset = bandOffsets[b] + y * scanlineStride + (x + ww);
-	    data.setElem(bankIndices[b], offset, iArray[inOffset++]);
-	  }
-	y++;
+        for (int ww = 0; ww < w; ww++)
+          {
+            int offset = bandOffsets[b] + y * scanlineStride + (x + ww);
+            data.setElem(bankIndices[b], offset, iArray[inOffset++]);
+          }
+        y++;
       }
   }
 
@@ -752,7 +752,7 @@ public final class BandedSampleModel extends ComponentSampleModel
       result.append(", mask[").append(i).append("]=0x").append(
           Integer.toHexString(bitMasks[i]));
     }
-    
+
     result.append("]");
     return result.toString();
   }
diff --git a/libjava/classpath/java/awt/image/BufferedImage.java b/libjava/classpath/java/awt/image/BufferedImage.java
index 260d254..094c71d 100644
--- a/libjava/classpath/java/awt/image/BufferedImage.java
+++ b/libjava/classpath/java/awt/image/BufferedImage.java
@@ -61,7 +61,7 @@ import java.util.Vector;
  * the image consists of one large tile (0,0) with the width and
  * height of the image. This tile is always considered to be checked
  * out.
- * 
+ *
  * @author Rolf W. Rasmussen (rolfwr@ii.uib.no)
  */
 public class BufferedImage extends Image
@@ -81,12 +81,12 @@ public class BufferedImage extends Image
                           TYPE_USHORT_GRAY    = 11,
                           TYPE_BYTE_BINARY    = 12,
                           TYPE_BYTE_INDEXED   = 13;
-  
+
   /**
    * Vector of TileObservers (or null)
    */
   Vector<TileObserver> tileObservers;
-  
+
   /**
    * The image's WritableRaster
    */
@@ -115,7 +115,7 @@ public class BufferedImage extends Image
   /**
    * Creates a new <code>BufferedImage</code> with the specified width, height
    * and type.  Valid <code>type</code> values are:
-   * 
+   *
    * <ul>
    *   <li>{@link #TYPE_INT_RGB}</li>
    *   <li>{@link #TYPE_INT_ARGB}</li>
@@ -131,11 +131,11 @@ public class BufferedImage extends Image
    *   <li>{@link #TYPE_BYTE_BINARY}</li>
    *   <li>{@link #TYPE_BYTE_INDEXED}</li>
    * </ul>
-   * 
+   *
    * @param width the width (must be > 0).
    * @param height the height (must be > 0).
    * @param type  the image type (see the list of valid types above).
-   * 
+   *
    * @throws IllegalArgumentException if <code>width</code> or
    *     <code>height</code> is less than or equal to zero.
    * @throws IllegalArgumentException if <code>type</code> is not one of the
@@ -151,18 +151,18 @@ public class BufferedImage extends Image
     switch( type )
       {
       case BufferedImage.TYPE_INT_RGB:
-        sm = new SinglePixelPackedSampleModel( DataBuffer.TYPE_INT, 
+        sm = new SinglePixelPackedSampleModel( DataBuffer.TYPE_INT,
                                                width, height,
-                                               new int[]{ 0x00FF0000, 
-                                                          0x0000FF00, 
+                                               new int[]{ 0x00FF0000,
+                                                          0x0000FF00,
                                                           0x000000FF } ) ;
         cm = new DirectColorModel( 24, 0xff0000, 0xff00, 0xff );
         break;
-	
+
       case BufferedImage.TYPE_3BYTE_BGR:
         sm = new PixelInterleavedSampleModel( DataBuffer.TYPE_BYTE,
                                               width, height,
-                                              3, width * 3, 
+                                              3, width * 3,
                                               new int[]{ 2, 1, 0 } );
         cm = new ComponentColorModel(ColorSpace.getInstance(ColorSpace.CS_sRGB),
                                      false, false,
@@ -172,11 +172,11 @@ public class BufferedImage extends Image
 
       case BufferedImage.TYPE_INT_ARGB:
       case BufferedImage.TYPE_INT_ARGB_PRE:
-        sm = new SinglePixelPackedSampleModel( DataBuffer.TYPE_INT, 
+        sm = new SinglePixelPackedSampleModel( DataBuffer.TYPE_INT,
                                                width, height,
-                                               new int[]{ 0x00FF0000, 
-                                                          0x0000FF00, 
-                                                          0x000000FF, 
+                                               new int[]{ 0x00FF0000,
+                                                          0x0000FF00,
+                                                          0x000000FF,
                                                           0xFF000000 } );
         if (premultiplied)
           cm = new DirectColorModel( ColorSpace.getInstance(ColorSpace.CS_sRGB),
@@ -185,12 +185,12 @@ public class BufferedImage extends Image
                                      Buffers.smallestAppropriateTransferType(32));
         else
           cm = new DirectColorModel( 32, 0xff0000, 0xff00, 0xff, 0xff000000 );
-        
+
         break;
 
       case BufferedImage.TYPE_4BYTE_ABGR:
       case BufferedImage.TYPE_4BYTE_ABGR_PRE:
-        sm = new PixelInterleavedSampleModel(DataBuffer.TYPE_BYTE, 
+        sm = new PixelInterleavedSampleModel(DataBuffer.TYPE_BYTE,
                                              width, height,
                                              4, 4*width,
                                              new int[]{3, 2, 1, 0});
@@ -201,10 +201,10 @@ public class BufferedImage extends Image
         break;
 
       case BufferedImage.TYPE_INT_BGR:
-        sm = new SinglePixelPackedSampleModel( DataBuffer.TYPE_INT, 
+        sm = new SinglePixelPackedSampleModel( DataBuffer.TYPE_INT,
                                                width, height,
-                                               new int[]{ 0x000000FF, 
-                                                          0x0000FF00, 
+                                               new int[]{ 0x000000FF,
+                                                          0x0000FF00,
                                                           0x00FF0000 } ) ;
         cm = new DirectColorModel( 24, 0xff, 0xff00, 0xff0000 );
         break;
@@ -212,17 +212,17 @@ public class BufferedImage extends Image
       case BufferedImage.TYPE_USHORT_565_RGB:
         sm = new SinglePixelPackedSampleModel( DataBuffer.TYPE_USHORT,
                                                width, height,
-                                               new int[]{ 0xF800, 
-                                                          0x7E0, 
+                                               new int[]{ 0xF800,
+                                                          0x7E0,
                                                           0x1F } ) ;
         cm = new DirectColorModel( 16, 0xF800, 0x7E0, 0x1F );
         break;
-        
+
       case BufferedImage.TYPE_USHORT_555_RGB:
         sm = new SinglePixelPackedSampleModel( DataBuffer.TYPE_USHORT,
                                                width, height,
-                                               new int[]{ 0x7C00, 
-                                                          0x3E0, 
+                                               new int[]{ 0x7C00,
+                                                          0x3E0,
                                                           0x1F } ) ;
         cm = new DirectColorModel( 15, 0x7C00, 0x3E0, 0x1F );
         break;
@@ -244,7 +244,7 @@ public class BufferedImage extends Image
 
       case BufferedImage.TYPE_BYTE_BINARY:
         cm = createDefaultIndexedColorModel( true );
-        sm = new MultiPixelPackedSampleModel(DataBuffer.TYPE_BYTE, 
+        sm = new MultiPixelPackedSampleModel(DataBuffer.TYPE_BYTE,
                                              width, height, 1);
         break;
 
@@ -254,8 +254,8 @@ public class BufferedImage extends Image
 
     if( sm == null )
       throw new IllegalArgumentException("Unknown predefined image type.");
-    
-    if( cm == null ) // only for the grayscale types 
+
+    if( cm == null ) // only for the grayscale types
       {
         int buftype;
         int[] bits = new int[1];
@@ -270,22 +270,22 @@ public class BufferedImage extends Image
             bits[0] = 16;
           }
         ColorSpace graySpace = ColorSpace.getInstance( ColorSpace.CS_GRAY );
-        
-        cm = new ComponentColorModel( graySpace, bits, false, false, 
+
+        cm = new ComponentColorModel( graySpace, bits, false, false,
                                       Transparency.OPAQUE, buftype );
       }
 
     WritableRaster rst = null;
-    
+
     // Attempt to create an accelerated backend for this image
     GraphicsEnvironment env = GraphicsEnvironment.getLocalGraphicsEnvironment();
     if (env instanceof ClasspathGraphicsEnvironment)
       rst = ((ClasspathGraphicsEnvironment)env).createRaster(cm, sm);
-    
+
     // Default to a standard Java raster & databuffer if needed
     if (rst == null)
       rst = Raster.createWritableRaster(sm, new Point( 0, 0 ) );
-    
+
     init(cm, rst, premultiplied,
          null, // no properties
          type );
@@ -308,13 +308,13 @@ public class BufferedImage extends Image
   }
 
   public BufferedImage(ColorModel colormodel, WritableRaster writableraster,
-		       boolean premultiplied, Hashtable<?,?> properties)
+                       boolean premultiplied, Hashtable<?,?> properties)
   {
     init(colormodel, writableraster, premultiplied, properties, TYPE_CUSTOM);
   }
- 
 
-  private void init(ColorModel cm, WritableRaster writableraster, 
+
+  private void init(ColorModel cm, WritableRaster writableraster,
                     boolean premultiplied, Hashtable properties, int type)
   {
     raster = writableraster;
@@ -330,7 +330,7 @@ public class BufferedImage extends Image
    *
    * @param binary - If <code>true</code>, a black and white palette,
    * otherwise a default 256-color palette is returned.
-   */    
+   */
   private IndexColorModel createDefaultIndexedColorModel( boolean binary )
   {
     if( binary )
@@ -342,7 +342,7 @@ public class BufferedImage extends Image
     byte[] r = new byte[256];
     byte[] g = new byte[256];
     byte[] b = new byte[256];
-    
+
     int index = 0;
     for( int i = 0; i < 6; i++ )
       for( int j = 0; j < 6; j++ )
@@ -353,17 +353,17 @@ public class BufferedImage extends Image
             b[ index ] = (byte)(k * 51);
             index++;
           }
-    
+
     while( index < 256 )
       {
-        r[ index ] = g[ index ] = b[ index ] = 
+        r[ index ] = g[ index ] = b[ index ] =
           (byte)(18 + (index - 216) * 6);
         index++;
       }
-    
+
     return new IndexColorModel( 8, 256, r, g, b );
   }
-  
+
   public void coerceData(boolean premultiplied)
   {
     colorModel = colorModel.coerceData(raster, premultiplied);
@@ -380,17 +380,17 @@ public class BufferedImage extends Image
     int y = dest.getMinY();
     int w = dest.getWidth();
     int h = dest.getHeight();
-    
+
     // create a src child that has the right bounds...
     WritableRaster src =
       raster.createWritableChild(x, y, w, h, x, y,
                                  null);  // same bands
-    
+
     if (src.getSampleModel () instanceof ComponentSampleModel
         && dest.getSampleModel () instanceof ComponentSampleModel)
       // Refer to ComponentDataBlitOp for optimized data blitting:
       ComponentDataBlitOp.INSTANCE.filter(src, dest);
-    
+
     else
       {
         // slower path
@@ -410,17 +410,17 @@ public class BufferedImage extends Image
   public void flush()
   {
   }
-  
+
   public WritableRaster getAlphaRaster()
   {
     return colorModel.getAlphaRaster(raster);
   }
-  
+
   public ColorModel getColorModel()
   {
     return colorModel;
   }
-  
+
   public Raster getData()
   {
     return copyData(null);
@@ -434,7 +434,7 @@ public class BufferedImage extends Image
       raster.createCompatibleWritableRaster(rectangle);
     return copyData(dest);
   }
-  
+
   public Graphics getGraphics()
   {
     return createGraphics();
@@ -444,17 +444,17 @@ public class BufferedImage extends Image
   {
     return raster.getHeight();
   }
-  
+
   public int getHeight(ImageObserver imageobserver)
   {
     return getHeight();
   }
-    
+
   public int getMinTileX()
   {
     return 0;
   }
-  
+
   public int getMinTileY()
   {
     return 0;
@@ -462,14 +462,14 @@ public class BufferedImage extends Image
 
   public int getMinX()
   {
-    return 0; 
+    return 0;
   }
 
-  public int getMinY() 
+  public int getMinY()
   {
     return 0;
   }
-  
+
   public int getNumXTiles()
   {
     return 1;
@@ -477,17 +477,17 @@ public class BufferedImage extends Image
 
   public int getNumYTiles()
   {
-	return 1;
+        return 1;
   }
 
   /**
-   * Returns the value of the specified property, or 
+   * Returns the value of the specified property, or
    * {@link Image#UndefinedProperty} if the property is not defined.
-   * 
+   *
    * @param string  the property key (<code>null</code> not permitted).
-   * 
+   *
    * @return The property value.
-   * 
+   *
    * @throws NullPointerException if <code>string</code> is <code>null</code>.
    */
   public Object getProperty(String string)
@@ -511,7 +511,7 @@ public class BufferedImage extends Image
 
   /**
    * Returns <code>null</code> always.
-   * 
+   *
    * @return <code>null</code> always.
    */
   public String[] getPropertyNames()
@@ -526,29 +526,29 @@ public class BufferedImage extends Image
     Object rgbElem = raster.getDataElements(x, y, null);
     return colorModel.getRGB(rgbElem);
   }
-    
+
   public int[] getRGB(int startX, int startY, int w, int h, int[] rgbArray,
                       int offset, int scanlineStride)
   {
     if (rgbArray == null)
       {
         /*
-	      000000000000000000
-	      00000[#######-----   [ = start
-	      -----########-----   ] = end
-	      -----#######]00000
-	      000000000000000000 
+              000000000000000000
+              00000[#######-----   [ = start
+              -----########-----   ] = end
+              -----#######]00000
+              000000000000000000
         */
         int size = (h-1)*scanlineStride + w;
         rgbArray = new int[size];
     }
-	
+
     int endX = startX + w;
     int endY = startY + h;
-    
+
     /* *TODO*:
        Opportunity for optimization by examining color models...
-       
+
        Perhaps wrap the rgbArray up in a WritableRaster with packed
        sRGB color model and perform optimized rendering into the
        array. */
@@ -573,12 +573,12 @@ public class BufferedImage extends Image
   {
     return raster;
   }
-  
+
   public SampleModel getSampleModel()
   {
     return raster.getSampleModel();
   }
-    
+
   public ImageProducer getSource()
   {
     return new ImageProducer()
@@ -609,8 +609,8 @@ public class BufferedImage extends Image
           int height = getHeight();
           int stride = width;
           int offset = 0;
-          int[] pixels = getRGB(x, y, 
-                                width, height, 
+          int[] pixels = getRGB(x, y,
+                                width, height,
                                 (int[])null, offset, stride);
           // We already convert the color to RGB in the getRGB call, so
           // we pass a simple RGB color model to the consumers.
@@ -636,17 +636,17 @@ public class BufferedImage extends Image
 
       };
   }
-  
+
   public Vector<RenderedImage> getSources()
   {
     return null;
   }
-  
+
   public BufferedImage getSubimage(int x, int y, int w, int h)
   {
-    WritableRaster subRaster = 
+    WritableRaster subRaster =
       getRaster().createWritableChild(x, y, w, h, 0, 0, null);
-    
+
     return new BufferedImage(getColorModel(), subRaster, isPremultiplied,
                              properties);
   }
@@ -655,7 +655,7 @@ public class BufferedImage extends Image
   {
     return getWritableTile(tileX, tileY);
   }
-    
+
   public int getTileGridXOffset()
   {
     return 0; // according to javadocs
@@ -698,7 +698,7 @@ public class BufferedImage extends Image
   }
 
   private static final Point[] tileIndices = { new Point() };
-    
+
   public Point[] getWritableTileIndices()
   {
     return tileIndices;
@@ -708,7 +708,7 @@ public class BufferedImage extends Image
   {
     return true;
   }
-  
+
   public boolean isAlphaPremultiplied()
   {
     return isPremultiplied;
@@ -734,7 +734,7 @@ public class BufferedImage extends Image
     int y = src.getMinY();
     int w = src.getWidth();
     int h = src.getHeight();
-    
+
     // create a dest child that has the right bounds...
     WritableRaster dest =
       raster.createWritableChild(x, y, w, h, x, y, null);
@@ -757,13 +757,13 @@ public class BufferedImage extends Image
     Object rgbElem = colorModel.getDataElements(argb, null);
     raster.setDataElements(x, y, rgbElem);
   }
-  
+
   public void setRGB(int startX, int startY, int w, int h,
-		     int[] argbArray, int offset, int scanlineStride)
+                     int[] argbArray, int offset, int scanlineStride)
   {
     int endX = startX + w;
     int endY = startY + h;
-    
+
     Object rgbElem = null;
     for (int y=startY; y<endY; y++)
       {
@@ -774,10 +774,10 @@ public class BufferedImage extends Image
             rgbElem = colorModel.getDataElements(argb, rgbElem);
             raster.setDataElements(x, y, rgbElem);
           }
-        offset += scanlineStride;    
+        offset += scanlineStride;
       }
   }
-    
+
   public String toString()
   {
     CPStringBuilder buf;
@@ -806,10 +806,10 @@ public class BufferedImage extends Image
   {
     if (tileObservers == null)
       tileObservers = new Vector<TileObserver>();
-	
+
     tileObservers.add (to);
   }
-	
+
   /**
    * Removes a tile observer. If the observer was not registered,
    * nothing happens. If the observer was registered for multiple
@@ -821,7 +821,7 @@ public class BufferedImage extends Image
   {
     if (tileObservers == null)
       return;
-	
+
     tileObservers.remove (to);
   }
 
diff --git a/libjava/classpath/java/awt/image/BufferedImageFilter.java b/libjava/classpath/java/awt/image/BufferedImageFilter.java
index 50d627d..04b6672 100644
--- a/libjava/classpath/java/awt/image/BufferedImageFilter.java
+++ b/libjava/classpath/java/awt/image/BufferedImageFilter.java
@@ -40,10 +40,10 @@ import java.awt.Point;
 
 /**
  * The BufferedImageFilter class wraps BufferedImageOp objects in a Filter.
- * 
+ *
  * When pixels are pushed through the filter, we create a BufferedImage,
  * apply the BufferedImageOp, and pass the filtered pixels to the base class.
- * 
+ *
  * @author jlquinn@optonline.net
  */
 public class BufferedImageFilter extends ImageFilter implements Cloneable
@@ -51,17 +51,17 @@ public class BufferedImageFilter extends ImageFilter implements Cloneable
   private BufferedImageOp op;
 
   /**
-   * 
+   *
    */
   public BufferedImageFilter(BufferedImageOp op)
   {
     super();
     if (op == null)
       throw new NullPointerException("BufferedImageFilter null"
-				     + " op in constructor");
+                                     + " op in constructor");
     this.op = op;
   }
-  
+
   /**
    * @return Returns the contained BufferedImageOp.
    */
@@ -74,7 +74,7 @@ public class BufferedImageFilter extends ImageFilter implements Cloneable
   // create a compatible sample model that incorporates scansize != w.  I
   // asume off is handled by the db itself.
   public void setPixels(int x, int y, int w, int h, ColorModel model,
-			byte[] pixels, int off, int scansize)
+                        byte[] pixels, int off, int scansize)
   {
     // Create an input BufferedImage
     DataBufferByte db = new DataBufferByte(pixels, scansize * h + off, off);
@@ -84,16 +84,16 @@ public class BufferedImageFilter extends ImageFilter implements Cloneable
       new BufferedImage(model, wr, model.isAlphaPremultiplied(), null);
     BufferedImage out = op.createCompatibleDestImage(in, model);
     op.filter(in, out);
-    DataBuffer dbout = out.getRaster().getDataBuffer(); 
+    DataBuffer dbout = out.getRaster().getDataBuffer();
     super.setPixels(0, 0, w, h, model, ((DataBufferByte)dbout).getData(), 0,
-		    scansize);
+                    scansize);
   }
 
   // FIXME: Definitely not sure this is the right thing.  I'm not sure how
   // to create a compatible sample model that incorporates
   // scansize != w.  I asume off is handled by the db itself.
   public void setPixels(int x, int y, int w, int h, ColorModel model,
-			int[] pixels, int off, int scansize)
+                        int[] pixels, int off, int scansize)
   {
     // Create an input BufferedImage
     DataBufferInt db = new DataBufferInt(pixels, scansize * h + off, off);
@@ -103,8 +103,8 @@ public class BufferedImageFilter extends ImageFilter implements Cloneable
       new BufferedImage(model, wr, model.isAlphaPremultiplied(), null);
     BufferedImage out = op.createCompatibleDestImage(in, model);
     op.filter(in, out);
-    DataBuffer dbout = out.getRaster().getDataBuffer(); 
+    DataBuffer dbout = out.getRaster().getDataBuffer();
     super.setPixels(0, 0, w, h, model, ((DataBufferInt)dbout).getData(), 0,
-		    scansize);
+                    scansize);
   }
 }
diff --git a/libjava/classpath/java/awt/image/BufferedImageOp.java b/libjava/classpath/java/awt/image/BufferedImageOp.java
index f6a24c9..1aba4bb 100644
--- a/libjava/classpath/java/awt/image/BufferedImageOp.java
+++ b/libjava/classpath/java/awt/image/BufferedImageOp.java
@@ -1,4 +1,4 @@
-/* BufferedImageOp.java -- 
+/* BufferedImageOp.java --
    Copyright (C) 2002, 2006, Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -43,65 +43,65 @@ import java.awt.geom.Point2D;
 import java.awt.geom.Rectangle2D;
 
 /**
- * An operation that is performed on one <code>BufferedImage</code> (the 
+ * An operation that is performed on one <code>BufferedImage</code> (the
  * source) producing a new <code>BufferedImage</code> (the destination).
  */
 public interface BufferedImageOp
 {
   /**
    * Performs an operation on the source image, returning the result in a
-   * <code>BufferedImage</code>.  If <code>dest</code> is <code>null</code>, a 
+   * <code>BufferedImage</code>.  If <code>dest</code> is <code>null</code>, a
    * new <code>BufferedImage</code> will be created by calling the
    * {@link #createCompatibleDestImage} method.  If <code>dest</code>
-   * is not <code>null</code>, the result is written to <code>dest</code> then 
-   * returned (this avoids creating a new <code>BufferedImage</code> each 
+   * is not <code>null</code>, the result is written to <code>dest</code> then
+   * returned (this avoids creating a new <code>BufferedImage</code> each
    * time this method is called).
-   * 
+   *
    * @param src  the source image.
    * @param dst  the destination image (<code>null</code> permitted).
-   * 
+   *
    * @return The filterd image.
    */
   BufferedImage filter(BufferedImage src, BufferedImage dst);
-  
+
   /**
    * Returns the bounds of the destination image on the basis of this
    * <code>BufferedImageOp</code> being applied to the specified source image.
-   * 
+   *
    * @param src  the source image.
-   * 
+   *
    * @return The destination bounds.
    */
   Rectangle2D getBounds2D(BufferedImage src);
-  
+
   /**
-   * Returns a new <code>BufferedImage</code> that can be used by this 
-   * <code>BufferedImageOp</code> as the destination image when filtering 
+   * Returns a new <code>BufferedImage</code> that can be used by this
+   * <code>BufferedImageOp</code> as the destination image when filtering
    * the specified source image.
-   * 
+   *
    * @param src  the source image.
    * @param dstCM  the color model for the destination image.
-   * 
+   *
    * @return A new image that can be used as the destination image.
    */
   BufferedImage createCompatibleDestImage(BufferedImage src, ColorModel dstCM);
-  
+
   /**
    * Returns the point on the destination image that corresponds to the given
    * point on the source image.
-   * 
+   *
    * @param src  the source point.
    * @param dst  the destination point (<code>null</code> permitted).
-   * 
+   *
    * @return The destination point.
    */
   Point2D getPoint2D(Point2D src, Point2D dst);
-  
+
   /**
    * Returns the rendering hints for this operation.
-   * 
+   *
    * @return The rendering hints.
    */
   RenderingHints getRenderingHints();
-  
-} 
+
+}
diff --git a/libjava/classpath/java/awt/image/ByteLookupTable.java b/libjava/classpath/java/awt/image/ByteLookupTable.java
index ecc0023..89804c5 100644
--- a/libjava/classpath/java/awt/image/ByteLookupTable.java
+++ b/libjava/classpath/java/awt/image/ByteLookupTable.java
@@ -58,7 +58,7 @@ public class ByteLookupTable extends LookupTable
    * Offset is subtracted from pixel values when looking up in the translation
    * tables.  If data.length is one, the same table is applied to all pixel
    * components.
-   * 
+   *
    * @param offset Offset to be subtracted.
    * @param data Array of lookup tables (<code>null</code> not permitted).
    * @exception IllegalArgumentException if offset &lt; 0 or data.length &lt; 1.
@@ -67,9 +67,9 @@ public class ByteLookupTable extends LookupTable
     throws IllegalArgumentException
   {
     super(offset, data.length);
-    
+
     // tests show that Sun's implementation creates a new array to store the
-    // references from the incoming 'data' array - not sure why, but we'll 
+    // references from the incoming 'data' array - not sure why, but we'll
     // match that behaviour just in case it matters...
     this.data = new byte[data.length][];
     for (int i = 0; i < data.length; i++)
@@ -81,9 +81,9 @@ public class ByteLookupTable extends LookupTable
    *
    * Offset is subtracted from pixel values when looking up in the translation
    * table.  The same table is applied to all pixel components.
-   * 
+   *
    * @param offset Offset to be subtracted.
-   * @param data Lookup table for all components (<code>null</code> not 
+   * @param data Lookup table for all components (<code>null</code> not
    *     permitted).
    * @exception IllegalArgumentException if offset &lt; 0.
    */
@@ -131,11 +131,11 @@ public class ByteLookupTable extends LookupTable
 
     if (data.length == 1)
       for (int i=0; i < src.length; i++)
-	dst[i] = data[0][src[i] - offset];
+        dst[i] = data[0][src[i] - offset];
     else
       for (int i=0; i < src.length; i++)
-	dst[i] = data[i][src[i] - offset];
-      
+        dst[i] = data[i][src[i] - offset];
+
     return dst;
   }
 
@@ -164,11 +164,11 @@ public class ByteLookupTable extends LookupTable
 
     if (data.length == 1)
       for (int i=0; i < src.length; i++)
-	dst[i] = data[0][((int)src[i]) - offset];
+        dst[i] = data[0][((int)src[i]) - offset];
     else
       for (int i=0; i < src.length; i++)
-	dst[i] = data[i][((int)src[i]) - offset];
-      
+        dst[i] = data[i][((int)src[i]) - offset];
+
     return dst;
 
   }
diff --git a/libjava/classpath/java/awt/image/ColorConvertOp.java b/libjava/classpath/java/awt/image/ColorConvertOp.java
index e6c8541..b1d6f85 100644
--- a/libjava/classpath/java/awt/image/ColorConvertOp.java
+++ b/libjava/classpath/java/awt/image/ColorConvertOp.java
@@ -51,17 +51,17 @@ import java.awt.geom.Rectangle2D;
 
 /**
  * ColorConvertOp is a filter for converting images or rasters between
- * colorspaces, either through a sequence of colorspaces or just from source to 
+ * colorspaces, either through a sequence of colorspaces or just from source to
  * destination.
- * 
+ *
  * Color conversion is done on the color components without alpha.  Thus
  * if a BufferedImage has alpha premultiplied, this is divided out before
  * color conversion, and premultiplication applied if the destination
  * requires it.
- * 
+ *
  * Color rendering and dithering hints may be applied if specified.  This is
  * likely platform-dependent.
- * 
+ *
  * @author jlquinn@optonline.net
  */
 public class ColorConvertOp implements BufferedImageOp, RasterOp
@@ -69,16 +69,16 @@ public class ColorConvertOp implements BufferedImageOp, RasterOp
   private RenderingHints hints;
   private ICC_Profile[] profiles = null;
   private ColorSpace[] spaces;
-  
+
 
   /**
    * Convert a BufferedImage through a ColorSpace.
-   * 
+   *
    * Objects created with this constructor can be used to convert
    * BufferedImage's to a destination ColorSpace.  Attempts to convert Rasters
    * with this constructor will result in an IllegalArgumentException when the
-   * filter(Raster, WritableRaster) method is called.  
-   * 
+   * filter(Raster, WritableRaster) method is called.
+   *
    * @param cspace The target color space.
    * @param hints Rendering hints to use in conversion, if any (may be null)
    * @throws NullPointerException if the ColorSpace is null.
@@ -90,53 +90,53 @@ public class ColorConvertOp implements BufferedImageOp, RasterOp
     spaces = new ColorSpace[]{cspace};
     this.hints = hints;
   }
-  
+
   /**
    * Convert from a source colorspace to a destination colorspace.
-   * 
+   *
    * This constructor takes two ColorSpace arguments as the source and
    * destination color spaces.  It is usually used with the
-   * filter(Raster, WritableRaster) method, in which case the source colorspace 
-   * is assumed to correspond to the source Raster, and the destination 
+   * filter(Raster, WritableRaster) method, in which case the source colorspace
+   * is assumed to correspond to the source Raster, and the destination
    * colorspace with the destination Raster.
-   * 
-   * If used with BufferedImages that do not match the source or destination 
-   * colorspaces specified here, there is an implicit conversion from the 
-   * source image to the source ColorSpace, or the destination ColorSpace to 
+   *
+   * If used with BufferedImages that do not match the source or destination
+   * colorspaces specified here, there is an implicit conversion from the
+   * source image to the source ColorSpace, or the destination ColorSpace to
    * the destination image.
-   * 
+   *
    * @param srcCspace The source ColorSpace.
    * @param dstCspace The destination ColorSpace.
    * @param hints Rendering hints to use in conversion, if any (may be null).
    * @throws NullPointerException if any ColorSpace is null.
    */
   public ColorConvertOp(ColorSpace srcCspace, ColorSpace dstCspace,
-			RenderingHints hints)
+                        RenderingHints hints)
   {
     if (srcCspace == null || dstCspace == null)
       throw new NullPointerException();
     spaces = new ColorSpace[]{srcCspace, dstCspace};
-    this.hints = hints;     
+    this.hints = hints;
   }
 
   /**
    * Convert from a source colorspace to a destinatino colorspace.
-   * 
+   *
    * This constructor builds a ColorConvertOp from an array of ICC_Profiles.
    * The source will be converted through the sequence of color spaces
    * defined by the profiles.  If the sequence of profiles doesn't give a
    * well-defined conversion, an IllegalArgumentException is thrown.
-   * 
-   * If used with BufferedImages that do not match the source or destination 
-   * colorspaces specified here, there is an implicit conversion from the 
-   * source image to the source ColorSpace, or the destination ColorSpace to 
+   *
+   * If used with BufferedImages that do not match the source or destination
+   * colorspaces specified here, there is an implicit conversion from the
+   * source image to the source ColorSpace, or the destination ColorSpace to
    * the destination image.
-   * 
+   *
    * For Rasters, the first and last profiles must have the same number of
    * bands as the source and destination Rasters, respectively.  If this is
    * not the case, or there fewer than 2 profiles, an IllegalArgumentException
-   * will be thrown. 
-   * 
+   * will be thrown.
+   *
    * @param profiles An array of ICC_Profile's to convert through.
    * @param hints Rendering hints to use in conversion, if any (may be null).
    * @throws NullPointerException if the profile array is null.
@@ -147,10 +147,10 @@ public class ColorConvertOp implements BufferedImageOp, RasterOp
   {
     if (profiles == null)
       throw new NullPointerException();
-    
-    this.hints = hints; 
+
+    this.hints = hints;
     this.profiles = profiles;
-    
+
     // Create colorspace array with space for src and dest colorspace
     // Note that the ICC_ColorSpace constructor will throw an
     // IllegalArgumentException if the profile is invalid; thus we check
@@ -159,17 +159,17 @@ public class ColorConvertOp implements BufferedImageOp, RasterOp
     for (int i = 0; i < profiles.length; i++)
       spaces[i] = new ICC_ColorSpace(profiles[i]);
   }
-  
+
   /**
    * Convert from source color space to destination color space.
-   * 
+   *
    * Only valid for BufferedImage objects, this Op converts from the source
    * image's color space to the destination image's color space.
-   * 
-   * The destination in the filter(BufferedImage, BufferedImage) method cannot 
+   *
+   * The destination in the filter(BufferedImage, BufferedImage) method cannot
    * be null for this operation, and it also cannot be used with the
    * filter(Raster, WritableRaster) method.
-   * 
+   *
    * @param hints Rendering hints to use in conversion, if any (may be null).
    */
   public ColorConvertOp(RenderingHints hints)
@@ -177,12 +177,12 @@ public class ColorConvertOp implements BufferedImageOp, RasterOp
     this.hints = hints;
     spaces = new ColorSpace[0];
   }
-  
+
   /**
    * Converts the source image using the conversion path specified in the
    * constructor.  The resulting image is stored in the destination image if one
-   * is provided; otherwise a new BufferedImage is created and returned. 
-   * 
+   * is provided; otherwise a new BufferedImage is created and returned.
+   *
    * The source and destination BufferedImage (if one is supplied) must have
    * the same dimensions.
    *
@@ -196,7 +196,7 @@ public class ColorConvertOp implements BufferedImageOp, RasterOp
   {
     // TODO: The plan is to create a scanline buffer for intermediate buffers.
     // For now we just suck it up and create intermediate buffers.
-    
+
     if (dst == null && spaces.length == 0)
       throw new IllegalArgumentException("Not enough color space information "
                                          + "to complete conversion.");
@@ -245,12 +245,12 @@ public class ColorConvertOp implements BufferedImageOp, RasterOp
    * Converts the source raster using the conversion path specified in the
    * constructor.  The resulting raster is stored in the destination raster if
    * one is provided; otherwise a new WritableRaster is created and returned.
-   * 
+   *
    * This operation is not valid with every constructor of this class; see
    * the constructors for details.  Further, the source raster must have the
    * same number of bands as the source ColorSpace, and the destination raster
    * must have the same number of bands as the destination ColorSpace.
-   * 
+   *
    * The source and destination raster (if one is supplied) must also have the
    * same dimensions.
    *
@@ -303,7 +303,7 @@ public class ColorConvertOp implements BufferedImageOp, RasterOp
 
   /**
    * Creates an empty BufferedImage with the size equal to the source and the
-   * correct number of bands for the conversion defined in this Op. The newly 
+   * correct number of bands for the conversion defined in this Op. The newly
    * created image is created with the specified ColorModel, or if no ColorModel
    * is supplied, an appropriate one is chosen.
    *
@@ -332,11 +332,11 @@ public class ColorConvertOp implements BufferedImageOp, RasterOp
                                                         dstCM.getTransferType()),
                              src.isPremultiplied, null);
   }
-  
+
   /**
    * Creates a new WritableRaster with the size equal to the source and the
    * correct number of bands.
-   * 
+   *
    * Note, the new Raster will always use a BYTE storage size, regardless of
    * the color model or defined destination; this is for compatibility with
    * the reference implementation.
@@ -361,7 +361,7 @@ public class ColorConvertOp implements BufferedImageOp, RasterOp
   /**
    * Returns the array of ICC_Profiles used to create this Op, or null if the
    * Op was created using ColorSpace arguments.
-   * 
+   *
    * @return The array of ICC_Profiles, or null.
    */
   public final ICC_Profile[] getICC_Profiles()
@@ -371,7 +371,7 @@ public class ColorConvertOp implements BufferedImageOp, RasterOp
 
   /**
    * Returns the rendering hints for this op.
-   * 
+   *
    * @return The rendering hints for this Op, or null.
    */
   public final RenderingHints getRenderingHints()
@@ -383,7 +383,7 @@ public class ColorConvertOp implements BufferedImageOp, RasterOp
    * Returns the corresponding destination point for a source point.
    * Because this is not a geometric operation, the destination and source
    * points will be identical.
-   * 
+   *
    * @param src The source point.
    * @param dst The transformed destination point.
    * @return The transformed destination point.
@@ -392,7 +392,7 @@ public class ColorConvertOp implements BufferedImageOp, RasterOp
   {
     if (dst == null)
       return (Point2D)src.clone();
-    
+
     dst.setLocation(src);
     return dst;
   }
@@ -401,7 +401,7 @@ public class ColorConvertOp implements BufferedImageOp, RasterOp
    * Returns the corresponding destination boundary of a source boundary.
    * Because this is not a geometric operation, the destination and source
    * boundaries will be identical.
-   * 
+   *
    * @param src The source boundary.
    * @return The boundaries of the destination.
    */
@@ -414,7 +414,7 @@ public class ColorConvertOp implements BufferedImageOp, RasterOp
    * Returns the corresponding destination boundary of a source boundary.
    * Because this is not a geometric operation, the destination and source
    * boundaries will be identical.
-   * 
+   *
    * @param src The source boundary.
    * @return The boundaries of the destination.
    */
@@ -424,9 +424,9 @@ public class ColorConvertOp implements BufferedImageOp, RasterOp
   }
 
   /**
-   * Copy a source image to a destination image, respecting their colorspaces 
-   * and performing colorspace conversions if necessary.  
-   * 
+   * Copy a source image to a destination image, respecting their colorspaces
+   * and performing colorspace conversions if necessary.
+   *
    * @param src The source image.
    * @param dst The destination image.
    */
@@ -434,21 +434,21 @@ public class ColorConvertOp implements BufferedImageOp, RasterOp
   {
     // This is done using Graphics2D in order to respect the rendering hints.
     Graphics2D gg = dst.createGraphics();
-    
+
     // If no hints are set there is no need to call
     // setRenderingHints on the Graphics2D object.
     if (hints != null)
       gg.setRenderingHints(hints);
-    
+
     gg.drawImage(src, 0, 0, null);
     gg.dispose();
   }
-  
+
   /**
    * Copy a source raster to a destination raster, performing a colorspace
    * conversion between the two.  The conversion will respect the
    * KEY_COLOR_RENDERING rendering hint if one is present.
-   * 
+   *
    * @param src The source raster.
    * @param scs The colorspace of the source raster.
    * @dst The destination raster.
@@ -457,7 +457,7 @@ public class ColorConvertOp implements BufferedImageOp, RasterOp
   private void copyraster(Raster src, ColorSpace scs, WritableRaster dst, ColorSpace dcs)
   {
     float[] sbuf = new float[src.getNumBands()];
-    
+
     if (hints != null
         && hints.get(RenderingHints.KEY_COLOR_RENDERING) ==
                  RenderingHints.VALUE_COLOR_RENDER_QUALITY)
@@ -466,7 +466,7 @@ public class ColorConvertOp implements BufferedImageOp, RasterOp
       for (int y = src.getMinY(); y < src.getHeight() + src.getMinY(); y++)
         for (int x = src.getMinX(); x < src.getWidth() + src.getMinX(); x++)
           dst.setPixel(x, y,
-		       dcs.fromCIEXYZ(scs.toCIEXYZ(src.getPixel(x, y, sbuf))));
+                       dcs.fromCIEXYZ(scs.toCIEXYZ(src.getPixel(x, y, sbuf))));
     }
     else
     {
@@ -474,7 +474,7 @@ public class ColorConvertOp implements BufferedImageOp, RasterOp
       for (int y = src.getMinY(); y < src.getHeight() + src.getMinY(); y++)
         for (int x = src.getMinX(); x < src.getWidth() + src.getMinX(); x++)
           dst.setPixel(x, y,
-		       dcs.fromRGB(scs.toRGB(src.getPixel(x, y, sbuf))));
+                       dcs.fromRGB(scs.toRGB(src.getPixel(x, y, sbuf))));
     }
   }
 
@@ -482,31 +482,31 @@ public class ColorConvertOp implements BufferedImageOp, RasterOp
    * This method creates a color model with the same colorspace and alpha
    * settings as the source image.  The created color model will always be a
    * ComponentColorModel and have a BYTE transfer type.
-   * 
+   *
    * @param img The source image.
    * @param cs The ColorSpace to use.
    * @return A color model compatible with the source image.
-   */ 
+   */
   private ColorModel createCompatibleColorModel(BufferedImage img, ColorSpace cs)
   {
     // The choice of ComponentColorModel and DataBuffer.TYPE_BYTE is based on
     // Mauve testing of the reference implementation.
     return new ComponentColorModel(cs,
-                                   img.getColorModel().hasAlpha(), 
+                                   img.getColorModel().hasAlpha(),
                                    img.isAlphaPremultiplied(),
                                    img.getColorModel().getTransparency(),
-                                   DataBuffer.TYPE_BYTE);    
+                                   DataBuffer.TYPE_BYTE);
   }
 
   /**
    * This method creates a compatible Raster, given a source raster, colorspace,
    * alpha value, and transfer type.
-   * 
+   *
    * @param src The source raster.
    * @param cs The ColorSpace to use.
    * @param hasAlpha Whether the raster should include a component for an alpha.
    * @param transferType The size of a single data element.
-   * @return A compatible WritableRaster. 
+   * @return A compatible WritableRaster.
    */
   private WritableRaster createCompatibleDestRaster(Raster src, ColorSpace cs,
                                                     boolean hasAlpha,
@@ -514,11 +514,11 @@ public class ColorConvertOp implements BufferedImageOp, RasterOp
   {
     // The use of a PixelInterleavedSampleModel weas determined using mauve
     // tests, based on the reference implementation
-    
+
     int numComponents = cs.getNumComponents();
     if (hasAlpha)
       numComponents++;
-    
+
     int[] offsets = new int[numComponents];
     for (int i = 0; i < offsets.length; i++)
       offsets[i] = i;
diff --git a/libjava/classpath/java/awt/image/ColorModel.java b/libjava/classpath/java/awt/image/ColorModel.java
index 005b8d4..ede9e31 100644
--- a/libjava/classpath/java/awt/image/ColorModel.java
+++ b/libjava/classpath/java/awt/image/ColorModel.java
@@ -64,7 +64,7 @@ import java.util.Arrays;
  *
  * <li>sRGB pixel int value: a pixel in sRGB color space, encoded in
  * default 0xAARRGGBB format, assumed not alpha premultiplied.</li>
- * 
+ *
  * <li>single [0, 255] scaled int samples from default sRGB color
  * space. These are always assumed to be alpha non-premultiplied.</li>
  *
@@ -109,10 +109,10 @@ public abstract class ColorModel implements Transparency
     byte[] array = new byte[times];
     java.util.Arrays.fill(array, value);
     return array;
-  } 
+  }
 
   /**
-   * Constructs the default color model.  The default color model 
+   * Constructs the default color model.  The default color model
    * can be obtained by calling <code>getRGBdefault</code> of this
    * class.
    * @param bits the number of bits wide used for bit size of pixel values
@@ -120,12 +120,12 @@ public abstract class ColorModel implements Transparency
   public ColorModel(int bits)
   {
     this(bits * 4, // total bits, sRGB, four channels
-	 nArray(bits, 4), // bits for each channel
-	 ColorSpace.getInstance(ColorSpace.CS_sRGB), // sRGB
-	 true, // has alpha
-	 false, // not premultiplied
-	 TRANSLUCENT,
-	 Buffers.smallestAppropriateTransferType(bits * 4));
+         nArray(bits, 4), // bits for each channel
+         ColorSpace.getInstance(ColorSpace.CS_sRGB), // sRGB
+         true, // has alpha
+         false, // not premultiplied
+         TRANSLUCENT,
+         Buffers.smallestAppropriateTransferType(bits * 4));
   }
 
   /**
@@ -138,8 +138,8 @@ public abstract class ColorModel implements Transparency
    * bits is less than 1 or if any of the elements in bits is less than 0.
    */
   protected ColorModel(int pixel_bits, int[] bits, ColorSpace cspace,
-		       boolean hasAlpha, boolean isAlphaPremultiplied,
-		       int transparency, int transferType)
+                       boolean hasAlpha, boolean isAlphaPremultiplied,
+                       int transparency, int transferType)
   {
     int bits_sum = 0;
     for (int i = 0; i < bits.length; i++)
@@ -149,7 +149,7 @@ public abstract class ColorModel implements Transparency
 
         bits_sum |= bits [i];
       }
-    
+
     if ((bits.length < cspace.getNumComponents())
         || (bits_sum < 1))
       throw new IllegalArgumentException ();
@@ -162,7 +162,7 @@ public abstract class ColorModel implements Transparency
     this.transparency = transparency;
     this.transferType = transferType;
   }
-  
+
   public void finalize()
   {
     // Do nothing here.
@@ -194,12 +194,12 @@ public abstract class ColorModel implements Transparency
   {
     return pixel_bits;
   }
-    
+
   public int getComponentSize(int componentIdx)
   {
     return bits[componentIdx];
   }
-    
+
   public int[] getComponentSize()
   {
     return bits;
@@ -240,7 +240,7 @@ public abstract class ColorModel implements Transparency
    * @see #getRed(int)
    */
   public abstract int getGreen(int pixel);
-    
+
   /**
    * Converts pixel value to sRGB and extract blue int sample
    * scaled to range [0, 255].
@@ -265,7 +265,7 @@ public abstract class ColorModel implements Transparency
    *
    * This method is typically overriden in subclasses to provide a
    * more efficient implementation.
-   * 
+   *
    * @param pixel pixel value that will be interpreted according to
    * the color model.
    *
@@ -273,13 +273,13 @@ public abstract class ColorModel implements Transparency
    * 0xAARRGGBB format.  */
   public int getRGB(int pixel)
   {
-    return 
+    return
       ((getAlpha(pixel) & 0xff) << 24) |
       ((  getRed(pixel) & 0xff) << 16) |
       ((getGreen(pixel) & 0xff) <<  8) |
       (( getBlue(pixel) & 0xff) <<  0);
   }
-  
+
 
   /**
    * In this color model we know that the whole pixel value will
@@ -294,13 +294,13 @@ public abstract class ColorModel implements Transparency
     return data.getElem(0);
   }
 
-  /** 
+  /**
    * Converts pixel in the given array to sRGB and extract blue int
    * sample scaled to range [0-255].
    *
    * This method is typically overriden in subclasses to provide a
    * more efficient implementation.
-   * 
+   *
    * @param inData array of transferType containing a single pixel.  The
    * pixel should be encoded in the natural way of the color model.
    */
@@ -350,7 +350,7 @@ public abstract class ColorModel implements Transparency
    */
   public int getRGB(Object inData)
   {
-    return 
+    return
       ((getAlpha(inData) & 0xff) << 24) |
       ((  getRed(inData) & 0xff) << 16) |
       ((getGreen(inData) & 0xff) <<  8) |
@@ -360,7 +360,7 @@ public abstract class ColorModel implements Transparency
   /**
    * Converts an sRGB pixel int value to an array containing a
    * single pixel of the color space of the color model.
-   * 
+   *
    * <p>This method performs the inverse function of
    * <code>getRGB(Object inData)</code>.
    *
@@ -379,7 +379,7 @@ public abstract class ColorModel implements Transparency
    * <li>Scale the components to the correct number of bits.</li>
    *
    * <li>Arrange the components in the output array</li>
-   * 
+   *
    * </ol>
    *
    * @param rgb The color to be converted to dataElements.  A pixel
@@ -392,7 +392,7 @@ public abstract class ColorModel implements Transparency
    *
    * @return An array of transferType values representing the color,
    * in the color model format. The color model defines whether the
-   *  
+   *
    * @see #getRGB(Object)
    */
   public Object getDataElements(int rgb, Object pixel)
@@ -404,11 +404,11 @@ public abstract class ColorModel implements Transparency
   /**
    * Fills an array with the unnormalized component samples from a
    * pixel value. I.e. decompose the pixel, but not perform any
-   * color conversion. 
+   * color conversion.
    *
    * This method is typically overriden in subclasses to provide a
    * more efficient implementation.
-   * 
+   *
    * @param pixel pixel value encoded according to the color model.
    *
    * @return arrays of unnormalized component samples of single
@@ -421,7 +421,7 @@ public abstract class ColorModel implements Transparency
     // subclasses has to implement this method.
     throw new UnsupportedOperationException();
   }
-  
+
   /**
    * Fills an array with the unnormalized component samples from an
    * array of transferType containing a single pixel. I.e. decompose
@@ -438,7 +438,7 @@ public abstract class ColorModel implements Transparency
    * of the pixel.  If this is null, a new array will be allocated
    * @param offset index into the components array at which the result
    * will be stored
-   * 
+   *
    * @return arrays of unnormalized component samples of single
    * pixel.  The scale and multiplication state of the samples are
    * according to the color model. Each component sample is stored
@@ -454,16 +454,16 @@ public abstract class ColorModel implements Transparency
    * Convert normalized components to unnormalized components.
    */
   public int[] getUnnormalizedComponents(float[] normComponents,
-					 int normOffset,
-					 int[] components,
-					 int offset)
+                                         int normOffset,
+                                         int[] components,
+                                         int offset)
   {
     int numComponents = getNumComponents();
     if (components == null)
     {
       components = new int[offset + numComponents];
     }
-    
+
     for (int i=0; i<numComponents; i++)
     {
       float in = normComponents[normOffset++];
@@ -477,9 +477,9 @@ public abstract class ColorModel implements Transparency
    * Convert unnormalized components to normalized components.
    */
   public float[] getNormalizedComponents(int[] components,
-					 int offset,
-					 float[] normComponents,
-					 int normOffset)
+                                         int offset,
+                                         float[] normComponents,
+                                         int normOffset)
   {
     int numComponents = getNumComponents();
     if (normComponents == null)
@@ -513,10 +513,10 @@ public abstract class ColorModel implements Transparency
    * Converts the unnormalized component samples from an array to a
    * pixel value. I.e. composes the pixel from component samples, but
    * does not perform any color conversion or scaling of the samples.
-   * 
+   *
    * This method performs the inverse function of
    * <code>getComponents(int pixel, int[] components,
-   *			       int offset)</code>. I.e.
+   *                           int offset)</code>. I.e.
    *
    * <code>(pixel == cm.getDataElement(cm.getComponents(pixel, null,
    * 0), 0))</code>.
@@ -542,7 +542,7 @@ public abstract class ColorModel implements Transparency
    * Converts the normalized component samples from an array to a pixel
    * value. I.e. composes the pixel from component samples, but does not
    * perform any color conversion or scaling of the samples.
-   * 
+   *
    * This method is typically overriden in subclasses to provide a
    * more efficient implementation.  The method provided by this abstract
    * class converts the components to unnormalized form and returns
@@ -561,9 +561,9 @@ public abstract class ColorModel implements Transparency
   {
     return
       getDataElement(getUnnormalizedComponents(components, offset, null, 0),
-		     0);
+                     0);
   }
-  
+
   public Object getDataElements(int[] components, int offset, Object obj)
   {
     // subclasses have to implement this method.
@@ -579,7 +579,7 @@ public abstract class ColorModel implements Transparency
    * Otherwise the results are stored in obj and obj is returned.  If obj is
    * not long enough, ArrayIndexOutOfBounds is thrown.  If obj is not an array
    * of primitives, ClassCastException is thrown.
-   * 
+   *
    * This method is typically overriden in subclasses to provide a
    * more efficient implementation.  The method provided by this abstract
    * class converts the components to unnormalized form and returns
@@ -601,7 +601,7 @@ public abstract class ColorModel implements Transparency
   {
     return
       getDataElements(getUnnormalizedComponents(components, offset, null, 0),
-		      0, obj);
+                      0, obj);
   }
 
   public boolean equals(Object obj)
@@ -609,7 +609,7 @@ public abstract class ColorModel implements Transparency
     if (!(obj instanceof ColorModel)) return false;
 
     ColorModel o = (ColorModel) obj;
-    return 
+    return
       (pixel_bits == o.pixel_bits) &&
       (transferType == o.transferType) &&
       (transparency == o.transparency) &&
@@ -632,7 +632,7 @@ public abstract class ColorModel implements Transparency
   }
 
   void coerceDataWorker(WritableRaster raster,
-			boolean isAlphaPremultiplied)
+                        boolean isAlphaPremultiplied)
   {
     int w = raster.getWidth();
     int h = raster.getHeight();
@@ -659,12 +659,12 @@ public abstract class ColorModel implements Transparency
 
     raster.setPixels(0, 0, w, h, pixels);
   }
-    
+
   /**
    * Checks if the given raster has a compatible data-layout (SampleModel).
    * @param raster The Raster to test.
    * @return true if raster is compatible.
-   */ 
+   */
   public boolean isCompatibleRaster(Raster raster)
   {
     SampleModel sampleModel = raster.getSampleModel();
@@ -675,7 +675,7 @@ public abstract class ColorModel implements Transparency
   public WritableRaster createCompatibleWritableRaster(int w, int h)
   {
     return new WritableRaster(createCompatibleSampleModel(w, h),
-			      new Point(0, 0));
+                              new Point(0, 0));
   }
 
   // Typically overridden
@@ -705,19 +705,19 @@ public abstract class ColorModel implements Transparency
   public WritableRaster getAlphaRaster(WritableRaster raster)
   {
     return null;
-    
+
     /* It is a mystery to me why we couldn't use the following code...
-       
-       
+
+
        if (!hasAlpha()) return null;
-       
+
        SampleModel sm = raster.getSampleModel();
        int[] alphaBand = { sm.getNumBands() - 1 };
        SampleModel alphaModel = sm.createSubsetSampleModel(alphaBand);
        DataBuffer buffer = raster.getDataBuffer();
        Point origin = new Point(0, 0);
        return Raster.createWritableRaster(alphaModel, buffer, origin);
-       
+
 
        ...here, and avoided overriding the method in subclasses,
        but the Sun docs state that this method always will return
@@ -746,7 +746,7 @@ public abstract class ColorModel implements Transparency
   private static class SRGBColorModel
     extends DirectColorModel
   {
-    
+
     SRGBColorModel()
     {
       super(32,0x00FF0000,0x0000FF00,0x000000FF,0xFF000000);
@@ -781,13 +781,13 @@ public abstract class ColorModel implements Transparency
     {
       if(pixel == null)
         {
-          pixel = new int[]{rgb};  
+          pixel = new int[]{rgb};
         }
       else
         {
-          ((int[]) pixel)[0] = rgb;  
+          ((int[]) pixel)[0] = rgb;
         }
-      
+
       return pixel;
     }
   }
diff --git a/libjava/classpath/java/awt/image/ComponentColorModel.java b/libjava/classpath/java/awt/image/ComponentColorModel.java
index e1e85e1..ef0b84f 100644
--- a/libjava/classpath/java/awt/image/ComponentColorModel.java
+++ b/libjava/classpath/java/awt/image/ComponentColorModel.java
@@ -54,7 +54,7 @@ public class ComponentColorModel extends ColorModel
       sum += values[i];
     return sum;
   }
-  
+
   // Create an appropriate array of bits, given a colorspace (ie, number of
   // bands), size of the storage data type, and presence of an alpha band.
   private static int[] findBits(ColorSpace colorSpace, int transferType,
@@ -67,28 +67,28 @@ public class ComponentColorModel extends ColorModel
       bits = new int[colorSpace.getNumComponents()];
 
     Arrays.fill(bits, DataBuffer.getDataTypeSize(transferType));
-    
+
     return bits;
   }
 
   public ComponentColorModel(ColorSpace colorSpace, int[] bits,
-			     boolean hasAlpha,
-			     boolean isAlphaPremultiplied,
-			     int transparency, int transferType)
+                             boolean hasAlpha,
+                             boolean isAlphaPremultiplied,
+                             int transparency, int transferType)
   {
     super(sum(bits), bits, colorSpace, hasAlpha, isAlphaPremultiplied,
-	  transparency, transferType);
+          transparency, transferType);
   }
 
   /**
    * Construct a new ComponentColorModel.
-   * 
+   *
    * This constructor makes all bits of each sample significant, so for a
    * transferType of DataBuffer.BYTE, the bits per sample is 8, etc.  If
    * both hasAlpha and isAlphaPremultiplied are true, color samples are
    * assumed to be premultiplied by the alpha component.  Transparency may be
-   * one of OPAQUE, BITMASK, or TRANSLUCENT. 
-   * 
+   * one of OPAQUE, BITMASK, or TRANSLUCENT.
+   *
    * @param colorSpace The colorspace for this color model.
    * @param hasAlpha True if there is an alpha component.
    * @param isAlphaPremultiplied True if colors are already multiplied by
@@ -98,10 +98,10 @@ public class ComponentColorModel extends ColorModel
    * @since 1.4
    */
   public ComponentColorModel(ColorSpace colorSpace,
-			     boolean hasAlpha,
-			     boolean isAlphaPremultiplied,
-			     int transparency, int transferType)
-  {	
+                             boolean hasAlpha,
+                             boolean isAlphaPremultiplied,
+                             int transparency, int transferType)
+  {
     this(colorSpace, findBits(colorSpace, transferType, hasAlpha), hasAlpha,
          isAlphaPremultiplied, transparency, transferType);
   }
@@ -117,7 +117,7 @@ public class ComponentColorModel extends ColorModel
     if (getNumComponents()>1) throw new IllegalArgumentException();
     return (int) getRGBFloat(pixel)[0];
   }
-  
+
   public int getBlue(int pixel)
   {
     if (getNumComponents()>1) throw new IllegalArgumentException();
@@ -131,7 +131,7 @@ public class ComponentColorModel extends ColorModel
     if (shift >= 0) return pixel << shift;
     return pixel >> (-shift);
   }
-   
+
   public int getRGB(int pixel)
   {
     float[] rgb = getRGBFloat(pixel);
@@ -143,7 +143,7 @@ public class ComponentColorModel extends ColorModel
 
   /* Note, it's OK to pass a to large array to toRGB(). Extra
      elements are ignored. */
-  
+
   private float[] getRGBFloat(int pixel)
   {
     float[] data = { pixel };
@@ -154,20 +154,20 @@ public class ComponentColorModel extends ColorModel
   {
     DataBuffer buffer =
     Buffers.createBufferFromData(transferType, inData,
-				 getNumComponents());
+                                 getNumComponents());
     int colors = getNumColorComponents();
     float[] data = new float[colors];
-    
+
     // FIXME: unpremultiply data that is premultiplied
     for (int i=0; i<colors; i++)
       {
-	float maxValue = (1<<getComponentSize(i))-1;
-	data[i] = buffer.getElemFloat(i)/maxValue; 
+        float maxValue = (1<<getComponentSize(i))-1;
+        data[i] = buffer.getElemFloat(i)/maxValue;
       }
     float[] rgb = cspace.toRGB(data);
     return rgb;
   }
-  
+
   public int getRed(Object inData)
   {
     return (int) getRGBFloat(inData)[0]*255;
@@ -187,7 +187,7 @@ public class ComponentColorModel extends ColorModel
   {
     DataBuffer buffer =
       Buffers.createBufferFromData(transferType, inData,
-				   getNumComponents());
+                                   getNumComponents());
     int shift = 8 - getComponentSize(getNumColorComponents());
     int alpha = buffer.getElem(getNumColorComponents());
     if (shift >= 0) return alpha << shift;
@@ -200,7 +200,7 @@ public class ComponentColorModel extends ColorModel
        avoid bits spilling over from one bit field to
        another. But, if we assume that floats are in the [0.0,
        1.0] range, this will never happen anyway. */
-    
+
     /* Remember to multiply BEFORE casting to int, otherwise, decimal
        point data will be lost. */
     int ret =
@@ -234,30 +234,30 @@ public class ComponentColorModel extends ColorModel
     // Convert from rgb to color space components.
     float[] data = cspace.fromRGB(rgbFloats);
     DataBuffer buffer = Buffers.createBuffer(transferType, pixel,
-					     getNumComponents());
+                                             getNumComponents());
     int numColors = getNumColorComponents();
-    
+
     if (hasAlpha())
       {
-	float alpha = ((rgb >> 24)&0xff)/255.0F;
-	
-	/* If color model has alpha and should be premultiplied, multiply
-	   color space components with alpha value. */
-	if (isAlphaPremultiplied()) {
-	  for (int i=0; i<numColors; i++)
-	    data[i] *= alpha;
-	}
-	// Scale the alpha sample to the correct number of bits.
-	alpha *= (1<<(bits[numColors]-1));
-	// Arrange the alpha sample in the output array.
-	buffer.setElemFloat(numColors, alpha);
+        float alpha = ((rgb >> 24)&0xff)/255.0F;
+
+        /* If color model has alpha and should be premultiplied, multiply
+           color space components with alpha value. */
+        if (isAlphaPremultiplied()) {
+          for (int i=0; i<numColors; i++)
+            data[i] *= alpha;
+        }
+        // Scale the alpha sample to the correct number of bits.
+        alpha *= (1<<(bits[numColors]-1));
+        // Arrange the alpha sample in the output array.
+        buffer.setElemFloat(numColors, alpha);
       }
     for (int i=0; i<numColors; i++)
       {
-	// Scale the color samples to the correct number of bits.
-	float value = data[i]*(1<<(bits[i]-1));
-	// Arrange the color samples in the output array.
-	buffer.setElemFloat(i, value);
+        // Scale the color samples to the correct number of bits.
+        float value = data[i]*(1<<(bits[i]-1));
+        // Arrange the color samples in the output array.
+        buffer.setElemFloat(i, value);
       }
     return Buffers.getData(buffer);
   }
@@ -274,7 +274,7 @@ public class ComponentColorModel extends ColorModel
   public int[] getComponents(Object pixel, int[] components, int offset)
   {
     DataBuffer buffer = Buffers.createBuffer(transferType, pixel,
-					     getNumComponents());
+                                             getNumComponents());
     int numComponents = getNumComponents();
 
     if (components == null)
@@ -295,7 +295,7 @@ public class ComponentColorModel extends ColorModel
   public Object getDataElements(int[] components, int offset, Object obj)
   {
     DataBuffer buffer = Buffers.createBuffer(transferType, obj,
-					     getNumComponents());
+                                             getNumComponents());
     int numComponents = getNumComponents();
 
     for (int i=0; i<numComponents; i++)
@@ -305,7 +305,7 @@ public class ComponentColorModel extends ColorModel
   }
 
   public ColorModel coerceData(WritableRaster raster,
-			       boolean isAlphaPremultiplied) {
+                               boolean isAlphaPremultiplied) {
     if (this.isAlphaPremultiplied == isAlphaPremultiplied || !hasAlpha())
       return this;
 
@@ -313,7 +313,7 @@ public class ComponentColorModel extends ColorModel
        assumptions we can make due to the specific type of the
        color model. */
     coerceDataWorker(raster, isAlphaPremultiplied);
-    
+
     return new ComponentColorModel(cspace, hasAlpha, isAlphaPremultiplied,
                                    transparency, transferType);
   }
@@ -383,7 +383,7 @@ public class ComponentColorModel extends ColorModel
 
   public boolean isCompatibleSampleModel(SampleModel sm)
   {
-    return 
+    return
       (sm instanceof ComponentSampleModel) &&
       super.isCompatibleSampleModel(sm);
   }
@@ -391,7 +391,7 @@ public class ComponentColorModel extends ColorModel
   public WritableRaster getAlphaRaster(WritableRaster raster)
   {
     if (!hasAlpha()) return null;
-    
+
     SampleModel sm = raster.getSampleModel();
     int[] alphaBand = { sm.getNumBands() - 1 };
     SampleModel alphaModel = sm.createSubsetSampleModel(alphaBand);
@@ -399,7 +399,7 @@ public class ComponentColorModel extends ColorModel
     Point origin = new Point(0, 0);
     return Raster.createWritableRaster(alphaModel, buffer, origin);
   }
-    
+
   public boolean equals(Object obj)
   {
     if (!(obj instanceof ComponentColorModel)) return false;
diff --git a/libjava/classpath/java/awt/image/ComponentSampleModel.java b/libjava/classpath/java/awt/image/ComponentSampleModel.java
index 73e7fb4..f32eae3 100644
--- a/libjava/classpath/java/awt/image/ComponentSampleModel.java
+++ b/libjava/classpath/java/awt/image/ComponentSampleModel.java
@@ -60,65 +60,65 @@ public class ComponentSampleModel extends SampleModel
 {
   /** The offsets to the first sample for each band. */
   protected int[] bandOffsets;
-  
+
   /** The indices of the bank used to store each band in a data buffer. */
   protected int[] bankIndices;
-  
-  /** 
+
+  /**
    * The number of bands in the image.
    * @specnote This field shadows the protected numBands in SampleModel.
    */
   protected int numBands;
-  
+
   /** Used when creating data buffers. */
   protected int numBanks;
 
-  /** 
-   * The number of data elements between a sample in one row and the 
+  /**
+   * The number of data elements between a sample in one row and the
    * corresponding sample in the next row.
    */
   protected int scanlineStride;
-  
+
   /**
-   * The number of data elements between a sample for one pixel and the 
+   * The number of data elements between a sample for one pixel and the
    * corresponding sample for the next pixel in the same row.
    */
   protected int pixelStride;
 
   /**
-   * Creates a new sample model that assumes that all bands are stored in a 
+   * Creates a new sample model that assumes that all bands are stored in a
    * single bank of the {@link DataBuffer}.
    * <p>
    * Note that the <code>bandOffsets</code> array is copied to internal storage
    * to prevent subsequent changes to the array from affecting this object.
-   * 
+   *
    * @param dataType  the data type (one of {@link DataBuffer#TYPE_BYTE},
    *   {@link DataBuffer#TYPE_USHORT}, {@link DataBuffer#TYPE_SHORT},
-   *   {@link DataBuffer#TYPE_INT}, {@link DataBuffer#TYPE_FLOAT} or 
+   *   {@link DataBuffer#TYPE_INT}, {@link DataBuffer#TYPE_FLOAT} or
    *   {@link DataBuffer#TYPE_DOUBLE}).
    * @param w  the width in pixels.
    * @param h  the height in pixels.
    * @param pixelStride  the number of data elements in the step from a sample
    *   in one pixel to the corresponding sample in the next pixel.
-   * @param scanlineStride  the number of data elements in the step from a 
+   * @param scanlineStride  the number of data elements in the step from a
    *   sample in a pixel to the corresponding sample in the pixel in the next
    *   row.
-   * @param bandOffsets  the offset to the first element for each band, with 
+   * @param bandOffsets  the offset to the first element for each band, with
    *   the size of the array defining the number of bands (<code>null</code>
    *   not permitted).
-   *   
+   *
    * @throws IllegalArgumentException if <code>dataType</code> is not one of
    *   the specified values.
    * @throws IllegalArgumentException if <code>w</code> is less than or equal
    *   to zero.
-   * @throws IllegalArgumentException if <code>h</code> is less than or equal 
+   * @throws IllegalArgumentException if <code>h</code> is less than or equal
    *   to zero.
    * @throws IllegalArgumentException if <code>w * h</code> exceeds
    *   {@link Integer#MAX_VALUE}.
    * @throws IllegalArgumentException if <code>pixelStride</code> is negative.
-   * @throws IllegalArgumentException if <code>scanlineStride</code> is less 
+   * @throws IllegalArgumentException if <code>scanlineStride</code> is less
    *   than or equal to zero.
-   * @throws IllegalArgumentException if <code>bandOffsets</code> has zero 
+   * @throws IllegalArgumentException if <code>bandOffsets</code> has zero
    *   length.
    */
   public ComponentSampleModel(int dataType,
@@ -130,43 +130,43 @@ public class ComponentSampleModel extends SampleModel
     this(dataType, w, h, pixelStride, scanlineStride,
          new int[bandOffsets.length], bandOffsets);
   }
-    
+
   /**
-   * Creates a new sample model that assumes that all bands are stored in a 
+   * Creates a new sample model that assumes that all bands are stored in a
    * single bank of the {@link DataBuffer}.
-   * 
+   *
    * @param dataType  the data type (one of {@link DataBuffer#TYPE_BYTE},
    *   {@link DataBuffer#TYPE_USHORT}, {@link DataBuffer#TYPE_SHORT},
-   *   {@link DataBuffer#TYPE_INT}, {@link DataBuffer#TYPE_FLOAT} or 
+   *   {@link DataBuffer#TYPE_INT}, {@link DataBuffer#TYPE_FLOAT} or
    *   {@link DataBuffer#TYPE_DOUBLE}).
    * @param w  the width in pixels.
    * @param h  the height in pixels.
    * @param pixelStride  the number of data elements in the step from a sample
    *   in one pixel to the corresponding sample in the next pixel.
-   * @param scanlineStride  the number of data elements in the step from a 
+   * @param scanlineStride  the number of data elements in the step from a
    *   sample in a pixel to the corresponding sample in the pixel in the next
    *   row.
-   * @param bankIndices  the index of the bank in which each band is stored 
+   * @param bankIndices  the index of the bank in which each band is stored
    *   (<code>null</code> not permitted).  This array is copied to internal
-   *   storage so that subsequent updates to the array do not affect the sample 
+   *   storage so that subsequent updates to the array do not affect the sample
    *   model.
-   * @param bandOffsets  the offset to the first element for each band, with 
+   * @param bandOffsets  the offset to the first element for each band, with
    *   the size of the array defining the number of bands (<code>null</code>
-   *   not permitted).  This array is copied to internal storage so that 
+   *   not permitted).  This array is copied to internal storage so that
    *   subsequent updates to the array do not affect the sample model.
-   *   
+   *
    * @throws IllegalArgumentException if <code>dataType</code> is not one of
    *   the specified values.
    * @throws IllegalArgumentException if <code>w</code> is less than or equal
    *   to zero.
-   * @throws IllegalArgumentException if <code>h</code> is less than or equal 
+   * @throws IllegalArgumentException if <code>h</code> is less than or equal
    *   to zero.
    * @throws IllegalArgumentException if <code>w * h</code> exceeds
    *   {@link Integer#MAX_VALUE}.
    * @throws IllegalArgumentException if <code>pixelStride</code> is negative.
-   * @throws IllegalArgumentException if <code>scanlineStride</code> is less 
+   * @throws IllegalArgumentException if <code>scanlineStride</code> is less
    *   than or equal to zero.
-   * @throws IllegalArgumentException if <code>bandOffsets</code> has zero 
+   * @throws IllegalArgumentException if <code>bandOffsets</code> has zero
    *   length.
    */
   public ComponentSampleModel(int dataType,
@@ -177,15 +177,15 @@ public class ComponentSampleModel extends SampleModel
                               int[] bandOffsets)
   {
     super(dataType, w, h, bandOffsets.length);
-    
+
     // super permits DataBuffer.TYPE_UNDEFINED but this class doesn't...
     if (dataType == DataBuffer.TYPE_UNDEFINED)
       throw new IllegalArgumentException("Unsupported dataType.");
-    
-    if ((pixelStride < 0) || (scanlineStride < 0) || (bandOffsets.length < 1) 
+
+    if ((pixelStride < 0) || (scanlineStride < 0) || (bandOffsets.length < 1)
         || (bandOffsets.length != bankIndices.length))
       throw new IllegalArgumentException();
-    
+
     this.bandOffsets = (int[]) bandOffsets.clone();
     this.bankIndices = (int[]) bankIndices.clone();
     this.numBands = bandOffsets.length;
@@ -197,15 +197,15 @@ public class ComponentSampleModel extends SampleModel
     this.scanlineStride = scanlineStride;
     this.pixelStride = pixelStride;
 
-  }             
+  }
 
   /**
    * Creates a new sample model that is compatible with this one, but with the
    * specified dimensions.
-   * 
+   *
    * @param w  the width (must be greater than zero).
    * @param h  the height (must be greater than zero).
-   * 
+   *
    * @return A new sample model.
    */
   public SampleModel createCompatibleSampleModel(int w, int h)
@@ -218,15 +218,15 @@ public class ComponentSampleModel extends SampleModel
   /**
    * Creates a new sample model that provides access to a subset of the bands
    * that this sample model supports.
-   * 
+   *
    * @param bands  the bands (<code>null</code> not permitted).
-   * 
+   *
    * @return The new sample model.
    */
   public SampleModel createSubsetSampleModel(int[] bands)
   {
     int numBands = bands.length;
-    
+
     int[] bankIndices = new int[numBands];
     int[] bandOffsets = new int[numBands];
     for (int b = 0; b < numBands; b++)
@@ -242,7 +242,7 @@ public class ComponentSampleModel extends SampleModel
 
   /**
    * Creates a new data buffer that is compatible with this sample model.
-   * 
+   *
    * @return The new data buffer.
    */
   public DataBuffer createDataBuffer()
@@ -250,8 +250,8 @@ public class ComponentSampleModel extends SampleModel
     // Maybe this value should be precalculated in the constructor?
     int highestOffset = 0;
     for (int b = 0; b < numBands; b++)
-      highestOffset = Math.max(highestOffset, bandOffsets[b]);    
-    int size = pixelStride * (width - 1) + scanlineStride * (height - 1) 
+      highestOffset = Math.max(highestOffset, bandOffsets[b]);
+    int size = pixelStride * (width - 1) + scanlineStride * (height - 1)
         + highestOffset + 1;
 
     DataBuffer buffer = null;
@@ -283,12 +283,12 @@ public class ComponentSampleModel extends SampleModel
    * Returns the offset of the sample in band 0 for the pixel at location
    * <code>(x, y)</code>.  This offset can be used to read a sample value from
    * a {@link DataBuffer}.
-   * 
+   *
    * @param x  the x-coordinate.
    * @param y  the y-coordinate.
-   * 
+   *
    * @return The offset.
-   * 
+   *
    * @see #getOffset(int, int, int)
    */
   public int getOffset(int x, int y)
@@ -300,11 +300,11 @@ public class ComponentSampleModel extends SampleModel
    * Returns the offset of the sample in band <code>b</code> for the pixel at
    * location <code>(x, y)</code>.  This offset can be used to read a sample
    * value from a {@link DataBuffer}.
-   * 
+   *
    * @param x  the x-coordinate.
    * @param y  the y-coordinate.
    * @param b  the band index.
-   * 
+   *
    * @return The offset.
    */
   public int getOffset(int x, int y, int b)
@@ -316,9 +316,9 @@ public class ComponentSampleModel extends SampleModel
    * Returns the size in bits for each sample (one per band).  For this sample
    * model, each band has the same sample size and this is determined by the
    * data type for the sample model.
-   * 
+   *
    * @return The sample sizes.
-   * 
+   *
    * @see SampleModel#getDataType()
    */
   public final int[] getSampleSize()
@@ -332,13 +332,13 @@ public class ComponentSampleModel extends SampleModel
 
   /**
    * Returns the size in bits for the samples in the specified band.  In this
-   * class, the sample size is the same for every band and is determined from 
+   * class, the sample size is the same for every band and is determined from
    * the data type for the model.
-   * 
+   *
    * @param band  the band index (ignored here).
-   * 
+   *
    * @return The sample size in bits.
-   * 
+   *
    * @see SampleModel#getDataType()
    */
   public final int getSampleSize(int band)
@@ -347,10 +347,10 @@ public class ComponentSampleModel extends SampleModel
   }
 
   /**
-   * Returns the indices of the bank(s) in the {@link DataBuffer} used to 
+   * Returns the indices of the bank(s) in the {@link DataBuffer} used to
    * store the samples for each band.  The returned array is a copy, so that
    * altering it will not impact the sample model.
-   * 
+   *
    * @return The bank indices.
    */
   public final int[] getBankIndices()
@@ -361,7 +361,7 @@ public class ComponentSampleModel extends SampleModel
   /**
    * Returns the offsets to the first sample in each band.  The returned array
    * is a copy, so that altering it will not impact the sample model.
-   * 
+   *
    * @return The offsets.
    */
   public final int[] getBandOffsets()
@@ -371,10 +371,10 @@ public class ComponentSampleModel extends SampleModel
 
   /**
    * Returns the distance (in terms of element indices) between the sample for
-   * one pixel and the corresponding sample for the equivalent pixel in the 
+   * one pixel and the corresponding sample for the equivalent pixel in the
    * next row.  This is used in the calculation of the element offset for
    * retrieving samples from a {@link DataBuffer}.
-   * 
+   *
    * @return The distance between pixel samples in consecutive rows.
    */
   public final int getScanlineStride()
@@ -383,11 +383,11 @@ public class ComponentSampleModel extends SampleModel
   }
 
   /**
-   * Returns the distance (in terms of element indices) between the sample for 
-   * one pixel and the corresponding sample for the next pixel in a row.  This 
-   * is used in the calculation of the element offset for retrieving samples 
+   * Returns the distance (in terms of element indices) between the sample for
+   * one pixel and the corresponding sample for the next pixel in a row.  This
+   * is used in the calculation of the element offset for retrieving samples
    * from a {@link DataBuffer}.
-   * 
+   *
    * @return The distance between pixel samples in the same row.
    */
   public final int getPixelStride()
@@ -396,10 +396,10 @@ public class ComponentSampleModel extends SampleModel
   }
 
   /**
-   * Returns the number of data elements used to store the samples for one 
+   * Returns the number of data elements used to store the samples for one
    * pixel.  In this model, this is the same as the number of bands.
-   * 
-   * @return The number of data elements used to store the samples for one 
+   *
+   * @return The number of data elements used to store the samples for one
    *   pixel.
    */
   public final int getNumDataElements()
@@ -409,17 +409,17 @@ public class ComponentSampleModel extends SampleModel
 
   /**
    * Returns the samples for the pixel at location <code>(x, y)</code> in
-   * a primitive array (the array type is determined by the data type for 
+   * a primitive array (the array type is determined by the data type for
    * this model).  The <code>obj</code> argument provides an option to supply
    * an existing array to hold the result, if this is <code>null</code> a new
    * array will be allocated.
-   * 
+   *
    * @param x  the x-coordinate.
    * @param y  the y-coordinate.
-   * @param obj  a primitive array that, if not <code>null</code>, will be 
+   * @param obj  a primitive array that, if not <code>null</code>, will be
    *   used to store and return the sample values.
    * @param data  the data buffer (<code>null</code> not permitted).
-   * 
+   *
    * @return An array of sample values for the specified pixel.
    */
   public Object getDataElements(int x, int y, Object obj, DataBuffer data)
@@ -502,23 +502,23 @@ public class ComponentSampleModel extends SampleModel
   /**
    * Returns all the samples for the pixel at location <code>(x, y)</code>
    * stored in the specified data buffer.
-   * 
+   *
    * @param x  the x-coordinate.
    * @param y  the y-coordinate.
    * @param iArray  an array that will be populated with the sample values and
-   *   returned as the result.  The size of this array should be equal to the 
+   *   returned as the result.  The size of this array should be equal to the
    *   number of bands in the model.  If the array is <code>null</code>, a new
    *   array is created.
    * @param data  the data buffer (<code>null</code> not permitted).
-   * 
+   *
    * @return The samples for the specified pixel.
-   * 
+   *
    * @see #setPixel(int, int, int[], DataBuffer)
    */
   public int[] getPixel(int x, int y, int[] iArray, DataBuffer data)
   {
     if (x < 0 || x >= width || y < 0 || y >= height)
-      throw new ArrayIndexOutOfBoundsException("Pixel (" + x + ", " + y 
+      throw new ArrayIndexOutOfBoundsException("Pixel (" + x + ", " + y
                                                + ") is out of bounds.");
     int offset = pixelStride * x + scanlineStride * y;
     if (iArray == null)
@@ -532,22 +532,22 @@ public class ComponentSampleModel extends SampleModel
 
   /**
    * Returns the samples for all the pixels in a rectangular region.
-   * 
+   *
    * @param x  the x-coordinate.
    * @param y  the y-coordinate.
    * @param w  the width.
    * @param h  the height.
-   * @param iArray  an array that if non-<code>null</code> will be populated 
+   * @param iArray  an array that if non-<code>null</code> will be populated
    *   with the sample values and returned as the result.
    * @param data  the data buffer (<code>null</code> not permitted).
-   * 
+   *
    * @return The samples for all the pixels in the rectangle.
    */
   public int[] getPixels(int x, int y, int w, int h, int[] iArray,
                          DataBuffer data)
   {
     int offset = pixelStride * x + scanlineStride * y;
-    if (iArray == null) 
+    if (iArray == null)
       iArray = new int[numBands * w * h];
     int outOffset = 0;
     for (y = 0; y < h; y++)
@@ -557,7 +557,7 @@ public class ComponentSampleModel extends SampleModel
           {
             for (int b = 0; b < numBands; b++)
               {
-                iArray[outOffset++] 
+                iArray[outOffset++]
                     = data.getElem(bankIndices[b], lineOffset+bandOffsets[b]);
               }
             lineOffset += pixelStride;
@@ -566,41 +566,41 @@ public class ComponentSampleModel extends SampleModel
       }
     return iArray;
   }
- 
+
   /**
-   * Returns the sample for band <code>b</code> of the pixel at 
+   * Returns the sample for band <code>b</code> of the pixel at
    * <code>(x, y)</code> that is stored in the specified data buffer.
-   * 
+   *
    * @param x  the x-coordinate.
    * @param y  the y-coordinate.
    * @param b  the band index.
    * @param data  the data buffer (<code>null</code> not permitted).
-   * 
+   *
    * @return The sample value.
-   * 
-   * @throws ArrayIndexOutOfBoundsException if <code>(x, y)</code> is outside 
+   *
+   * @throws ArrayIndexOutOfBoundsException if <code>(x, y)</code> is outside
    *     the bounds <code>[0, 0, width, height]</code>.
-   *     
+   *
    * @see #setSample(int, int, int, int, DataBuffer)
    */
   public int getSample(int x, int y, int b, DataBuffer data)
   {
     if (x < 0 || x >= width || y < 0 || y >= height)
-      throw new ArrayIndexOutOfBoundsException("Sample (" + x + ", " + y 
+      throw new ArrayIndexOutOfBoundsException("Sample (" + x + ", " + y
                                                + ") is out of bounds.");
     return data.getElem(bankIndices[b], getOffset(x, y, b));
   }
 
   /**
-   * Sets the samples for the pixel at location <code>(x, y)</code> from the 
-   * supplied primitive array (the array type must be consistent with the data 
+   * Sets the samples for the pixel at location <code>(x, y)</code> from the
+   * supplied primitive array (the array type must be consistent with the data
    * type for this model).
-   * 
+   *
    * @param x  the x-coordinate.
    * @param y  the y-coordinate.
    * @param obj  a primitive array containing the pixel's sample values.
    * @param data  the data buffer (<code>null</code> not permitted).
-   * 
+   *
    * @see #setDataElements(int, int, Object, DataBuffer)
    */
   public void setDataElements(int x, int y, Object obj, DataBuffer data)
@@ -652,16 +652,16 @@ public class ComponentSampleModel extends SampleModel
         break;
       }
   }
-  
+
   /**
    * Sets the sample values for the pixel at location <code>(x, y)</code>
    * stored in the specified data buffer.
-   * 
+   *
    * @param x  the x-coordinate.
    * @param y  the y-coordinate.
    * @param iArray  the pixel sample values (<code>null</code> not permitted).
    * @param data  the data buffer (<code>null</code> not permitted).
-   * 
+   *
    * @see #getPixel(int, int, int[], DataBuffer)
    */
   public void setPixel(int x, int y, int[] iArray, DataBuffer data)
@@ -670,24 +670,24 @@ public class ComponentSampleModel extends SampleModel
     for (int b = 0; b < numBands; b++)
       data.setElem(bankIndices[b], offset + bandOffsets[b], iArray[b]);
   }
-    
+
   /**
    * Sets the sample value for band <code>b</code> of the pixel at location
    * <code>(x, y)</code> in the specified data buffer.
-   * 
+   *
    * @param x  the x-coordinate.
    * @param y  the y-coordinate.
    * @param b  the band index.
    * @param s  the sample value.
    * @param data  the data buffer (<code>null</code> not permitted).
-   * 
+   *
    * @see #getSample(int, int, int, DataBuffer)
    */
   public void setSample(int x, int y, int b, int s, DataBuffer data)
   {
     data.setElem(bankIndices[b], getOffset(x, y, b), s);
   }
-  
+
   /**
    * Tests this sample model for equality with an arbitrary object.  Returns
    * <code>true</code> if and only if:
@@ -700,10 +700,10 @@ public class ComponentSampleModel extends SampleModel
    *   <code>scanlineStride</code>, <code>bandOffsets</code> and
    *   <code>bankIndices</code> fields.</li>
    * </ul>
-   * 
+   *
    * @param obj  the object to test (<code>null</code> permitted).
-   * 
-   * @return <code>true</code> if this sample model is equal to 
+   *
+   * @return <code>true</code> if this sample model is equal to
    *   <code>obj</code>, and <code>false</code> otherwise.
    */
   public boolean equals(Object obj)
@@ -730,10 +730,10 @@ public class ComponentSampleModel extends SampleModel
     // couldn't find any difference, so...
     return true;
   }
-  
+
   /**
    * Returns a hash code for this sample model.
-   * 
+   *
    * @return The hash code.
    */
   public int hashCode()
diff --git a/libjava/classpath/java/awt/image/ConvolveOp.java b/libjava/classpath/java/awt/image/ConvolveOp.java
index cf30e76..10b85f4 100644
--- a/libjava/classpath/java/awt/image/ConvolveOp.java
+++ b/libjava/classpath/java/awt/image/ConvolveOp.java
@@ -44,58 +44,58 @@ import java.awt.geom.Rectangle2D;
 
 /**
  * Convolution filter.
- * 
+ *
  * ConvolveOp convolves the source image with a Kernel to generate a
  * destination image.  This involves multiplying each pixel and its neighbors
  * with elements in the kernel to compute a new pixel.
- * 
+ *
  * Each band in a Raster is convolved and copied to the destination Raster.
- * For BufferedImages, convolution is applied to all components.  Color 
+ * For BufferedImages, convolution is applied to all components.  Color
  * conversion will be applied if needed.
- * 
+ *
  * Note that this filter ignores whether the source or destination is alpha
  * premultiplied.  The reference spec states that data will be premultiplied
  * prior to convolving and divided back out afterwards (if needed), but testing
  * has shown that this is not the case with their implementation.
- * 
+ *
  * @author jlquinn@optonline.net
  */
 public class ConvolveOp implements BufferedImageOp, RasterOp
 {
   /** Edge pixels are set to 0. */
   public static final int EDGE_ZERO_FILL = 0;
-  
+
   /** Edge pixels are copied from the source. */
   public static final int EDGE_NO_OP = 1;
-  
+
   private Kernel kernel;
   private int edge;
   private RenderingHints hints;
 
   /**
    * Construct a ConvolveOp.
-   * 
+   *
    * The edge condition specifies that pixels outside the area that can be
    * filtered are either set to 0 or copied from the source image.
-   * 
+   *
    * @param kernel The kernel to convolve with.
    * @param edgeCondition Either EDGE_ZERO_FILL or EDGE_NO_OP.
    * @param hints Rendering hints for color conversion, or null.
    */
   public ConvolveOp(Kernel kernel,
-      				int edgeCondition,
-      				RenderingHints hints)
+                                int edgeCondition,
+                                RenderingHints hints)
   {
     this.kernel = kernel;
     edge = edgeCondition;
     this.hints = hints;
   }
-  
+
   /**
    * Construct a ConvolveOp.
-   * 
+   *
    * The edge condition defaults to EDGE_ZERO_FILL.
-   * 
+   *
    * @param kernel The kernel to convolve with.
    */
   public ConvolveOp(Kernel kernel)
@@ -108,8 +108,8 @@ public class ConvolveOp implements BufferedImageOp, RasterOp
   /**
    * Converts the source image using the kernel specified in the
    * constructor.  The resulting image is stored in the destination image if one
-   * is provided; otherwise a new BufferedImage is created and returned. 
-   * 
+   * is provided; otherwise a new BufferedImage is created and returned.
+   *
    * The source and destination BufferedImage (if one is supplied) must have
    * the same dimensions.
    *
@@ -124,10 +124,10 @@ public class ConvolveOp implements BufferedImageOp, RasterOp
     if (src == dst)
       throw new IllegalArgumentException("Source and destination images " +
             "cannot be the same.");
-    
+
     if (dst == null)
       dst = createCompatibleDestImage(src, src.getColorModel());
-    
+
     // Make sure source image is premultiplied
     BufferedImage src1 = src;
     // The spec says we should do this, but mauve testing shows that Sun's
@@ -146,15 +146,15 @@ public class ConvolveOp implements BufferedImageOp, RasterOp
       dst1 = createCompatibleDestImage(src, src.getColorModel());
 
     filter(src1.getRaster(), dst1.getRaster());
-    
+
     // Since we don't coerceData above, we don't need to divide it back out.
     // This is wrong (one mauve test specifically tests converting a non-
     // premultiplied image to a premultiplied image, and it shows that Sun
     // simply ignores the premultipled flag, contrary to the spec), but we
     // mimic it for compatibility.
     /*
-	if (! dst.isAlphaPremultiplied())
-	  dst1.coerceData(false);
+        if (! dst.isAlphaPremultiplied())
+          dst1.coerceData(false);
     */
 
     // Convert between color models if needed
@@ -166,7 +166,7 @@ public class ConvolveOp implements BufferedImageOp, RasterOp
 
   /**
    * Creates an empty BufferedImage with the size equal to the source and the
-   * correct number of bands. The new image is created with the specified 
+   * correct number of bands. The new image is created with the specified
    * ColorModel, or if no ColorModel is supplied, an appropriate one is chosen.
    *
    * @param src The source image.
@@ -191,17 +191,17 @@ public class ConvolveOp implements BufferedImageOp, RasterOp
   {
     return hints;
   }
-  
+
   /**
    * Get the edge condition for this Op.
-   * 
+   *
    * @return The edge condition.
    */
   public int getEdgeCondition()
   {
     return edge;
   }
-  
+
   /**
    * Returns (a clone of) the convolution kernel.
    *
@@ -213,13 +213,13 @@ public class ConvolveOp implements BufferedImageOp, RasterOp
   }
 
   /**
-   * Converts the source raster using the kernel specified in the constructor.  
-   * The resulting raster is stored in the destination raster if one is 
+   * Converts the source raster using the kernel specified in the constructor.
+   * The resulting raster is stored in the destination raster if one is
    * provided; otherwise a new WritableRaster is created and returned.
-   * 
+   *
    * If the convolved value for a sample is outside the range of [0-255], it
    * will be clipped.
-   * 
+   *
    * The source and destination raster (if one is supplied) cannot be the same,
    * and must also have the same dimensions.
    *
@@ -233,7 +233,7 @@ public class ConvolveOp implements BufferedImageOp, RasterOp
   {
     if (src == dest)
       throw new IllegalArgumentException("src == dest is not allowed.");
-    if (kernel.getWidth() > src.getWidth() 
+    if (kernel.getWidth() > src.getWidth()
         || kernel.getHeight() > src.getHeight())
       throw new ImagingOpException("The kernel is too large.");
     if (dest == null)
@@ -248,12 +248,12 @@ public class ConvolveOp implements BufferedImageOp, RasterOp
     int right = Math.max(kWidth - left - 1, 0);
     int top = kernel.getYOrigin();
     int bottom = Math.max(kHeight - top - 1, 0);
-    
+
     // Calculate max sample values for clipping
     int[] maxValue = src.getSampleModel().getSampleSize();
     for (int i = 0; i < maxValue.length; i++)
       maxValue[i] = (int)Math.pow(2, maxValue[i]) - 1;
-    
+
     // process the region that is reachable...
     int regionW = src.width - left - right;
     int regionH = src.height - top - bottom;
@@ -271,8 +271,8 @@ public class ConvolveOp implements BufferedImageOp, RasterOp
               src.getSamples(x, y, kWidth, kHeight, b, tmp);
               for (int i = 0; i < tmp.length; i++)
                 v += tmp[tmp.length - i - 1] * kvals[i];
-                // FIXME: in the above line, I've had to reverse the order of 
-                // the samples array to make the tests pass.  I haven't worked 
+                // FIXME: in the above line, I've had to reverse the order of
+                // the samples array to make the tests pass.  I haven't worked
                 // out why this is necessary.
 
               // This clipping is is undocumented, but determined by testing.
@@ -281,34 +281,34 @@ public class ConvolveOp implements BufferedImageOp, RasterOp
               else if (v < 0)
                 v = 0;
 
-              dest.setSample(x + kernel.getXOrigin(), y + kernel.getYOrigin(), 
+              dest.setSample(x + kernel.getXOrigin(), y + kernel.getYOrigin(),
                              b, v);
             }
           }
       }
-    
+
     // fill in the top border
     fillEdge(src, dest, 0, 0, src.width, top, edge);
-    
+
     // fill in the bottom border
     fillEdge(src, dest, 0, src.height - bottom, src.width, bottom, edge);
-    
+
     // fill in the left border
     fillEdge(src, dest, 0, top, left, regionH, edge);
-    
+
     // fill in the right border
     fillEdge(src, dest, src.width - right, top, right, regionH, edge);
-    
-    return dest;  
+
+    return dest;
   }
-  
+
   /**
    * Fills a range of pixels (typically at the edge of a raster) with either
-   * zero values (if <code>edgeOp</code> is <code>EDGE_ZERO_FILL</code>) or the 
+   * zero values (if <code>edgeOp</code> is <code>EDGE_ZERO_FILL</code>) or the
    * corresponding pixel values from the source raster (if <code>edgeOp</code>
-   * is <code>EDGE_NO_OP</code>).  This utility method is called by the 
+   * is <code>EDGE_NO_OP</code>).  This utility method is called by the
    * {@link #fillEdge(Raster, WritableRaster, int, int, int, int, int)} method.
-   * 
+   *
    * @param src  the source raster.
    * @param dest  the destination raster.
    * @param x  the x-coordinate of the top left pixel in the range.
@@ -318,8 +318,8 @@ public class ConvolveOp implements BufferedImageOp, RasterOp
    * @param edgeOp  indicates how to determine the values for the range
    *     (either {@link #EDGE_ZERO_FILL} or {@link #EDGE_NO_OP}).
    */
-  private void fillEdge(Raster src, WritableRaster dest, int x, int y, int w, 
-                        int h, int edgeOp) 
+  private void fillEdge(Raster src, WritableRaster dest, int x, int y, int w,
+                        int h, int edgeOp)
   {
     if (w <= 0)
       return;
@@ -328,7 +328,7 @@ public class ConvolveOp implements BufferedImageOp, RasterOp
     if (edgeOp == EDGE_ZERO_FILL)  // fill region with zeroes
       {
         float[] zeros = new float[src.getNumBands() * w * h];
-        dest.setPixels(x, y, w, h, zeros); 
+        dest.setPixels(x, y, w, h, zeros);
       }
     else  // copy pixels from source
       {
@@ -366,7 +366,7 @@ public class ConvolveOp implements BufferedImageOp, RasterOp
    * Returns the corresponding destination point for a source point. Because
    * this is not a geometric operation, the destination and source points will
    * be identical.
-   * 
+   *
    * @param src The source point.
    * @param dst The transformed destination point.
    * @return The transformed destination point.
diff --git a/libjava/classpath/java/awt/image/CropImageFilter.java b/libjava/classpath/java/awt/image/CropImageFilter.java
index 53b4156..4d8fb62 100644
--- a/libjava/classpath/java/awt/image/CropImageFilter.java
+++ b/libjava/classpath/java/awt/image/CropImageFilter.java
@@ -44,7 +44,7 @@ import java.util.Hashtable;
 /**
  * Currently this filter does almost nothing and needs to be implemented.
  *
- * @author C. Brian Jones (cbj@gnu.org) 
+ * @author C. Brian Jones (cbj@gnu.org)
  */
 public class CropImageFilter extends ImageFilter
 {
@@ -62,10 +62,10 @@ public class CropImageFilter extends ImageFilter
      * @param height the height of the cropped rectangle
      */
     public CropImageFilter(int x, int y, int width, int height) {
-	this.x = x;
-	this.y = y;
-	this.width = width;
-	this.height = height;
+        this.x = x;
+        this.y = y;
+        this.width = width;
+        this.height = height;
     }
 
     /**
@@ -73,14 +73,14 @@ public class CropImageFilter extends ImageFilter
      * being produced using this method.  This filter overrides this
      * method in order to set the dimentions to the size of the
      * cropped rectangle instead of the size of the image.
-     * 
+     *
      * @param width the width of the image
-     * @param height the height of the image 
+     * @param height the height of the image
      */
     public void setDimensions(int width, int height)
     {
       if (consumer != null)
-	consumer.setDimensions(this.width, this.height);
+        consumer.setDimensions(this.width, this.height);
     }
 
     /**
@@ -89,7 +89,7 @@ public class CropImageFilter extends ImageFilter
      * <br>
      * FIXME - What property is set for this class?
      *
-     * @param props the list of properties associated with this image 
+     * @param props the list of properties associated with this image
      */
     public void setProperties(Hashtable<?, ?> props)
     {
@@ -102,7 +102,7 @@ public class CropImageFilter extends ImageFilter
     /**
      * This function delivers a rectangle of pixels where any
      * pixel(m,n) is stored in the array as a <code>byte</code> at
-     * index (n * scansize + m + offset).  
+     * index (n * scansize + m + offset).
      *
      * @param x the x coordinate of the rectangle
      * @param y the y coordinate of the rectangle
@@ -113,37 +113,37 @@ public class CropImageFilter extends ImageFilter
      * @param offset the index of the first pixels in the <code>pixels</code> array
      * @param scansize the width to use in extracting pixels from the <code>pixels</code> array
      */
-    public void setPixels(int x, int y, int w, int h, 
-	   ColorModel model, byte[] pixels, int offset, int scansize)
+    public void setPixels(int x, int y, int w, int h,
+           ColorModel model, byte[] pixels, int offset, int scansize)
     {
-	Rectangle filterBounds = new Rectangle(this.x, this.y,
-	                                       this.width, this.height);
-	Rectangle pixelBounds = new Rectangle(x, y, w, h);
-
-	if (filterBounds.intersects(pixelBounds))
-	{
-	    Rectangle bounds = filterBounds.intersection(pixelBounds);
-
-	    byte[] cropped = new byte[bounds.width * bounds.height];
-	    for (int i = 0; i < bounds.height; i++)
-	    {
-		int start = (bounds.y - pixelBounds.y + i) * scansize + offset;
-
-		for (int j = 0; j < bounds.width; j++)
-		    cropped[i * bounds.width + j] = pixels[start + bounds.x + j];
-	    }
-	    
-	    if (consumer != null)
-	      consumer.setPixels(0, 0,
-				 bounds.width, bounds.height,
-				 model, cropped, 0, bounds.width);
-	}
+        Rectangle filterBounds = new Rectangle(this.x, this.y,
+                                               this.width, this.height);
+        Rectangle pixelBounds = new Rectangle(x, y, w, h);
+
+        if (filterBounds.intersects(pixelBounds))
+        {
+            Rectangle bounds = filterBounds.intersection(pixelBounds);
+
+            byte[] cropped = new byte[bounds.width * bounds.height];
+            for (int i = 0; i < bounds.height; i++)
+            {
+                int start = (bounds.y - pixelBounds.y + i) * scansize + offset;
+
+                for (int j = 0; j < bounds.width; j++)
+                    cropped[i * bounds.width + j] = pixels[start + bounds.x + j];
+            }
+
+            if (consumer != null)
+              consumer.setPixels(0, 0,
+                                 bounds.width, bounds.height,
+                                 model, cropped, 0, bounds.width);
+        }
     }
 
     /**
      * This function delivers a rectangle of pixels where any
      * pixel(m,n) is stored in the array as an <code>int</code> at
-     * index (n * scansize + m + offset).  
+     * index (n * scansize + m + offset).
      *
      * @param x the x coordinate of the rectangle
      * @param y the y coordinate of the rectangle
@@ -154,32 +154,31 @@ public class CropImageFilter extends ImageFilter
      * @param offset the index of the first pixels in the <code>pixels</code> array
      * @param scansize the width to use in extracting pixels from the <code>pixels</code> array
      */
-    public void setPixels(int x, int y, int w, int h, 
+    public void setPixels(int x, int y, int w, int h,
            ColorModel model, int[] pixels, int offset, int scansize)
     {
-	Rectangle filterBounds = new Rectangle(this.x, this.y,
-	                                       this.width, this.height);
-	Rectangle pixelBounds = new Rectangle(x, y, w, h);
-
-	if (filterBounds.intersects(pixelBounds))
-	{
-	    Rectangle bounds = filterBounds.intersection(pixelBounds);
-
-	    int[] cropped = new int[bounds.width * bounds.height];
-	    for (int i = 0; i < bounds.height; i++)
-	    {
-		int start = (bounds.y - pixelBounds.y + i) * scansize + offset;
-
-		for (int j = 0; j < bounds.width; j++)
-		    cropped[i * bounds.width + j] = pixels[start + bounds.x + j];
-	    }
-	    
-	    if (consumer != null)
-	      consumer.setPixels(0, 0,
-				 bounds.width, bounds.height,
-				 model, cropped, 0, bounds.width);
-	}
+        Rectangle filterBounds = new Rectangle(this.x, this.y,
+                                               this.width, this.height);
+        Rectangle pixelBounds = new Rectangle(x, y, w, h);
+
+        if (filterBounds.intersects(pixelBounds))
+        {
+            Rectangle bounds = filterBounds.intersection(pixelBounds);
+
+            int[] cropped = new int[bounds.width * bounds.height];
+            for (int i = 0; i < bounds.height; i++)
+            {
+                int start = (bounds.y - pixelBounds.y + i) * scansize + offset;
+
+                for (int j = 0; j < bounds.width; j++)
+                    cropped[i * bounds.width + j] = pixels[start + bounds.x + j];
+            }
+
+            if (consumer != null)
+              consumer.setPixels(0, 0,
+                                 bounds.width, bounds.height,
+                                 model, cropped, 0, bounds.width);
+        }
     }
 
 }
-
diff --git a/libjava/classpath/java/awt/image/DataBuffer.java b/libjava/classpath/java/awt/image/DataBuffer.java
index 5a2cfd3..78bc75b 100644
--- a/libjava/classpath/java/awt/image/DataBuffer.java
+++ b/libjava/classpath/java/awt/image/DataBuffer.java
@@ -36,7 +36,7 @@ exception statement from your version. */
 
 package java.awt.image;
 
-/** 
+/**
  * Class that manages arrays of data elements. A data buffer consists
  * of one or more banks.  A bank is a continuous region of data
  * elements.
@@ -52,31 +52,31 @@ public abstract class DataBuffer
   public static final int TYPE_BYTE      =  0;
 
   /**
-   * A constant representing a data type that uses <code>short</code> 
+   * A constant representing a data type that uses <code>short</code>
    * primitives as the storage unit.
    */
   public static final int TYPE_USHORT    =  1;
 
   /**
-   * A constant representing a data type that uses <code>short</code> 
+   * A constant representing a data type that uses <code>short</code>
    * primitives as the storage unit.
    */
   public static final int TYPE_SHORT     =  2;
 
   /**
-   * A constant representing a data type that uses <code>int</code> 
+   * A constant representing a data type that uses <code>int</code>
    * primitives as the storage unit.
    */
   public static final int TYPE_INT       =  3;
-  
+
   /**
-   * A constant representing a data type that uses <code>float</code> 
+   * A constant representing a data type that uses <code>float</code>
    * primitives as the storage unit.
    */
   public static final int TYPE_FLOAT     =  4;
 
   /**
-   * A constant representing a data type that uses <code>double</code> 
+   * A constant representing a data type that uses <code>double</code>
    * primitives as the storage unit.
    */
   public static final int TYPE_DOUBLE    =  5;
@@ -85,30 +85,30 @@ public abstract class DataBuffer
    * A constant representing an undefined data type.
    */
   public static final int TYPE_UNDEFINED = 32;
-  
+
   /** The type of the data elements stored in the data buffer.  */
   protected int dataType;
-  
+
   /** The number of banks in this buffer.  */
   protected int banks = 1;
-  
+
   /** Offset into the default (0'th) bank). */
   protected int offset; // FIXME: Is offsets[0] always mirrored in offset?
-  
+
   /** The size of the banks.  */
   protected int size;
-  
+
   /** Offset into each bank.  */
   protected int[] offsets;
-  
+
   /**
    * Creates a new <code>DataBuffer</code> with the specified data type and
-   * size.  The <code>dataType</code> should be one of the constants 
-   * {@link #TYPE_BYTE}, {@link #TYPE_SHORT}, {@link #TYPE_USHORT}, 
+   * size.  The <code>dataType</code> should be one of the constants
+   * {@link #TYPE_BYTE}, {@link #TYPE_SHORT}, {@link #TYPE_USHORT},
    * {@link #TYPE_INT}, {@link #TYPE_FLOAT} and {@link #TYPE_DOUBLE}.
    * <p>
    * The physical (array-based) storage is allocated by a subclass.
-   * 
+   *
    * @param dataType the data type.
    * @param size the number of elements in the buffer.
    */
@@ -119,13 +119,13 @@ public abstract class DataBuffer
 
   /**
    * Creates a new <code>DataBuffer</code> with the specified data type,
-   * size and number of banks.  The <code>dataType</code> should be one of 
-   * the constants {@link #TYPE_BYTE}, {@link #TYPE_SHORT}, 
-   * {@link #TYPE_USHORT}, {@link #TYPE_INT}, {@link #TYPE_FLOAT} and 
+   * size and number of banks.  The <code>dataType</code> should be one of
+   * the constants {@link #TYPE_BYTE}, {@link #TYPE_SHORT},
+   * {@link #TYPE_USHORT}, {@link #TYPE_INT}, {@link #TYPE_FLOAT} and
    * {@link #TYPE_DOUBLE}.
    * <p>
    * The physical (array-based) storage is allocated by a subclass.
-   * 
+   *
    * @param dataType the data type.
    * @param size the number of elements in the buffer.
    * @param numBanks the number of data banks.
@@ -137,13 +137,13 @@ public abstract class DataBuffer
   /**
    * Creates a new <code>DataBuffer</code> with the specified data type,
    * size and number of banks.  An offset (which applies to all banks) is
-   * also specified.  The <code>dataType</code> should be one of 
-   * the constants {@link #TYPE_BYTE}, {@link #TYPE_SHORT}, 
-   * {@link #TYPE_USHORT}, {@link #TYPE_INT}, {@link #TYPE_FLOAT} and 
+   * also specified.  The <code>dataType</code> should be one of
+   * the constants {@link #TYPE_BYTE}, {@link #TYPE_SHORT},
+   * {@link #TYPE_USHORT}, {@link #TYPE_INT}, {@link #TYPE_FLOAT} and
    * {@link #TYPE_DOUBLE}.
    * <p>
    * The physical (array-based) storage is allocated by a subclass.
-   * 
+   *
    * @param dataType the data type.
    * @param size the number of elements in the buffer.
    * @param numBanks the number of data banks.
@@ -163,42 +163,42 @@ public abstract class DataBuffer
   /**
    * Creates a new <code>DataBuffer</code> with the specified data type,
    * size and number of banks.  An offset (which applies to all banks) is
-   * also specified.  The <code>dataType</code> should be one of 
-   * the constants {@link #TYPE_BYTE}, {@link #TYPE_SHORT}, 
-   * {@link #TYPE_USHORT}, {@link #TYPE_INT}, {@link #TYPE_FLOAT} and 
+   * also specified.  The <code>dataType</code> should be one of
+   * the constants {@link #TYPE_BYTE}, {@link #TYPE_SHORT},
+   * {@link #TYPE_USHORT}, {@link #TYPE_INT}, {@link #TYPE_FLOAT} and
    * {@link #TYPE_DOUBLE}.
    * <p>
    * The physical (array-based) storage is allocated by a subclass.
-   * 
+   *
    * @param dataType the data type.
    * @param size the number of elements in the buffer.
    * @param numBanks the number of data banks.
    * @param offsets the offsets to the first element for all banks.
-   * 
-   * @throws ArrayIndexOutOfBoundsException if 
+   *
+   * @throws ArrayIndexOutOfBoundsException if
    *         <code>numBanks != offsets.length</code>.
    */
   protected DataBuffer(int dataType, int size, int numBanks, int[] offsets) {
-    if (numBanks != offsets.length) 
+    if (numBanks != offsets.length)
       throw new ArrayIndexOutOfBoundsException();
 
     this.dataType = dataType;
     this.size = size;
     banks = numBanks;
     this.offsets = offsets;
-    
+
     offset = offsets[0];
   }
-  
+
   /**
    * Returns the size (number of bits) of the specified data type. Valid types
-   * are defined by the constants {@link #TYPE_BYTE}, {@link #TYPE_SHORT}, 
-   * {@link #TYPE_USHORT}, {@link #TYPE_INT}, {@link #TYPE_FLOAT} and 
+   * are defined by the constants {@link #TYPE_BYTE}, {@link #TYPE_SHORT},
+   * {@link #TYPE_USHORT}, {@link #TYPE_INT}, {@link #TYPE_FLOAT} and
    * {@link #TYPE_DOUBLE}.
-   * 
+   *
    * @param dataType the data type.
    * @return The number of bits for the specified data type.
-   * @throws IllegalArgumentException if <code>dataType < 0</code> or 
+   * @throws IllegalArgumentException if <code>dataType < 0</code> or
    *         <code>dataType > TYPE_DOUBLE</code>.
    */
   public static int getDataTypeSize(int dataType) {
@@ -206,57 +206,57 @@ public abstract class DataBuffer
     switch (dataType)
       {
       case TYPE_BYTE:
-	return 8;
+        return 8;
       case TYPE_USHORT:
       case TYPE_SHORT:
-	return 16;
+        return 16;
       case TYPE_INT:
       case TYPE_FLOAT:
-	return 32;
+        return 32;
       case TYPE_DOUBLE:
-	return 64;
+        return 64;
       default:
-	throw new IllegalArgumentException();
+        throw new IllegalArgumentException();
       }
   }
 
   /**
    * Returns the type of the data elements in the data buffer.  Valid types
-   * are defined by the constants {@link #TYPE_BYTE}, {@link #TYPE_SHORT}, 
-   * {@link #TYPE_USHORT}, {@link #TYPE_INT}, {@link #TYPE_FLOAT} and 
+   * are defined by the constants {@link #TYPE_BYTE}, {@link #TYPE_SHORT},
+   * {@link #TYPE_USHORT}, {@link #TYPE_INT}, {@link #TYPE_FLOAT} and
    * {@link #TYPE_DOUBLE}.
-   * 
+   *
    * @return The type.
    */
   public int getDataType()
   {
     return dataType;
   }
-  
+
   /**
    * Returns the size of the data buffer.
-   * 
+   *
    * @return The size.
    */
   public int getSize()
   {
     return size;
   }
-  
+
   /**
    * Returns the element offset for the first data bank.
-   * 
+   *
    * @return The element offset.
    */
   public int getOffset()
   {
     return offset;
   }
-  
+
   /**
-   * Returns the offsets for all the data banks used by this 
+   * Returns the offsets for all the data banks used by this
    * <code>DataBuffer</code>.
-   * 
+   *
    * @return The offsets.
    */
   public int[] getOffsets()
@@ -281,9 +281,9 @@ public abstract class DataBuffer
 
   /**
    * Returns an element from the first data bank.  The offset (specified in
-   * the constructor) is added to <code>i</code> before accessing the 
+   * the constructor) is added to <code>i</code> before accessing the
    * underlying data array.
-   * 
+   *
    * @param i the element index.
    * @return The element.
    */
@@ -294,20 +294,20 @@ public abstract class DataBuffer
 
   /**
    * Returns an element from a particular data bank.  The offset (specified in
-   * the constructor) is added to <code>i</code> before accessing the 
+   * the constructor) is added to <code>i</code> before accessing the
    * underlying data array.
-   * 
+   *
    * @param bank the bank index.
    * @param i the element index.
    * @return The element.
    */
   public abstract int getElem(int bank, int i);
-  
+
   /**
    * Sets an element in the first data bank.  The offset (specified in the
    * constructor) is added to <code>i</code> before updating the underlying
    * data array.
-   * 
+   *
    * @param i the element index.
    * @param val the new element value.
    */
@@ -320,18 +320,18 @@ public abstract class DataBuffer
    * Sets an element in a particular data bank.  The offset (specified in the
    * constructor) is added to <code>i</code> before updating the underlying
    * data array.
-   * 
+   *
    * @param bank the data bank index.
    * @param i the element index.
    * @param val the new element value.
    */
   public abstract void setElem(int bank, int i, int val);
-  
+
   /**
-   * Returns an element from the first data bank, converted to a 
-   * <code>float</code>.  The offset (specified in the constructor) is added 
+   * Returns an element from the first data bank, converted to a
+   * <code>float</code>.  The offset (specified in the constructor) is added
    * to <code>i</code> before accessing the underlying data array.
-   * 
+   *
    * @param i the element index.
    * @return The element.
    */
@@ -339,12 +339,12 @@ public abstract class DataBuffer
   {
     return getElem(i);
   }
-    
+
   /**
-   * Returns an element from a particular data bank, converted to a 
-   * <code>float</code>.  The offset (specified in the constructor) is 
+   * Returns an element from a particular data bank, converted to a
+   * <code>float</code>.  The offset (specified in the constructor) is
    * added to <code>i</code> before accessing the underlying data array.
-   * 
+   *
    * @param bank the bank index.
    * @param i the element index.
    * @return The element.
@@ -357,8 +357,8 @@ public abstract class DataBuffer
   /**
    * Sets an element in the first data bank.  The offset (specified in the
    * constructor) is added to <code>i</code> before updating the underlying
-   * data array. 
-   * 
+   * data array.
+   *
    * @param i the element index.
    * @param val the new element value.
    */
@@ -371,7 +371,7 @@ public abstract class DataBuffer
    * Sets an element in a particular data bank.  The offset (specified in the
    * constructor) is added to <code>i</code> before updating the underlying
    * data array.
-   * 
+   *
    * @param bank the data bank index.
    * @param i the element index.
    * @param val the new element value.
@@ -382,10 +382,10 @@ public abstract class DataBuffer
   }
 
   /**
-   * Returns an element from the first data bank, converted to a 
+   * Returns an element from the first data bank, converted to a
    * <code>double</code>.  The offset (specified in the constructor) is added
    * to <code>i</code> before accessing the underlying data array.
-   * 
+   *
    * @param i the element index.
    * @return The element.
    */
@@ -393,12 +393,12 @@ public abstract class DataBuffer
   {
     return getElem(i);
   }
-    
+
   /**
-   * Returns an element from a particular data bank, converted to a 
-   * <code>double</code>.  The offset (specified in the constructor) is 
+   * Returns an element from a particular data bank, converted to a
+   * <code>double</code>.  The offset (specified in the constructor) is
    * added to <code>i</code> before accessing the underlying data array.
-   * 
+   *
    * @param bank the bank index.
    * @param i the element index.
    * @return The element.
@@ -411,8 +411,8 @@ public abstract class DataBuffer
   /**
    * Sets an element in the first data bank.  The offset (specified in the
    * constructor) is added to <code>i</code> before updating the underlying
-   * data array. 
-   * 
+   * data array.
+   *
    * @param i the element index.
    * @param val the new element value.
    */
@@ -425,7 +425,7 @@ public abstract class DataBuffer
    * Sets an element in a particular data bank.  The offset (specified in the
    * constructor) is added to <code>i</code> before updating the underlying
    * data array.
-   * 
+   *
    * @param bank the data bank index.
    * @param i the element index.
    * @param val the new element value.
diff --git a/libjava/classpath/java/awt/image/DataBufferByte.java b/libjava/classpath/java/awt/image/DataBufferByte.java
index 1113ebb..01364b0 100644
--- a/libjava/classpath/java/awt/image/DataBufferByte.java
+++ b/libjava/classpath/java/awt/image/DataBufferByte.java
@@ -48,19 +48,19 @@ package java.awt.image;
 
 /**
  * A {@link DataBuffer} that uses an array of <code>byte</code> primitives
- * to represent each of its banks. 
- * 
+ * to represent each of its banks.
+ *
  * @author Rolf W. Rasmussen (rolfwr@ii.uib.no)
  */
 public final class DataBufferByte extends DataBuffer
 {
   private byte[] data;
   private byte[][] bankData;
-  
+
   /**
-   * Creates a new data buffer with a single data bank containing the 
+   * Creates a new data buffer with a single data bank containing the
    * specified number of <code>byte</code> elements.
-   * 
+   *
    * @param size the number of elements in the data bank.
    */
   public DataBufferByte(int size)
@@ -72,9 +72,9 @@ public final class DataBufferByte extends DataBuffer
   }
 
   /**
-   * Creates a new data buffer with the specified number of data banks, 
+   * Creates a new data buffer with the specified number of data banks,
    * each containing the specified number of <code>byte</code> elements.
-   * 
+   *
    * @param size the number of elements in the data bank.
    * @param numBanks the number of data banks.
    */
@@ -88,10 +88,10 @@ public final class DataBufferByte extends DataBuffer
   /**
    * Creates a new data buffer backed by the specified data bank.
    * <p>
-   * Note: there is no exception when <code>dataArray</code> is 
+   * Note: there is no exception when <code>dataArray</code> is
    * <code>null</code>, but in that case an exception will be thrown
    * later if you attempt to access the data buffer.
-   * 
+   *
    * @param dataArray the data bank.
    * @param size the number of elements in the data bank.
    */
@@ -102,15 +102,15 @@ public final class DataBufferByte extends DataBuffer
     data = dataArray;
     bankData[0] = data;
   }
-    
+
   /**
    * Creates a new data buffer backed by the specified data bank, with
    * the specified offset to the first element.
    * <p>
-   * Note: there is no exception when <code>dataArray</code> is 
+   * Note: there is no exception when <code>dataArray</code> is
    * <code>null</code>, but in that case an exception will be thrown
    * later if you attempt to access the data buffer.
-   * 
+   *
    * @param dataArray the data bank.
    * @param size the number of elements in the data bank.
    * @param offset the offset to the first element in the array.
@@ -125,11 +125,11 @@ public final class DataBufferByte extends DataBuffer
 
   /**
    * Creates a new data buffer backed by the specified data banks.
-   * 
+   *
    * @param dataArray the data banks.
    * @param size the number of elements in the data bank.
-   * 
-   * @throws NullPointerException if <code>dataArray</code> is 
+   *
+   * @throws NullPointerException if <code>dataArray</code> is
    *         <code>null</code>.
    */
   public DataBufferByte(byte[][] dataArray, int size)
@@ -142,12 +142,12 @@ public final class DataBufferByte extends DataBuffer
   /**
    * Creates a new data buffer backed by the specified data banks, with
    * the specified offsets to the first element in each bank.
-   * 
+   *
    * @param dataArray the data banks.
    * @param size the number of elements in the data bank.
    * @param offsets the offsets to the first element in each data bank.
-   * 
-   * @throws NullPointerException if <code>dataArray</code> is 
+   *
+   * @throws NullPointerException if <code>dataArray</code> is
    *         <code>null</code>.
    */
   public DataBufferByte(byte[][] dataArray, int size, int[] offsets)
@@ -159,40 +159,40 @@ public final class DataBufferByte extends DataBuffer
 
   /**
    * Returns the first data bank.
-   * 
+   *
    * @return The first data bank.
    */
   public byte[] getData()
   {
     return data;
   }
-    
+
   /**
    * Returns a data bank.
-   * 
+   *
    * @param bank the bank index.
    * @return A data bank.
    */
-  public byte[] getData(int bank) 
+  public byte[] getData(int bank)
   {
     return bankData[bank];
   }
-    
+
   /**
    * Returns the array underlying this <code>DataBuffer</code>.
-   * 
+   *
    * @return The data banks.
    */
   public byte[][] getBankData()
   {
     return bankData;
   }
-  
+
   /**
    * Returns an element from the first data bank.  The offset (specified in
-   * the constructor) is added to <code>i</code> before accessing the 
+   * the constructor) is added to <code>i</code> before accessing the
    * underlying data array.
-   * 
+   *
    * @param i the element index.
    * @return The element.
    */
@@ -200,12 +200,12 @@ public final class DataBufferByte extends DataBuffer
   {
     return data[i+offset] & 0xff; // get unsigned byte as int
   }
-  
+
   /**
    * Returns an element from a particular data bank.  The offset (specified in
-   * the constructor) is added to <code>i</code> before accessing the 
+   * the constructor) is added to <code>i</code> before accessing the
    * underlying data array.
-   * 
+   *
    * @param bank the bank index.
    * @param i the element index.
    * @return The element.
@@ -220,7 +220,7 @@ public final class DataBufferByte extends DataBuffer
    * Sets an element in the first data bank.  The offset (specified in the
    * constructor) is added to <code>i</code> before updating the underlying
    * data array.
-   * 
+   *
    * @param i the element index.
    * @param val the new element value.
    */
@@ -233,7 +233,7 @@ public final class DataBufferByte extends DataBuffer
    * Sets an element in a particular data bank.  The offset (specified in the
    * constructor) is added to <code>i</code> before updating the underlying
    * data array.
-   * 
+   *
    * @param bank the data bank index.
    * @param i the element index.
    * @param val the new element value.
diff --git a/libjava/classpath/java/awt/image/DataBufferDouble.java b/libjava/classpath/java/awt/image/DataBufferDouble.java
index a8c4b9d..31c5ebd 100644
--- a/libjava/classpath/java/awt/image/DataBufferDouble.java
+++ b/libjava/classpath/java/awt/image/DataBufferDouble.java
@@ -48,8 +48,8 @@ package java.awt.image;
 
 /**
  * A {@link DataBuffer} that uses an array of <code>double</code> primitives
- * to represent each of its banks. 
- * 
+ * to represent each of its banks.
+ *
  * @since 1.4
  *
  * @author Rolf W. Rasmussen (rolfwr@ii.uib.no)
@@ -60,11 +60,11 @@ public final class DataBufferDouble
 {
   private double[] data;
   private double[][] bankData;
-  
+
   /**
-   * Creates a new data buffer with a single data bank containing the 
+   * Creates a new data buffer with a single data bank containing the
    * specified number of <code>double</code> elements.
-   * 
+   *
    * @param size the number of elements in the data bank.
    */
   public DataBufferDouble(int size)
@@ -76,9 +76,9 @@ public final class DataBufferDouble
   }
 
   /**
-   * Creates a new data buffer with the specified number of data banks, 
+   * Creates a new data buffer with the specified number of data banks,
    * each containing the specified number of <code>double</code> elements.
-   * 
+   *
    * @param size the number of elements in the data bank.
    * @param numBanks the number of data banks.
    */
@@ -92,10 +92,10 @@ public final class DataBufferDouble
   /**
    * Creates a new data buffer backed by the specified data bank.
    * <p>
-   * Note: there is no exception when <code>dataArray</code> is 
+   * Note: there is no exception when <code>dataArray</code> is
    * <code>null</code>, but in that case an exception will be thrown
    * later if you attempt to access the data buffer.
-   * 
+   *
    * @param dataArray the data bank.
    * @param size the number of elements in the data bank.
    */
@@ -106,15 +106,15 @@ public final class DataBufferDouble
     data = dataArray;
     bankData[0] = data;
   }
-    
+
   /**
    * Creates a new data buffer backed by the specified data bank, with
    * the specified offset to the first element.
    * <p>
-   * Note: there is no exception when <code>dataArray</code> is 
+   * Note: there is no exception when <code>dataArray</code> is
    * <code>null</code>, but in that case an exception will be thrown
    * later if you attempt to access the data buffer.
-   * 
+   *
    * @param dataArray the data bank.
    * @param size the number of elements in the data bank.
    * @param offset the offset to the first element in the array.
@@ -129,11 +129,11 @@ public final class DataBufferDouble
 
   /**
    * Creates a new data buffer backed by the specified data banks.
-   * 
+   *
    * @param dataArray the data banks.
    * @param size the number of elements in the data bank.
-   * 
-   * @throws NullPointerException if <code>dataArray</code> is 
+   *
+   * @throws NullPointerException if <code>dataArray</code> is
    *         <code>null</code>.
    */
   public DataBufferDouble(double[][] dataArray, int size)
@@ -146,12 +146,12 @@ public final class DataBufferDouble
   /**
    * Creates a new data buffer backed by the specified data banks, with
    * the specified offsets to the first element in each bank.
-   * 
+   *
    * @param dataArray the data banks.
    * @param size the number of elements in the data bank.
    * @param offsets the offsets to the first element in each data bank.
-   * 
-   * @throws NullPointerException if <code>dataArray</code> is 
+   *
+   * @throws NullPointerException if <code>dataArray</code> is
    *         <code>null</code>.
    */
   public DataBufferDouble(double[][] dataArray, int size, int[] offsets)
@@ -163,17 +163,17 @@ public final class DataBufferDouble
 
   /**
    * Returns the first data bank.
-   * 
+   *
    * @return The first data bank.
    */
   public double[] getData()
   {
     return data;
   }
-    
+
   /**
    * Returns a data bank.
-   * 
+   *
    * @param bank the bank index.
    * @return A data bank.
    */
@@ -181,22 +181,22 @@ public final class DataBufferDouble
   {
     return bankData[bank];
   }
-    
+
   /**
    * Returns the array underlying this <code>DataBuffer</code>.
-   * 
+   *
    * @return The data banks.
    */
   public double[][] getBankData()
   {
     return bankData;
   }
-  
+
   /**
    * Returns an element from the first data bank.  The offset (specified in
-   * the constructor) is added to <code>i</code> before accessing the 
+   * the constructor) is added to <code>i</code> before accessing the
    * underlying data array.
-   * 
+   *
    * @param i the element index.
    * @return The element.
    */
@@ -207,9 +207,9 @@ public final class DataBufferDouble
 
   /**
    * Returns an element from a particular data bank.  The offset (specified in
-   * the constructor) is added to <code>i</code> before accessing the 
+   * the constructor) is added to <code>i</code> before accessing the
    * underlying data array.
-   * 
+   *
    * @param bank the bank index.
    * @param i the element index.
    * @return The element.
@@ -223,7 +223,7 @@ public final class DataBufferDouble
    * Sets an element in the first data bank.  The offset (specified in the
    * constructor) is added to <code>i</code> before updating the underlying
    * data array.
-   * 
+   *
    * @param i the element index.
    * @param val the new element value.
    */
@@ -236,7 +236,7 @@ public final class DataBufferDouble
    * Sets an element in a particular data bank.  The offset (specified in the
    * constructor) is added to <code>i</code> before updating the underlying
    * data array.
-   * 
+   *
    * @param bank the data bank index.
    * @param i the element index.
    * @param val the new element value.
@@ -250,7 +250,7 @@ public final class DataBufferDouble
   {
     return (float) data[i+offset];
   }
-    
+
   public float getElemFloat(int bank, int i)
   {
     return (float) bankData[bank][i+offsets[bank]];
@@ -270,7 +270,7 @@ public final class DataBufferDouble
   {
     return data[i + offset];
   }
-    
+
   public double getElemDouble(int bank, int i)
   {
     return bankData[bank][i + offsets[bank]];
diff --git a/libjava/classpath/java/awt/image/DataBufferFloat.java b/libjava/classpath/java/awt/image/DataBufferFloat.java
index 9cf8784..44a0a38 100644
--- a/libjava/classpath/java/awt/image/DataBufferFloat.java
+++ b/libjava/classpath/java/awt/image/DataBufferFloat.java
@@ -48,8 +48,8 @@ package java.awt.image;
 
 /**
  * A {@link DataBuffer} that uses an array of <code>float</code> primitives
- * to represent each of its banks. 
- * 
+ * to represent each of its banks.
+ *
  * @author Rolf W. Rasmussen (rolfwr@ii.uib.no)
  * @author Sascha Brawer (brawer@dandelis.ch)
  */
@@ -58,11 +58,11 @@ public final class DataBufferFloat
 {
   private float[] data;
   private float[][] bankData;
-  
+
   /**
-   * Creates a new data buffer with a single data bank containing the 
+   * Creates a new data buffer with a single data bank containing the
    * specified number of <code>float</code> elements.
-   * 
+   *
    * @param size the number of elements in the data bank.
    */
   public DataBufferFloat(int size)
@@ -74,9 +74,9 @@ public final class DataBufferFloat
   }
 
   /**
-   * Creates a new data buffer with the specified number of data banks, 
+   * Creates a new data buffer with the specified number of data banks,
    * each containing the specified number of <code>float</code> elements.
-   * 
+   *
    * @param size the number of elements in the data bank.
    * @param numBanks the number of data banks.
    */
@@ -90,10 +90,10 @@ public final class DataBufferFloat
   /**
    * Creates a new data buffer backed by the specified data bank.
    * <p>
-   * Note: there is no exception when <code>dataArray</code> is 
+   * Note: there is no exception when <code>dataArray</code> is
    * <code>null</code>, but in that case an exception will be thrown
    * later if you attempt to access the data buffer.
-   * 
+   *
    * @param dataArray the data bank.
    * @param size the number of elements in the data bank.
    */
@@ -104,15 +104,15 @@ public final class DataBufferFloat
     data = dataArray;
     bankData[0] = data;
   }
-    
+
   /**
    * Creates a new data buffer backed by the specified data bank, with
    * the specified offset to the first element.
    * <p>
-   * Note: there is no exception when <code>dataArray</code> is 
+   * Note: there is no exception when <code>dataArray</code> is
    * <code>null</code>, but in that case an exception will be thrown
    * later if you attempt to access the data buffer.
-   * 
+   *
    * @param dataArray the data bank.
    * @param size the number of elements in the data bank.
    * @param offset the offset to the first element in the array.
@@ -127,11 +127,11 @@ public final class DataBufferFloat
 
   /**
    * Creates a new data buffer backed by the specified data banks.
-   * 
+   *
    * @param dataArray the data banks.
    * @param size the number of elements in the data bank.
-   * 
-   * @throws NullPointerException if <code>dataArray</code> is 
+   *
+   * @throws NullPointerException if <code>dataArray</code> is
    *         <code>null</code>.
    */
   public DataBufferFloat(float[][] dataArray, int size)
@@ -144,12 +144,12 @@ public final class DataBufferFloat
   /**
    * Creates a new data buffer backed by the specified data banks, with
    * the specified offsets to the first element in each bank.
-   * 
+   *
    * @param dataArray the data banks.
    * @param size the number of elements in the data bank.
    * @param offsets the offsets to the first element in each data bank.
-   * 
-   * @throws NullPointerException if <code>dataArray</code> is 
+   *
+   * @throws NullPointerException if <code>dataArray</code> is
    *         <code>null</code>.
    */
   public DataBufferFloat(float[][] dataArray, int size, int[] offsets)
@@ -161,17 +161,17 @@ public final class DataBufferFloat
 
   /**
    * Returns the first data bank.
-   * 
+   *
    * @return The first data bank.
    */
   public float[] getData()
   {
     return data;
   }
-    
+
   /**
    * Returns a data bank.
-   * 
+   *
    * @param bank the bank index.
    * @return A data bank.
    */
@@ -179,22 +179,22 @@ public final class DataBufferFloat
   {
     return bankData[bank];
   }
-    
+
   /**
    * Returns the array underlying this <code>DataBuffer</code>.
-   * 
+   *
    * @return The data banks.
    */
   public float[][] getBankData()
   {
     return bankData;
   }
-  
+
   /**
    * Returns an element from the first data bank.  The offset (specified in
-   * the constructor) is added to <code>i</code> before accessing the 
+   * the constructor) is added to <code>i</code> before accessing the
    * underlying data array.
-   * 
+   *
    * @param i the element index.
    * @return The element.
    */
@@ -205,9 +205,9 @@ public final class DataBufferFloat
 
   /**
    * Returns an element from a particular data bank.  The offset (specified in
-   * the constructor) is added to <code>i</code> before accessing the 
+   * the constructor) is added to <code>i</code> before accessing the
    * underlying data array.
-   * 
+   *
    * @param bank the bank index.
    * @param i the element index.
    * @return The element.
@@ -221,7 +221,7 @@ public final class DataBufferFloat
    * Sets an element in the first data bank.  The offset (specified in the
    * constructor) is added to <code>i</code> before updating the underlying
    * data array.
-   * 
+   *
    * @param i the element index.
    * @param val the new element value.
    */
@@ -234,7 +234,7 @@ public final class DataBufferFloat
    * Sets an element in a particular data bank.  The offset (specified in the
    * constructor) is added to <code>i</code> before updating the underlying
    * data array.
-   * 
+   *
    * @param bank the data bank index.
    * @param i the element index.
    * @param val the new element value.
@@ -248,7 +248,7 @@ public final class DataBufferFloat
   {
     return data[i+offset];
   }
-    
+
   public float getElemFloat(int bank, int i)
   {
     return bankData[bank][i+offsets[bank]];
@@ -268,7 +268,7 @@ public final class DataBufferFloat
   {
     return getElemFloat(i);
   }
-    
+
   public double getElemDouble(int bank, int i)
   {
     return getElemFloat(bank, i);
diff --git a/libjava/classpath/java/awt/image/DataBufferInt.java b/libjava/classpath/java/awt/image/DataBufferInt.java
index 0aac940..db9d5bc 100644
--- a/libjava/classpath/java/awt/image/DataBufferInt.java
+++ b/libjava/classpath/java/awt/image/DataBufferInt.java
@@ -48,19 +48,19 @@ package java.awt.image;
 
 /**
  * A {@link DataBuffer} that uses an array of <code>int</code> primitives
- * to represent each of its banks. 
- * 
+ * to represent each of its banks.
+ *
  * @author Rolf W. Rasmussen (rolfwr@ii.uib.no)
  */
 public final class DataBufferInt extends DataBuffer
 {
   private int[] data;
   private int[][] bankData;
-  
+
   /**
-   * Creates a new data buffer with a single data bank containing the 
+   * Creates a new data buffer with a single data bank containing the
    * specified number of <code>int</code> elements.
-   * 
+   *
    * @param size the number of elements in the data bank.
    */
   public DataBufferInt(int size)
@@ -72,9 +72,9 @@ public final class DataBufferInt extends DataBuffer
   }
 
   /**
-   * Creates a new data buffer with the specified number of data banks, 
+   * Creates a new data buffer with the specified number of data banks,
    * each containing the specified number of <code>int</code> elements.
-   * 
+   *
    * @param size the number of elements in the data bank.
    * @param numBanks the number of data banks.
    */
@@ -84,14 +84,14 @@ public final class DataBufferInt extends DataBuffer
     bankData = new int[numBanks][size];
     data = bankData[0];
   }
-  
+
   /**
    * Creates a new data buffer backed by the specified data bank.
    * <p>
-   * Note: there is no exception when <code>dataArray</code> is 
+   * Note: there is no exception when <code>dataArray</code> is
    * <code>null</code>, but in that case an exception will be thrown
    * later if you attempt to access the data buffer.
-   * 
+   *
    * @param dataArray the data bank.
    * @param size the number of elements in the data bank.
    */
@@ -102,15 +102,15 @@ public final class DataBufferInt extends DataBuffer
     data = dataArray;
     bankData[0] = data;
   }
-    
+
   /**
    * Creates a new data buffer backed by the specified data bank, with
    * the specified offset to the first element.
    * <p>
-   * Note: there is no exception when <code>dataArray</code> is 
+   * Note: there is no exception when <code>dataArray</code> is
    * <code>null</code>, but in that case an exception will be thrown
    * later if you attempt to access the data buffer.
-   * 
+   *
    * @param dataArray the data bank.
    * @param size the number of elements in the data bank.
    * @param offset the offset to the first element in the array.
@@ -122,14 +122,14 @@ public final class DataBufferInt extends DataBuffer
     data = dataArray;
     bankData[0] = data;
   }
-  
+
   /**
    * Creates a new data buffer backed by the specified data banks.
-   * 
+   *
    * @param dataArray the data banks.
    * @param size the number of elements in the data bank.
-   * 
-   * @throws NullPointerException if <code>dataArray</code> is 
+   *
+   * @throws NullPointerException if <code>dataArray</code> is
    *         <code>null</code>.
    */
   public DataBufferInt(int[][] dataArray, int size)
@@ -138,16 +138,16 @@ public final class DataBufferInt extends DataBuffer
     bankData = dataArray;
     data = bankData[0];
   }
-  
+
   /**
    * Creates a new data buffer backed by the specified data banks, with
    * the specified offsets to the first element in each bank.
-   * 
+   *
    * @param dataArray the data banks.
    * @param size the number of elements in the data bank.
    * @param offsets the offsets to the first element in each data bank.
-   * 
-   * @throws NullPointerException if <code>dataArray</code> is 
+   *
+   * @throws NullPointerException if <code>dataArray</code> is
    *         <code>null</code>.
    */
   public DataBufferInt(int[][] dataArray, int size, int[] offsets)
@@ -159,17 +159,17 @@ public final class DataBufferInt extends DataBuffer
 
   /**
    * Returns the first data bank.
-   * 
+   *
    * @return The first data bank.
    */
   public int[] getData()
   {
     return data;
   }
-    
+
   /**
    * Returns a data bank.
-   * 
+   *
    * @param bank the bank index.
    * @return A data bank.
    */
@@ -177,21 +177,21 @@ public final class DataBufferInt extends DataBuffer
   {
     return bankData[bank];
   }
-  
+
   /**
    * Returns the array underlying this <code>DataBuffer</code>.
-   * 
+   *
    * @return The data banks.
    */
   public int[][] getBankData()
   {
     return bankData;
   }
-  
+
   /**
    * Returns an element from the first data bank.  The <code>offset</code> is
    * added to the specified index before accessing the underlying data array.
-   * 
+   *
    * @param i the element index.
    * @return The element.
    */
@@ -201,10 +201,10 @@ public final class DataBufferInt extends DataBuffer
   }
 
   /**
-   * Returns an element from a particular data bank.  The <code>offset</code> 
-   * is added to the specified index before accessing the underlying data 
+   * Returns an element from a particular data bank.  The <code>offset</code>
+   * is added to the specified index before accessing the underlying data
    * array.
-   * 
+   *
    * @param bank the bank index.
    * @param i the element index.
    * @return The element.
@@ -219,7 +219,7 @@ public final class DataBufferInt extends DataBuffer
    * Sets an element in the first data bank.  The offset (specified in the
    * constructor) is added to <code>i</code> before updating the underlying
    * data array.
-   * 
+   *
    * @param i the element index.
    * @param val the new element value.
    */
@@ -227,12 +227,12 @@ public final class DataBufferInt extends DataBuffer
   {
     data[i+offset] = val;
   }
-  
+
   /**
    * Sets an element in a particular data bank.  The offset (specified in the
    * constructor) is added to <code>i</code> before updating the underlying
    * data array.
-   * 
+   *
    * @param bank the data bank index.
    * @param i the element index.
    * @param val the new element value.
diff --git a/libjava/classpath/java/awt/image/DataBufferShort.java b/libjava/classpath/java/awt/image/DataBufferShort.java
index 5c67a8d..2156d75 100644
--- a/libjava/classpath/java/awt/image/DataBufferShort.java
+++ b/libjava/classpath/java/awt/image/DataBufferShort.java
@@ -49,19 +49,19 @@ package java.awt.image;
 
 /**
  * A {@link DataBuffer} that uses an array of <code>short</code> primitives
- * to represent each of its banks. 
- * 
+ * to represent each of its banks.
+ *
  * @author Rolf W. Rasmussen (rolfwr@ii.uib.no)
  */
 public final class DataBufferShort extends DataBuffer
 {
   private short[] data;
   private short[][] bankData;
-  
+
   /**
-   * Creates a new data buffer with a single data bank containing the 
+   * Creates a new data buffer with a single data bank containing the
    * specified number of <code>short</code> elements.
-   * 
+   *
    * @param size the number of elements in the data bank.
    */
   public DataBufferShort(int size)
@@ -73,9 +73,9 @@ public final class DataBufferShort extends DataBuffer
   }
 
   /**
-   * Creates a new data buffer with the specified number of data banks, 
+   * Creates a new data buffer with the specified number of data banks,
    * each containing the specified number of <code>short</code> elements.
-   * 
+   *
    * @param size the number of elements in the data bank.
    * @param numBanks the number of data banks.
    */
@@ -89,10 +89,10 @@ public final class DataBufferShort extends DataBuffer
   /**
    * Creates a new data buffer backed by the specified data bank.
    * <p>
-   * Note: there is no exception when <code>dataArray</code> is 
+   * Note: there is no exception when <code>dataArray</code> is
    * <code>null</code>, but in that case an exception will be thrown
    * later if you attempt to access the data buffer.
-   * 
+   *
    * @param dataArray the data bank.
    * @param size the number of elements in the data bank.
    */
@@ -103,15 +103,15 @@ public final class DataBufferShort extends DataBuffer
     data = dataArray;
     bankData[0] = data;
   }
-    
+
   /**
    * Creates a new data buffer backed by the specified data bank, with
    * the specified offset to the first element.
    * <p>
-   * Note: there is no exception when <code>dataArray</code> is 
+   * Note: there is no exception when <code>dataArray</code> is
    * <code>null</code>, but in that case an exception will be thrown
    * later if you attempt to access the data buffer.
-   * 
+   *
    * @param dataArray the data bank.
    * @param size the number of elements in the data bank.
    * @param offset the offset to the first element in the array.
@@ -126,11 +126,11 @@ public final class DataBufferShort extends DataBuffer
 
   /**
    * Creates a new data buffer backed by the specified data banks.
-   * 
+   *
    * @param dataArray the data banks.
    * @param size the number of elements in the data bank.
-   * 
-   * @throws NullPointerException if <code>dataArray</code> is 
+   *
+   * @throws NullPointerException if <code>dataArray</code> is
    *         <code>null</code>.
    */
   public DataBufferShort(short[][] dataArray, int size)
@@ -143,12 +143,12 @@ public final class DataBufferShort extends DataBuffer
   /**
    * Creates a new data buffer backed by the specified data banks, with
    * the specified offsets to the first element in each bank.
-   * 
+   *
    * @param dataArray the data banks.
    * @param size the number of elements in the data bank.
    * @param offsets the offsets to the first element in each data bank.
-   * 
-   * @throws NullPointerException if <code>dataArray</code> is 
+   *
+   * @throws NullPointerException if <code>dataArray</code> is
    *         <code>null</code>.
    */
   public DataBufferShort(short[][] dataArray, int size, int[] offsets)
@@ -160,17 +160,17 @@ public final class DataBufferShort extends DataBuffer
 
   /**
    * Returns the first data bank.
-   * 
+   *
    * @return The first data bank.
    */
   public short[] getData()
   {
     return data;
   }
-    
+
   /**
    * Returns a data bank.
-   * 
+   *
    * @param bank the bank index.
    * @return A data bank.
    */
@@ -178,22 +178,22 @@ public final class DataBufferShort extends DataBuffer
   {
     return bankData[bank];
   }
-    
+
   /**
    * Returns the array underlying this <code>DataBuffer</code>.
-   * 
+   *
    * @return The data banks.
    */
   public short[][] getBankData()
   {
     return bankData;
   }
-  
+
   /**
    * Returns an element from the first data bank.  The offset (specified in
-   * the constructor) is added to <code>i</code> before accessing the 
+   * the constructor) is added to <code>i</code> before accessing the
    * underlying data array.
-   * 
+   *
    * @param i the element index.
    * @return The element.
    */
@@ -204,9 +204,9 @@ public final class DataBufferShort extends DataBuffer
 
   /**
    * Returns an element from a particular data bank.  The offset (specified in
-   * the constructor) is added to <code>i</code> before accessing the 
+   * the constructor) is added to <code>i</code> before accessing the
    * underlying data array.
-   * 
+   *
    * @param bank the bank index.
    * @param i the element index.
    * @return The element.
@@ -220,7 +220,7 @@ public final class DataBufferShort extends DataBuffer
    * Sets an element in the first data bank.  The offset (specified in the
    * constructor) is added to <code>i</code> before updating the underlying
    * data array.
-   * 
+   *
    * @param i the element index.
    * @param val the new element value.
    */
@@ -233,7 +233,7 @@ public final class DataBufferShort extends DataBuffer
    * Sets an element in a particular data bank.  The offset (specified in the
    * constructor) is added to <code>i</code> before updating the underlying
    * data array.
-   * 
+   *
    * @param bank the data bank index.
    * @param i the element index.
    * @param val the new element value.
diff --git a/libjava/classpath/java/awt/image/DataBufferUShort.java b/libjava/classpath/java/awt/image/DataBufferUShort.java
index 981e9e9..d2cadcf 100644
--- a/libjava/classpath/java/awt/image/DataBufferUShort.java
+++ b/libjava/classpath/java/awt/image/DataBufferUShort.java
@@ -49,19 +49,19 @@ package java.awt.image;
 
 /**
  * A {@link DataBuffer} that uses an array of <code>short</code> primitives
- * to represent each of its banks. 
- * 
+ * to represent each of its banks.
+ *
  * @author Rolf W. Rasmussen (rolfwr@ii.uib.no)
  */
 public final class DataBufferUShort extends DataBuffer
 {
   private short[] data;
   private short[][] bankData;
-  
+
   /**
-   * Creates a new data buffer with a single data bank containing the 
+   * Creates a new data buffer with a single data bank containing the
    * specified number of <code>short</code> elements.
-   * 
+   *
    * @param size the number of elements in the data bank.
    */
   public DataBufferUShort(int size)
@@ -73,9 +73,9 @@ public final class DataBufferUShort extends DataBuffer
   }
 
   /**
-   * Creates a new data buffer with the specified number of data banks, 
+   * Creates a new data buffer with the specified number of data banks,
    * each containing the specified number of <code>short</code> elements.
-   * 
+   *
    * @param size the number of elements in the data bank.
    * @param numBanks the number of data banks.
    */
@@ -88,7 +88,7 @@ public final class DataBufferUShort extends DataBuffer
 
   /**
    * Creates a new data buffer backed by the specified data bank.
-   * 
+   *
    * @param dataArray the data bank.
    * @param size the number of elements in the data bank.
    *
@@ -103,11 +103,11 @@ public final class DataBufferUShort extends DataBuffer
     data = dataArray;
     bankData[0] = data;
   }
-    
+
   /**
    * Creates a new data buffer backed by the specified data bank, with
    * the specified offset to the first element.
-   * 
+   *
    * @param dataArray the data bank.
    * @param size the number of elements in the data bank.
    * @param offset the offset to the first element in the array.
@@ -126,11 +126,11 @@ public final class DataBufferUShort extends DataBuffer
 
   /**
    * Creates a new data buffer backed by the specified data banks.
-   * 
+   *
    * @param dataArray the data banks.
    * @param size the number of elements in the data bank.
-   * 
-   * @throws NullPointerException if <code>dataArray</code> is 
+   *
+   * @throws NullPointerException if <code>dataArray</code> is
    *         <code>null</code>.
    */
   public DataBufferUShort(short[][] dataArray, int size)
@@ -143,12 +143,12 @@ public final class DataBufferUShort extends DataBuffer
   /**
    * Creates a new data buffer backed by the specified data banks, with
    * the specified offsets to the first element in each bank.
-   * 
+   *
    * @param dataArray the data banks.
    * @param size the number of elements in the data bank.
    * @param offsets the offsets to the first element in each data bank.
-   * 
-   * @throws NullPointerException if <code>dataArray</code> is 
+   *
+   * @throws NullPointerException if <code>dataArray</code> is
    *         <code>null</code>.
    */
   public DataBufferUShort(short[][] dataArray, int size, int[] offsets)
@@ -160,17 +160,17 @@ public final class DataBufferUShort extends DataBuffer
 
   /**
    * Returns the first data bank.
-   * 
+   *
    * @return The first data bank.
    */
   public short[] getData()
   {
     return data;
   }
-    
+
   /**
    * Returns a data bank.
-   * 
+   *
    * @param bank the bank index.
    * @return A data bank.
    */
@@ -178,22 +178,22 @@ public final class DataBufferUShort extends DataBuffer
   {
     return bankData[bank];
   }
-    
+
   /**
    * Returns the array underlying this <code>DataBuffer</code>.
-   * 
+   *
    * @return The data banks.
    */
   public short[][] getBankData()
   {
     return bankData;
   }
-  
+
   /**
    * Returns an element from the first data bank.  The offset (specified in
-   * the constructor) is added to <code>i</code> before accessing the 
+   * the constructor) is added to <code>i</code> before accessing the
    * underlying data array.
-   * 
+   *
    * @param i the element index.
    * @return The element.
    */
@@ -204,9 +204,9 @@ public final class DataBufferUShort extends DataBuffer
 
   /**
    * Returns an element from a particular data bank.  The offset (specified in
-   * the constructor) is added to <code>i</code> before accessing the 
+   * the constructor) is added to <code>i</code> before accessing the
    * underlying data array.
-   * 
+   *
    * @param bank the bank index.
    * @param i the element index.
    * @return The element.
@@ -221,7 +221,7 @@ public final class DataBufferUShort extends DataBuffer
    * Sets an element in the first data bank.  The offset (specified in the
    * constructor) is added to <code>i</code> before updating the underlying
    * data array.
-   * 
+   *
    * @param i the element index.
    * @param val the new element value.
    */
@@ -234,7 +234,7 @@ public final class DataBufferUShort extends DataBuffer
    * Sets an element in a particular data bank.  The offset (specified in the
    * constructor) is added to <code>i</code> before updating the underlying
    * data array.
-   * 
+   *
    * @param bank the data bank index.
    * @param i the element index.
    * @param val the new element value.
diff --git a/libjava/classpath/java/awt/image/DirectColorModel.java b/libjava/classpath/java/awt/image/DirectColorModel.java
index 3d43c76..a464fed 100644
--- a/libjava/classpath/java/awt/image/DirectColorModel.java
+++ b/libjava/classpath/java/awt/image/DirectColorModel.java
@@ -57,19 +57,19 @@ public class DirectColorModel extends PackedColorModel
    * Each mask should describe a fully contiguous set of bits in the
    * most likely order of alpha, red, green, blue from the most significant
    * byte to the least significant byte.
-   * 
+   *
    * @param pixelBits the number of bits wide used for bit size of pixel values
    * @param rmask the bits describing the red component of a pixel
    * @param gmask the bits describing the green component of a pixel
-   * @param bmask the bits describing the blue component of a pixel 
+   * @param bmask the bits describing the blue component of a pixel
    */
   public DirectColorModel(int pixelBits, int rmask, int gmask, int bmask)
   {
     this(ColorSpace.getInstance(ColorSpace.CS_sRGB), pixelBits,
-	 rmask, gmask, bmask, 0, 
-	 false, // not alpha premultiplied
-	 Buffers.smallestAppropriateTransferType(pixelBits) // find type
-	 );
+         rmask, gmask, bmask, 0,
+         false, // not alpha premultiplied
+         Buffers.smallestAppropriateTransferType(pixelBits) // find type
+         );
   }
 
   /**
@@ -78,34 +78,34 @@ public class DirectColorModel extends PackedColorModel
    * Each mask should describe a fully contiguous set of bits in the
    * most likely order of red, green, blue from the most significant
    * byte to the least significant byte.
-   * 
+   *
    * @param pixelBits the number of bits wide used for bit size of pixel values
    * @param rmask the bits describing the red component of a pixel
    * @param gmask the bits describing the green component of a pixel
-   * @param bmask the bits describing the blue component of a pixel 
-   * @param amask the bits describing the alpha component of a pixel 
+   * @param bmask the bits describing the blue component of a pixel
+   * @param amask the bits describing the alpha component of a pixel
    */
   public DirectColorModel(int pixelBits,
-			  int rmask, int gmask, int bmask, int amask)
+                          int rmask, int gmask, int bmask, int amask)
   {
     this(ColorSpace.getInstance(ColorSpace.CS_sRGB), pixelBits,
-	 rmask, gmask, bmask, amask,
-	 false, // not alpha premultiplied
-	 Buffers.smallestAppropriateTransferType(pixelBits) // find type
-	 );
+         rmask, gmask, bmask, amask,
+         false, // not alpha premultiplied
+         Buffers.smallestAppropriateTransferType(pixelBits) // find type
+         );
   }
 
   public DirectColorModel(ColorSpace cspace, int pixelBits,
-			  int rmask, int gmask, int bmask, int amask,
-			  boolean isAlphaPremultiplied,
-			  int transferType)
+                          int rmask, int gmask, int bmask, int amask,
+                          boolean isAlphaPremultiplied,
+                          int transferType)
   {
     super(cspace, pixelBits,
-	  rmask, gmask, bmask, amask, isAlphaPremultiplied,
-	  ((amask == 0) ? Transparency.OPAQUE : Transparency.TRANSLUCENT),
-	  transferType);
+          rmask, gmask, bmask, amask, isAlphaPremultiplied,
+          ((amask == 0) ? Transparency.OPAQUE : Transparency.TRANSLUCENT),
+          transferType);
   }
-    
+
   public final int getRedMask()
   {
     return getMask(0);
@@ -143,7 +143,7 @@ public class DirectColorModel extends PackedColorModel
   {
     return extractAndNormalizeSample(pixel, 1);
   }
-  
+
   /**
    * Get the blue component of the given pixel.
    * <br>
@@ -184,12 +184,12 @@ public class DirectColorModel extends PackedColorModel
 
   /**
    * Get the RGB color value of the given pixel using the default
-   * RGB color model. 
+   * RGB color model.
    * <br>
    *
    * @param pixel a pixel value
    */
-  public final int getRGB(int pixel) 
+  public final int getRGB(int pixel)
   {
     /* FIXME: The Sun docs show that this method is overridden, but I
        don't see any way to improve on the superclass
@@ -211,7 +211,7 @@ public class DirectColorModel extends PackedColorModel
   {
     return getBlue(getPixelFromArray(inData));
   }
-    
+
   public int getAlpha(Object inData)
   {
     return getAlpha(getPixelFromArray(inData));
@@ -221,7 +221,7 @@ public class DirectColorModel extends PackedColorModel
   {
     return getRGB(getPixelFromArray(inData));
   }
-    
+
   /**
    * Converts a normalized pixel int value in the sRGB color
    * space to an array containing a single pixel of the color space
@@ -231,7 +231,7 @@ public class DirectColorModel extends PackedColorModel
    * <code>getRGB(Object inData)</code>.
    *
    * @param rgb pixel as a normalized sRGB, 0xAARRGGBB value.
-   *  
+   *
    * @param pixel to avoid needless creation of arrays, an array to
    * use to return the pixel can be given. If null, a suitable array
    * will be created.
@@ -244,60 +244,60 @@ public class DirectColorModel extends PackedColorModel
   public Object getDataElements(int rgb, Object pixel)
   {
     // FIXME: handle alpha multiply
-    
+
     int pixelValue = 0;
     int a = 0;
     if (hasAlpha()) {
       a = (rgb >>> 24) & 0xff;
       pixelValue = valueToField(a, 3, 8);
     }
-	
+
     if (hasAlpha() && isAlphaPremultiplied())
       {
-	int r, g, b;
-	/* if r=0xff and a=0xff, then resulting
-	   value will be (r*a)>>>8 == 0xfe... This seems wrong.
-	   We should divide by 255 rather than shifting >>>8 after
-	   multiplying.
-	   
-	   Too bad, shifting is probably less expensive.
-	   r = ((rgb >>> 16) & 0xff)*a;
-	   g = ((rgb >>>  8) & 0xff)*a;
-	   b = ((rgb >>> 0) & 0xff)*a; */
-	/* The r, g, b values we calculate are 16 bit. This allows
-	   us to avoid discarding the lower 8 bits obtained if
-	   multiplying with the alpha band. */
-	
-	// using 16 bit values
-	r = ((rgb >>> 8) & 0xff00)*a/255;
-	g = ((rgb >>> 0) & 0xff00)*a/255;
-	b = ((rgb <<  8) & 0xff00)*a/255;
-	pixelValue |= 
-	  valueToField(r, 0, 16) |  // Red
-	  valueToField(g, 1, 16) |  // Green
-	  valueToField(b, 2, 16);   // Blue
+        int r, g, b;
+        /* if r=0xff and a=0xff, then resulting
+           value will be (r*a)>>>8 == 0xfe... This seems wrong.
+           We should divide by 255 rather than shifting >>>8 after
+           multiplying.
+
+           Too bad, shifting is probably less expensive.
+           r = ((rgb >>> 16) & 0xff)*a;
+           g = ((rgb >>>  8) & 0xff)*a;
+           b = ((rgb >>> 0) & 0xff)*a; */
+        /* The r, g, b values we calculate are 16 bit. This allows
+           us to avoid discarding the lower 8 bits obtained if
+           multiplying with the alpha band. */
+
+        // using 16 bit values
+        r = ((rgb >>> 8) & 0xff00)*a/255;
+        g = ((rgb >>> 0) & 0xff00)*a/255;
+        b = ((rgb <<  8) & 0xff00)*a/255;
+        pixelValue |=
+          valueToField(r, 0, 16) |  // Red
+          valueToField(g, 1, 16) |  // Green
+          valueToField(b, 2, 16);   // Blue
       }
     else
       {
-	int r, g, b;
-	// using 8 bit values
-	r = (rgb >>> 16) & 0xff;
-	g = (rgb >>>  8) & 0xff;
-	b = (rgb >>>  0) & 0xff;
-	
-	pixelValue |= 
-	  valueToField(r, 0, 8) |  // Red
-	  valueToField(g, 1, 8) |  // Green
-	  valueToField(b, 2, 8);   // Blue
+        int r, g, b;
+        // using 8 bit values
+        r = (rgb >>> 16) & 0xff;
+        g = (rgb >>>  8) & 0xff;
+        b = (rgb >>>  0) & 0xff;
+
+        pixelValue |=
+          valueToField(r, 0, 8) |  // Red
+          valueToField(g, 1, 8) |  // Green
+          valueToField(b, 2, 8);   // Blue
       }
-    
+
     /* In this color model, the whole pixel fits in the first element
        of the array. */
     DataBuffer buffer = Buffers.createBuffer(transferType, pixel, 1);
     buffer.setElem(0, pixelValue);
     return Buffers.getData(buffer);
   }
-    
+
   /**
    * Converts a value to the correct field bits based on the
    * information derived from the field masks.
@@ -307,13 +307,13 @@ public class DirectColorModel extends PackedColorModel
    */
   private int valueToField(int val, int component, int highBit)
   {
-    int toFieldShift = 
+    int toFieldShift =
       getComponentSize(component) + shifts[component] - highBit;
     int ret = (toFieldShift>0) ?
       (val << toFieldShift) :
       (val >>> (-toFieldShift));
     return ret & getMask(component);
-  }  
+  }
 
   /**
    * Converts a 16 bit value to the correct field bits based on the
@@ -336,15 +336,15 @@ public class DirectColorModel extends PackedColorModel
   {
     int numComponents = getNumComponents();
     if (components == null) components = new int[offset + numComponents];
-    
+
     for (int b=0; b<numComponents; b++)
       components[offset++] = (pixel&getMask(b)) >>> shifts[b];
-	
+
     return components;
   }
 
   public final int[] getComponents(Object pixel, int[] components,
-				   int offset)
+                                   int offset)
   {
     return getComponents(getPixelFromArray(pixel), components, offset);
   }
@@ -368,19 +368,19 @@ public class DirectColorModel extends PackedColorModel
 
     SampleModel sm = createCompatibleSampleModel(w, h);
     Point origin = new Point(0, 0);
-    return Raster.createWritableRaster(sm, origin);	
+    return Raster.createWritableRaster(sm, origin);
   }
 
   public int getDataElement(int[] components, int offset)
   {
     int numComponents = getNumComponents();
     int pixelValue = 0;
-    
+
     for (int c=0; c<numComponents; c++)
       pixelValue |= (components[offset++] << shifts[c]) & getMask(c);
 
     return pixelValue;
-  }  
+  }
 
   public Object getDataElements(int[] components, int offset, Object obj)
   {
@@ -392,26 +392,26 @@ public class DirectColorModel extends PackedColorModel
     buffer.setElem(0, pixelValue);
     return Buffers.getData(buffer);
   }
-    
+
   public final ColorModel coerceData (WritableRaster raster,
-				      boolean isAlphaPremultiplied)
+                                      boolean isAlphaPremultiplied)
   {
     if (this.isAlphaPremultiplied == isAlphaPremultiplied || !hasAlpha())
       return this;
-	
+
     /* TODO: provide better implementation based on the
        assumptions we can make due to the specific type of the
        color model. */
     coerceDataWorker(raster, isAlphaPremultiplied);
-    
+
     return new DirectColorModel(cspace, pixel_bits, getRedMask(),
                                 getGreenMask(), getBlueMask(), getAlphaMask(),
                                 isAlphaPremultiplied, transferType);
-  } 
+  }
 
   public boolean isCompatibleRaster(Raster raster)
   {
-    /* FIXME: the Sun docs say this method is overridden here, 
+    /* FIXME: the Sun docs say this method is overridden here,
        but I don't see any way to improve upon the implementation
        in ColorModel. */
     return super.isCompatibleRaster(raster);
@@ -433,4 +433,3 @@ public class DirectColorModel extends PackedColorModel
     return super.toString();
   }
 }
-
diff --git a/libjava/classpath/java/awt/image/FilteredImageSource.java b/libjava/classpath/java/awt/image/FilteredImageSource.java
index 8893e86..f56a93a 100644
--- a/libjava/classpath/java/awt/image/FilteredImageSource.java
+++ b/libjava/classpath/java/awt/image/FilteredImageSource.java
@@ -1,4 +1,4 @@
-/* FilteredImageSource.java -- Java class for providing image data 
+/* FilteredImageSource.java -- Java class for providing image data
    Copyright (C) 1999 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -43,7 +43,7 @@ import java.util.Hashtable;
 /**
  *
  * @see ImageConsumer
- * @author C. Brian Jones (cbj@gnu.org) 
+ * @author C. Brian Jones (cbj@gnu.org)
  */
 public class FilteredImageSource implements ImageProducer
 {
@@ -53,73 +53,72 @@ public class FilteredImageSource implements ImageProducer
 
     /**
      * The given filter is applied to the given image producer
-     * to create a new image producer.  
+     * to create a new image producer.
      */
     public FilteredImageSource(ImageProducer ip, ImageFilter filter) {
-	this.ip = ip;
-	this.filter = filter;
+        this.ip = ip;
+        this.filter = filter;
     }
 
     /**
      * Used to register an <code>ImageConsumer</code> with this
-     * <code>ImageProducer</code>.  
+     * <code>ImageProducer</code>.
      */
     public synchronized void addConsumer(ImageConsumer ic) {
-	if (consumers.containsKey(ic))
-	    return;
+        if (consumers.containsKey(ic))
+            return;
 
-	ImageFilter f = filter.getFilterInstance(ic);
-	consumers.put(ic, f);
-	ip.addConsumer(f);
+        ImageFilter f = filter.getFilterInstance(ic);
+        consumers.put(ic, f);
+        ip.addConsumer(f);
     }
 
     /**
      * Used to determine if the given <code>ImageConsumer</code> is
-     * already registered with this <code>ImageProducer</code>.  
+     * already registered with this <code>ImageProducer</code>.
      */
     public synchronized boolean isConsumer(ImageConsumer ic) {
-	ImageFilter f = (ImageFilter)consumers.get(ic);
-	if (f != null)
-	    return ip.isConsumer(f);
-	return false;
+        ImageFilter f = (ImageFilter)consumers.get(ic);
+        if (f != null)
+            return ip.isConsumer(f);
+        return false;
     }
 
     /**
      * Used to remove an <code>ImageConsumer</code> from the list of
-     * registered consumers for this <code>ImageProducer</code>.  
+     * registered consumers for this <code>ImageProducer</code>.
      */
     public synchronized void removeConsumer(ImageConsumer ic) {
-	ImageFilter f = (ImageFilter)consumers.remove(ic);
-	if (f != null)
-	    ip.removeConsumer(f);
+        ImageFilter f = (ImageFilter)consumers.remove(ic);
+        if (f != null)
+            ip.removeConsumer(f);
     }
 
     /**
      * Used to register an <code>ImageConsumer</code> with this
      * <code>ImageProducer</code> and then immediately start
      * reconstruction of the image data to be delivered to all
-     * registered consumers.  
+     * registered consumers.
      */
     public void startProduction(ImageConsumer ic) {
-	ImageFilter f;
-	if (!(consumers.containsKey(ic))) {
-	    f = filter.getFilterInstance(ic);
-	    consumers.put(ic, f);
-	    ip.addConsumer(f);
-	} else { 
-	    f = (ImageFilter)consumers.get( ic );
-	}
-	ip.startProduction(f);
+        ImageFilter f;
+        if (!(consumers.containsKey(ic))) {
+            f = filter.getFilterInstance(ic);
+            consumers.put(ic, f);
+            ip.addConsumer(f);
+        } else {
+            f = (ImageFilter)consumers.get( ic );
+        }
+        ip.startProduction(f);
     }
 
     /**
      * Used to register an <code>ImageConsumer</code> with this
      * <code>ImageProducer</code> and then request that this producer
-     * resend the image data in the order top-down, left-right.  
+     * resend the image data in the order top-down, left-right.
      */
     public void requestTopDownLeftRightResend(ImageConsumer ic) {
-	ImageFilter f = (ImageFilter)consumers.get(ic);
-	ip.requestTopDownLeftRightResend(f);
+        ImageFilter f = (ImageFilter)consumers.get(ic);
+        ip.requestTopDownLeftRightResend(f);
     }
 }
-
diff --git a/libjava/classpath/java/awt/image/ImageConsumer.java b/libjava/classpath/java/awt/image/ImageConsumer.java
index 11f64f9..8f3c2b1 100644
--- a/libjava/classpath/java/awt/image/ImageConsumer.java
+++ b/libjava/classpath/java/awt/image/ImageConsumer.java
@@ -43,7 +43,7 @@ import java.util.Hashtable;
 /**
  * An object implementing the <code>ImageProducer</code> interface can
  * use objects implementing this interface to deliver the image data.
- * 
+ *
  * @author C. Brian Jones (cbj@gnu.org)
  */
 public interface ImageConsumer
@@ -52,7 +52,7 @@ public interface ImageConsumer
      * The pixel order may be random.  This should be
      * the default assumption of the <code>ImageConsumer</code>.
      *
-     * @see #setHints 
+     * @see #setHints
      */
     int RANDOMPIXELORDER = 1;
 
@@ -75,7 +75,7 @@ public interface ImageConsumer
      * most one call to <code>setPixels</code> for any single pixel.
      *
      * @see #setHints
-     * @see #setPixels(int, int, int, int, ColorModel, int[], int, int) 
+     * @see #setPixels(int, int, int, int, ColorModel, int[], int, int)
      */
     int SINGLEPASS = 8;
 
@@ -87,9 +87,9 @@ public interface ImageConsumer
      * changing such as with video then the end of each frame is
      * marked by a similar call to <code>imageComplete</code> with the
      * <code>SINGLEFRAMEDONE</code> flag.
-     * 
+     *
      * @see #setHints
-     * @see #imageComplete 
+     * @see #imageComplete
      */
     int SINGLEFRAME = 16;
 
@@ -102,7 +102,7 @@ public interface ImageConsumer
 
     /**
      * A single frame is complete but more will follow.
-     * 
+     *
      * @see #imageComplete
      */
     int SINGLEFRAMEDONE = 2;
@@ -124,9 +124,9 @@ public interface ImageConsumer
     /**
      * An <code>ImageProducer</code> indicates the size of the image
      * being produced using this method.
-     * 
+     *
      * @param width the width of the image
-     * @param height the height of the image 
+     * @param height the height of the image
      */
     void setDimensions(int width, int height);
 
@@ -134,7 +134,7 @@ public interface ImageConsumer
      * An <code>ImageProducer</code> can set a list of properties
      * associated with this image by using this method.
      *
-     * @param props the list of properties associated with this image 
+     * @param props the list of properties associated with this image
      */
     void setProperties(Hashtable<?,?> props);
 
@@ -145,7 +145,7 @@ public interface ImageConsumer
      * <code>ColorModel</code>.
      *
      * @param model the color model to be used most often by setPixels
-     * @see ColorModel 
+     * @see ColorModel
      */
     void setColorModel(ColorModel model);
 
@@ -154,7 +154,7 @@ public interface ImageConsumer
      * bit mask of hints from any of <code>RANDOMPIXELORDER</code>,
      * <code>TOPDOWNLEFTRIGHT</code>, <code>COMPLETESCANLINES</code>,
      * <code>SINGLEPASS</code>, <code>SINGLEFRAME</code>.
-     * 
+     *
      * @param flags a bit mask of hints
      */
     void setHints(int flags);
@@ -178,8 +178,8 @@ public interface ImageConsumer
      * @param offset offset into pixels array
      * @param scansize width of one row in the pixel block
      */
-    void setPixels(int x, int y, int w, int h, 
-	   ColorModel model, byte[] pixels, int offset, int scansize);
+    void setPixels(int x, int y, int w, int h,
+           ColorModel model, byte[] pixels, int offset, int scansize);
 
     /**
      * Deliver a subset of an ImageProducer's pixels to this ImageConsumer.
@@ -200,14 +200,14 @@ public interface ImageConsumer
      * @param offset offset into pixels array
      * @param scansize width of one row in the pixel block
      */
-    void setPixels(int x, int y, int w, int h, 
+    void setPixels(int x, int y, int w, int h,
            ColorModel model, int[] pixels, int offset, int scansize);
 
     /**
      * The <code>ImageProducer</code> calls this method to indicate a
      * single frame or the entire image is complete.  The method is
      * also used to indicate an error in loading or producing the
-     * image.  
+     * image.
      *
      * @param status the status of image production, represented by a
      * bitwise OR of ImageConsumer flags
diff --git a/libjava/classpath/java/awt/image/ImageFilter.java b/libjava/classpath/java/awt/image/ImageFilter.java
index 0ead45a4..10df82e 100644
--- a/libjava/classpath/java/awt/image/ImageFilter.java
+++ b/libjava/classpath/java/awt/image/ImageFilter.java
@@ -45,24 +45,24 @@ import java.util.Hashtable;
  * extended to provide different types of filters for an image.  By
  * default this class does nothing to an image passing through it.
  *
- * @author C. Brian Jones (cbj@gnu.org) 
+ * @author C. Brian Jones (cbj@gnu.org)
  */
 public class ImageFilter implements ImageConsumer, Cloneable
 {
   /**
    * The consumer this filter is filtering an image data stream for.
-   * It is initialized in the method <code>getFilterInstance</code>.  
+   * It is initialized in the method <code>getFilterInstance</code>.
    */
   protected ImageConsumer consumer = null;
 
   /**
    * The <code>ImageConsumer</code> can use this method to request
-   * the pixels be delivered in top-down, left-right order.  
-   * <br> 
-   * The filter can respond in three different ways.  
+   * the pixels be delivered in top-down, left-right order.
+   * <br>
+   * The filter can respond in three different ways.
    * <ul>
-   *   <li>The default behavior is to forward the request to the 
-   *       <code>ImageProducer</code> 
+   *   <li>The default behavior is to forward the request to the
+   *       <code>ImageProducer</code>
    *       using the method <code>requestTopDownLeftRightResend</code>
    *       and using the filter as the consumer.</li>
    *   <li>The filter has the pixels and can retransmit them in the
@@ -77,7 +77,7 @@ public class ImageFilter implements ImageConsumer, Cloneable
 
   /**
    * By default, returns a shallow copy of the object created by
-   * <code>Object.clone()</code> 
+   * <code>Object.clone()</code>
    *
    * @see java.lang.Object#clone ()
    */
@@ -98,7 +98,7 @@ public class ImageFilter implements ImageConsumer, Cloneable
   /**
    * This is the only method which can set the
    * <code>ImageConsumer</code> for this filter.  By default a clone
-   * of this filter with the appropriate consumer set is returned.  
+   * of this filter with the appropriate consumer set is returned.
    *
    * @see #clone ()
    */
@@ -111,13 +111,13 @@ public class ImageFilter implements ImageConsumer, Cloneable
 
   /**
    * An <code>ImageProducer</code> indicates the size of the image
-   * being produced using this method.  A filter can override this 
+   * being produced using this method.  A filter can override this
    * method to intercept these calls from the producer in order to
    * change either the width or the height before in turn calling
    * the consumer's <code>setDimensions</code> method.
-   * 
+   *
    * @param width the width of the image
-   * @param height the height of the image 
+   * @param height the height of the image
    */
   public void setDimensions(int width, int height)
   {
@@ -128,7 +128,7 @@ public class ImageFilter implements ImageConsumer, Cloneable
    * An <code>ImageProducer</code> can set a list of properties
    * associated with this image by using this method.
    *
-   * @param props the list of properties associated with this image 
+   * @param props the list of properties associated with this image
    */
   public void setProperties(Hashtable<?,?> props)
   {
@@ -160,9 +160,9 @@ public class ImageFilter implements ImageConsumer, Cloneable
    * The <code>ImageProducer</code> should call this method with a
    * bit mask of hints from any of <code>RANDOMPIXELORDER</code>,
    * <code>TOPDOWNLEFTRIGHT</code>, <code>COMPLETESCANLINES</code>,
-   * <code>SINGLEPASS</code>, <code>SINGLEFRAME</code> from the 
+   * <code>SINGLEPASS</code>, <code>SINGLEFRAME</code> from the
    * <code>ImageConsumer</code> interface.
-   * 
+   *
    * @param flags a bit mask of hints
    * @see ImageConsumer
    */
@@ -174,7 +174,7 @@ public class ImageFilter implements ImageConsumer, Cloneable
   /**
    * This function delivers a rectangle of pixels where any
    * pixel(m,n) is stored in the array as a <code>byte</code> at
-   * index (n * scansize + m + offset).  
+   * index (n * scansize + m + offset).
    *
    * @param x the x coordinate of the rectangle
    * @param y the y coordinate of the rectangle
@@ -185,7 +185,7 @@ public class ImageFilter implements ImageConsumer, Cloneable
    * @param offset the index of the first pixels in the <code>pixels</code> array
    * @param scansize the width to use in extracting pixels from the <code>pixels</code> array
    */
-  public void setPixels(int x, int y, int w, int h, 
+  public void setPixels(int x, int y, int w, int h,
                         ColorModel model, byte[] pixels, int offset,
                         int scansize)
   {
@@ -195,7 +195,7 @@ public class ImageFilter implements ImageConsumer, Cloneable
   /**
    * This function delivers a rectangle of pixels where any
    * pixel(m,n) is stored in the array as an <code>int</code> at
-   * index (n * scansize + m + offset).  
+   * index (n * scansize + m + offset).
    *
    * @param x the x coordinate of the rectangle
    * @param y the y coordinate of the rectangle
@@ -206,7 +206,7 @@ public class ImageFilter implements ImageConsumer, Cloneable
    * @param offset the index of the first pixels in the <code>pixels</code> array
    * @param scansize the width to use in extracting pixels from the <code>pixels</code> array
    */
-  public void setPixels(int x, int y, int w, int h, 
+  public void setPixels(int x, int y, int w, int h,
                         ColorModel model, int[] pixels, int offset,
                         int scansize)
   {
@@ -217,7 +217,7 @@ public class ImageFilter implements ImageConsumer, Cloneable
    * The <code>ImageProducer</code> calls this method to indicate a
    * single frame or the entire image is complete.  The method is
    * also used to indicate an error in loading or producing the
-   * image.  
+   * image.
    */
   public void imageComplete(int status)
   {
diff --git a/libjava/classpath/java/awt/image/ImageObserver.java b/libjava/classpath/java/awt/image/ImageObserver.java
index 36dd013..e63d4bb 100644
--- a/libjava/classpath/java/awt/image/ImageObserver.java
+++ b/libjava/classpath/java/awt/image/ImageObserver.java
@@ -46,7 +46,7 @@ import java.awt.Image;
  * <code>ImageProducer</code> asynchronously.
  *
  * @see ImageProducer
- * @author C. Brian Jones (cbj@gnu.org) 
+ * @author C. Brian Jones (cbj@gnu.org)
  */
 public interface ImageObserver
 {
@@ -54,7 +54,7 @@ public interface ImageObserver
      * The width of the image has been provided as the
      * <code>width</code> argument to <code>imageUpdate</code>.
      *
-     * @see #imageUpdate 
+     * @see #imageUpdate
      */
     int WIDTH = 1;
 
@@ -62,7 +62,7 @@ public interface ImageObserver
      * The height of the image has been provided as the
      * <code>height</code> argument to <code>imageUpdate</code>.
      *
-     * @see #imageUpdate 
+     * @see #imageUpdate
      */
     int HEIGHT = 2;
 
@@ -78,7 +78,7 @@ public interface ImageObserver
      * More pixels are now available for drawing a scaled variation of
      * the image.
      *
-     * @see #imageUpdate 
+     * @see #imageUpdate
      */
     int SOMEBITS = 8;
 
@@ -86,7 +86,7 @@ public interface ImageObserver
      * All the pixels needed to draw a complete frame of a multi-frame
      * image are available.
      *
-     * @see #imageUpdate 
+     * @see #imageUpdate
      */
     int FRAMEBITS = 16;
 
@@ -121,9 +121,9 @@ public interface ImageObserver
      * @param y the y coordinate of the image
      * @param width the width of the image
      * @param height the height of the image
-     * 
-     * @see java.awt.Image 
+     *
+     * @see java.awt.Image
      */
-    boolean imageUpdate(Image image, int flags, int x, 
-					int y, int width, int height);
+    boolean imageUpdate(Image image, int flags, int x,
+                                        int y, int width, int height);
 }
diff --git a/libjava/classpath/java/awt/image/ImageProducer.java b/libjava/classpath/java/awt/image/ImageProducer.java
index 4984668..c0f9ad4 100644
--- a/libjava/classpath/java/awt/image/ImageProducer.java
+++ b/libjava/classpath/java/awt/image/ImageProducer.java
@@ -45,25 +45,25 @@ package java.awt.image;
  * resizing the image.
  *
  * @see ImageConsumer
- * @author C. Brian Jones (cbj@gnu.org) 
+ * @author C. Brian Jones (cbj@gnu.org)
  */
 public interface ImageProducer
 {
     /**
      * Used to register an <code>ImageConsumer</code> with this
-     * <code>ImageProducer</code>.  
+     * <code>ImageProducer</code>.
      */
     void addConsumer(ImageConsumer ic);
 
     /**
      * Used to determine if the given <code>ImageConsumer</code> is
-     * already registered with this <code>ImageProducer</code>.  
+     * already registered with this <code>ImageProducer</code>.
      */
     boolean isConsumer(ImageConsumer ic);
 
     /**
      * Used to remove an <code>ImageConsumer</code> from the list of
-     * registered consumers for this <code>ImageProducer</code>.  
+     * registered consumers for this <code>ImageProducer</code>.
      */
     void removeConsumer(ImageConsumer ic);
 
@@ -71,15 +71,14 @@ public interface ImageProducer
      * Used to register an <code>ImageConsumer</code> with this
      * <code>ImageProducer</code> and then immediately start
      * reconstruction of the image data to be delivered to all
-     * registered consumers.  
+     * registered consumers.
      */
     void startProduction(ImageConsumer ic);
 
     /**
      * Used to register an <code>ImageConsumer</code> with this
      * <code>ImageProducer</code> and then request that this producer
-     * resend the image data in the order top-down, left-right.  
+     * resend the image data in the order top-down, left-right.
      */
     void requestTopDownLeftRightResend(ImageConsumer ic);
 }
-
diff --git a/libjava/classpath/java/awt/image/IndexColorModel.java b/libjava/classpath/java/awt/image/IndexColorModel.java
index d8a27d5..340d38e 100644
--- a/libjava/classpath/java/awt/image/IndexColorModel.java
+++ b/libjava/classpath/java/awt/image/IndexColorModel.java
@@ -49,9 +49,9 @@ import java.math.BigInteger;
  * Thus, pixel values are indexes into the color map.  Each color component is
  * an 8-bit unsigned value.
  * <br><br>
- * The <code>IndexColorModel</code> supports a map of valid pixels, allowing 
- * the representation of holes in the the color map.  The valid map is 
- * represented as a {@link BigInteger} where each bit indicates the validity 
+ * The <code>IndexColorModel</code> supports a map of valid pixels, allowing
+ * the representation of holes in the the color map.  The valid map is
+ * represented as a {@link BigInteger} where each bit indicates the validity
  * of the map entry with the same index.
  * <br><br>
  * Colors can have alpha components for transparency support.  If alpha
@@ -59,11 +59,11 @@ import java.math.BigInteger;
  * supports a reserved pixel value to represent completely transparent colors,
  * no matter what the actual color component values are.
  * <br><br>
- * <code>IndexColorModel</code> supports anywhere from 1 to 16 bit index 
- * values.  The allowed transfer types are {@link DataBuffer#TYPE_BYTE} and 
+ * <code>IndexColorModel</code> supports anywhere from 1 to 16 bit index
+ * values.  The allowed transfer types are {@link DataBuffer#TYPE_BYTE} and
  * {@link DataBuffer#TYPE_USHORT}.
  *
- * @author C. Brian Jones (cbj@gnu.org) 
+ * @author C. Brian Jones (cbj@gnu.org)
  */
 public class IndexColorModel extends ColorModel
 {
@@ -74,22 +74,22 @@ public class IndexColorModel extends ColorModel
   private BigInteger validBits = BigInteger.ZERO;
 
   /**
-   * Creates a new indexed color model for <code>size</code> color elements 
-   * with no alpha component.  Each array must contain at least 
-   * <code>size</code> elements.  For each array, the i-th color is described 
-   * by reds[i], greens[i] and blues[i]. 
+   * Creates a new indexed color model for <code>size</code> color elements
+   * with no alpha component.  Each array must contain at least
+   * <code>size</code> elements.  For each array, the i-th color is described
+   * by reds[i], greens[i] and blues[i].
    *
-   * @param bits the number of bits needed to represent <code>size</code> 
+   * @param bits the number of bits needed to represent <code>size</code>
    *             colors.
    * @param size the number of colors in the color map.
    * @param reds the red component of all colors.
    * @param greens the green component of all colors.
    * @param blues the blue component of all colors.
    *
-   * @throws IllegalArgumentException if <code>bits</code> &lt; 1 or 
+   * @throws IllegalArgumentException if <code>bits</code> &lt; 1 or
    *         <code>bits</code> &gt; 16.
    * @throws NullPointerException if any of the arrays is <code>null</code>.
-   * @throws ArrayIndexOutOfBoundsException if <code>size</code> is greater 
+   * @throws ArrayIndexOutOfBoundsException if <code>size</code> is greater
    *         than the length of the component arrays.
    */
   public IndexColorModel(int bits, int size, byte[] reds, byte[] greens,
@@ -100,34 +100,34 @@ public class IndexColorModel extends ColorModel
 
   /**
    * Creates a new indexed color model for <code>size</code> color elements.
-   * Each array must contain at least <code>size</code> elements.  For each 
-   * array, the i-th color is described by reds[i], greens[i] and blues[i]. 
-   * All the colors are opaque except for the transparent color. 
+   * Each array must contain at least <code>size</code> elements.  For each
+   * array, the i-th color is described by reds[i], greens[i] and blues[i].
+   * All the colors are opaque except for the transparent color.
    *
-   * @param bits the number of bits needed to represent <code>size</code> 
+   * @param bits the number of bits needed to represent <code>size</code>
    *             colors
    * @param size the number of colors in the color map
    * @param reds the red component of all colors
    * @param greens the green component of all colors
    * @param blues the blue component of all colors
-   * @param trans the index of the transparent color (use -1 for no 
+   * @param trans the index of the transparent color (use -1 for no
    *              transparent color).
-   * 
-   * @throws IllegalArgumentException if <code>bits</code> &lt; 1 or 
+   *
+   * @throws IllegalArgumentException if <code>bits</code> &lt; 1 or
    *         <code>bits</code> &gt; 16.
    * @throws NullPointerException if any of the arrays is <code>null</code>.
-   * @throws ArrayIndexOutOfBoundsException if <code>size</code> is greater 
+   * @throws ArrayIndexOutOfBoundsException if <code>size</code> is greater
    *         than the length of the component arrays.
    */
   public IndexColorModel(int bits, int size, byte[] reds, byte[] greens,
                          byte[] blues, int trans)
   {
-    super(bits, nArray(8, (0 <= trans && trans < size) ? 4 : 3), 
-        ColorSpace.getInstance(ColorSpace.CS_sRGB), 
-        (0 <= trans && trans < size),  // hasAlpha 
-        false, OPAQUE, 
-        Buffers.smallestAppropriateTransferType(bits)); 
-    if (bits < 1) 
+    super(bits, nArray(8, (0 <= trans && trans < size) ? 4 : 3),
+        ColorSpace.getInstance(ColorSpace.CS_sRGB),
+        (0 <= trans && trans < size),  // hasAlpha
+        false, OPAQUE,
+        Buffers.smallestAppropriateTransferType(bits));
+    if (bits < 1)
       throw new IllegalArgumentException("bits < 1");
     if (bits > 16)
       throw new IllegalArgumentException("bits > 16");
@@ -150,35 +150,35 @@ public class IndexColorModel extends ColorModel
   }
 
   /**
-   * Creates a new indexed color model for <code>size</code> color elements 
-   * including alpha.  Each array must contain at least <code>size</code> 
-   * elements.  For each array, the i-th color is described 
-   * by reds[i], greens[i], blues[i] and alphas[i]. 
+   * Creates a new indexed color model for <code>size</code> color elements
+   * including alpha.  Each array must contain at least <code>size</code>
+   * elements.  For each array, the i-th color is described
+   * by reds[i], greens[i], blues[i] and alphas[i].
    *
-   * @param bits the number of bits needed to represent <code>size</code> 
+   * @param bits the number of bits needed to represent <code>size</code>
    *             colors.
    * @param size the number of colors in the color map.
    * @param reds the red component of all colors.
    * @param greens the green component of all colors.
    * @param blues the blue component of all colors.
-   * @param alphas the alpha component of all colors (<code>null</code> 
+   * @param alphas the alpha component of all colors (<code>null</code>
    *               permitted).
    *
-   * @throws IllegalArgumentException if <code>bits</code> &lt; 1 or 
+   * @throws IllegalArgumentException if <code>bits</code> &lt; 1 or
    *           <code>bits</code> &gt; 16.
    * @throws NullPointerException if <code>reds</code>, <code>greens</code> or
    *         <code>blues</code> is <code>null</code>.
-   * @throws ArrayIndexOutOfBoundsException if <code>size</code> is greater 
+   * @throws ArrayIndexOutOfBoundsException if <code>size</code> is greater
    *         than the length of the component arrays.
    */
   public IndexColorModel(int bits, int size, byte[] reds, byte[] greens,
                          byte[] blues, byte[] alphas)
   {
-    super(bits, nArray(8, (alphas == null ? 3 : 4)), 
-        ColorSpace.getInstance(ColorSpace.CS_sRGB), 
-        (alphas != null), false, TRANSLUCENT, 
-        Buffers.smallestAppropriateTransferType(bits)); 
-    if (bits < 1) 
+    super(bits, nArray(8, (alphas == null ? 3 : 4)),
+        ColorSpace.getInstance(ColorSpace.CS_sRGB),
+        (alphas != null), false, TRANSLUCENT,
+        Buffers.smallestAppropriateTransferType(bits));
+    if (bits < 1)
       throw new IllegalArgumentException("bits < 1");
     if (bits > 16)
       throw new IllegalArgumentException("bits > 16");
@@ -201,11 +201,11 @@ public class IndexColorModel extends ColorModel
       }
     else
       {
-	byte alphaZero = (byte) 0x00;
+        byte alphaZero = (byte) 0x00;
         byte alphaOne = (byte) 0xFF;
         for (int i = 0; i < size; i++)
           {
-	    alphaZero = (byte) (alphaZero | alphas[i]);
+            alphaZero = (byte) (alphaZero | alphas[i]);
             alphaOne = (byte) (alphaOne & alphas[i]);
             rgb[i] = ((alphas[i] & 0xff) << 24
                       | ((reds[i] & 0xff) << 16)
@@ -213,9 +213,9 @@ public class IndexColorModel extends ColorModel
                       | (blues[i] & 0xff));
           }
         if ((alphaZero == (byte) 0x00) || (alphaOne == (byte) 0xFF))
-	  transparency = BITMASK;
-	else
-	  transparency = TRANSLUCENT;
+          transparency = BITMASK;
+        else
+          transparency = TRANSLUCENT;
       }
 
     // Generate a bigint with 1's for every pixel
@@ -223,22 +223,22 @@ public class IndexColorModel extends ColorModel
   }
 
   /**
-   * Creates a new indexed color model using the color components in 
+   * Creates a new indexed color model using the color components in
    * <code>cmap</code>. If <code>hasAlpha</code> is <code>true</code> then
    * <code>cmap</code> contains an alpha component after each of the red, green
    * and blue components.
    *
-   * @param bits the number of bits needed to represent <code>size</code> 
+   * @param bits the number of bits needed to represent <code>size</code>
    *             colors
    * @param size the number of colors in the color map
    * @param cmap packed color components
    * @param start the offset of the first color component in <code>cmap</code>
    * @param hasAlpha <code>cmap</code> has alpha values
-   * @throws IllegalArgumentException if bits &lt; 1, bits &gt; 16, or size 
+   * @throws IllegalArgumentException if bits &lt; 1, bits &gt; 16, or size
    *         &lt; 1.
    * @throws NullPointerException if <code>cmap</code> is <code>null</code>.
    */
-  public IndexColorModel(int bits, int size, byte[] cmap, int start, 
+  public IndexColorModel(int bits, int size, byte[] cmap, int start,
                          boolean hasAlpha)
   {
     this(bits, size, cmap, start, hasAlpha, -1);
@@ -247,8 +247,8 @@ public class IndexColorModel extends ColorModel
   /**
    * Construct an IndexColorModel from an array of red, green, blue, and
    * optional alpha components. The component values are interleaved as RGB(A).
-   * 
-   * @param bits the number of bits needed to represent <code>size</code> 
+   *
+   * @param bits the number of bits needed to represent <code>size</code>
    *             colors
    * @param size the number of colors in the color map
    * @param cmap interleaved color components
@@ -259,12 +259,12 @@ public class IndexColorModel extends ColorModel
    *         &lt; 1.
    * @throws NullPointerException if <code>cmap</code> is <code>null</code>.
    */
-  public IndexColorModel(int bits, int size, byte[] cmap, int start, 
+  public IndexColorModel(int bits, int size, byte[] cmap, int start,
                          boolean hasAlpha, int trans)
   {
-    super(bits, nArray(8, hasAlpha || (0 <= trans && trans < size) ? 4 : 3), 
+    super(bits, nArray(8, hasAlpha || (0 <= trans && trans < size) ? 4 : 3),
         ColorSpace.getInstance(ColorSpace.CS_sRGB),
-        hasAlpha || (0 <= trans && trans < size), false, OPAQUE, 
+        hasAlpha || (0 <= trans && trans < size), false, OPAQUE,
         Buffers.smallestAppropriateTransferType(bits));
     if (bits < 1)
       throw new IllegalArgumentException("bits < 1");
@@ -282,37 +282,37 @@ public class IndexColorModel extends ColorModel
       int alphaZero = 0x00;  // use to detect all zeros
       int alphaOne = 0xff;   // use to detect all ones
       for (int i = 0; i < size; i++) {
-	alpha = cmap[4 * i + 3 + start] & 0xff;  
+        alpha = cmap[4 * i + 3 + start] & 0xff;
         alphaZero = alphaZero | alpha;
         alphaOne = alphaOne & alpha;
         rgb[i] =
-	  ( alpha << 24
-	   // red
-	   | ((cmap[4 * i + start] & 0xff) << 16)
-	   // green
-	   | ((cmap[4 * i + 1 + start] & 0xff) << 8)
-	   // blue
-	   | (cmap[4 * i + 2 + start] & 0xff));
+          ( alpha << 24
+           // red
+           | ((cmap[4 * i + start] & 0xff) << 16)
+           // green
+           | ((cmap[4 * i + 1 + start] & 0xff) << 8)
+           // blue
+           | (cmap[4 * i + 2 + start] & 0xff));
       }
-      if (alphaZero == 0) 
-	transparency = BITMASK;
-      else if (alphaOne == 255) 
+      if (alphaZero == 0)
+        transparency = BITMASK;
+      else if (alphaOne == 255)
         transparency = (trans != -1 ? BITMASK : OPAQUE);
       else
-	transparency = TRANSLUCENT;
+        transparency = TRANSLUCENT;
     }
     else
     {
       for (int i = 0; i < size; i++)
-	rgb[i] = (0xff000000
-		  // red
-		  | ((cmap[3 * i + start] & 0xff) << 16)
-		  // green
-		  | ((cmap[3 * i + 1 + start] & 0xff) << 8)
-		  // blue
-		  | (cmap[3 * i + 2 + start] & 0xff));
+        rgb[i] = (0xff000000
+                  // red
+                  | ((cmap[3 * i + start] & 0xff) << 16)
+                  // green
+                  | ((cmap[3 * i + 1 + start] & 0xff) << 8)
+                  // blue
+                  | (cmap[3 * i + 2 + start] & 0xff));
       if (trans != -1)
-	transparency = BITMASK;
+        transparency = BITMASK;
     }
 
     setTransparentPixel(trans);
@@ -327,30 +327,30 @@ public class IndexColorModel extends ColorModel
    * alpha values packed in order.  If hasAlpha is false, then all the colors
    * are opaque except for the transparent color.
    *
-   * @param bits the number of bits needed to represent <code>size</code> 
+   * @param bits the number of bits needed to represent <code>size</code>
    *             colors
    * @param size the number of colors in the color map
    * @param cmap packed color components
    * @param start the offset of the first color component in <code>cmap</code>
    * @param hasAlpha <code>cmap</code> has alpha values
    * @param trans the index of the transparent color
-   * @param transferType {@link DataBuffer#TYPE_BYTE} or 
+   * @param transferType {@link DataBuffer#TYPE_BYTE} or
             {@link DataBuffer#TYPE_USHORT}.
    * @throws IllegalArgumentException if bits &lt; 1, bits &gt; 16, or size
    *         &lt; 1.
    * @throws IllegalArgumentException if <code>transferType</code> is something
-   *         other than {@link DataBuffer#TYPE_BYTE} or 
+   *         other than {@link DataBuffer#TYPE_BYTE} or
    *         {@link DataBuffer#TYPE_USHORT}.
    */
-  public IndexColorModel(int bits, int size, int[] cmap, int start, 
+  public IndexColorModel(int bits, int size, int[] cmap, int start,
                          boolean hasAlpha, int trans, int transferType)
   {
-    super(bits, 
-	  nArray(8, 4), // bits for each channel
-	  ColorSpace.getInstance(ColorSpace.CS_sRGB), // sRGB
-	  true, // has alpha
-	  false, // not premultiplied
-	  TRANSLUCENT, transferType);
+    super(bits,
+          nArray(8, 4), // bits for each channel
+          ColorSpace.getInstance(ColorSpace.CS_sRGB), // sRGB
+          true, // has alpha
+          false, // not premultiplied
+          TRANSLUCENT, transferType);
     if (transferType != DataBuffer.TYPE_BYTE
         && transferType != DataBuffer.TYPE_USHORT)
       throw new IllegalArgumentException();
@@ -363,7 +363,7 @@ public class IndexColorModel extends ColorModel
     rgb = createColorMap(bits, size);
     if (!hasAlpha)
       for (int i = 0; i < size; i++)
-	rgb[i] = cmap[i + start] | 0xff000000;
+        rgb[i] = cmap[i + start] | 0xff000000;
     else
       System.arraycopy(cmap, start, rgb, 0, size);
 
@@ -383,14 +383,14 @@ public class IndexColorModel extends ColorModel
    * <br><br>
    * This constructor permits indicating which colormap entries are valid,
    * using the validBits argument.  Each entry in cmap is valid if the
-   * corresponding bit in validBits is set.  
-   * 
-   * @param bits the number of bits needed to represent <code>size</code> 
+   * corresponding bit in validBits is set.
+   *
+   * @param bits the number of bits needed to represent <code>size</code>
    *             colors.
    * @param size the number of colors in the color map.
    * @param cmap packed color components.
    * @param start the offset of the first color component in <code>cmap</code>.
-   * @param transferType {@link DataBuffer#TYPE_BYTE} or 
+   * @param transferType {@link DataBuffer#TYPE_BYTE} or
    *                     {@link DataBuffer#TYPE_USHORT}.
    * @param validBits a map of the valid entries in <code>cmap</code>.
    * @throws IllegalArgumentException if bits &lt; 1, bits &gt; 16, or size
@@ -398,15 +398,15 @@ public class IndexColorModel extends ColorModel
    * @throws IllegalArgumentException if transferType is something other than
    *         {@link DataBuffer#TYPE_BYTE} or {@link DataBuffer#TYPE_USHORT}.
    */
-  public IndexColorModel(int bits, int size, int[] cmap, int start, 
+  public IndexColorModel(int bits, int size, int[] cmap, int start,
                          int transferType, BigInteger validBits)
   {
     super(bits, // total bits, sRGB, four channels
-	  nArray(8, 4), // bits for each channel
-	  ColorSpace.getInstance(ColorSpace.CS_sRGB), // sRGB
-	  true, // has alpha
-	  false, // not premultiplied
-	  TRANSLUCENT, transferType);
+          nArray(8, 4), // bits for each channel
+          ColorSpace.getInstance(ColorSpace.CS_sRGB), // sRGB
+          true, // has alpha
+          false, // not premultiplied
+          TRANSLUCENT, transferType);
     if (transferType != DataBuffer.TYPE_BYTE
         && transferType != DataBuffer.TYPE_USHORT)
       throw new IllegalArgumentException();
@@ -422,7 +422,7 @@ public class IndexColorModel extends ColorModel
     rgb = createColorMap(bits, size);
     if (!hasAlpha)
       for (int i = 0; i < size; i++)
-	rgb[i] = cmap[i + start] | 0xff000000;
+        rgb[i] = cmap[i + start] | 0xff000000;
     else
       System.arraycopy(cmap, start, rgb, 0, size);
   }
@@ -440,7 +440,7 @@ public class IndexColorModel extends ColorModel
   /**
    * Get the index of the transparent color in this color model.
    *
-   * @return The index of the color that is considered transparent, or -1 if 
+   * @return The index of the color that is considered transparent, or -1 if
    *         there is no transparent color.
    */
   public final int getTransparentPixel()
@@ -449,13 +449,13 @@ public class IndexColorModel extends ColorModel
   }
 
   /**
-   * Fills the supplied array with the red component of each color in the 
+   * Fills the supplied array with the red component of each color in the
    * lookup table.
    *
    * @param r an array that is at least as large as {@link #getMapSize()}.
    * @throws NullPointerException if <code>r</code> is <code>null</code>.
-   * @throws ArrayIndexOutOfBoundsException if <code>r</code> has less 
-   *         than {@link #getMapSize()} elements. 
+   * @throws ArrayIndexOutOfBoundsException if <code>r</code> has less
+   *         than {@link #getMapSize()} elements.
    */
   public final void getReds(byte[] r)
   {
@@ -465,13 +465,13 @@ public class IndexColorModel extends ColorModel
   }
 
   /**
-   * Fills the supplied array with the green component of each color in the 
+   * Fills the supplied array with the green component of each color in the
    * lookup table.
    *
    * @param g an array that is at least as large as {@link #getMapSize()}.
    * @throws NullPointerException if <code>g</code> is <code>null</code>.
-   * @throws ArrayIndexOutOfBoundsException if <code>g</code> has less 
-   *         than {@link #getMapSize()} elements. 
+   * @throws ArrayIndexOutOfBoundsException if <code>g</code> has less
+   *         than {@link #getMapSize()} elements.
    */
   public final void getGreens(byte[] g)
   {
@@ -481,13 +481,13 @@ public class IndexColorModel extends ColorModel
   }
 
   /**
-   * Fills the supplied array with the blue component of each color in the 
+   * Fills the supplied array with the blue component of each color in the
    * lookup table.
    *
    * @param b an array that is at least as large as {@link #getMapSize()}.
    * @throws NullPointerException if <code>b</code> is <code>null</code>.
-   * @throws ArrayIndexOutOfBoundsException if <code>b</code> has less 
-   *         than {@link #getMapSize()} elements. 
+   * @throws ArrayIndexOutOfBoundsException if <code>b</code> has less
+   *         than {@link #getMapSize()} elements.
    */
   public final void getBlues(byte[] b)
   {
@@ -497,27 +497,27 @@ public class IndexColorModel extends ColorModel
   }
 
   /**
-   * Fills the supplied array with the alpha component of each color in the 
+   * Fills the supplied array with the alpha component of each color in the
    * lookup table.  If the model has a transparent pixel specified, the alpha
    * for that pixel will be 0.
    *
    * @param a an array that is at least as large as {@link #getMapSize()}.
    * @throws NullPointerException if <code>a</code> is <code>null</code>.
-   * @throws ArrayIndexOutOfBoundsException if <code>a</code> has less 
-   *         than {@link #getMapSize()} elements. 
+   * @throws ArrayIndexOutOfBoundsException if <code>a</code> has less
+   *         than {@link #getMapSize()} elements.
    */
   public final void getAlphas(byte[] a)
   {
     int i;
     for (i = 0; i < map_size; i++)
-      if (i == trans) 
-	a[i] = (byte) 0;
-      else 
+      if (i == trans)
+        a[i] = (byte) 0;
+      else
         a[i] = (byte) ((0xFF000000  & rgb[i]) >> 24);
   }
 
   /**
-   * Returns the red component of the color in the lookup table for the 
+   * Returns the red component of the color in the lookup table for the
    * given pixel value.
    *
    * @param pixel  the pixel lookup value.
@@ -529,12 +529,12 @@ public class IndexColorModel extends ColorModel
   {
     if (pixel < map_size)
       return (0x00FF0000 & rgb[pixel]) >> 16;
-    
+
     return 0;
   }
 
   /**
-   * Returns the green component of the color in the lookup table for the 
+   * Returns the green component of the color in the lookup table for the
    * given pixel value.
    *
    * @param pixel  the pixel lookup value.
@@ -546,12 +546,12 @@ public class IndexColorModel extends ColorModel
   {
     if (pixel < map_size)
       return (0x0000FF00 & rgb[pixel]) >> 8;
-    
+
     return 0;
   }
 
   /**
-   * Returns the blue component of the color in the lookup table for the 
+   * Returns the blue component of the color in the lookup table for the
    * given pixel value.
    *
    * @param pixel  the pixel lookup value.
@@ -563,12 +563,12 @@ public class IndexColorModel extends ColorModel
   {
     if (pixel < map_size)
       return 0x000000FF & rgb[pixel];
-    
+
     return 0;
   }
 
   /**
-   * Returns the alpha component of the color in the lookup table for the 
+   * Returns the alpha component of the color in the lookup table for the
    * given pixel value. If no alpha channel was specified when the color model
    * was created, then 255 is returned for all pixels except the transparent
    * pixel (if one is defined - see {@link #getTransparentPixel()}) which
@@ -576,7 +576,7 @@ public class IndexColorModel extends ColorModel
    *
    * @param pixel  the pixel lookup value.
    *
-   * @return The alpha component of the color in the lookup table (in the 
+   * @return The alpha component of the color in the lookup table (in the
    *         range 0 to 255).
    * @throws ArrayIndexOutOfBoundsException if <code>pixel</code> is negative.
    */
@@ -587,7 +587,7 @@ public class IndexColorModel extends ColorModel
 
   /**
    * Get the RGB color value of the given pixel using the default
-   * RGB color model. 
+   * RGB color model.
    *
    * @param pixel the pixel lookup value.
    * @return The RGB color value.
@@ -597,13 +597,13 @@ public class IndexColorModel extends ColorModel
   {
     if (pixel >= 0 && pixel < map_size)
       return rgb[pixel];
-    
+
     return 0;
   }
-    
+
   /**
    * Get the RGB color values of all pixels in the map using the default
-   * RGB color model. 
+   * RGB color model.
    *
    * @param rgb The destination array.
    */
@@ -611,13 +611,13 @@ public class IndexColorModel extends ColorModel
   {
     System.arraycopy(this.rgb, 0, rgb, 0, map_size);
   }
-    
-  /** 
-   * Return <code>true</code> if the lookup table contains valid data for 
+
+  /**
+   * Return <code>true</code> if the lookup table contains valid data for
    * <code>pixel</code>, and <code>false</code> otherwise.
    *
    * @param pixel  the pixel value used to index the color lookup table.
-   * @return <code>true</code> if <code>pixel</code> is valid, 
+   * @return <code>true</code> if <code>pixel</code> is valid,
    *         <code>false</code> otherwise.
    */
   public boolean isValid(int pixel)
@@ -626,12 +626,12 @@ public class IndexColorModel extends ColorModel
       return validBits.testBit(pixel);
     return false;
   }
-  
-  /** 
-   * Return <code>true</code> if all pixels are valid, <code>false</code> 
+
+  /**
+   * Return <code>true</code> if all pixels are valid, <code>false</code>
    * otherwise.
    *
-   * @return <code>true</code> if all pixels are valid, <code>false</code> 
+   * @return <code>true</code> if all pixels are valid, <code>false</code>
    * otherwise.
    */
   public boolean isValid()
@@ -642,28 +642,28 @@ public class IndexColorModel extends ColorModel
     allbits = allbits.subtract(new BigInteger("1"));
     return allbits.equals(validBits);
   }
-  
-  /** 
-   * Returns a binary value ({@link BigInteger}) where each bit represents an 
+
+  /**
+   * Returns a binary value ({@link BigInteger}) where each bit represents an
    * entry in the color lookup table.  If the bit is on, the entry is valid.
-   * 
+   *
    * @return The binary value.
    */
   public BigInteger getValidPixels()
   {
     return validBits;
   }
-  
+
   /**
-   * Construct a {@link BufferedImage} with rgb pixel values from a 
+   * Construct a {@link BufferedImage} with rgb pixel values from a
    * {@link Raster}.
-   * 
+   *
    * Constructs a new BufferedImage in which each pixel is an RGBA int from
    * a Raster with index-valued pixels.  If this model has no alpha component
    * or transparent pixel, the type of the new BufferedImage is TYPE_INT_RGB.
    * Otherwise the type is TYPE_INT_ARGB.  If forceARGB is true, the type is
    * forced to be TYPE_INT_ARGB no matter what.
-   * 
+   *
    * @param raster The source of pixel values.
    * @param forceARGB True if type must be TYPE_INT_ARGB.
    * @return New BufferedImage with RBGA int pixel values.
@@ -672,7 +672,7 @@ public class IndexColorModel extends ColorModel
   {
     int type = forceARGB ? BufferedImage.TYPE_INT_ARGB
       : ((opaque && trans == -1) ? BufferedImage.TYPE_INT_RGB :
-	 BufferedImage.TYPE_INT_ARGB); 
+         BufferedImage.TYPE_INT_ARGB);
 
     // FIXME: assuming that raster has only 1 band since pixels are supposed
     // to be int indexes.
diff --git a/libjava/classpath/java/awt/image/Kernel.java b/libjava/classpath/java/awt/image/Kernel.java
index 8361c0c..ae0ff14 100644
--- a/libjava/classpath/java/awt/image/Kernel.java
+++ b/libjava/classpath/java/awt/image/Kernel.java
@@ -49,10 +49,10 @@ public class Kernel implements Cloneable
 {
   /** The kernel width. */
   private final int width;
-  
+
   /** The kernel height. */
   private final int height;
-  
+
   /** Internal storage for the kernel's values. */
   private final float[] data;
 
@@ -64,10 +64,10 @@ public class Kernel implements Cloneable
    * @param width  the kernel width.
    * @param height  the kernel height.
    * @param data  the source data array (<code>null</code> not permitted).
-   * 
+   *
    * @throws IllegalArgumentException if <code>data.length</code> is less than
    *     <code>width * height</code>.
-   * @throws IllegalArgumentException if <code>width</code> or 
+   * @throws IllegalArgumentException if <code>width</code> or
    *      <code>height</code> is less than zero.
    * @throws NullPointerException if <code>data</code> is <code>null</code>.
    */
@@ -83,9 +83,9 @@ public class Kernel implements Cloneable
   }
 
   /**
-   * Returns the x-origin for the kernel, which is calculated as 
+   * Returns the x-origin for the kernel, which is calculated as
    * <code>(width - 1) / 2</code>.
-   * 
+   *
    * @return The x-origin for the kernel.
    */
   public final int getXOrigin()
@@ -96,7 +96,7 @@ public class Kernel implements Cloneable
   /**
    * Returns the y-origin for the kernel, which is calculated as
    * <code>(height - 1) / 2</code>.
-   * 
+   *
    * @return The y-origin for the kernel.
    */
   public final int getYOrigin()
@@ -106,7 +106,7 @@ public class Kernel implements Cloneable
 
   /**
    * Returns the kernel width (as supplied to the constructor).
-   * 
+   *
    * @return The kernel width.
    */
   public final int getWidth()
@@ -116,7 +116,7 @@ public class Kernel implements Cloneable
 
   /**
    * Returns the kernel height (as supplied to the constructor).
-   * 
+   *
    * @return The kernel height.
    */
   public final int getHeight()
@@ -125,18 +125,18 @@ public class Kernel implements Cloneable
   }
 
   /**
-   * Returns an array containing a copy of the kernel data.  If the 
+   * Returns an array containing a copy of the kernel data.  If the
    * <code>data</code> argument is non-<code>null</code>, the kernel values
    * are copied into it and then <code>data</code> is returned as the result.
-   * If the <code>data</code> argument is <code>null</code>, this method 
+   * If the <code>data</code> argument is <code>null</code>, this method
    * allocates a new array then populates and returns it.
    *
-   * @param data  an array to copy the return values into (if 
+   * @param data  an array to copy the return values into (if
    *     <code>null</code>, a new array is allocated).
-   *     
+   *
    * @return The array with copied values.
-   * 
-   * @throws IllegalArgumentException if <code>data.length</code> is less than 
+   *
+   * @throws IllegalArgumentException if <code>data.length</code> is less than
    *     the kernel's <code>width * height</code>.
    */
   public final float[] getKernelData(float[] data)
@@ -154,7 +154,7 @@ public class Kernel implements Cloneable
 
   /**
    * Returns a clone of this kernel.
-   * 
+   *
    * @return a clone of this Kernel.
    */
   public Object clone()
diff --git a/libjava/classpath/java/awt/image/LookupOp.java b/libjava/classpath/java/awt/image/LookupOp.java
index 5b0cf78..0bc79a0 100644
--- a/libjava/classpath/java/awt/image/LookupOp.java
+++ b/libjava/classpath/java/awt/image/LookupOp.java
@@ -44,31 +44,31 @@ import java.awt.geom.Rectangle2D;
 
 /**
  * LookupOp is a filter that converts each pixel using a lookup table.
- * 
+ *
  * For filtering Rasters, the lookup table must have either one component
  * that is applied to all bands, or one component for every band in the
  * Rasters.
- * 
+ *
  * For BufferedImages, the lookup table may apply to both color and alpha
  * components.  If the lookup table contains one component, or if there are
  * the same number of components as color components in the source, the table
  * applies to all color components.  Otherwise the table applies to all
  * components including alpha.  Alpha premultiplication is ignored during the
  * lookup filtering.
- * 
+ *
  * After filtering, if color conversion is necessary, the conversion happens,
  * taking alpha premultiplication into account.
- * 
+ *
  * @author jlquinn
  */
 public class LookupOp implements BufferedImageOp, RasterOp
 {
   private LookupTable lut;
   private RenderingHints hints;
-  
+
   /**
    * Construct a new LookupOp using the given LookupTable.
-   * 
+   *
    * @param lookup LookupTable to use.
    * @param hints Rendering hints (can be null).
    */
@@ -77,12 +77,12 @@ public class LookupOp implements BufferedImageOp, RasterOp
     lut = lookup;
     this.hints = hints;
   }
-  
+
   /**
    * Converts the source image using the lookup table specified in the
    * constructor.  The resulting image is stored in the destination image if one
-   * is provided; otherwise a new BufferedImage is created and returned. 
-   * 
+   * is provided; otherwise a new BufferedImage is created and returned.
+   *
    * The source image cannot use an IndexColorModel, and the destination image
    * (if one is provided) must have the same size.
    *
@@ -98,17 +98,17 @@ public class LookupOp implements BufferedImageOp, RasterOp
   {
     if (src.getColorModel() instanceof IndexColorModel)
       throw new IllegalArgumentException("LookupOp.filter: IndexColorModel "
-					 + "not allowed");
-    
+                                         + "not allowed");
+
     if (lut.getNumComponents() != 1
          && lut.getNumComponents() != src.getColorModel().getNumComponents()
          && lut.getNumComponents() != src.getColorModel().getNumColorComponents())
      throw new IllegalArgumentException("LookupOp.filter: Incompatible " +
                 "lookup table and source image");
-    
+
     if (dst == null)
       dst = createCompatibleDestImage(src, null);
-    
+
     else if (src.getHeight() != dst.getHeight() || src.getWidth() != dst.getWidth())
       throw new IllegalArgumentException("Source and destination images are " +
                 "different sizes.");
@@ -131,16 +131,16 @@ public class LookupOp implements BufferedImageOp, RasterOp
       int[] dbuf = new int[src.getColorModel().getNumComponents()];
       int tmpBands = src.getColorModel().getNumColorComponents();
       int[] tmp = new int[tmpBands];
-        
+
       // Filter the pixels
       for (int y = src.getMinY(); y < src.getHeight() + src.getMinY(); y++)
         for (int x = src.getMinX(); x < src.getWidth() + src.getMinX(); x++)
-        {	
+        {
           // Filter only color components, but also copy alpha
           sr.getPixel(x, y, dbuf);
           System.arraycopy(dbuf, 0, tmp, 0, tmpBands);
           dr.setPixel(x, y, lut.lookupPixel(tmp, dbuf));
-          
+
           /* The reference implementation does not use LookupTable.lookupPixel,
            * but rather it seems to copy the table into a native array.  The
            * effect of this (a probable bug in their implementation) is that
@@ -148,7 +148,7 @@ public class LookupOp implements BufferedImageOp, RasterOp
            * out of bounds exception, but will instead return random garbage.
            * A bad lookup on a ShortLookupTable, however, will throw an
            * exception.
-           * 
+           *
            * Instead of mimicing this behaviour, we always throw an
            * ArrayOutofBoundsException by virtue of using
            * LookupTable.lookupPixle.
@@ -159,16 +159,16 @@ public class LookupOp implements BufferedImageOp, RasterOp
     {
       // No alpha to ignore
       int[] dbuf = new int[src.getColorModel().getNumComponents()];
-          
+
       // Filter the pixels
       for (int y = src.getMinY(); y < src.getHeight() + src.getMinY(); y++)
         for (int x = src.getMinX(); x < src.getWidth() + src.getMinX(); x++)
           dr.setPixel(x, y, lut.lookupPixel(sr.getPixel(x, y, dbuf), dbuf));
     }
-    
+
     if (tgt != dst)
       new ColorConvertOp(hints).filter(tgt, dst);
-    
+
     return dst;
   }
 
@@ -184,13 +184,13 @@ public class LookupOp implements BufferedImageOp, RasterOp
    * @see java.awt.image.BufferedImageOp#createCompatibleDestImage(java.awt.image.BufferedImage, java.awt.image.ColorModel)
    */
   public BufferedImage createCompatibleDestImage(BufferedImage src,
-						 ColorModel dstCM)
+                                                 ColorModel dstCM)
   {
     if (dstCM != null)
       return new BufferedImage(dstCM,
                                src.getRaster().createCompatibleWritableRaster(),
                                src.isAlphaPremultiplied(), null);
-    
+
     // This is a strange exception, done for compatibility with the reference
     // (as demonstrated by a mauve testcase)
     int imgType = src.getType();
@@ -202,9 +202,9 @@ public class LookupOp implements BufferedImageOp, RasterOp
 
   /**
    * Returns the corresponding destination point for a given source point.
-   * 
+   *
    * This Op will return the source point unchanged.
-   * 
+   *
    * @param src The source point.
    * @param dst The destination point.
    */
@@ -219,7 +219,7 @@ public class LookupOp implements BufferedImageOp, RasterOp
 
   /**
    * Return the LookupTable for this op.
-   * 
+   *
    *  @return The lookup table.
    */
   public final LookupTable getTable()
@@ -237,11 +237,11 @@ public class LookupOp implements BufferedImageOp, RasterOp
 
   /**
    * Filter a raster through a lookup table.
-   * 
+   *
    * Applies the lookup table for this Rasterop to each pixel of src and
    * puts the results in dest.  If dest is null, a new Raster is created and
    * returned.
-   * 
+   *
    * @param src The source raster.
    * @param dest The destination raster.
    * @return The WritableRaster with the filtered pixels.
@@ -252,7 +252,7 @@ public class LookupOp implements BufferedImageOp, RasterOp
    */
   public final WritableRaster filter(Raster src, WritableRaster dest)
   {
-    if (dest == null) 
+    if (dest == null)
       // Allocate a raster if needed
       dest = createCompatibleDestRaster(src);
     else
@@ -260,19 +260,19 @@ public class LookupOp implements BufferedImageOp, RasterOp
         throw new IllegalArgumentException("Source and destination rasters " +
                 "are incompatible.");
 
-    if (lut.getNumComponents() != 1 
+    if (lut.getNumComponents() != 1
         && lut.getNumComponents() != src.getNumBands())
       throw new IllegalArgumentException("Lookup table is incompatible with " +
             "this raster.");
-   
-    // Allocate pixel storage. 
+
+    // Allocate pixel storage.
     int[] tmp = new int[src.getNumBands()];
-    
+
     // Filter the pixels
     for (int y = src.getMinY(); y < src.getHeight() + src.getMinY(); y++)
       for (int x = src.getMinX(); x < src.getWidth() + src.getMinX(); x++)
         dest.setPixel(x, y, lut.lookupPixel(src.getPixel(x, y, tmp), tmp));
-    
+
     /* The reference implementation does not use LookupTable.lookupPixel,
      * but rather it seems to copy the table into a native array.  The
      * effect of this (a probable bug in their implementation) is that
@@ -280,7 +280,7 @@ public class LookupOp implements BufferedImageOp, RasterOp
      * out of bounds exception, but will instead return random garbage.
      * A bad lookup on a ShortLookupTable, however, will throw an
      * exception.
-     * 
+     *
      * Instead of mimicing this behaviour, we always throw an
      * ArrayOutofBoundsException by virtue of using
      * LookupTable.lookupPixle.
diff --git a/libjava/classpath/java/awt/image/LookupTable.java b/libjava/classpath/java/awt/image/LookupTable.java
index f814b8e..d104b2f 100644
--- a/libjava/classpath/java/awt/image/LookupTable.java
+++ b/libjava/classpath/java/awt/image/LookupTable.java
@@ -61,7 +61,7 @@ public abstract class LookupTable
    *
    * If numComponents is 1, the same translation table is used for all pixel
    * components.
-   * 
+   *
    * @param offset Offset to be subtracted.
    * @param numComponents Number of image components.
    * @exception IllegalArgumentException if offset < 0 or numComponents < 1.
@@ -87,7 +87,7 @@ public abstract class LookupTable
     return offset;
   }
 
-  
+
   /**
    * Return translated values for a pixel.
    *
diff --git a/libjava/classpath/java/awt/image/MemoryImageSource.java b/libjava/classpath/java/awt/image/MemoryImageSource.java
index 83a03ca..e8780f6 100644
--- a/libjava/classpath/java/awt/image/MemoryImageSource.java
+++ b/libjava/classpath/java/awt/image/MemoryImageSource.java
@@ -77,7 +77,7 @@ public class MemoryImageSource implements ImageProducer
 
   /**
    * Constructs an ImageProducer from memory.
-   * 
+   *
    * @param w  the image width.
    * @param h  the image height.
    * @param cm  the color model.
@@ -85,7 +85,7 @@ public class MemoryImageSource implements ImageProducer
    * @param off  the offset to the first pixel in the array.
    * @param scan  the number of array elements from a pixel on one row to the
    *     corresponding pixel on the next row.
-   * @param props  image properties (<code>null</code> permitted). 
+   * @param props  image properties (<code>null</code> permitted).
    */
   public MemoryImageSource(int w, int h, ColorModel cm, byte[] pix, int off,
                            int scan, Hashtable<?,?> props)
@@ -119,7 +119,7 @@ public class MemoryImageSource implements ImageProducer
 
   /**
    * Constructs an ImageProducer from memory
-   * 
+   *
    * @param w  the image width.
    * @param h  the image height.
    * @param cm  the color model.
@@ -127,7 +127,7 @@ public class MemoryImageSource implements ImageProducer
    * @param off  the offset to the first pixel in the array.
    * @param scan  the number of array elements from a pixel on one row to the
    *     corresponding pixel on the next row.
-   * @param props  image properties (<code>null</code> permitted). 
+   * @param props  image properties (<code>null</code> permitted).
    */
   public MemoryImageSource(int w, int h, ColorModel cm, int[] pix, int off,
                            int scan, Hashtable<?,?> props)
@@ -144,14 +144,14 @@ public class MemoryImageSource implements ImageProducer
 
   /**
    * Constructs an ImageProducer from memory using the default RGB ColorModel.
-   * 
+   *
    * @param w  the image width.
    * @param h  the image height.
    * @param pix  the image data.
    * @param off  the offset to the first pixel in the array.
    * @param scan  the number of array elements from a pixel on one row to the
    *     corresponding pixel on the next row.
-   * @param props  image properties (<code>null</code> permitted). 
+   * @param props  image properties (<code>null</code> permitted).
 
    */
   public MemoryImageSource(int w, int h, int[] pix, int off, int scan,
@@ -162,13 +162,13 @@ public class MemoryImageSource implements ImageProducer
 
   /**
    * Constructs an ImageProducer from memory using the default RGB ColorModel.
-   * 
+   *
    * @param w  the image width.
    * @param h  the image height.
    * @param pix  the image data.
    * @param off  the offset to the first pixel in the array.
    * @param scan  the number of array elements from a pixel on one row to the
-   *     corresponding pixel on the next row. 
+   *     corresponding pixel on the next row.
    */
   public MemoryImageSource(int w, int h, int[] pix, int off, int scan)
   {
@@ -178,7 +178,7 @@ public class MemoryImageSource implements ImageProducer
   /**
    * Used to register an <code>ImageConsumer</code> with this
    * <code>ImageProducer</code>.
-   * 
+   *
    * @param ic  the image consumer.
    */
   public synchronized void addConsumer(ImageConsumer ic)
@@ -192,7 +192,7 @@ public class MemoryImageSource implements ImageProducer
   /**
    * Used to determine if the given <code>ImageConsumer</code> is
    * already registered with this <code>ImageProducer</code>.
-   * 
+   *
    * @param ic  the image consumer.
    */
   public synchronized boolean isConsumer(ImageConsumer ic)
@@ -205,7 +205,7 @@ public class MemoryImageSource implements ImageProducer
   /**
    * Used to remove an <code>ImageConsumer</code> from the list of
    * registered consumers for this <code>ImageProducer</code>.
-   * 
+   *
    * @param ic  the image consumer.
    */
   public synchronized void removeConsumer(ImageConsumer ic)
@@ -227,12 +227,12 @@ public class MemoryImageSource implements ImageProducer
     Vector list = (Vector) consumers.clone();
     for (int i = 0; i < list.size(); i++)
       {
-	ic = (ImageConsumer) list.elementAt(i);
-	sendPicture(ic);
-	if (animated)
-	  ic.imageComplete(ImageConsumer.SINGLEFRAMEDONE);
-	else
-	  ic.imageComplete(ImageConsumer.STATICIMAGEDONE);
+        ic = (ImageConsumer) list.elementAt(i);
+        sendPicture(ic);
+        if (animated)
+          ic.imageComplete(ImageConsumer.SINGLEFRAMEDONE);
+        else
+          ic.imageComplete(ImageConsumer.STATICIMAGEDONE);
       }
   }
 
@@ -240,7 +240,7 @@ public class MemoryImageSource implements ImageProducer
    * Used to register an <code>ImageConsumer</code> with this
    * <code>ImageProducer</code> and then request that this producer
    * resend the image data in the order top-down, left-right.
-   * 
+   *
    * @param ic  the image consumer.
    */
   public void requestTopDownLeftRightResend(ImageConsumer ic)
@@ -278,14 +278,14 @@ public class MemoryImageSource implements ImageProducer
   {
     if (animated == true)
       {
-	ImageConsumer ic;
-	Vector list = (Vector) consumers.clone();
-	for (int i = 0; i < list.size(); i++)
-	  {
-	    ic = (ImageConsumer) list.elementAt(i);
-	    sendPicture(ic);
-	    ic.imageComplete(ImageConsumer.SINGLEFRAME);
-	  }
+        ImageConsumer ic;
+        Vector list = (Vector) consumers.clone();
+        for (int i = 0; i < list.size(); i++)
+          {
+            ic = (ImageConsumer) list.elementAt(i);
+            sendPicture(ic);
+            ic.imageComplete(ImageConsumer.SINGLEFRAME);
+          }
       }
   }
 
@@ -305,7 +305,7 @@ public class MemoryImageSource implements ImageProducer
   /**
    * Send an animation frame to the image consumers containing the specified
    * pixels unless setFullBufferUpdates is set.
-   * 
+   *
    * @param x  the x-coordinate.
    * @param y  the y-coordinate.
    * @param w  the width.
@@ -315,38 +315,38 @@ public class MemoryImageSource implements ImageProducer
   {
     if (animated == true)
       {
-	if (fullbuffers)
-	  newPixels();
-	else
-	  {
-	    ImageConsumer ic;
-	    Vector list = (Vector) consumers.clone();
-	    for (int i = 0; i < list.size(); i++)
-	      {
-		ic = (ImageConsumer) list.elementAt(i);
-		ic.setHints(ImageConsumer.TOPDOWNLEFTRIGHT);
-		if (props != null)
-		  ic.setProperties(props);
-		if (pixeli != null)
-		  {
-		    int[] pixelbuf = new int[w * h];
-		    for (int row = y; row < y + h; row++)
-		      System.arraycopy(pixeli, row * scansize + x + offset,
-		                       pixelbuf, 0, w * h);
-		    ic.setPixels(x, y, w, h, cm, pixelbuf, 0, w);
-		  }
-		else
-		  {
-		    byte[] pixelbuf = new byte[w * h];
-		    for (int row = y; row < y + h; row++)
-		      System.arraycopy(pixelb, row * scansize + x + offset,
-		                       pixelbuf, 0, w * h);
-
-		    ic.setPixels(x, y, w, h, cm, pixelbuf, 0, w);
-		  }
-		ic.imageComplete(ImageConsumer.SINGLEFRAME);
-	      }
-	  }
+        if (fullbuffers)
+          newPixels();
+        else
+          {
+            ImageConsumer ic;
+            Vector list = (Vector) consumers.clone();
+            for (int i = 0; i < list.size(); i++)
+              {
+                ic = (ImageConsumer) list.elementAt(i);
+                ic.setHints(ImageConsumer.TOPDOWNLEFTRIGHT);
+                if (props != null)
+                  ic.setProperties(props);
+                if (pixeli != null)
+                  {
+                    int[] pixelbuf = new int[w * h];
+                    for (int row = y; row < y + h; row++)
+                      System.arraycopy(pixeli, row * scansize + x + offset,
+                                       pixelbuf, 0, w * h);
+                    ic.setPixels(x, y, w, h, cm, pixelbuf, 0, w);
+                  }
+                else
+                  {
+                    byte[] pixelbuf = new byte[w * h];
+                    for (int row = y; row < y + h; row++)
+                      System.arraycopy(pixelb, row * scansize + x + offset,
+                                       pixelbuf, 0, w * h);
+
+                    ic.setPixels(x, y, w, h, cm, pixelbuf, 0, w);
+                  }
+                ic.imageComplete(ImageConsumer.SINGLEFRAME);
+              }
+          }
       }
   }
 
@@ -356,7 +356,7 @@ public class MemoryImageSource implements ImageProducer
    *
    * If framenotify is set then a notification is sent when the frame
    * is sent otherwise no status is sent.
-   * 
+   *
    * @param x  the x-coordinate.
    * @param y  the y-coordinate.
    * @param w  the width.
@@ -368,38 +368,38 @@ public class MemoryImageSource implements ImageProducer
   {
     if (animated == true)
       {
-	if (fullbuffers)
-	  newPixels();
-	else
-	  {
-	    ImageConsumer ic;
-	    Vector list = (Vector) consumers.clone();
-	    for (int i = 0; i < list.size(); i++)
-	      {
-		ic = (ImageConsumer) list.elementAt(i);
-		ic.setHints(ImageConsumer.TOPDOWNLEFTRIGHT);
-		if (props != null)
-		  ic.setProperties(props);
-		if (pixeli != null)
-		  {
-		    int[] pixelbuf = new int[w * h];
-		    for (int row = y; row < y + h; row++)
-		      System.arraycopy(pixeli, row * scansize + x + offset,
-		                       pixelbuf, 0, w * h);
-		    ic.setPixels(x, y, w, h, cm, pixelbuf, 0, w);
-		  }
-		else
-		  {
-		    byte[] pixelbuf = new byte[w * h];
-		    for (int row = y; row < y + h; row++)
-		      System.arraycopy(pixelb, row * scansize + x + offset,
-		                       pixelbuf, 0, w * h);
-		    ic.setPixels(x, y, w, h, cm, pixelbuf, 0, w);
-		  }
-		if (framenotify == true)
-		  ic.imageComplete(ImageConsumer.SINGLEFRAME);
-	      }
-	  }
+        if (fullbuffers)
+          newPixels();
+        else
+          {
+            ImageConsumer ic;
+            Vector list = (Vector) consumers.clone();
+            for (int i = 0; i < list.size(); i++)
+              {
+                ic = (ImageConsumer) list.elementAt(i);
+                ic.setHints(ImageConsumer.TOPDOWNLEFTRIGHT);
+                if (props != null)
+                  ic.setProperties(props);
+                if (pixeli != null)
+                  {
+                    int[] pixelbuf = new int[w * h];
+                    for (int row = y; row < y + h; row++)
+                      System.arraycopy(pixeli, row * scansize + x + offset,
+                                       pixelbuf, 0, w * h);
+                    ic.setPixels(x, y, w, h, cm, pixelbuf, 0, w);
+                  }
+                else
+                  {
+                    byte[] pixelbuf = new byte[w * h];
+                    for (int row = y; row < y + h; row++)
+                      System.arraycopy(pixelb, row * scansize + x + offset,
+                                       pixelbuf, 0, w * h);
+                    ic.setPixels(x, y, w, h, cm, pixelbuf, 0, w);
+                  }
+                if (framenotify == true)
+                  ic.imageComplete(ImageConsumer.SINGLEFRAME);
+              }
+          }
       }
   }
 
diff --git a/libjava/classpath/java/awt/image/MultiPixelPackedSampleModel.java b/libjava/classpath/java/awt/image/MultiPixelPackedSampleModel.java
index 8db26b5..592611c 100644
--- a/libjava/classpath/java/awt/image/MultiPixelPackedSampleModel.java
+++ b/libjava/classpath/java/awt/image/MultiPixelPackedSampleModel.java
@@ -65,14 +65,14 @@ public class MultiPixelPackedSampleModel extends SampleModel
    *   <li>{@link DataBuffer#TYPE_USHORT};</li>
    *   <li>{@link DataBuffer#TYPE_INT};</li>
    * </ul>
-   * 
+   *
    * @param dataType  the data type.
    * @param w  the width (in pixels).
    * @param h  the height (in pixels).
    * @param numberOfBits  the number of bits per pixel (must be a power of 2).
    */
   public MultiPixelPackedSampleModel(int dataType, int w, int h,
-				     int numberOfBits)
+                                     int numberOfBits)
   {
     this(dataType, w, h, numberOfBits, 0, 0);
   }
@@ -85,35 +85,35 @@ public class MultiPixelPackedSampleModel extends SampleModel
    *   <li>{@link DataBuffer#TYPE_USHORT};</li>
    *   <li>{@link DataBuffer#TYPE_INT};</li>
    * </ul>
-   * 
+   *
    * @param dataType  the data type.
    * @param w  the width (in pixels).
    * @param h  the height (in pixels).
    * @param numberOfBits  the number of bits per pixel (must be a power of 2).
-   * @param scanlineStride  the number of data elements from a pixel on one 
+   * @param scanlineStride  the number of data elements from a pixel on one
    *     row to the corresponding pixel in the next row.
    * @param dataBitOffset  the offset to the first data bit.
    */
   public MultiPixelPackedSampleModel(int dataType, int w, int h,
-				     int numberOfBits, int scanlineStride,
-				     int dataBitOffset)
+                                     int numberOfBits, int scanlineStride,
+                                     int dataBitOffset)
   {
     super(dataType, w, h, 1);
 
     switch (dataType)
       {
       case DataBuffer.TYPE_BYTE:
-	elemBits = 8;
-	break;
+        elemBits = 8;
+        break;
       case DataBuffer.TYPE_USHORT:
-	elemBits = 16;
-	break;
+        elemBits = 16;
+        break;
       case DataBuffer.TYPE_INT:
-	elemBits = 32;
-	break;
+        elemBits = 32;
+        break;
       default:
-	throw new IllegalArgumentException("MultiPixelPackedSampleModel"
-					   + " unsupported dataType");
+        throw new IllegalArgumentException("MultiPixelPackedSampleModel"
+                                           + " unsupported dataType");
       }
 
     this.dataBitOffset = dataBitOffset;
@@ -121,13 +121,13 @@ public class MultiPixelPackedSampleModel extends SampleModel
     this.numberOfBits = numberOfBits;
     if (numberOfBits > elemBits)
       throw new RasterFormatException("MultiPixelPackedSampleModel pixel size"
-				      + " larger than dataType");
+                                      + " larger than dataType");
     switch (numberOfBits)
       {
       case 1: case 2: case 4: case 8: case 16: case 32: break;
       default:
-	throw new RasterFormatException("MultiPixelPackedSampleModel pixel"
-					+ " size not 2^n bits");
+        throw new RasterFormatException("MultiPixelPackedSampleModel pixel"
+                                        + " size not 2^n bits");
       }
     numElems = elemBits / numberOfBits;
 
@@ -136,7 +136,7 @@ public class MultiPixelPackedSampleModel extends SampleModel
       scanlineStride = ((dataBitOffset + w * numberOfBits) - 1) / elemBits + 1;
     this.scanlineStride = scanlineStride;
 
-    
+
     sampleSize = new int[1];
     sampleSize[0] = numberOfBits;
 
@@ -144,9 +144,9 @@ public class MultiPixelPackedSampleModel extends SampleModel
     bitOffsets = new int[numElems];
     for (int i=0; i < numElems; i++)
       {
-	bitOffsets[numElems - i- 1] = numberOfBits * i;
-	bitMasks[numElems - i - 1] = ((1 << numberOfBits) - 1) << 
-	    bitOffsets[numElems - i - 1];
+        bitOffsets[numElems - i- 1] = numberOfBits * i;
+        bitMasks[numElems - i - 1] = ((1 << numberOfBits) - 1) <<
+            bitOffsets[numElems - i - 1];
       }
   }
 
@@ -154,10 +154,10 @@ public class MultiPixelPackedSampleModel extends SampleModel
    * Creates a new <code>MultiPixelPackedSample</code> model with the same
    * data type and bits per pixel as this model, but with the specified
    * dimensions.
-   * 
+   *
    * @param w  the width (in pixels).
    * @param h  the height (in pixels).
-   * 
+   *
    * @return The new sample model.
    */
   public SampleModel createCompatibleSampleModel(int w, int h)
@@ -172,7 +172,7 @@ public class MultiPixelPackedSampleModel extends SampleModel
    * Creates a DataBuffer for holding pixel data in the format and
    * layout described by this SampleModel. The returned buffer will
    * consist of one single bank.
-   * 
+   *
    * @return A new data buffer.
    */
   public DataBuffer createDataBuffer()
@@ -186,7 +186,7 @@ public class MultiPixelPackedSampleModel extends SampleModel
   /**
    * Returns the number of data elements required to transfer a pixel in the
    * get/setDataElements() methods.
-   * 
+   *
    * @return <code>1</code>.
    */
   public int getNumDataElements()
@@ -195,29 +195,29 @@ public class MultiPixelPackedSampleModel extends SampleModel
   }
 
   /**
-   * Returns an array containing the size (in bits) of the samples in each 
+   * Returns an array containing the size (in bits) of the samples in each
    * band.  The <code>MultiPixelPackedSampleModel</code> class supports only
-   * one band, so this method returns an array with length <code>1</code>. 
-   * 
-   * @return An array containing the size (in bits) of the samples in band zero. 
-   *     
+   * one band, so this method returns an array with length <code>1</code>.
+   *
+   * @return An array containing the size (in bits) of the samples in band zero.
+   *
    * @see #getSampleSize(int)
    */
   public int[] getSampleSize()
   {
     return (int[]) sampleSize.clone();
   }
-  
+
   /**
    * Returns the size of the samples in the specified band.  Note that the
    * <code>MultiPixelPackedSampleModel</code> supports only one band -- this
    * method ignored the <code>band</code> argument, and always returns the size
    * of band zero.
-   * 
+   *
    * @param band  the band (this parameter is ignored).
-   * 
+   *
    * @return The size of the samples in band zero.
-   * 
+   *
    * @see #getSampleSize()
    */
   public int getSampleSize(int band)
@@ -227,12 +227,12 @@ public class MultiPixelPackedSampleModel extends SampleModel
 
   /**
    * Returns the index in the data buffer that stores the pixel at (x, y).
-   * 
+   *
    * @param x  the x-coordinate.
    * @param y  the y-coordinate.
-   * 
+   *
    * @return The index in the data buffer that stores the pixel at (x, y).
-   * 
+   *
    * @see #getBitOffset(int)
    */
   public int getOffset(int x, int y)
@@ -241,11 +241,11 @@ public class MultiPixelPackedSampleModel extends SampleModel
   }
 
   /**
-   * The bit offset (within an element in the data buffer) of the pixels with 
+   * The bit offset (within an element in the data buffer) of the pixels with
    * the specified x-coordinate.
-   * 
+   *
    * @param x  the x-coordinate.
-   * 
+   *
    * @return The bit offset.
    */
   public int getBitOffset(int x)
@@ -255,7 +255,7 @@ public class MultiPixelPackedSampleModel extends SampleModel
 
   /**
    * Returns the offset to the first data bit.
-   * 
+   *
    * @return The offset to the first data bit.
    */
   public int getDataBitOffset()
@@ -266,7 +266,7 @@ public class MultiPixelPackedSampleModel extends SampleModel
   /**
    * Returns the number of data elements from a pixel in one row to the
    * corresponding pixel in the next row.
-   * 
+   *
    * @return The scanline stride.
    */
   public int getScanlineStride()
@@ -276,14 +276,14 @@ public class MultiPixelPackedSampleModel extends SampleModel
 
   /**
    * Returns the number of bits per pixel.
-   * 
+   *
    * @return The number of bits per pixel.
    */
   public int getPixelBitStride()
   {
     return numberOfBits;
   }
-  
+
   /**
    * Returns the transfer type, which is one of the following (depending on
    * the number of bits per sample for this model):
@@ -292,7 +292,7 @@ public class MultiPixelPackedSampleModel extends SampleModel
    *   <li>{@link DataBuffer#TYPE_USHORT};</li>
    *   <li>{@link DataBuffer#TYPE_INT};</li>
    * </ul>
-   * 
+   *
    * @return The transfer type.
    */
   public int getTransferType()
@@ -310,12 +310,12 @@ public class MultiPixelPackedSampleModel extends SampleModel
    * only supports a single band, this overridden implementation just returns
    * a new instance of <code>MultiPixelPackedSampleModel</code>, with the same
    * attributes as this instance.
-   * 
+   *
    * @param bands  the bands to include in the subset (this is ignored, except
    *     that if it is non-<code>null</code> a check is made to ensure that the
    *     array length is equal to <code>1</code>).
-   *     
-   * @throws RasterFormatException if <code>bands</code> is not 
+   *
+   * @throws RasterFormatException if <code>bands</code> is not
    *     <code>null</code> and <code>bands.length != 1</code>.
    */
   public SampleModel createSubsetSampleModel(int[] bands)
@@ -323,7 +323,7 @@ public class MultiPixelPackedSampleModel extends SampleModel
     if (bands != null && bands.length != 1)
       throw new RasterFormatException("MultiPixelPackedSampleModel only"
           + " supports one band");
-    return new MultiPixelPackedSampleModel(dataType, width, height, 
+    return new MultiPixelPackedSampleModel(dataType, width, height,
         numberOfBits, scanlineStride, dataBitOffset);
   }
 
@@ -334,15 +334,15 @@ public class MultiPixelPackedSampleModel extends SampleModel
    * array obj, since there is only one band.  If obj is null, a new array of
    * getTransferType() is created.
    *
-   * @param x The x-coordinate of the pixel rectangle to store in 
+   * @param x The x-coordinate of the pixel rectangle to store in
    *     <code>obj</code>.
-   * @param y The y-coordinate of the pixel rectangle to store in 
+   * @param y The y-coordinate of the pixel rectangle to store in
    *     <code>obj</code>.
-   * @param obj The primitive array to store the pixels into or null to force 
+   * @param obj The primitive array to store the pixels into or null to force
    *     creation.
    * @param data The DataBuffer that is the source of the pixel data.
    * @return The primitive array containing the pixel data.
-   * @see java.awt.image.SampleModel#getDataElements(int, int, Object, 
+   * @see java.awt.image.SampleModel#getDataElements(int, int, Object,
    *     DataBuffer)
    */
   public Object getDataElements(int x, int y, Object obj, DataBuffer data)
@@ -351,17 +351,17 @@ public class MultiPixelPackedSampleModel extends SampleModel
     switch (getTransferType())
       {
         case DataBuffer.TYPE_BYTE:
-          if (obj == null) 
+          if (obj == null)
             obj = new byte[1];
           ((byte[]) obj)[0] = (byte) pixel;
           return obj;
         case DataBuffer.TYPE_USHORT:
-          if (obj == null) 
+          if (obj == null)
             obj = new short[1];
           ((short[]) obj)[0] = (short) pixel;
           return obj;
         case DataBuffer.TYPE_INT:
-          if (obj == null) 
+          if (obj == null)
             obj = new int[1];
           ((int[]) obj)[0] = pixel;
           return obj;
@@ -372,42 +372,42 @@ public class MultiPixelPackedSampleModel extends SampleModel
   }
 
   /**
-   * Returns an array (of length 1) containing the sample for the pixel at 
-   * (x, y) in the specified data buffer.  If <code>iArray</code> is not 
-   * <code>null</code>, it will be populated with the sample value and 
-   * returned as the result of this function (this avoids allocating a new 
+   * Returns an array (of length 1) containing the sample for the pixel at
+   * (x, y) in the specified data buffer.  If <code>iArray</code> is not
+   * <code>null</code>, it will be populated with the sample value and
+   * returned as the result of this function (this avoids allocating a new
    * array instance).
-   * 
+   *
    * @param x  the x-coordinate of the pixel.
    * @param y  the y-coordinate of the pixel.
-   * @param iArray  an array to populate with the sample values and return as 
+   * @param iArray  an array to populate with the sample values and return as
    *     the result (if <code>null</code>, a new array will be allocated).
    * @param data  the data buffer (<code>null</code> not permitted).
-   * 
+   *
    * @return An array containing the pixel sample value.
-   * 
+   *
    * @throws NullPointerException if <code>data</code> is <code>null</code>.
    */
   public int[] getPixel(int x, int y, int[] iArray, DataBuffer data)
   {
-    if (iArray == null) 
+    if (iArray == null)
       iArray = new int[1];
     iArray[0] = getSample(x, y, 0, data);
     return iArray;
   }
 
   /**
-   * Returns the sample value for the pixel at (x, y) in the specified data 
+   * Returns the sample value for the pixel at (x, y) in the specified data
    * buffer.
-   * 
+   *
    * @param x  the x-coordinate of the pixel.
    * @param y  the y-coordinate of the pixel.
-   * @param b  the band (in the range <code>0</code> to 
+   * @param b  the band (in the range <code>0</code> to
    *     <code>getNumBands() - 1</code>).
    * @param data  the data buffer (<code>null</code> not permitted).
-   * 
+   *
    * @return The sample value.
-   * 
+   *
    * @throws NullPointerException if <code>data</code> is <code>null</code>.
    */
   public int getSample(int x, int y, int b, DataBuffer data)
@@ -418,7 +418,7 @@ public class MultiPixelPackedSampleModel extends SampleModel
     int samples = data.getElem(offset);
     return (samples & bitMasks[pos]) >>> bitOffsets[pos];
   }
-  
+
   /**
    * Set the pixel at x, y to the value in the first element of the primitive
    * array obj.
@@ -472,17 +472,17 @@ public class MultiPixelPackedSampleModel extends SampleModel
   }
 
   /**
-   * Sets the sample value for the pixel at (x, y) in the specified data 
-   * buffer to the specified value. 
-   * 
+   * Sets the sample value for the pixel at (x, y) in the specified data
+   * buffer to the specified value.
+   *
    * @param x  the x-coordinate of the pixel.
    * @param y  the y-coordinate of the pixel.
    * @param iArray  the sample value (<code>null</code> not permitted).
    * @param data  the data buffer (<code>null</code> not permitted).
-   * 
-   * @throws NullPointerException if either <code>iArray</code> or 
+   *
+   * @throws NullPointerException if either <code>iArray</code> or
    *     <code>data</code> is <code>null</code>.
-   *     
+   *
    * @see #setSample(int, int, int, int, DataBuffer)
    */
   public void setPixel(int x, int y, int[] iArray, DataBuffer data)
@@ -491,16 +491,16 @@ public class MultiPixelPackedSampleModel extends SampleModel
   }
 
   /**
-   * Sets the sample value for a band for the pixel at (x, y) in the 
-   * specified data buffer. 
-   * 
+   * Sets the sample value for a band for the pixel at (x, y) in the
+   * specified data buffer.
+   *
    * @param x  the x-coordinate of the pixel.
    * @param y  the y-coordinate of the pixel.
-   * @param b  the band (in the range <code>0</code> to 
+   * @param b  the band (in the range <code>0</code> to
    *     <code>getNumBands() - 1</code>).
    * @param s  the sample value.
    * @param data  the data buffer (<code>null</code> not permitted).
-   * 
+   *
    * @throws NullPointerException if <code>data</code> is <code>null</code>.
    */
   public void setSample(int x, int y, int b, int s, DataBuffer data)
@@ -516,13 +516,13 @@ public class MultiPixelPackedSampleModel extends SampleModel
     sample |= s;
     data.setElem(offset, sample);
   }
-  
+
   /**
-   * Tests this sample model for equality with an arbitrary object.  This 
+   * Tests this sample model for equality with an arbitrary object.  This
    * method returns <code>true</code> if and only if:
    * <ul>
    *   <li><code>obj</code> is not <code>null</code>;
-   *   <li><code>obj</code> is an instance of 
+   *   <li><code>obj</code> is an instance of
    *       <code>MultiPixelPackedSampleModel</code>;
    *   <li>both models have the same:
    *     <ul>
@@ -535,17 +535,17 @@ public class MultiPixelPackedSampleModel extends SampleModel
    *     </ul>
    *   </li>
    * </ul>
-   * 
+   *
    * @param obj  the object (<code>null</code> permitted)
-   * 
+   *
    * @return <code>true</code> if this model is equal to <code>obj</code>, and
    *     <code>false</code> otherwise.
    */
-  public boolean equals(Object obj) 
+  public boolean equals(Object obj)
   {
-    if (this == obj) 
+    if (this == obj)
       return true;
-    if (! (obj instanceof MultiPixelPackedSampleModel)) 
+    if (! (obj instanceof MultiPixelPackedSampleModel))
       return false;
     MultiPixelPackedSampleModel that = (MultiPixelPackedSampleModel) obj;
     if (this.dataType != that.dataType)
@@ -562,10 +562,10 @@ public class MultiPixelPackedSampleModel extends SampleModel
       return false;
     return true;
   }
-  
+
   /**
    * Returns a hash code for this <code>MultiPixelPackedSampleModel</code>.
-   * 
+   *
    * @return A hash code.
    */
   public int hashCode()
@@ -580,7 +580,7 @@ public class MultiPixelPackedSampleModel extends SampleModel
     result = 37 * result + dataBitOffset;
     return result;
   }
-  
+
   /**
    * Creates a String with some information about this SampleModel.
    * @return A String describing this SampleModel.
@@ -596,7 +596,7 @@ public class MultiPixelPackedSampleModel extends SampleModel
     {
       result.append(", mask[").append(i).append("]=0x").append(Integer.toHexString(bitMasks[i]));
     }
-    
+
     result.append("]");
     return result.toString();
   }
diff --git a/libjava/classpath/java/awt/image/PackedColorModel.java b/libjava/classpath/java/awt/image/PackedColorModel.java
index b60230f..a89d73b 100644
--- a/libjava/classpath/java/awt/image/PackedColorModel.java
+++ b/libjava/classpath/java/awt/image/PackedColorModel.java
@@ -48,44 +48,44 @@ import java.awt.color.ColorSpace;
 public abstract class PackedColorModel extends ColorModel
 {
   private int masks[];
-  
+
   /* Package accessibility, the DirectColorModel needs this array */
   int shifts[];
 
   public PackedColorModel(ColorSpace cspace, int pixelBits,
-			  int[] colorMaskArray, int alphaMask,
-			  boolean isAlphaPremultiplied,
-			  int transparency,
-			  int transferType)
+                          int[] colorMaskArray, int alphaMask,
+                          boolean isAlphaPremultiplied,
+                          int transparency,
+                          int transferType)
   {
     super(pixelBits, calcBitsPerComponent(colorMaskArray, alphaMask),
-	  cspace, (alphaMask != 0), isAlphaPremultiplied, transparency,
-	  transferType);
+          cspace, (alphaMask != 0), isAlphaPremultiplied, transparency,
+          transferType);
     initMasks(colorMaskArray, alphaMask);
     if ((pixelBits<1) || (pixelBits>32)) {
       throw new IllegalArgumentException("pixels per bits must be " +
-					 "in the range [1, 32]");
+                                         "in the range [1, 32]");
     }
   }
-    
+
   private static int[] calcBitsPerComponent(int[] colorMaskArray,
-					    int alphaMask)
+                                            int alphaMask)
   {
     int numComponents = colorMaskArray.length;
     if (alphaMask != 0) numComponents++;
-    
+
     int[] bitsPerComponent = new int[numComponents];
-    
+
     BitMaskExtent extent = new BitMaskExtent();
     for (int b=0; b<colorMaskArray.length; b++)
       {
-	extent.setMask(colorMaskArray[b]);
-	bitsPerComponent[b] = extent.bitWidth;
+        extent.setMask(colorMaskArray[b]);
+        bitsPerComponent[b] = extent.bitWidth;
       }
     if (alphaMask != 0)
       {
-	extent.setMask(alphaMask);
-	bitsPerComponent[numComponents-1] = extent.bitWidth;
+        extent.setMask(alphaMask);
+        bitsPerComponent[numComponents-1] = extent.bitWidth;
       }
     return bitsPerComponent;
   }
@@ -96,38 +96,38 @@ public abstract class PackedColorModel extends ColorModel
     int numComponents = colorMaskArray.length;
     if (alphaMask == 0)
       {
-	masks = colorMaskArray;
+        masks = colorMaskArray;
       }
     else
       {
-	masks = new int[numComponents+1];
-	System.arraycopy(colorMaskArray, 0,
-			 masks, 0,
-			 numComponents);
-	masks[numComponents++] = alphaMask;
+        masks = new int[numComponents+1];
+        System.arraycopy(colorMaskArray, 0,
+                         masks, 0,
+                         numComponents);
+        masks[numComponents++] = alphaMask;
       }
-	
+
     shifts = new int[numComponents];
-	
+
     // Bit field handling have been moved to a utility class
     BitMaskExtent extent = new BitMaskExtent();
     for (int b=0; b<numComponents; b++)
       {
-	extent.setMask(masks[b]);
-	shifts[b] = extent.leastSignificantBit;
+        extent.setMask(masks[b]);
+        shifts[b] = extent.leastSignificantBit;
       }
   }
-    
+
   public PackedColorModel(ColorSpace cspace, int pixelBits,
-			  int rmask, int gmask, int bmask,
-			  int amask, boolean isAlphaPremultiplied,
-			  int transparency,
-			  int transferType)
+                          int rmask, int gmask, int bmask,
+                          int amask, boolean isAlphaPremultiplied,
+                          int transparency,
+                          int transferType)
   {
     this(cspace, pixelBits, makeColorMaskArray(rmask, gmask, bmask),
-	 amask, isAlphaPremultiplied, transparency, transferType);
+         amask, isAlphaPremultiplied, transparency, transferType);
   }
-    
+
   /* TODO: If there is a alpha mask, it is inefficient to create a
      color mask array that will be discarded when the alpha mask is
      appended. We should probably create a private constructor that
@@ -138,13 +138,13 @@ public abstract class PackedColorModel extends ColorModel
   {
     int[] colorMaskArray = { rmask, gmask, bmask };
     return colorMaskArray;
-  }   
+  }
 
   public final int getMask(int index)
   {
     return masks[index];
   }
-  
+
   public final int[] getMasks()
   {
     return masks;
@@ -154,12 +154,12 @@ public abstract class PackedColorModel extends ColorModel
   {
     return new SinglePixelPackedSampleModel(transferType, w, h, masks);
   }
-    
+
   public boolean isCompatibleSampleModel(SampleModel sm)
   {
     if (!super.isCompatibleSampleModel(sm)) return false;
     if (!(sm instanceof SinglePixelPackedSampleModel)) return false;
-    
+
     SinglePixelPackedSampleModel sppsm =
       (SinglePixelPackedSampleModel) sm;
     return java.util.Arrays.equals(sppsm.getBitMasks(), masks);
@@ -167,7 +167,7 @@ public abstract class PackedColorModel extends ColorModel
 
   public WritableRaster getAlphaRaster(WritableRaster raster) {
     if (!hasAlpha()) return null;
-	
+
     SampleModel sm = raster.getSampleModel();
     int[] alphaBand = { sm.getNumBands() - 1 };
     SampleModel alphaModel = sm.createSubsetSampleModel(alphaBand);
@@ -175,14 +175,14 @@ public abstract class PackedColorModel extends ColorModel
     Point origin = new Point(0, 0);
     return Raster.createWritableRaster(alphaModel, buffer, origin);
   }
-    
+
   public boolean equals(Object obj)
   {
     if (!super.equals(obj)) return false;
     if (!(obj instanceof PackedColorModel)) return false;
-    
+
     PackedColorModel other = (PackedColorModel) obj;
-    
+
     return java.util.Arrays.equals(masks, other.masks);
   }
 }
diff --git a/libjava/classpath/java/awt/image/PixelGrabber.java b/libjava/classpath/java/awt/image/PixelGrabber.java
index fc5e0ef..b83fab5 100644
--- a/libjava/classpath/java/awt/image/PixelGrabber.java
+++ b/libjava/classpath/java/awt/image/PixelGrabber.java
@@ -95,7 +95,7 @@ public class PixelGrabber implements ImageConsumer
    * pixels in the grab rectangle
    */
   public PixelGrabber(Image img, int x, int y, int w, int h,
-		      int pix[], int off, int scansize)
+                      int pix[], int off, int scansize)
   {
     this (img.getSource(), x, y, w, h, pix, off, scansize);
   }
@@ -130,7 +130,7 @@ public class PixelGrabber implements ImageConsumer
    * pixels in the grab rectangle
    */
   public PixelGrabber(ImageProducer ip, int x, int y, int w, int h,
-		      int pix[], int off, int scansize)
+                      int pix[], int off, int scansize)
   {
     this.ip = ip;
     this.x = x;
@@ -175,9 +175,9 @@ public class PixelGrabber implements ImageConsumer
    * region's pixel data to RGB
    */
   public PixelGrabber(Image img,
-		      int x, int y,
-		      int w, int h,
-		      boolean forceRGB)
+                      int x, int y,
+                      int w, int h,
+                      boolean forceRGB)
   {
     this.ip = img.getSource();
 
@@ -192,8 +192,8 @@ public class PixelGrabber implements ImageConsumer
     // initialization until setDimensions is called back by ip.
     if (width >= 0 && height >= 0)
       {
-	int_pixel_buffer = new int[width * height];
-	byte_pixel_buffer = new byte[width * height];
+        int_pixel_buffer = new int[width * height];
+        byte_pixel_buffer = new byte[width * height];
       }
     this.forceRGB = forceRGB;
   }
@@ -209,11 +209,11 @@ public class PixelGrabber implements ImageConsumer
     // Make sure we're not already grabbing.
     if (grabbing == false)
       {
-	grabbing = true;
-	grabberThread = new Thread ()
-	  {
-	    public void run ()
-	    {
+        grabbing = true;
+        grabberThread = new Thread ()
+          {
+            public void run ()
+            {
               try
                 {
                   ip.startProduction (PixelGrabber.this);
@@ -222,9 +222,9 @@ public class PixelGrabber implements ImageConsumer
                 {
                   imageComplete(ImageConsumer.IMAGEABORTED);
                 }
-	    }
-	  };
-	grabberThread.start ();
+            }
+          };
+        grabberThread.start ();
       }
   }
 
@@ -235,12 +235,12 @@ public class PixelGrabber implements ImageConsumer
   {
     if (grabbing)
       {
-	// Interrupt the grabbing thread.
+        // Interrupt the grabbing thread.
         Thread moribund = grabberThread;
         grabberThread = null;
         moribund.interrupt();
 
-	imageComplete (ImageConsumer.IMAGEABORTED);
+        imageComplete (ImageConsumer.IMAGEABORTED);
       }
   }
 
@@ -282,7 +282,7 @@ public class PixelGrabber implements ImageConsumer
   {
     if (ms < 0)
       return ((observerStatus & (ImageObserver.FRAMEBITS
-				 | ImageObserver.ALLBITS)) != 0);
+                                 | ImageObserver.ALLBITS)) != 0);
 
     // Spawn a new ImageProducer thread to send us the image data via
     // our ImageConsumer methods.
@@ -290,16 +290,16 @@ public class PixelGrabber implements ImageConsumer
 
     if (ms > 0)
       {
-	long stop_time = System.currentTimeMillis() + ms;
-	long time_remaining;
-	while (grabbing)
-	  {
-	    time_remaining = stop_time - System.currentTimeMillis();
-	    if (time_remaining <= 0)
-	      break;
-	    wait (time_remaining);
-	  }
-	abortGrabbing ();
+        long stop_time = System.currentTimeMillis() + ms;
+        long time_remaining;
+        while (grabbing)
+          {
+            time_remaining = stop_time - System.currentTimeMillis();
+            if (time_remaining <= 0)
+              break;
+            wait (time_remaining);
+          }
+        abortGrabbing ();
       }
     else
       wait ();
@@ -310,7 +310,7 @@ public class PixelGrabber implements ImageConsumer
       return setObserverStatus ();
 
     return ((observerStatus & (ImageObserver.FRAMEBITS
-			       | ImageObserver.ALLBITS)) != 0);
+                               | ImageObserver.ALLBITS)) != 0);
   }
 
   // Set observer status flags based on the current consumer status
@@ -328,14 +328,14 @@ public class PixelGrabber implements ImageConsumer
 
     if ((consumerStatus & STATICIMAGEDONE) != 0)
       {
-	observerStatus |= ImageObserver.ALLBITS;
-	retval = true;
+        observerStatus |= ImageObserver.ALLBITS;
+        retval = true;
       }
 
     if ((consumerStatus & SINGLEFRAMEDONE) != 0)
       {
-	observerStatus |= ImageObserver.FRAMEBITS;
-	retval = true;
+        observerStatus |= ImageObserver.FRAMEBITS;
+        retval = true;
       }
 
     return retval;
@@ -402,7 +402,7 @@ public class PixelGrabber implements ImageConsumer
    * ImageConsumer methods should be called by code that instantiates
    * a PixelGrabber.  They are only made public so they can be called
    * by the PixelGrabber's ImageProducer.
-   * 
+   *
    * @param width the width of the image
    * @param height the height of the image
    */
@@ -472,7 +472,7 @@ public class PixelGrabber implements ImageConsumer
    * bit mask of hints from any of <code>RANDOMPIXELORDER</code>,
    * <code>TOPDOWNLEFTRIGHT</code>, <code>COMPLETESCANLINES</code>,
    * <code>SINGLEPASS</code>, <code>SINGLEFRAME</code>.
-   * 
+   *
    * setHints is an ImageConsumer method.  None of PixelGrabber's
    * ImageConsumer methods should be called by code that instantiates
    * a PixelGrabber.  They are only made public so they can be called
@@ -505,9 +505,9 @@ public class PixelGrabber implements ImageConsumer
    * @param offset offset into pixels array
    * @param scansize width of one row in the pixel block
    */
-  public synchronized void setPixels(int x, int y, int w, int h, 
-				     ColorModel model, byte[] pixels,
-				     int offset, int scansize)
+  public synchronized void setPixels(int x, int y, int w, int h,
+                                     ColorModel model, byte[] pixels,
+                                     int offset, int scansize)
   {
     ColorModel currentModel;
     if (model != null)
@@ -517,31 +517,31 @@ public class PixelGrabber implements ImageConsumer
 
     for(int yp = y; yp < (y + h); yp++)
       {
-	for(int xp = x; xp < (x + w); xp++)
-	  {
-	    // Check if the coordinates (xp, yp) are within the
-	    // pixel block that we are grabbing.
-	    if(xp >= this.x
-	       && yp >= this.y
-	       && xp < (this.x + this.width)
-	       && yp < (this.y + this.height))
-	      {
-		int i = (yp - this.y) * this.scansize + (xp - this.x) + this.offset;
-		int p = (yp - y) * scansize + (xp - x) + offset;
-		if (forceRGB)
-		  {
-		    ints_delivered = true;
-
-		    int_pixel_buffer[i] = currentModel.getRGB (pixels[p] & 0xFF);
-		  }
-		else
-		  {
-		    bytes_delivered = true;
-
-		    byte_pixel_buffer[i] = pixels[p];
-		  }
-	      }
-	  }
+        for(int xp = x; xp < (x + w); xp++)
+          {
+            // Check if the coordinates (xp, yp) are within the
+            // pixel block that we are grabbing.
+            if(xp >= this.x
+               && yp >= this.y
+               && xp < (this.x + this.width)
+               && yp < (this.y + this.height))
+              {
+                int i = (yp - this.y) * this.scansize + (xp - this.x) + this.offset;
+                int p = (yp - y) * scansize + (xp - x) + offset;
+                if (forceRGB)
+                  {
+                    ints_delivered = true;
+
+                    int_pixel_buffer[i] = currentModel.getRGB (pixels[p] & 0xFF);
+                  }
+                else
+                  {
+                    bytes_delivered = true;
+
+                    byte_pixel_buffer[i] = pixels[p];
+                  }
+              }
+          }
       }
   }
 
@@ -565,9 +565,9 @@ public class PixelGrabber implements ImageConsumer
    * @param offset offset into pixels array
    * @param scansize width of one row in the pixel block
    */
-  public synchronized void setPixels(int x, int y, int w, int h, 
-				     ColorModel model, int[] pixels,
-				     int offset, int scansize)
+  public synchronized void setPixels(int x, int y, int w, int h,
+                                     ColorModel model, int[] pixels,
+                                     int offset, int scansize)
   {
     ColorModel currentModel;
     if (model != null)
@@ -579,23 +579,23 @@ public class PixelGrabber implements ImageConsumer
 
     for(int yp = y; yp < (y + h); yp++)
       {
-	for(int xp = x; xp < (x + w); xp++)
-	  {
-	    // Check if the coordinates (xp, yp) are within the
-	    // pixel block that we are grabbing.
-	    if(xp >= this.x
-	       && yp >= this.y
-	       && xp < (this.x + this.width)
-	       && yp < (this.y + this.height))
-	      {
-		int i = (yp - this.y) * this.scansize + (xp - this.x) + this.offset;
-		int p = (yp - y) * scansize + (xp - x) + offset;
-		if (forceRGB)
-		  int_pixel_buffer[i] = currentModel.getRGB (pixels[p]);
-		else
-		  int_pixel_buffer[i] = pixels[p];
-	      }
-	  }
+        for(int xp = x; xp < (x + w); xp++)
+          {
+            // Check if the coordinates (xp, yp) are within the
+            // pixel block that we are grabbing.
+            if(xp >= this.x
+               && yp >= this.y
+               && xp < (this.x + this.width)
+               && yp < (this.y + this.height))
+              {
+                int i = (yp - this.y) * this.scansize + (xp - this.x) + this.offset;
+                int p = (yp - y) * scansize + (xp - x) + offset;
+                if (forceRGB)
+                  int_pixel_buffer[i] = currentModel.getRGB (pixels[p]);
+                else
+                  int_pixel_buffer[i] = pixels[p];
+              }
+          }
       }
   }
 
diff --git a/libjava/classpath/java/awt/image/PixelInterleavedSampleModel.java b/libjava/classpath/java/awt/image/PixelInterleavedSampleModel.java
index 3a0d415..13134b4 100644
--- a/libjava/classpath/java/awt/image/PixelInterleavedSampleModel.java
+++ b/libjava/classpath/java/awt/image/PixelInterleavedSampleModel.java
@@ -58,7 +58,7 @@ public class PixelInterleavedSampleModel
           bandOffsets);
   }
 
-  
+
   /**
    * Creates a new <code>SampleModel</code> that is like this one, but
    * uses the specified width and height.
diff --git a/libjava/classpath/java/awt/image/RGBImageFilter.java b/libjava/classpath/java/awt/image/RGBImageFilter.java
index 3cd1423..1354c3a 100644
--- a/libjava/classpath/java/awt/image/RGBImageFilter.java
+++ b/libjava/classpath/java/awt/image/RGBImageFilter.java
@@ -39,7 +39,7 @@ exception statement from your version. */
 package java.awt.image;
 
 /**
- * A filter designed to filter images in the default RGBColorModel regardless of 
+ * A filter designed to filter images in the default RGBColorModel regardless of
  * the ImageProducer's ColorModel.
  *
  * @author Mark Benvenuto (mcb54@columbia.edu)
@@ -49,7 +49,7 @@ public abstract class RGBImageFilter extends ImageFilter
   protected ColorModel origmodel;
 
   protected ColorModel newmodel;
-    
+
   /**
    * Specifies whether to apply the filter to the index entries of the
    * IndexColorModel. Subclasses should set this to true if the filter
@@ -60,7 +60,7 @@ public abstract class RGBImageFilter extends ImageFilter
   /**
    * Construct new RGBImageFilter.
    */
-  public RGBImageFilter() 
+  public RGBImageFilter()
   {
   }
 
@@ -75,7 +75,7 @@ public abstract class RGBImageFilter extends ImageFilter
    *
    * @see ColorModel
    */
-  public void setColorModel(ColorModel model) 
+  public void setColorModel(ColorModel model)
   {
     if ((model instanceof IndexColorModel) && canFilterIndexColorModel)
       {
@@ -90,10 +90,10 @@ public abstract class RGBImageFilter extends ImageFilter
   }
 
   /**
-   * Registers a new ColorModel to subsitute for the old ColorModel when 
-   * setPixels encounters the a pixel with the old ColorModel. The pixel 
+   * Registers a new ColorModel to subsitute for the old ColorModel when
+   * setPixels encounters the a pixel with the old ColorModel. The pixel
    * remains unchanged except for a new ColorModel.
-   * 
+   *
    * @param oldcm the old ColorModel
    * @param newcm the new ColorModel
    */
@@ -109,7 +109,7 @@ public abstract class RGBImageFilter extends ImageFilter
    *
    * @param icm an IndexColorModel to filter
    */
-  public IndexColorModel filterIndexColorModel(IndexColorModel icm) 
+  public IndexColorModel filterIndexColorModel(IndexColorModel icm)
   {
     int len = icm.getMapSize();
     byte[] reds = new byte[len];
@@ -175,8 +175,8 @@ public abstract class RGBImageFilter extends ImageFilter
   }
 
   /**
-   * If the ColorModel is the same ColorModel which as already converted 
-   * then it converts it the converted ColorModel. Otherwise it passes the 
+   * If the ColorModel is the same ColorModel which as already converted
+   * then it converts it the converted ColorModel. Otherwise it passes the
    * array of pixels through filterRGBpixels.
    *
    * @param x the x coordinate of the rectangle
@@ -217,7 +217,7 @@ public abstract class RGBImageFilter extends ImageFilter
   /**
    * This function delivers a rectangle of pixels where any
    * pixel(m,n) is stored in the array as an <code>int</code> at
-   * index (n * scansize + m + offset).  
+   * index (n * scansize + m + offset).
    *
    * @param x the x coordinate of the rectangle
    * @param y the y coordinate of the rectangle
diff --git a/libjava/classpath/java/awt/image/Raster.java b/libjava/classpath/java/awt/image/Raster.java
index 615155f..6d99c36 100644
--- a/libjava/classpath/java/awt/image/Raster.java
+++ b/libjava/classpath/java/awt/image/Raster.java
@@ -46,44 +46,44 @@ import java.awt.Rectangle;
  * A rectangular collection of pixels composed from a {@link DataBuffer} which
  * stores the pixel values, and a {@link SampleModel} which is used to retrieve
  * the pixel values.
- * 
+ *
  * @author Rolf W. Rasmussen (rolfwr@ii.uib.no)
  */
 public class Raster
 {
   /** The sample model used to access the pixel values. */
   protected SampleModel sampleModel;
-  
+
   /** The data buffer used to store the pixel values. */
   protected DataBuffer dataBuffer;
-  
+
   /** The x-coordinate of the top left corner of the raster. */
   protected int minX;
-  
+
   /** The y-coordinate of the top left corner of the raster. */
   protected int minY;
-  
+
   /** The width of the raster. */
   protected int width;
-  
+
   /** The height of the raster. */
   protected int height;
-  
+
   protected int sampleModelTranslateX;
-  
+
   protected int sampleModelTranslateY;
-  
+
   /** The number of bands. */
   protected int numBands;
-  
+
   protected int numDataElements;
-  
+
   /** The raster's parent. */
   protected Raster parent;
-  
+
   /**
    * Creates a new raster.
-   * 
+   *
    * @param sampleModel  the sample model.
    * @param origin  the origin.
    */
@@ -91,10 +91,10 @@ public class Raster
   {
     this(sampleModel, sampleModel.createDataBuffer(), origin);
   }
-  
+
   /**
    * Creates a new raster.
-   * 
+   *
    * @param sampleModel  the sample model.
    * @param dataBuffer  the data buffer.
    * @param origin  the origin.
@@ -108,7 +108,7 @@ public class Raster
 
   /**
    * Creates a new raster.
-   * 
+   *
    * @param sampleModel  the sample model.
    * @param dataBuffer  the data buffer.
    * @param aRegion  the raster's bounds.
@@ -124,7 +124,7 @@ public class Raster
     this.minY = aRegion.y;
     this.width = aRegion.width;
     this.height = aRegion.height;
-    
+
     // If sampleModelTranslate is null, use (0,0).  Methods such as
     // Raster.createRaster are specified to allow for a null argument.
     if (sampleModelTranslate != null)
@@ -137,16 +137,16 @@ public class Raster
     this.numDataElements = sampleModel.getNumDataElements();
     this.parent = parent;
   }
-    
+
   /**
    * Creates an interleaved raster using the specified data type.
-   * 
+   *
    * @param dataType  the data type.
    * @param w  the width.
    * @param h  the height.
    * @param bands  the number of bands.
    * @param location
-   * 
+   *
    * @return The new raster.
    */
   public static WritableRaster createInterleavedRaster(int dataType,
@@ -154,9 +154,9 @@ public class Raster
   {
     int[] bandOffsets = new int[bands];
     // TODO: Maybe not generate this every time.
-    for (int b = 0; b < bands; b++) 
+    for (int b = 0; b < bands; b++)
       bandOffsets[b] = b;
-    
+
     int scanlineStride = bands * w;
     return createInterleavedRaster(dataType, w, h, scanlineStride, bands,
                                    bandOffsets, location);
@@ -164,20 +164,20 @@ public class Raster
 
   /**
    * Creates an interleaved raster.
-   * 
+   *
    * @param dataType  the data type.
    * @param w  the width.
    * @param h  the height.
-   * @param scanlineStride  the number of data elements from a sample on one 
+   * @param scanlineStride  the number of data elements from a sample on one
    *     row to the corresponding sample on the next row.
    * @param pixelStride  the number of elements from a sample in one pixel to
    *     the corresponding sample in the next pixel.
    * @param bandOffsets  the band offsets.
    * @param location
-   * 
+   *
    * @return The new raster.
    */
-  public static WritableRaster createInterleavedRaster(int dataType, 
+  public static WritableRaster createInterleavedRaster(int dataType,
       int w, int h, int scanlineStride, int pixelStride, int[] bandOffsets,
       Point location)
   {
@@ -188,16 +188,16 @@ public class Raster
 
   /**
    * Creates a new banded raster.
-   * 
+   *
    * @param dataType  the data type.
    * @param w  the width.
    * @param h  the height.
    * @param bands  the number of bands.
-   * @param location  
-   * 
+   * @param location
+   *
    * @return The new raster.
    */
-  public static WritableRaster createBandedRaster(int dataType, int w, int h, 
+  public static WritableRaster createBandedRaster(int dataType, int w, int h,
       int bands, Point location)
   {
     SampleModel sm = new BandedSampleModel(dataType, w, h, bands);
@@ -206,16 +206,16 @@ public class Raster
 
   /**
    * Creates a new banded raster.
-   * 
+   *
    * @param dataType  the data type.
    * @param w  the width.
    * @param h  the height.
-   * @param scanlineStride  the number of data elements from a sample on one 
+   * @param scanlineStride  the number of data elements from a sample on one
    *     row to the corresponding sample on the next row.
    * @param bankIndices  the index for each bank.
    * @param bandOffsets  the offset for each band.
    * @param location
-   * 
+   *
    * @return The new raster.
    */
   public static WritableRaster createBandedRaster(int dataType, int w, int h,
@@ -225,16 +225,16 @@ public class Raster
                                            bankIndices, bandOffsets);
     return createWritableRaster(sm, location);
   }
-  
+
   /**
    * Creates a new packed raster.
-   * 
+   *
    * @param dataType  the data type.
    * @param w  the width.
    * @param h  the height.
    * @param bandMasks  the bit mask for each band.
-   * @param location 
-   * 
+   * @param location
+   *
    * @return The new raster.
    */
   public static WritableRaster createPackedRaster(int dataType, int w, int h,
@@ -247,14 +247,14 @@ public class Raster
 
   /**
    * Creates a new raster.
-   * 
+   *
    * @param dataType  the data type.
    * @param w  the width.
    * @param h  the height.
    * @param bands  the number of bands.
    * @param bitsPerBand  the number of bits per band.
    * @param location
-   * 
+   *
    * @return The new raster.
    */
   public static WritableRaster createPackedRaster(int dataType,
@@ -278,7 +278,7 @@ public class Raster
             bandMasks[i] = mask;
             mask <<= bitsPerBand;
           }
-          
+
         sm = new SinglePixelPackedSampleModel(dataType, w, h, bandMasks);
       }
     return createWritableRaster(sm, location);
@@ -286,21 +286,21 @@ public class Raster
 
   /**
    * Creates a new interleaved raster.
-   * 
+   *
    * @param dataBuffer  the data buffer.
    * @param w  the width.
    * @param h  the height.
-   * @param scanlineStride  the number of data elements from a sample on one 
+   * @param scanlineStride  the number of data elements from a sample on one
    *     row to the corresponding sample on the next row.
    * @param pixelStride  the number of elements from a sample in one pixel to
    *     the corresponding sample in the next pixel.
    * @param bandOffsets  the offset for each band.
    * @param location
-   * 
+   *
    * @return The new raster.
    */
-  public static WritableRaster createInterleavedRaster(DataBuffer dataBuffer, 
-      int w, int h, int scanlineStride, int pixelStride, int[] bandOffsets, 
+  public static WritableRaster createInterleavedRaster(DataBuffer dataBuffer,
+      int w, int h, int scanlineStride, int pixelStride, int[] bandOffsets,
       Point location)
   {
     SampleModel sm = new ComponentSampleModel(dataBuffer.getDataType(),
@@ -310,16 +310,16 @@ public class Raster
 
   /**
    * Creates a new banded raster.
-   * 
+   *
    * @param dataBuffer  the data buffer.
    * @param w  the width.
    * @param h  the height.
-   * @param scanlineStride  the number of data elements from a sample on one 
+   * @param scanlineStride  the number of data elements from a sample on one
    *     row to the corresponding sample on the next row.
    * @param bankIndices  the index for each bank.
    * @param bandOffsets  the band offsets.
    * @param location
-   * 
+   *
    * @return The new raster.
    */
   public static WritableRaster createBandedRaster(DataBuffer dataBuffer,
@@ -330,18 +330,18 @@ public class Raster
         w, h, scanlineStride, bankIndices, bandOffsets);
     return createWritableRaster(sm, dataBuffer, location);
   }
-  
+
   /**
    * Creates a new packed raster.
-   * 
+   *
    * @param dataBuffer  the data buffer.
    * @param w  the width.
    * @param h  the height.
-   * @param scanlineStride  the number of data elements from a sample on one 
+   * @param scanlineStride  the number of data elements from a sample on one
    *     row to the corresponding sample on the next row.
    * @param bandMasks  the bit mask for each band.
    * @param location
-   * 
+   *
    * @return The new raster.
    */
   public static WritableRaster createPackedRaster(DataBuffer dataBuffer,
@@ -351,16 +351,16 @@ public class Raster
         w, h, scanlineStride, bandMasks);
     return createWritableRaster(sm, dataBuffer, location);
   }
-  
+
   /**
    * Creates a new packed raster.
-   * 
+   *
    * @param dataBuffer  the data buffer.
    * @param w  the width.
    * @param h  the height.
    * @param bitsPerPixel  the number of bits per pixel.
    * @param location
-   * 
+   *
    * @return The new raster.
    */
   public static WritableRaster createPackedRaster(DataBuffer dataBuffer,
@@ -370,14 +370,14 @@ public class Raster
         w, h, bitsPerPixel);
     return createWritableRaster(sm, dataBuffer, location);
   }
-    
+
   /**
    * Creates a new raster.
-   * 
+   *
    * @param sm  the sample model.
    * @param db  the data buffer.
    * @param location
-   * 
+   *
    * @return The new raster.
    */
   public static Raster createRaster(SampleModel sm, DataBuffer db,
@@ -388,10 +388,10 @@ public class Raster
 
   /**
    * Creates a new writable raster.
-   * 
+   *
    * @param sm  the sample model.
    * @param location
-   * 
+   *
    * @return The new writable raster.
    */
   public static WritableRaster createWritableRaster(SampleModel sm,
@@ -402,11 +402,11 @@ public class Raster
 
   /**
    * Creates a new writable raster.
-   * 
+   *
    * @param sm  the sample model.
    * @param db  the data buffer.
-   * @param location 
-   * 
+   * @param location
+   *
    * @return The new writable raster.
    */
   public static WritableRaster createWritableRaster(SampleModel sm,
@@ -417,7 +417,7 @@ public class Raster
 
   /**
    * Returns the raster's parent.
-   * 
+   *
    * @return The raster's parent.
    */
   public Raster getParent()
@@ -427,7 +427,7 @@ public class Raster
 
   /**
    * Returns the x-translation.
-   * 
+   *
    * @return The x-translation.
    */
   public final int getSampleModelTranslateX()
@@ -437,7 +437,7 @@ public class Raster
 
   /**
    * Returns the y-translation.
-   * 
+   *
    * @return The y-translation.
    */
   public final int getSampleModelTranslateY()
@@ -447,7 +447,7 @@ public class Raster
 
   /**
    * Creates a new writable raster that is compatible with this raster.
-   * 
+   *
    * @return A new writable raster.
    */
   public WritableRaster createCompatibleWritableRaster()
@@ -457,10 +457,10 @@ public class Raster
 
   /**
    * Creates a new writable raster that is compatible with this raster.
-   * 
+   *
    * @param w  the width.
    * @param h  the height.
-   * 
+   *
    * @return A new writable raster.
    */
   public WritableRaster createCompatibleWritableRaster(int w, int h)
@@ -471,9 +471,9 @@ public class Raster
   /**
    * Creates a new writable raster that is compatible with this raster, with
    * the specified bounds.
-   * 
+   *
    * @param rect  the raster bounds.
-   * 
+   *
    * @return A new writable raster.
    */
   public WritableRaster createCompatibleWritableRaster(Rectangle rect)
@@ -485,12 +485,12 @@ public class Raster
   /**
    * Creates a new writable raster that is compatible with this raster, with
    * the specified bounds.
-   * 
+   *
    * @param x  the x-coordinate of the top-left corner of the raster.
    * @param y  the y-coordinate of the top-left corner of the raster.
    * @param w  the raster width.
    * @param h  the raster height.
-   * 
+   *
    * @return A new writable raster.
    */
   public WritableRaster createCompatibleWritableRaster(int x, int y,
@@ -503,7 +503,7 @@ public class Raster
   public Raster createTranslatedChild(int childMinX, int childMinY) {
     int tcx = sampleModelTranslateX - minX + childMinX;
     int tcy = sampleModelTranslateY - minY + childMinY;
-    
+
     return new Raster(sampleModel, dataBuffer,
                       new Rectangle(childMinX, childMinY, width, height),
                       new Point(tcx, tcy), this);
@@ -516,7 +516,7 @@ public class Raster
     if (parentX < minX || parentX + width > minX + this.width
         || parentY < minY || parentY + height > minY + this.height)
       throw new RasterFormatException("Child raster extends beyond parent");
-    
+
     SampleModel sm = (bandList == null) ?
       sampleModel :
       sampleModel.createSubsetSampleModel(bandList);
@@ -526,18 +526,18 @@ public class Raster
        /
       +-------------------------
       |\. __ parent trans
-      | \`.  
+      | \`.
       |  \ `.    parent origin
       |   \  `. /
       |   /\   +-------- - -
       |trans\ /<\-- deltaTrans
-      |child +-+-\---- - - 
+      |child +-+-\---- - -
       |     /|`|  \__ parent [x, y]
       |child | |`. \
       |origin| :  `.\
       |      |    / `\
       |      :   /    +
-      | child [x, y] 
+      | child [x, y]
 
       parent_xy - parent_trans = child_xy - child_trans
 
@@ -553,7 +553,7 @@ public class Raster
 
   /**
    * Returns a new rectangle containing the bounds of this raster.
-   * 
+   *
    * @return A new rectangle containing the bounds of this raster.
    */
   public Rectangle getBounds()
@@ -563,7 +563,7 @@ public class Raster
 
   /**
    * Returns the x-coordinate of the top left corner of the raster.
-   * 
+   *
    * @return The x-coordinate of the top left corner of the raster.
    */
   public final int getMinX()
@@ -573,7 +573,7 @@ public class Raster
 
   /**
    * Returns the t-coordinate of the top left corner of the raster.
-   * 
+   *
    * @return The t-coordinate of the top left corner of the raster.
    */
   public final int getMinY()
@@ -583,7 +583,7 @@ public class Raster
 
   /**
    * Returns the width of the raster.
-   * 
+   *
    * @return The width of the raster.
    */
   public final int getWidth()
@@ -593,7 +593,7 @@ public class Raster
 
   /**
    * Returns the height of the raster.
-   * 
+   *
    * @return The height of the raster.
    */
   public final int getHeight()
@@ -603,23 +603,23 @@ public class Raster
 
   /**
    * Returns the number of bands for this raster.
-   * 
+   *
    * @return The number of bands.
    */
   public final int getNumBands()
   {
     return numBands;
   }
-    
+
   public final int getNumDataElements()
   {
     return numDataElements;
   }
-  
+
   /**
-   * Returns the transfer type for the raster (this is determined by the 
+   * Returns the transfer type for the raster (this is determined by the
    * raster's sample model).
-   * 
+   *
    * @return The transfer type.
    */
   public final int getTransferType()
@@ -629,7 +629,7 @@ public class Raster
 
   /**
    * Returns the data buffer that stores the pixel data for this raster.
-   * 
+   *
    * @return The data buffer.
    */
   public DataBuffer getDataBuffer()
@@ -640,7 +640,7 @@ public class Raster
   /**
    * Returns the sample model that accesses the data buffer (to extract pixel
    * data) for this raster.
-   * 
+   *
    * @return The sample model.
    */
   public SampleModel getSampleModel()
@@ -662,15 +662,15 @@ public class Raster
 
   /**
    * Returns an array containing the samples for the pixel at (x, y) in the
-   * raster.  If <code>iArray</code> is not <code>null</code>, it will be 
+   * raster.  If <code>iArray</code> is not <code>null</code>, it will be
    * populated with the sample values and returned as the result of
    * this function (this avoids allocating a new array instance).
-   * 
+   *
    * @param x  the x-coordinate of the pixel.
    * @param y  the y-coordinate of the pixel.
-   * @param iArray  an array to populate with the sample values and return as 
+   * @param iArray  an array to populate with the sample values and return as
    *     the result (if <code>null</code>, a new array will be allocated).
-   * 
+   *
    * @return The pixel sample values.
    */
   public int[] getPixel(int x, int y, int[] iArray)
@@ -681,15 +681,15 @@ public class Raster
 
   /**
    * Returns an array containing the samples for the pixel at (x, y) in the
-   * raster.  If <code>fArray</code> is not <code>null</code>, it will be 
+   * raster.  If <code>fArray</code> is not <code>null</code>, it will be
    * populated with the sample values and returned as the result of
    * this function (this avoids allocating a new array instance).
-   * 
+   *
    * @param x  the x-coordinate of the pixel.
    * @param y  the y-coordinate of the pixel.
-   * @param fArray  an array to populate with the sample values and return as 
+   * @param fArray  an array to populate with the sample values and return as
    *     the result (if <code>null</code>, a new array will be allocated).
-   * 
+   *
    * @return The pixel sample values.
    */
   public float[] getPixel(int x, int y, float[] fArray)
@@ -700,15 +700,15 @@ public class Raster
 
   /**
    * Returns an array containing the samples for the pixel at (x, y) in the
-   * raster.  If <code>dArray</code> is not <code>null</code>, it will be 
+   * raster.  If <code>dArray</code> is not <code>null</code>, it will be
    * populated with the sample values and returned as the result of
    * this function (this avoids allocating a new array instance).
-   * 
+   *
    * @param x  the x-coordinate of the pixel.
    * @param y  the y-coordinate of the pixel.
-   * @param dArray  an array to populate with the sample values and return as 
+   * @param dArray  an array to populate with the sample values and return as
    *     the result (if <code>null</code>, a new array will be allocated).
-   * 
+   *
    * @return The pixel sample values.
    */
   public double[] getPixel(int x, int y, double[] dArray)
@@ -718,21 +718,21 @@ public class Raster
   }
 
   /**
-   * Returns an array containing the samples for the pixels in the region 
-   * specified by (x, y, w, h) in the raster.  The array is ordered by pixels 
-   * (that is, all the samples for the first pixel are grouped together, 
-   * followed by all the samples for the second pixel, and so on).  
-   * If <code>iArray</code> is not <code>null</code>, it will be populated 
-   * with the sample values and returned as the result of this function (this 
+   * Returns an array containing the samples for the pixels in the region
+   * specified by (x, y, w, h) in the raster.  The array is ordered by pixels
+   * (that is, all the samples for the first pixel are grouped together,
+   * followed by all the samples for the second pixel, and so on).
+   * If <code>iArray</code> is not <code>null</code>, it will be populated
+   * with the sample values and returned as the result of this function (this
    * avoids allocating a new array instance).
-   * 
+   *
    * @param x  the x-coordinate of the top-left pixel.
    * @param y  the y-coordinate of the top-left pixel.
    * @param w  the width of the region of pixels.
    * @param h  the height of the region of pixels.
-   * @param iArray  an array to populate with the sample values and return as 
+   * @param iArray  an array to populate with the sample values and return as
    *     the result (if <code>null</code>, a new array will be allocated).
-   * 
+   *
    * @return The pixel sample values.
    */
   public int[] getPixels(int x, int y, int w, int h, int[] iArray)
@@ -742,21 +742,21 @@ public class Raster
   }
 
   /**
-   * Returns an array containing the samples for the pixels in the region 
-   * specified by (x, y, w, h) in the raster.  The array is ordered by pixels 
-   * (that is, all the samples for the first pixel are grouped together, 
-   * followed by all the samples for the second pixel, and so on).  
-   * If <code>fArray</code> is not <code>null</code>, it will be populated 
-   * with the sample values and returned as the result of this function (this 
+   * Returns an array containing the samples for the pixels in the region
+   * specified by (x, y, w, h) in the raster.  The array is ordered by pixels
+   * (that is, all the samples for the first pixel are grouped together,
+   * followed by all the samples for the second pixel, and so on).
+   * If <code>fArray</code> is not <code>null</code>, it will be populated
+   * with the sample values and returned as the result of this function (this
    * avoids allocating a new array instance).
-   * 
+   *
    * @param x  the x-coordinate of the top-left pixel.
    * @param y  the y-coordinate of the top-left pixel.
    * @param w  the width of the region of pixels.
    * @param h  the height of the region of pixels.
-   * @param fArray  an array to populate with the sample values and return as 
+   * @param fArray  an array to populate with the sample values and return as
    *     the result (if <code>null</code>, a new array will be allocated).
-   * 
+   *
    * @return The pixel sample values.
    */
   public float[] getPixels(int x, int y, int w, int h, float[] fArray)
@@ -766,21 +766,21 @@ public class Raster
   }
 
   /**
-   * Returns an array containing the samples for the pixels in the region 
-   * specified by (x, y, w, h) in the raster.  The array is ordered by pixels 
-   * (that is, all the samples for the first pixel are grouped together, 
-   * followed by all the samples for the second pixel, and so on).  
-   * If <code>dArray</code> is not <code>null</code>, it will be populated 
-   * with the sample values and returned as the result of this function (this 
+   * Returns an array containing the samples for the pixels in the region
+   * specified by (x, y, w, h) in the raster.  The array is ordered by pixels
+   * (that is, all the samples for the first pixel are grouped together,
+   * followed by all the samples for the second pixel, and so on).
+   * If <code>dArray</code> is not <code>null</code>, it will be populated
+   * with the sample values and returned as the result of this function (this
    * avoids allocating a new array instance).
-   * 
+   *
    * @param x  the x-coordinate of the top-left pixel.
    * @param y  the y-coordinate of the top-left pixel.
    * @param w  the width of the region of pixels.
    * @param h  the height of the region of pixels.
-   * @param dArray  an array to populate with the sample values and return as 
+   * @param dArray  an array to populate with the sample values and return as
    *     the result (if <code>null</code>, a new array will be allocated).
-   * 
+   *
    * @return The pixel sample values.
    */
   public double[] getPixels(int x, int y, int w, int h, double[] dArray)
@@ -791,12 +791,12 @@ public class Raster
 
   /**
    * Returns the sample value for the pixel at (x, y) in the raster.
-   * 
+   *
    * @param x  the x-coordinate of the pixel.
    * @param y  the y-coordinate of the pixel.
-   * @param b  the band (in the range <code>0</code> to 
+   * @param b  the band (in the range <code>0</code> to
    *     <code>getNumBands() - 1</code>).
-   * 
+   *
    * @return The sample value.
    */
   public int getSample(int x, int y, int b)
@@ -807,14 +807,14 @@ public class Raster
 
   /**
    * Returns the sample value for the pixel at (x, y) in the raster.
-   * 
+   *
    * @param x  the x-coordinate of the pixel.
    * @param y  the y-coordinate of the pixel.
-   * @param b  the band (in the range <code>0</code> to 
+   * @param b  the band (in the range <code>0</code> to
    *     <code>getNumBands() - 1</code>).
-   * 
+   *
    * @return The sample value.
-   * 
+   *
    * @see #getSample(int, int, int)
    */
   public float getSampleFloat(int x, int y, int b)
@@ -825,14 +825,14 @@ public class Raster
 
   /**
    * Returns the sample value for the pixel at (x, y) in the raster.
-   * 
+   *
    * @param x  the x-coordinate of the pixel.
    * @param y  the y-coordinate of the pixel.
-   * @param b  the band (in the range <code>0</code> to 
+   * @param b  the band (in the range <code>0</code> to
    *     <code>getNumBands() - 1</code>).
-   * 
+   *
    * @return The sample value.
-   * 
+   *
    * @see #getSample(int, int, int)
    */
   public double getSampleDouble(int x, int y, int b)
@@ -842,21 +842,21 @@ public class Raster
   }
 
   /**
-   * Returns an array containing the samples from one band for the pixels in 
-   * the region specified by (x, y, w, h) in the raster.  If 
-   * <code>iArray</code> is not <code>null</code>, it will be 
-   * populated with the sample values and returned as the result of this 
+   * Returns an array containing the samples from one band for the pixels in
+   * the region specified by (x, y, w, h) in the raster.  If
+   * <code>iArray</code> is not <code>null</code>, it will be
+   * populated with the sample values and returned as the result of this
    * function (this avoids allocating a new array instance).
-   * 
+   *
    * @param x  the x-coordinate of the top-left pixel.
    * @param y  the y-coordinate of the top-left pixel.
    * @param w  the width of the region of pixels.
    * @param h  the height of the region of pixels.
-   * @param b  the band (in the range <code>0</code> to 
+   * @param b  the band (in the range <code>0</code> to
    *     </code>getNumBands() - 1</code>).
-   * @param iArray  an array to populate with the sample values and return as 
+   * @param iArray  an array to populate with the sample values and return as
    *     the result (if <code>null</code>, a new array will be allocated).
-   * 
+   *
    * @return The sample values.
    */
   public int[] getSamples(int x, int y, int w, int h, int b,
@@ -867,23 +867,23 @@ public class Raster
   }
 
   /**
-   * Returns an array containing the samples from one band for the pixels in 
-   * the region specified by (x, y, w, h) in the raster.  If 
-   * <code>fArray</code> is not <code>null</code>, it will be 
-   * populated with the sample values and returned as the result of this 
+   * Returns an array containing the samples from one band for the pixels in
+   * the region specified by (x, y, w, h) in the raster.  If
+   * <code>fArray</code> is not <code>null</code>, it will be
+   * populated with the sample values and returned as the result of this
    * function (this avoids allocating a new array instance).
    *
    * @param x  the x-coordinate of the top-left pixel.
    * @param y  the y-coordinate of the top-left pixel.
    * @param w  the width of the region of pixels.
    * @param h  the height of the region of pixels.
-   * @param b  the band (in the range <code>0</code> to 
+   * @param b  the band (in the range <code>0</code> to
    *     </code>getNumBands() - 1</code>).
-   * @param fArray  an array to populate with the sample values and return as 
+   * @param fArray  an array to populate with the sample values and return as
    *     the result (if <code>null</code>, a new array will be allocated).
-   * 
+   *
    * @return The sample values.
-   */  
+   */
   public float[] getSamples(int x, int y, int w, int h, int b, float[] fArray)
   {
     return sampleModel.getSamples(x - sampleModelTranslateX,
@@ -891,39 +891,39 @@ public class Raster
   }
 
   /**
-   * Returns an array containing the samples from one band for the pixels in 
-   * the region specified by (x, y, w, h) in the raster.  If 
-   * <code>dArray</code> is not <code>null</code>, it will be 
-   * populated with the sample values and returned as the result of this 
+   * Returns an array containing the samples from one band for the pixels in
+   * the region specified by (x, y, w, h) in the raster.  If
+   * <code>dArray</code> is not <code>null</code>, it will be
+   * populated with the sample values and returned as the result of this
    * function (this avoids allocating a new array instance).
-   * 
+   *
    * @param x  the x-coordinate of the top-left pixel.
    * @param y  the y-coordinate of the top-left pixel.
    * @param w  the width of the region of pixels.
    * @param h  the height of the region of pixels.
-   * @param b  the band (in the range <code>0</code> to 
+   * @param b  the band (in the range <code>0</code> to
    *     </code>getNumBands() - 1</code>).
-   * @param dArray  an array to populate with the sample values and return as 
+   * @param dArray  an array to populate with the sample values and return as
    *     the result (if <code>null</code>, a new array will be allocated).
-   * 
+   *
    * @return The sample values.
    */
-  public double[] getSamples(int x, int y, int w, int h, int b, 
+  public double[] getSamples(int x, int y, int w, int h, int b,
                              double[] dArray)
   {
     return sampleModel.getSamples(x - sampleModelTranslateX,
         y - sampleModelTranslateY, w, h, b, dArray, dataBuffer);
   }
-  
+
   /**
    * Create a String representing the state of this Raster.
-   * 
+   *
    * @return A String representing the stat of this Raster.
    */
   public String toString()
   {
     CPStringBuilder result = new CPStringBuilder();
-    
+
     result.append(getClass().getName());
     result.append("[(");
     result.append(minX).append(",").append(minY).append("), ");
@@ -931,12 +931,12 @@ public class Raster
     result.append(sampleModel).append(",");
     result.append(dataBuffer);
     result.append("]");
-    
+
     return result.toString();
   }
 
   /**
-   * Returns the number of bits used to represent the specified data type.  
+   * Returns the number of bits used to represent the specified data type.
    * Valid types are:
    * <ul>
    *   <li>{@link DataBuffer#TYPE_BYTE};</li>
@@ -947,9 +947,9 @@ public class Raster
    *   <li>{@link DataBuffer#TYPE_DOUBLE};</li>
    * </ul>
    * This method returns 0 for invalid data types.
-   * 
+   *
    * @param dataType  the data type.
-   * 
+   *
    * @return The number of bits used to represent the specified data type.
    */
   private static int getTypeBits(int dataType)
diff --git a/libjava/classpath/java/awt/image/RasterOp.java b/libjava/classpath/java/awt/image/RasterOp.java
index 656370e..2b2c073 100644
--- a/libjava/classpath/java/awt/image/RasterOp.java
+++ b/libjava/classpath/java/awt/image/RasterOp.java
@@ -53,13 +53,13 @@ public interface RasterOp
    * writable raster.  If <code>dest</code> is <code>null</code>, a new
    * <code>WritableRaster</code> will be created by calling the
    * {@link #createCompatibleDestRaster(Raster)} method.  If <code>dest</code>
-   * is not <code>null</code>, the result is written to <code>dest</code> then 
-   * returned (this avoids creating a new <code>WritableRaster</code> each 
+   * is not <code>null</code>, the result is written to <code>dest</code> then
+   * returned (this avoids creating a new <code>WritableRaster</code> each
    * time this method is called).
-   * 
+   *
    * @param src  the source raster.
    * @param dest  the destination raster (<code>null</code> permitted).
-   * 
+   *
    * @return The filtered raster.
    */
   WritableRaster filter(Raster src, WritableRaster dest);
@@ -67,9 +67,9 @@ public interface RasterOp
   /**
    * Returns the bounds of the destination raster on the basis of this
    * <code>RasterOp</code> being applied to the specified source raster.
-   * 
+   *
    * @param src  the source raster.
-   * 
+   *
    * @return The destination bounds.
    */
   Rectangle2D getBounds2D(Raster src);
@@ -77,9 +77,9 @@ public interface RasterOp
   /**
    * Returns a raster that can be used by this <code>RasterOp</code> as the
    * destination raster when operating on the specified source raster.
-   * 
+   *
    * @param src  the source raster.
-   * 
+   *
    * @return A new writable raster that can be used as the destination raster.
    */
   WritableRaster createCompatibleDestRaster(Raster src);
@@ -87,19 +87,18 @@ public interface RasterOp
   /**
    * Returns the point on the destination raster that corresponds to the given
    * point on the source raster.
-   * 
+   *
    * @param srcPoint  the source point.
    * @param destPoint  the destination point (<code>null</code> permitted).
-   * 
+   *
    * @return The destination point.
    */
   Point2D getPoint2D(Point2D srcPoint, Point2D destPoint);
 
   /**
    * Returns the rendering hints for this operation.
-   * 
+   *
    * @return The rendering hints.
    */
   RenderingHints getRenderingHints();
 }
-
diff --git a/libjava/classpath/java/awt/image/RenderedImage.java b/libjava/classpath/java/awt/image/RenderedImage.java
index 067e9b9..fd18871 100644
--- a/libjava/classpath/java/awt/image/RenderedImage.java
+++ b/libjava/classpath/java/awt/image/RenderedImage.java
@@ -1,4 +1,4 @@
-/* RenderedImage.java -- 
+/* RenderedImage.java --
    Copyright (C) 2002 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
diff --git a/libjava/classpath/java/awt/image/ReplicateScaleFilter.java b/libjava/classpath/java/awt/image/ReplicateScaleFilter.java
index 5ba03f1..94aad85 100644
--- a/libjava/classpath/java/awt/image/ReplicateScaleFilter.java
+++ b/libjava/classpath/java/awt/image/ReplicateScaleFilter.java
@@ -48,13 +48,13 @@ import java.util.Hashtable;
  * <br>
  * Currently this filter does nothing and needs to be implemented.
  *
- * @author C. Brian Jones (cbj@gnu.org) 
+ * @author C. Brian Jones (cbj@gnu.org)
  */
 public class ReplicateScaleFilter extends ImageFilter
 {
     public ReplicateScaleFilter(int width, int height) {
-	destHeight = height;
-	destWidth = width;
+        destHeight = height;
+        destWidth = width;
     }
 
     /**
@@ -94,45 +94,45 @@ public class ReplicateScaleFilter extends ImageFilter
 
     /**
      * An <code>ImageProducer</code> indicates the size of the image
-     * being produced using this method.  A filter can override this 
+     * being produced using this method.  A filter can override this
      * method to intercept these calls from the producer in order to
      * change either the width or the height before in turn calling
      * the consumer's <code>setDimensions</code> method.
-     * 
+     *
      * @param width the width of the image
-     * @param height the height of the image 
+     * @param height the height of the image
      */
     public void setDimensions(int width, int height)
     {
-	srcWidth = width;
-	srcHeight = height;
+        srcWidth = width;
+        srcHeight = height;
 
-	/* If either destHeight or destWidth is < 0, the image should
-	   maintain its original aspect ratio.  When both are < 0,
-	   just maintain the original width and height. */
-	if (destWidth < 0 && destHeight < 0)
+        /* If either destHeight or destWidth is < 0, the image should
+           maintain its original aspect ratio.  When both are < 0,
+           just maintain the original width and height. */
+        if (destWidth < 0 && destHeight < 0)
+        {
+            destWidth = width;
+            destHeight = height;
+        }
+        else if (destWidth < 0)
         {
-	    destWidth = width;
-	    destHeight = height;
-	}
-	else if (destWidth < 0)
-	{
-	    destWidth = width * destHeight / srcHeight;
-	}
-	else if (destHeight < 0)
-	{
-	    destHeight = height * destWidth / srcWidth;
-	}
+            destWidth = width * destHeight / srcHeight;
+        }
+        else if (destHeight < 0)
+        {
+            destHeight = height * destWidth / srcWidth;
+        }
 
-	if (consumer != null)
-	  consumer.setDimensions(destWidth, destHeight);
+        if (consumer != null)
+          consumer.setDimensions(destWidth, destHeight);
     }
 
     /**
      * An <code>ImageProducer</code> can set a list of properties
      * associated with this image by using this method.
      *
-     * @param props the list of properties associated with this image 
+     * @param props the list of properties associated with this image
      */
     public void setProperties(Hashtable<?, ?> props)
     {
@@ -145,7 +145,7 @@ public class ReplicateScaleFilter extends ImageFilter
     /**
      * This function delivers a rectangle of pixels where any
      * pixel(m,n) is stored in the array as a <code>byte</code> at
-     * index (n * scansize + m + offset).  
+     * index (n * scansize + m + offset).
      *
      * @param x the x coordinate of the rectangle
      * @param y the y coordinate of the rectangle
@@ -156,8 +156,8 @@ public class ReplicateScaleFilter extends ImageFilter
      * @param offset the index of the first pixels in the <code>pixels</code> array
      * @param scansize the width to use in extracting pixels from the <code>pixels</code> array
      */
-    public void setPixels(int x, int y, int w, int h, 
-	   ColorModel model, byte[] pixels, int offset, int scansize)
+    public void setPixels(int x, int y, int w, int h,
+           ColorModel model, byte[] pixels, int offset, int scansize)
     {
       if (srcrows == null || srccols == null)
         setupSources();
@@ -193,7 +193,7 @@ public class ReplicateScaleFilter extends ImageFilter
     /**
      * This function delivers a rectangle of pixels where any
      * pixel(m,n) is stored in the array as an <code>int</code> at
-     * index (n * scansize + m + offset).  
+     * index (n * scansize + m + offset).
      *
      * @param x the x coordinate of the rectangle
      * @param y the y coordinate of the rectangle
@@ -204,7 +204,7 @@ public class ReplicateScaleFilter extends ImageFilter
      * @param offset the index of the first pixels in the <code>pixels</code> array
      * @param scansize the width to use in extracting pixels from the <code>pixels</code> array
      */
-    public void setPixels(int x, int y, int w, int h, 
+    public void setPixels(int x, int y, int w, int h,
            ColorModel model, int[] pixels, int offset, int scansize)
     {
       if (srcrows == null || srccols == null)
@@ -255,4 +255,3 @@ public class ReplicateScaleFilter extends ImageFilter
       }
   }
 }
-
diff --git a/libjava/classpath/java/awt/image/RescaleOp.java b/libjava/classpath/java/awt/image/RescaleOp.java
index d56b12cb9..efab40b 100644
--- a/libjava/classpath/java/awt/image/RescaleOp.java
+++ b/libjava/classpath/java/awt/image/RescaleOp.java
@@ -44,20 +44,20 @@ import java.util.Arrays;
 
 /**
  * RescaleOp is a filter that changes each pixel by a scaling factor and offset.
- * 
+ *
  * For filtering Rasters, either one scaling factor and offset can be specified,
  * which will be applied to all bands; or a scaling factor and offset can be
  * specified for each band.
- * 
+ *
  * For BufferedImages, the scaling may apply to both color and alpha components.
  * If only one scaling factor is provided, or if the number of factors provided
  * equals the number of color components, the scaling is performed on all color
  * components.  Otherwise, the scaling is performed on all components including
  * alpha.  Alpha premultiplication is ignored.
- * 
+ *
  * After filtering, if color conversion is necessary, the conversion happens,
  * taking alpha premultiplication into account.
- * 
+ *
  * @author Jerry Quinn (jlquinn@optonline.net)
  * @author Francis Kung (fkung@redhat.com)
  */
@@ -66,47 +66,47 @@ public class RescaleOp implements BufferedImageOp, RasterOp
   private float[] scale;
   private float[] offsets;
   private RenderingHints hints = null;
-  
+
   /**
    * Create a new RescaleOp object using the given scale factors and offsets.
-   * 
+   *
    * The length of the arrays must be equal to the number of bands (or number of
    * data or color components) of the raster/image that this Op will be used on,
    * otherwise an IllegalArgumentException will be thrown when calling the
    * filter method.
-   *  
+   *
    * @param scaleFactors an array of scale factors.
    * @param offsets an array of offsets.
    * @param hints any rendering hints to use (can be null).
    * @throws NullPointerException if the scaleFactors or offsets array is null.
    */
   public RescaleOp(float[] scaleFactors,
-		   float[] offsets,
-		   RenderingHints hints)
+                   float[] offsets,
+                   RenderingHints hints)
   {
     int length = Math.min(scaleFactors.length, offsets.length);
-    
+
     scale = new float[length];
     System.arraycopy(scaleFactors, 0, this.scale, 0, length);
-    
+
     this.offsets = new float[length];
     System.arraycopy(offsets, 0, this.offsets, 0, length);
-    
+
     this.hints = hints;
   }
-  
+
   /**
    * Create a new RescaleOp object using the given scale factor and offset.
-   * 
+   *
    * The same scale factor and offset will be used on all bands/components.
-   *  
+   *
    * @param scaleFactor the scale factor to use.
    * @param offset the offset to use.
    * @param hints any rendering hints to use (can be null).
    */
   public RescaleOp(float scaleFactor,
-		   float offset,
-		   RenderingHints hints)
+                   float offset,
+                   RenderingHints hints)
   {
     scale = new float[]{ scaleFactor };
     offsets = new float[]{offset};
@@ -115,10 +115,10 @@ public class RescaleOp implements BufferedImageOp, RasterOp
 
   /**
    * Returns the scaling factors.  This method accepts an optional array, which
-   * will be used to store the factors if not null (this avoids allocating a 
+   * will be used to store the factors if not null (this avoids allocating a
    * new array).  If this array is too small to hold all the scaling factors,
    * the array will be filled and the remaining factors discarded.
-   * 
+   *
    * @param scaleFactors array to store the scaling factors in (can be null).
    * @return an array of scaling factors.
    */
@@ -133,10 +133,10 @@ public class RescaleOp implements BufferedImageOp, RasterOp
 
   /**
    * Returns the offsets.  This method accepts an optional array, which
-   * will be used to store the offsets if not null (this avoids allocating a 
-   * new array).  If this array is too small to hold all the offsets, the array 
+   * will be used to store the offsets if not null (this avoids allocating a
+   * new array).  If this array is too small to hold all the offsets, the array
    * will be filled and the remaining factors discarded.
-   * 
+   *
    * @param offsets array to store the offsets in (can be null).
    * @return an array of offsets.
    */
@@ -151,7 +151,7 @@ public class RescaleOp implements BufferedImageOp, RasterOp
 
   /**
    * Returns the number of scaling factors / offsets.
-   * 
+   *
    * @return the number of scaling factors / offsets.
    */
   public final int getNumFactors()
@@ -168,13 +168,13 @@ public class RescaleOp implements BufferedImageOp, RasterOp
   }
 
   /**
-   * Converts the source image using the scale factors and offsets specified in 
-   * the constructor.  The resulting image is stored in the destination image if 
-   * one is provided; otherwise a new BufferedImage is created and returned. 
-   * 
+   * Converts the source image using the scale factors and offsets specified in
+   * the constructor.  The resulting image is stored in the destination image if
+   * one is provided; otherwise a new BufferedImage is created and returned.
+   *
    * The source image cannot use an IndexColorModel, and the destination image
    * (if one is provided) must have the same size.
-   * 
+   *
    * If the final value of a sample is beyond the range of the color model, it
    * will be clipped to the appropriate maximum / minimum.
    *
@@ -264,16 +264,16 @@ public class RescaleOp implements BufferedImageOp, RasterOp
     Arrays.fill(bands, true);
     return filter(src, dest, bands);
   }
-  
+
   /**
    * Perform raster-based filtering on a selected number of bands.
-   * 
+   *
    * The length of the bands array should equal the number of bands; a true
    * element indicates filtering should happen on the corresponding band, while
    * a false element will skip the band.
-   * 
+   *
    * The rasters are assumed to be compatible and non-null.
-   * 
+   *
    * @param src the source raster.
    * @param dest the destination raster.
    * @param bands an array indicating which bands to filter.
@@ -285,12 +285,12 @@ public class RescaleOp implements BufferedImageOp, RasterOp
   {
     int[] values = new int[src.getHeight() * src.getWidth()];
     float scaleFactor, offset;
-    
+
     // Find max sample value, to be used for clipping later
     int[] maxValue = src.getSampleModel().getSampleSize();
     for (int i = 0; i < maxValue.length; i++)
       maxValue[i] = (int)Math.pow(2, maxValue[i]) - 1;
-    
+
     // TODO: can this be optimized further?
     // Filter all samples of all requested bands
     for (int band = 0; band < bands.length; band++)
@@ -324,22 +324,22 @@ public class RescaleOp implements BufferedImageOp, RasterOp
           dest.setSamples(dest.getMinX(), dest.getMinY(), dest.getWidth(),
                           dest.getHeight(), band, values);
         }
-    
+
     return dest;
   }
 
   /*
    * (non-Javadoc)
-   * 
+   *
    * @see java.awt.image.BufferedImageOp#createCompatibleDestImage(java.awt.image.BufferedImage,
    *      java.awt.image.ColorModel)
    */
   public BufferedImage createCompatibleDestImage(BufferedImage src,
-						 ColorModel dstCM)
+                                                 ColorModel dstCM)
   {
     if (dstCM == null)
       return new BufferedImage(src.getWidth(), src.getHeight(), src.getType());
-    
+
     return new BufferedImage(dstCM,
                              src.getRaster().createCompatibleWritableRaster(),
                              src.isAlphaPremultiplied(), null);
@@ -352,7 +352,7 @@ public class RescaleOp implements BufferedImageOp, RasterOp
   {
     return src.createCompatibleWritableRaster();
   }
-  
+
   /* (non-Javadoc)
    * @see java.awt.image.BufferedImageOp#getBounds2D(java.awt.image.BufferedImage)
    */
@@ -378,7 +378,7 @@ public class RescaleOp implements BufferedImageOp, RasterOp
       dst = (Point2D) src.clone();
     else
       dst.setLocation(src);
-    
+
     return dst;
   }
 
diff --git a/libjava/classpath/java/awt/image/SampleModel.java b/libjava/classpath/java/awt/image/SampleModel.java
index 506e78a..7e0b18c 100644
--- a/libjava/classpath/java/awt/image/SampleModel.java
+++ b/libjava/classpath/java/awt/image/SampleModel.java
@@ -37,24 +37,24 @@ exception statement from your version. */
 package java.awt.image;
 
 /**
- * A <code>SampleModel</code> is used to access pixel data from a 
+ * A <code>SampleModel</code> is used to access pixel data from a
  * {@link DataBuffer}.  This is used by the {@link Raster} class.
- * 
+ *
  * @author Rolf W. Rasmussen (rolfwr@ii.uib.no)
  */
 public abstract class SampleModel
 {
   /** Width of image described. */
   protected int width;
-  
+
   /** Height of image described. */
   protected int height;
-  
+
   /** Number of bands in the image described.  Package-private here,
       shadowed by ComponentSampleModel. */
   protected int numBands;
 
-  /** 
+  /**
    * The DataBuffer type that is used to store the data of the image
    * described.
    */
@@ -62,20 +62,20 @@ public abstract class SampleModel
 
   /**
    * Creates a new sample model with the specified attributes.
-   * 
+   *
    * @param dataType  the data type (one of {@link DataBuffer#TYPE_BYTE},
    *   {@link DataBuffer#TYPE_USHORT}, {@link DataBuffer#TYPE_SHORT},
-   *   {@link DataBuffer#TYPE_INT}, {@link DataBuffer#TYPE_FLOAT}, 
+   *   {@link DataBuffer#TYPE_INT}, {@link DataBuffer#TYPE_FLOAT},
    *   {@link DataBuffer#TYPE_DOUBLE} or {@link DataBuffer#TYPE_UNDEFINED}).
    * @param w  the width in pixels (must be greater than zero).
    * @param h  the height in pixels (must be greater than zero).
    * @param numBands  the number of bands (must be greater than zero).
-   * 
-   * @throws IllegalArgumentException if <code>dataType</code> is not one of 
+   *
+   * @throws IllegalArgumentException if <code>dataType</code> is not one of
    *   the listed values.
    * @throws IllegalArgumentException if <code>w</code> is less than or equal
    *   to zero.
-   * @throws IllegalArgumentException if <code>h</code> is less than or equal 
+   * @throws IllegalArgumentException if <code>h</code> is less than or equal
    *   to zero.
    * @throws IllegalArgumentException if <code>w * h</code> is greater than
    *   {@link Integer#MAX_VALUE}.
@@ -85,30 +85,30 @@ public abstract class SampleModel
     if (dataType != DataBuffer.TYPE_UNDEFINED)
       if (dataType < DataBuffer.TYPE_BYTE || dataType > DataBuffer.TYPE_DOUBLE)
         throw new IllegalArgumentException("Unrecognised 'dataType' argument.");
-    
-    if ((w <= 0) || (h <= 0)) 
+
+    if ((w <= 0) || (h <= 0))
       throw new IllegalArgumentException((w <= 0 ? " width<=0" : " width is ok")
           + (h <= 0 ? " height<=0" : " height is ok"));
-        
+
     long area = (long) w * (long) h;
     if (area > Integer.MAX_VALUE)
       throw new IllegalArgumentException("w * h exceeds Integer.MAX_VALUE.");
 
     if (numBands <= 0)
       throw new IllegalArgumentException("Requires numBands > 0.");
-      
+
     this.dataType = dataType;
     this.width = w;
     this.height = h;
-    this.numBands = numBands;  
+    this.numBands = numBands;
   }
-  
+
   /**
-   * Returns the width of the pixel data accessible via this 
+   * Returns the width of the pixel data accessible via this
    * <code>SampleModel</code>.
-   * 
+   *
    * @return The width.
-   * 
+   *
    * @see #getHeight()
    */
   public final int getWidth()
@@ -117,11 +117,11 @@ public abstract class SampleModel
   }
 
   /**
-   * Returns the height of the pixel data accessible via this 
+   * Returns the height of the pixel data accessible via this
    * <code>SampleModel</code>.
-   * 
+   *
    * @return The height.
-   * 
+   *
    * @see #getWidth()
    */
   public final int getHeight()
@@ -131,20 +131,20 @@ public abstract class SampleModel
 
   /**
    * Returns the number of bands for this <code>SampleModel</code>.
-   * 
+   *
    * @return The number of bands.
    */
   public final int getNumBands()
   {
     return numBands;
   }
-    
+
   public abstract int getNumDataElements();
-  
+
   /**
-   * Returns the type of the {@link DataBuffer} that this 
+   * Returns the type of the {@link DataBuffer} that this
    * <code>SampleModel</code> accesses.
-   * 
+   *
    * @return The data buffer type.
    */
   public final int getDataType()
@@ -163,26 +163,26 @@ public abstract class SampleModel
    * specified data buffer.  If <code>iArray</code> is not <code>null</code>,
    * it will be populated with the sample values and returned as the result of
    * this function (this avoids allocating a new array instance).
-   * 
+   *
    * @param x  the x-coordinate of the pixel.
    * @param y  the y-coordinate of the pixel.
-   * @param iArray  an array to populate with the sample values and return as 
+   * @param iArray  an array to populate with the sample values and return as
    *     the result (if <code>null</code>, a new array will be allocated).
    * @param data  the data buffer (<code>null</code> not permitted).
-   * 
+   *
    * @return The pixel sample values.
-   * 
+   *
    * @throws NullPointerException if <code>data</code> is <code>null</code>.
    */
   public int[] getPixel(int x, int y, int[] iArray, DataBuffer data)
   {
-    if (iArray == null) 
+    if (iArray == null)
       iArray = new int[numBands];
-    for (int b = 0; b < numBands; b++) 
+    for (int b = 0; b < numBands; b++)
       iArray[b] = getSample(x, y, b, data);
     return iArray;
   }
-  
+
   /**
    *
    * This method is provided as a faster alternative to getPixel(),
@@ -199,14 +199,14 @@ public abstract class SampleModel
   public abstract Object getDataElements(int x, int y, Object obj,
                                          DataBuffer data);
 
-    
+
   public Object getDataElements(int x, int y, int w, int h, Object obj,
                                 DataBuffer data)
   {
     int size = w * h;
     int numDataElements = getNumDataElements();
     int dataSize = numDataElements * size;
-    
+
     if (obj == null)
       {
         switch (getTransferType())
@@ -247,7 +247,7 @@ public abstract class SampleModel
                               Object obj, DataBuffer data)
   {
     int numDataElements = getNumDataElements();
-    
+
     Object pixelData;
     switch (getTransferType())
       {
@@ -292,22 +292,22 @@ public abstract class SampleModel
    * specified data buffer.  If <code>fArray</code> is not <code>null</code>,
    * it will be populated with the sample values and returned as the result of
    * this function (this avoids allocating a new array instance).
-   * 
+   *
    * @param x  the x-coordinate of the pixel.
    * @param y  the y-coordinate of the pixel.
-   * @param fArray  an array to populate with the sample values and return as 
+   * @param fArray  an array to populate with the sample values and return as
    *     the result (if <code>null</code>, a new array will be allocated).
    * @param data  the data buffer (<code>null</code> not permitted).
-   * 
+   *
    * @return The pixel sample values.
-   * 
+   *
    * @throws NullPointerException if <code>data</code> is <code>null</code>.
    */
   public float[] getPixel(int x, int y, float[] fArray, DataBuffer data)
   {
-    if (fArray == null) 
+    if (fArray == null)
       fArray = new float[numBands];
-    
+
     for (int b = 0; b < numBands; b++)
       {
         fArray[b] = getSampleFloat(x, y, b, data);
@@ -320,19 +320,19 @@ public abstract class SampleModel
    * specified data buffer.  If <code>dArray</code> is not <code>null</code>,
    * it will be populated with the sample values and returned as the result of
    * this function (this avoids allocating a new array instance).
-   * 
+   *
    * @param x  the x-coordinate of the pixel.
    * @param y  the y-coordinate of the pixel.
-   * @param dArray  an array to populate with the sample values and return as 
+   * @param dArray  an array to populate with the sample values and return as
    *     the result (if <code>null</code>, a new array will be allocated).
    * @param data  the data buffer (<code>null</code> not permitted).
-   * 
+   *
    * @return The pixel sample values.
-   * 
+   *
    * @throws NullPointerException if <code>data</code> is <code>null</code>.
    */
   public double[] getPixel(int x, int y, double[] dArray, DataBuffer data) {
-    if (dArray == null) 
+    if (dArray == null)
       dArray = new double[numBands];
     for (int b = 0; b < numBands; b++)
       {
@@ -342,24 +342,24 @@ public abstract class SampleModel
   }
 
   /**
-   * Returns an array containing the samples for the pixels in the region 
+   * Returns an array containing the samples for the pixels in the region
    * specified by (x, y, w, h) in the specified data buffer.  The array is
-   * ordered by pixels (that is, all the samples for the first pixel are 
+   * ordered by pixels (that is, all the samples for the first pixel are
    * grouped together, followed by all the samples for the second pixel, and so
-   * on).  If <code>iArray</code> is not <code>null</code>, it will be 
-   * populated with the sample values and returned as the result of this 
+   * on).  If <code>iArray</code> is not <code>null</code>, it will be
+   * populated with the sample values and returned as the result of this
    * function (this avoids allocating a new array instance).
-   * 
+   *
    * @param x  the x-coordinate of the top-left pixel.
    * @param y  the y-coordinate of the top-left pixel.
    * @param w  the width of the region of pixels.
    * @param h  the height of the region of pixels.
-   * @param iArray  an array to populate with the sample values and return as 
+   * @param iArray  an array to populate with the sample values and return as
    *     the result (if <code>null</code>, a new array will be allocated).
    * @param data  the data buffer (<code>null</code> not permitted).
-   * 
+   *
    * @return The pixel sample values.
-   * 
+   *
    * @throws NullPointerException if <code>data</code> is <code>null</code>.
    */
   public int[] getPixels(int x, int y, int w, int h, int[] iArray,
@@ -368,7 +368,7 @@ public abstract class SampleModel
     int size = w * h;
     int outOffset = 0;
     int[] pixel = null;
-    if (iArray == null) 
+    if (iArray == null)
       iArray = new int[w * h * numBands];
     for (int yy = y; yy < (y + h); yy++)
       {
@@ -383,24 +383,24 @@ public abstract class SampleModel
   }
 
   /**
-   * Returns an array containing the samples for the pixels in the region 
+   * Returns an array containing the samples for the pixels in the region
    * specified by (x, y, w, h) in the specified data buffer.  The array is
-   * ordered by pixels (that is, all the samples for the first pixel are 
+   * ordered by pixels (that is, all the samples for the first pixel are
    * grouped together, followed by all the samples for the second pixel, and so
-   * on).  If <code>fArray</code> is not <code>null</code>, it will be 
-   * populated with the sample values and returned as the result of this 
+   * on).  If <code>fArray</code> is not <code>null</code>, it will be
+   * populated with the sample values and returned as the result of this
    * function (this avoids allocating a new array instance).
-   * 
+   *
    * @param x  the x-coordinate of the top-left pixel.
    * @param y  the y-coordinate of the top-left pixel.
    * @param w  the width of the region of pixels.
    * @param h  the height of the region of pixels.
-   * @param fArray  an array to populate with the sample values and return as 
+   * @param fArray  an array to populate with the sample values and return as
    *     the result (if <code>null</code>, a new array will be allocated).
    * @param data  the data buffer (<code>null</code> not permitted).
-   * 
+   *
    * @return The pixel sample values.
-   * 
+   *
    * @throws NullPointerException if <code>data</code> is <code>null</code>.
    */
   public float[] getPixels(int x, int y, int w, int h, float[] fArray,
@@ -421,26 +421,26 @@ public abstract class SampleModel
       }
     return fArray;
   }
-    
+
   /**
-   * Returns an array containing the samples for the pixels in the region 
+   * Returns an array containing the samples for the pixels in the region
    * specified by (x, y, w, h) in the specified data buffer.  The array is
-   * ordered by pixels (that is, all the samples for the first pixel are 
+   * ordered by pixels (that is, all the samples for the first pixel are
    * grouped together, followed by all the samples for the second pixel, and so
-   * on).  If <code>dArray</code> is not <code>null</code>, it will be 
-   * populated with the sample values and returned as the result of this 
+   * on).  If <code>dArray</code> is not <code>null</code>, it will be
+   * populated with the sample values and returned as the result of this
    * function (this avoids allocating a new array instance).
-   * 
+   *
    * @param x  the x-coordinate of the top-left pixel.
    * @param y  the y-coordinate of the top-left pixel.
    * @param w  the width of the region of pixels.
    * @param h  the height of the region of pixels.
-   * @param dArray  an array to populate with the sample values and return as 
+   * @param dArray  an array to populate with the sample values and return as
    *     the result (if <code>null</code>, a new array will be allocated).
    * @param data  the data buffer (<code>null</code> not permitted).
-   * 
+   *
    * @return The pixel sample values.
-   * 
+   *
    * @throws NullPointerException if <code>data</code> is <code>null</code>.
    */
   public double[] getPixels(int x, int y, int w, int h, double[] dArray,
@@ -449,7 +449,7 @@ public abstract class SampleModel
     int size = w * h;
     int outOffset = 0;
     double[] pixel = null;
-    if (dArray == null) 
+    if (dArray == null)
       dArray = new double[w * h * numBands];
     for (int yy = y; yy < (y + h); yy++)
       {
@@ -464,35 +464,35 @@ public abstract class SampleModel
   }
 
   /**
-   * Returns the sample value for the pixel at (x, y) in the specified data 
+   * Returns the sample value for the pixel at (x, y) in the specified data
    * buffer.
-   * 
+   *
    * @param x  the x-coordinate of the pixel.
    * @param y  the y-coordinate of the pixel.
-   * @param b  the band (in the range <code>0</code> to 
+   * @param b  the band (in the range <code>0</code> to
    *     <code>getNumBands() - 1</code>).
    * @param data  the data buffer (<code>null</code> not permitted).
-   * 
+   *
    * @return The sample value.
-   * 
+   *
    * @throws NullPointerException if <code>data</code> is <code>null</code>.
    */
   public abstract int getSample(int x, int y, int b, DataBuffer data);
 
   /**
-   * Returns the sample value for the pixel at (x, y) in the specified data 
+   * Returns the sample value for the pixel at (x, y) in the specified data
    * buffer.
-   * 
+   *
    * @param x  the x-coordinate of the pixel.
    * @param y  the y-coordinate of the pixel.
-   * @param b  the band (in the range <code>0</code> to 
+   * @param b  the band (in the range <code>0</code> to
    *     <code>getNumBands() - 1</code>).
    * @param data  the data buffer (<code>null</code> not permitted).
-   * 
+   *
    * @return The sample value.
-   * 
+   *
    * @throws NullPointerException if <code>data</code> is <code>null</code>.
-   * 
+   *
    * @see #getSample(int, int, int, DataBuffer)
    */
   public float getSampleFloat(int x, int y, int b, DataBuffer data)
@@ -501,19 +501,19 @@ public abstract class SampleModel
   }
 
   /**
-   * Returns the sample value for the pixel at (x, y) in the specified data 
+   * Returns the sample value for the pixel at (x, y) in the specified data
    * buffer.
-   * 
+   *
    * @param x  the x-coordinate of the pixel.
    * @param y  the y-coordinate of the pixel.
-   * @param b  the band (in the range <code>0</code> to 
+   * @param b  the band (in the range <code>0</code> to
    *     <code>getNumBands() - 1</code>).
    * @param data  the data buffer (<code>null</code> not permitted).
-   * 
+   *
    * @return The sample value.
-   * 
+   *
    * @throws NullPointerException if <code>data</code> is <code>null</code>.
-   * 
+   *
    * @see #getSample(int, int, int, DataBuffer)
    */
   public double getSampleDouble(int x, int y, int b, DataBuffer data)
@@ -522,24 +522,24 @@ public abstract class SampleModel
   }
 
   /**
-   * Returns an array containing the samples from one band for the pixels in 
-   * the region specified by (x, y, w, h) in the specified data buffer.  If 
-   * <code>iArray</code> is not <code>null</code>, it will be 
-   * populated with the sample values and returned as the result of this 
+   * Returns an array containing the samples from one band for the pixels in
+   * the region specified by (x, y, w, h) in the specified data buffer.  If
+   * <code>iArray</code> is not <code>null</code>, it will be
+   * populated with the sample values and returned as the result of this
    * function (this avoids allocating a new array instance).
-   * 
+   *
    * @param x  the x-coordinate of the top-left pixel.
    * @param y  the y-coordinate of the top-left pixel.
    * @param w  the width of the region of pixels.
    * @param h  the height of the region of pixels.
-   * @param b  the band (in the range <code>0</code> to 
+   * @param b  the band (in the range <code>0</code> to
    *     </code>getNumBands() - 1</code>).
-   * @param iArray  an array to populate with the sample values and return as 
+   * @param iArray  an array to populate with the sample values and return as
    *     the result (if <code>null</code>, a new array will be allocated).
    * @param data  the data buffer (<code>null</code> not permitted).
-   * 
+   *
    * @return The sample values.
-   * 
+   *
    * @throws NullPointerException if <code>data</code> is <code>null</code>.
    */
   public int[] getSamples(int x, int y, int w, int h, int b,
@@ -547,7 +547,7 @@ public abstract class SampleModel
   {
     int size = w * h;
     int outOffset = 0;
-    if (iArray == null) 
+    if (iArray == null)
       iArray = new int[size];
     for (int yy = y; yy < (y + h); yy++)
       {
@@ -560,24 +560,24 @@ public abstract class SampleModel
   }
 
   /**
-   * Returns an array containing the samples from one band for the pixels in 
-   * the region specified by (x, y, w, h) in the specified data buffer.  If 
-   * <code>fArray</code> is not <code>null</code>, it will be 
-   * populated with the sample values and returned as the result of this 
+   * Returns an array containing the samples from one band for the pixels in
+   * the region specified by (x, y, w, h) in the specified data buffer.  If
+   * <code>fArray</code> is not <code>null</code>, it will be
+   * populated with the sample values and returned as the result of this
    * function (this avoids allocating a new array instance).
-   * 
+   *
    * @param x  the x-coordinate of the top-left pixel.
    * @param y  the y-coordinate of the top-left pixel.
    * @param w  the width of the region of pixels.
    * @param h  the height of the region of pixels.
-   * @param b  the band (in the range <code>0</code> to 
+   * @param b  the band (in the range <code>0</code> to
    *     </code>getNumBands() - 1</code>).
-   * @param fArray  an array to populate with the sample values and return as 
+   * @param fArray  an array to populate with the sample values and return as
    *     the result (if <code>null</code>, a new array will be allocated).
    * @param data  the data buffer (<code>null</code> not permitted).
-   * 
+   *
    * @return The sample values.
-   * 
+   *
    * @throws NullPointerException if <code>data</code> is <code>null</code>.
    */
   public float[] getSamples(int x, int y, int w, int h, int b,
@@ -585,7 +585,7 @@ public abstract class SampleModel
   {
     int size = w * h;
     int outOffset = 0;
-    if (fArray == null) 
+    if (fArray == null)
       fArray = new float[size];
     for (int yy = y; yy < (y + h); yy++)
       {
@@ -598,24 +598,24 @@ public abstract class SampleModel
   }
 
   /**
-   * Returns an array containing the samples from one band for the pixels in 
-   * the region specified by (x, y, w, h) in the specified data buffer.  If 
-   * <code>dArray</code> is not <code>null</code>, it will be 
-   * populated with the sample values and returned as the result of this 
+   * Returns an array containing the samples from one band for the pixels in
+   * the region specified by (x, y, w, h) in the specified data buffer.  If
+   * <code>dArray</code> is not <code>null</code>, it will be
+   * populated with the sample values and returned as the result of this
    * function (this avoids allocating a new array instance).
-   * 
+   *
    * @param x  the x-coordinate of the top-left pixel.
    * @param y  the y-coordinate of the top-left pixel.
    * @param w  the width of the region of pixels.
    * @param h  the height of the region of pixels.
-   * @param b  the band (in the range <code>0</code> to 
+   * @param b  the band (in the range <code>0</code> to
    *     </code>getNumBands() - 1</code>).
-   * @param dArray  an array to populate with the sample values and return as 
+   * @param dArray  an array to populate with the sample values and return as
    *     the result (if <code>null</code>, a new array will be allocated).
    * @param data  the data buffer (<code>null</code> not permitted).
-   * 
+   *
    * @return The sample values.
-   * 
+   *
    * @throws NullPointerException if <code>data</code> is <code>null</code>.
    */
   public double[] getSamples(int x, int y, int w, int h, int b,
@@ -623,7 +623,7 @@ public abstract class SampleModel
   {
     int size = w * h;
     int outOffset = 0;
-    if (dArray == null) 
+    if (dArray == null)
       dArray = new double[size];
     for (int yy = y; yy < (y + h); yy++)
       {
@@ -634,76 +634,76 @@ public abstract class SampleModel
       }
     return dArray;
   }
-  
+
   /**
    * Sets the samples for the pixel at (x, y) in the specified data buffer to
-   * the specified values. 
-   * 
+   * the specified values.
+   *
    * @param x  the x-coordinate of the pixel.
    * @param y  the y-coordinate of the pixel.
    * @param iArray  the sample values (<code>null</code> not permitted).
    * @param data  the data buffer (<code>null</code> not permitted).
-   * 
-   * @throws NullPointerException if either <code>iArray</code> or 
+   *
+   * @throws NullPointerException if either <code>iArray</code> or
    *     <code>data</code> is <code>null</code>.
    */
   public void setPixel(int x, int y, int[] iArray, DataBuffer data)
   {
-    for (int b = 0; b < numBands; b++) 
+    for (int b = 0; b < numBands; b++)
       setSample(x, y, b, iArray[b], data);
   }
 
   /**
    * Sets the samples for the pixel at (x, y) in the specified data buffer to
-   * the specified values. 
-   * 
+   * the specified values.
+   *
    * @param x  the x-coordinate of the pixel.
    * @param y  the y-coordinate of the pixel.
    * @param fArray  the sample values (<code>null</code> not permitted).
    * @param data  the data buffer (<code>null</code> not permitted).
-   * 
-   * @throws NullPointerException if either <code>fArray</code> or 
+   *
+   * @throws NullPointerException if either <code>fArray</code> or
    *     <code>data</code> is <code>null</code>.
    */
   public void setPixel(int x, int y, float[] fArray, DataBuffer data)
   {
-    for (int b = 0; b < numBands; b++) 
+    for (int b = 0; b < numBands; b++)
       setSample(x, y, b, fArray[b], data);
   }
 
   /**
    * Sets the samples for the pixel at (x, y) in the specified data buffer to
-   * the specified values. 
-   * 
+   * the specified values.
+   *
    * @param x  the x-coordinate of the pixel.
    * @param y  the y-coordinate of the pixel.
    * @param dArray  the sample values (<code>null</code> not permitted).
    * @param data  the data buffer (<code>null</code> not permitted).
-   * 
-   * @throws NullPointerException if either <code>dArray</code> or 
+   *
+   * @throws NullPointerException if either <code>dArray</code> or
    *     <code>data</code> is <code>null</code>.
    */
   public void setPixel(int x, int y, double[] dArray, DataBuffer data)
   {
-    for (int b = 0; b < numBands; b++) 
+    for (int b = 0; b < numBands; b++)
       setSample(x, y, b, dArray[b], data);
   }
 
   /**
-   * Sets the sample values for the pixels in the region specified by 
+   * Sets the sample values for the pixels in the region specified by
    * (x, y, w, h) in the specified data buffer.  The array is
-   * ordered by pixels (that is, all the samples for the first pixel are 
+   * ordered by pixels (that is, all the samples for the first pixel are
    * grouped together, followed by all the samples for the second pixel, and so
-   * on). 
-   *  
+   * on).
+   *
    * @param x  the x-coordinate of the top-left pixel.
    * @param y  the y-coordinate of the top-left pixel.
    * @param w  the width of the region of pixels.
    * @param h  the height of the region of pixels.
    * @param iArray  the pixel sample values (<code>null</code> not permitted).
    * @param data  the data buffer (<code>null</code> not permitted).
-   * 
-   * @throws NullPointerException if either <code>iArray</code> or 
+   *
+   * @throws NullPointerException if either <code>iArray</code> or
    *     <code>data</code> is <code>null</code>.
    */
   public void setPixels(int x, int y, int w, int h, int[] iArray,
@@ -723,20 +723,20 @@ public abstract class SampleModel
   }
 
   /**
-   * Sets the sample values for the pixels in the region specified by 
+   * Sets the sample values for the pixels in the region specified by
    * (x, y, w, h) in the specified data buffer.  The array is
-   * ordered by pixels (that is, all the samples for the first pixel are 
+   * ordered by pixels (that is, all the samples for the first pixel are
    * grouped together, followed by all the samples for the second pixel, and so
-   * on). 
-   *  
+   * on).
+   *
    * @param x  the x-coordinate of the top-left pixel.
    * @param y  the y-coordinate of the top-left pixel.
    * @param w  the width of the region of pixels.
    * @param h  the height of the region of pixels.
    * @param fArray  the pixel sample values (<code>null</code> not permitted).
    * @param data  the data buffer (<code>null</code> not permitted).
-   * 
-   * @throws NullPointerException if either <code>fArray</code> or 
+   *
+   * @throws NullPointerException if either <code>fArray</code> or
    *     <code>data</code> is <code>null</code>.
    */
   public void setPixels(int x, int y, int w, int h, float[] fArray,
@@ -756,20 +756,20 @@ public abstract class SampleModel
   }
 
   /**
-   * Sets the sample values for the pixels in the region specified by 
+   * Sets the sample values for the pixels in the region specified by
    * (x, y, w, h) in the specified data buffer.  The array is
-   * ordered by pixels (that is, all the samples for the first pixel are 
+   * ordered by pixels (that is, all the samples for the first pixel are
    * grouped together, followed by all the samples for the second pixel, and so
-   * on). 
-   *  
+   * on).
+   *
    * @param x  the x-coordinate of the top-left pixel.
    * @param y  the y-coordinate of the top-left pixel.
    * @param w  the width of the region of pixels.
    * @param h  the height of the region of pixels.
    * @param dArray  the pixel sample values (<code>null</code> not permitted).
    * @param data  the data buffer (<code>null</code> not permitted).
-   * 
-   * @throws NullPointerException if either <code>dArray</code> or 
+   *
+   * @throws NullPointerException if either <code>dArray</code> or
    *     <code>data</code> is <code>null</code>.
    */
   public void setPixels(int x, int y, int w, int h, double[] dArray,
@@ -789,32 +789,32 @@ public abstract class SampleModel
   }
 
   /**
-   * Sets the sample value for a band for the pixel at (x, y) in the 
-   * specified data buffer. 
-   * 
+   * Sets the sample value for a band for the pixel at (x, y) in the
+   * specified data buffer.
+   *
    * @param x  the x-coordinate of the pixel.
    * @param y  the y-coordinate of the pixel.
-   * @param b  the band (in the range <code>0</code> to 
+   * @param b  the band (in the range <code>0</code> to
    *     <code>getNumBands() - 1</code>).
    * @param s  the sample value.
    * @param data  the data buffer (<code>null</code> not permitted).
-   * 
+   *
    * @throws NullPointerException if <code>data</code> is <code>null</code>.
    */
   public abstract void setSample(int x, int y, int b, int s,
                                  DataBuffer data);
 
   /**
-   * Sets the sample value for a band for the pixel at (x, y) in the 
-   * specified data buffer. 
-   * 
+   * Sets the sample value for a band for the pixel at (x, y) in the
+   * specified data buffer.
+   *
    * @param x  the x-coordinate of the pixel.
    * @param y  the y-coordinate of the pixel.
-   * @param b  the band (in the range <code>0</code> to 
+   * @param b  the band (in the range <code>0</code> to
    *     <code>getNumBands() - 1</code>).
    * @param s  the sample value.
    * @param data  the data buffer (<code>null</code> not permitted).
-   * 
+   *
    * @throws NullPointerException if <code>data</code> is <code>null</code>.
    */
   public void setSample(int x, int y, int b, float s,
@@ -824,16 +824,16 @@ public abstract class SampleModel
   }
 
   /**
-   * Sets the sample value for a band for the pixel at (x, y) in the 
-   * specified data buffer. 
-   * 
+   * Sets the sample value for a band for the pixel at (x, y) in the
+   * specified data buffer.
+   *
    * @param x  the x-coordinate of the pixel.
    * @param y  the y-coordinate of the pixel.
-   * @param b  the band (in the range <code>0</code> to 
+   * @param b  the band (in the range <code>0</code> to
    *     <code>getNumBands() - 1</code>).
    * @param s  the sample value.
    * @param data  the data buffer (<code>null</code> not permitted).
-   * 
+   *
    * @throws NullPointerException if <code>data</code> is <code>null</code>.
    */
   public void setSample(int x, int y, int b, double s,
@@ -843,19 +843,19 @@ public abstract class SampleModel
   }
 
   /**
-   * Sets the sample values for one band for the pixels in the region 
-   * specified by (x, y, w, h) in the specified data buffer. 
-   * 
+   * Sets the sample values for one band for the pixels in the region
+   * specified by (x, y, w, h) in the specified data buffer.
+   *
    * @param x  the x-coordinate of the top-left pixel.
    * @param y  the y-coordinate of the top-left pixel.
    * @param w  the width of the region of pixels.
    * @param h  the height of the region of pixels.
-   * @param b  the band (in the range <code>0</code> to 
+   * @param b  the band (in the range <code>0</code> to
    *     </code>getNumBands() - 1</code>).
    * @param iArray  the sample values (<code>null</code> not permitted).
    * @param data  the data buffer (<code>null</code> not permitted).
-   * 
-   * @throws NullPointerException if either <code>iArray</code> or 
+   *
+   * @throws NullPointerException if either <code>iArray</code> or
    *     <code>data</code> is <code>null</code>.
    */
   public void setSamples(int x, int y, int w, int h, int b,
@@ -869,19 +869,19 @@ public abstract class SampleModel
   }
 
   /**
-   * Sets the sample values for one band for the pixels in the region 
-   * specified by (x, y, w, h) in the specified data buffer. 
-   * 
+   * Sets the sample values for one band for the pixels in the region
+   * specified by (x, y, w, h) in the specified data buffer.
+   *
    * @param x  the x-coordinate of the top-left pixel.
    * @param y  the y-coordinate of the top-left pixel.
    * @param w  the width of the region of pixels.
    * @param h  the height of the region of pixels.
-   * @param b  the band (in the range <code>0</code> to 
+   * @param b  the band (in the range <code>0</code> to
    *     </code>getNumBands() - 1</code>).
    * @param fArray  the sample values (<code>null</code> not permitted).
    * @param data  the data buffer (<code>null</code> not permitted).
-   * 
-   * @throws NullPointerException if either <code>iArray</code> or 
+   *
+   * @throws NullPointerException if either <code>iArray</code> or
    *     <code>data</code> is <code>null</code>.
    */
   public void setSamples(int x, int y, int w, int h, int b,
@@ -896,19 +896,19 @@ public abstract class SampleModel
   }
 
   /**
-   * Sets the sample values for one band for the pixels in the region 
-   * specified by (x, y, w, h) in the specified data buffer. 
-   * 
+   * Sets the sample values for one band for the pixels in the region
+   * specified by (x, y, w, h) in the specified data buffer.
+   *
    * @param x  the x-coordinate of the top-left pixel.
    * @param y  the y-coordinate of the top-left pixel.
    * @param w  the width of the region of pixels.
    * @param h  the height of the region of pixels.
-   * @param b  the band (in the range <code>0</code> to 
+   * @param b  the band (in the range <code>0</code> to
    *     </code>getNumBands() - 1</code>).
    * @param dArray  the sample values (<code>null</code> not permitted).
    * @param data  the data buffer (<code>null</code> not permitted).
-   * 
-   * @throws NullPointerException if either <code>iArray</code> or 
+   *
+   * @throws NullPointerException if either <code>iArray</code> or
    *     <code>data</code> is <code>null</code>.
    */
   public void setSamples(int x, int y, int w, int h, int b,
@@ -923,31 +923,31 @@ public abstract class SampleModel
   /**
    * Creates a new <code>SampleModel</code> that is compatible with this
    * model and has the specified width and height.
-   * 
+   *
    * @param w  the width (in pixels).
    * @param h  the height (in pixels).
-   * 
+   *
    * @return The new sample model.
    */
   public abstract SampleModel createCompatibleSampleModel(int w, int h);
 
   /**
    * Return a SampleModel with a subset of the bands in this model.
-   * 
+   *
    * Selects bands.length bands from this sample model.  The bands chosen
    * are specified in the indices of bands[].  This also permits permuting
    * the bands as well as taking a subset.  Thus, giving an array with
    * 1, 2, 3, ..., numbands, will give an identical sample model.
-   * 
+   *
    * @param bands Array with band indices to include.
    * @return A new sample model
    */
   public abstract SampleModel createSubsetSampleModel(int[] bands);
 
   /**
-   * Creates a new {@link DataBuffer} of the correct type and size for this 
+   * Creates a new {@link DataBuffer} of the correct type and size for this
    * <code>SampleModel</code>.
-   * 
+   *
    * @return The data buffer.
    */
   public abstract DataBuffer createDataBuffer();
@@ -955,19 +955,19 @@ public abstract class SampleModel
   /**
    * Returns an array containing the size (in bits) for each band accessed by
    * the <code>SampleModel</code>.
-   * 
+   *
    * @return An array.
-   * 
+   *
    * @see #getSampleSize(int)
    */
   public abstract int[] getSampleSize();
 
   /**
    * Returns the size (in bits) of the samples for the specified band.
-   * 
-   * @param band  the band (in the range <code>0</code> to 
+   *
+   * @param band  the band (in the range <code>0</code> to
    *     <code>getNumBands() - 1</code>).
-   *     
+   *
    * @return The sample size (in bits).
    */
   public abstract int getSampleSize(int band);
diff --git a/libjava/classpath/java/awt/image/ShortLookupTable.java b/libjava/classpath/java/awt/image/ShortLookupTable.java
index 858818c..3e276fe 100644
--- a/libjava/classpath/java/awt/image/ShortLookupTable.java
+++ b/libjava/classpath/java/awt/image/ShortLookupTable.java
@@ -58,7 +58,7 @@ public class ShortLookupTable extends LookupTable
    * Offset is subtracted from pixel values when looking up in the translation
    * tables.  If data.length is one, the same table is applied to all pixel
    * components.
-   * 
+   *
    * @param offset Offset to be subtracted.
    * @param data Array of lookup tables.
    * @exception IllegalArgumentException if offset &lt; 0 or data.length &lt; 1.
@@ -67,9 +67,9 @@ public class ShortLookupTable extends LookupTable
     throws IllegalArgumentException
   {
     super(offset, data.length);
-    
+
     // tests show that Sun's implementation creates a new array to store the
-    // references from the incoming 'data' array - not sure why, but we'll 
+    // references from the incoming 'data' array - not sure why, but we'll
     // match that behaviour just in case it matters...
     this.data = new short[data.length][];
     for (int i = 0; i < data.length; i++)
@@ -81,9 +81,9 @@ public class ShortLookupTable extends LookupTable
    *
    * Offset is subtracted from pixel values when looking up in the translation
    * table.  The same table is applied to all pixel components.
-   * 
+   *
    * @param offset Offset to be subtracted.
-   * @param data Lookup table for all components (<code>null</code> not 
+   * @param data Lookup table for all components (<code>null</code> not
    *     permitted).
    * @exception IllegalArgumentException if offset &lt; 0.
    */
@@ -96,10 +96,10 @@ public class ShortLookupTable extends LookupTable
     this.data = new short[][] {data};
   }
 
-  /** 
+  /**
    * Return the lookup tables.  This is a reference to the actual table, so
-   * modifying the contents of the returned array will modify the lookup table. 
-   * 
+   * modifying the contents of the returned array will modify the lookup table.
+   *
    * @return The lookup table.
    */
   public final short[][] getTable()
@@ -136,7 +136,7 @@ public class ShortLookupTable extends LookupTable
     else
       for (int i = 0; i < src.length; i++)
         dst[i] = data[i][src[i] - offset];
-      
+
     return dst;
   }
 
@@ -170,7 +170,7 @@ public class ShortLookupTable extends LookupTable
     else
       for (int i = 0; i < src.length; i++)
         dst[i] = data[i][((int) src[i]) - offset];
-      
+
     return dst;
 
   }
diff --git a/libjava/classpath/java/awt/image/SinglePixelPackedSampleModel.java b/libjava/classpath/java/awt/image/SinglePixelPackedSampleModel.java
index 2251386..143581d 100644
--- a/libjava/classpath/java/awt/image/SinglePixelPackedSampleModel.java
+++ b/libjava/classpath/java/awt/image/SinglePixelPackedSampleModel.java
@@ -43,9 +43,9 @@ import gnu.java.lang.CPStringBuilder;
 
 /**
  * A <code>SampleModel</code> used when all samples are stored in a single
- * data element in the {@link DataBuffer}, and each data element contains 
+ * data element in the {@link DataBuffer}, and each data element contains
  * samples for one pixel only.
- * 
+ *
  * @author Rolf W. Rasmussen (rolfwr@ii.uib.no)
  */
 public class SinglePixelPackedSampleModel extends SampleModel
@@ -54,10 +54,10 @@ public class SinglePixelPackedSampleModel extends SampleModel
   private int[] bitMasks;
   private int[] bitOffsets;
   private int[] sampleSize;
-  
+
   /**
    * Creates a new <code>SinglePixelPackedSampleModel</code>.
-   * 
+   *
    * @param dataType  the data buffer type.
    * @param w  the width (in pixels).
    * @param h  the height (in pixels).
@@ -65,14 +65,14 @@ public class SinglePixelPackedSampleModel extends SampleModel
    *     sample value for each band.
    */
   public SinglePixelPackedSampleModel(int dataType, int w, int h,
-				      int[] bitMasks)
+                                      int[] bitMasks)
   {
     this(dataType, w, h, w, bitMasks);
   }
 
   /**
    * Creates a new <code>SinglePixelPackedSampleModel</code>.
-   * 
+   *
    * @param dataType  the data buffer type.
    * @param w  the width (in pixels).
    * @param h  the height (in pixels).
@@ -82,7 +82,7 @@ public class SinglePixelPackedSampleModel extends SampleModel
    *     sample value for each band.
    */
   public SinglePixelPackedSampleModel(int dataType, int w, int h,
-				      int scanlineStride, int[] bitMasks)
+                                      int scanlineStride, int[] bitMasks)
   {
     super(dataType, w, h, bitMasks.length);
 
@@ -91,18 +91,18 @@ public class SinglePixelPackedSampleModel extends SampleModel
       case DataBuffer.TYPE_BYTE:
       case DataBuffer.TYPE_USHORT:
       case DataBuffer.TYPE_INT:
-	break;
+        break;
       default:
         throw new IllegalArgumentException(
             "SinglePixelPackedSampleModel unsupported dataType");
       }
-    
+
     this.scanlineStride = scanlineStride;
     this.bitMasks = bitMasks;
-    
+
     bitOffsets = new int[numBands];
     sampleSize = new int[numBands];
-    
+
     BitMaskExtent extent = new BitMaskExtent();
     for (int b = 0; b < numBands; b++)
       {
@@ -116,7 +116,7 @@ public class SinglePixelPackedSampleModel extends SampleModel
 
   /**
    * Returns the number of data elements.
-   * 
+   *
    * @return <code>1</code>.
    */
   public int getNumDataElements()
@@ -127,10 +127,10 @@ public class SinglePixelPackedSampleModel extends SampleModel
   /**
    * Creates a new <code>SampleModel</code> that is compatible with this
    * model and has the specified width and height.
-   * 
+   *
    * @param w  the width (in pixels).
    * @param h  the height (in pixels).
-   * 
+   *
    * @return The new sample model.
    */
   public SampleModel createCompatibleSampleModel(int w, int h)
@@ -146,7 +146,7 @@ public class SinglePixelPackedSampleModel extends SampleModel
    * Creates a DataBuffer for holding pixel data in the format and
    * layout described by this SampleModel. The returned buffer will
    * consist of one single bank.
-   * 
+   *
    * @return The data buffer.
    */
   public DataBuffer createDataBuffer()
@@ -175,22 +175,22 @@ public class SinglePixelPackedSampleModel extends SampleModel
   /**
    * Returns an array containing the size (in bits) for each band accessed by
    * the <code>SampleModel</code>.
-   * 
+   *
    * @return An array.
-   * 
+   *
    * @see #getSampleSize(int)
    */
   public int[] getSampleSize()
   {
     return (int[]) sampleSize.clone();
   }
-  
+
   /**
    * Returns the size (in bits) of the samples for the specified band.
-   * 
-   * @param band  the band (in the range <code>0</code> to 
+   *
+   * @param band  the band (in the range <code>0</code> to
    *     <code>getNumBands() - 1</code>).
-   *     
+   *
    * @return The sample size (in bits).
    */
   public int getSampleSize(int band)
@@ -200,10 +200,10 @@ public class SinglePixelPackedSampleModel extends SampleModel
 
   /**
    * Returns the index in the data buffer that stores the pixel at (x, y).
-   * 
+   *
    * @param x  the x-coordinate.
    * @param y  the y-coordinate.
-   * 
+   *
    * @return The index in the data buffer that stores the pixel at (x, y).
    */
   public int getOffset(int x, int y)
@@ -224,7 +224,7 @@ public class SinglePixelPackedSampleModel extends SampleModel
   /**
    * Returns the number of data elements from a pixel in one row to the
    * corresponding pixel in the next row.
-   * 
+   *
    * @return The scanline stride.
    */
   public int getScanlineStride()
@@ -235,12 +235,12 @@ public class SinglePixelPackedSampleModel extends SampleModel
   /**
    * Creates a new <code>SinglePixelPackedSampleModel</code> that accesses
    * the specified subset of bands.
-   * 
+   *
    * @param bands  an array containing band indices (<code>null</code> not
    *     permitted).
-   * 
+   *
    * @return A new sample model.
-   * 
+   *
    * @throws NullPointerException if <code>bands</code> is <code>null</code>.
    * @throws RasterFormatException if <code>bands.length</code> is greater
    *     than the number of bands in this model.
@@ -249,20 +249,20 @@ public class SinglePixelPackedSampleModel extends SampleModel
   {
     if (bands.length > numBands)
       throw new RasterFormatException("Too many bands.");
-    
+
     int numBands = bands.length;
-    
+
     int[] bitMasks = new int[numBands];
 
     for (int b = 0; b < numBands; b++)
       bitMasks[b] = this.bitMasks[bands[b]];
 
     return new SinglePixelPackedSampleModel(dataType, width, height,
-					    scanlineStride, bitMasks);
+                                            scanlineStride, bitMasks);
   }
 
   public Object getDataElements(int x, int y, Object obj,
-				DataBuffer data)
+                                DataBuffer data)
   {
     int type = getTransferType();
     Object ret = null;
@@ -298,21 +298,21 @@ public class SinglePixelPackedSampleModel extends SampleModel
       }
     return ret;
   }
-  
+
   /**
    * Returns an array containing the samples for the pixel at (x, y) in the
    * specified data buffer.  If <code>iArray</code> is not <code>null</code>,
    * it will be populated with the sample values and returned as the result of
    * this function (this avoids allocating a new array instance).
-   * 
+   *
    * @param x  the x-coordinate of the pixel.
    * @param y  the y-coordinate of the pixel.
-   * @param iArray  an array to populate with the sample values and return as 
+   * @param iArray  an array to populate with the sample values and return as
    *     the result (if <code>null</code>, a new array will be allocated).
    * @param data  the data buffer (<code>null</code> not permitted).
-   * 
+   *
    * @return The pixel sample values.
-   * 
+   *
    * @throws NullPointerException if <code>data</code> is <code>null</code>.
    */
   public int[] getPixel(int x, int y, int[] iArray, DataBuffer data)
@@ -323,63 +323,63 @@ public class SinglePixelPackedSampleModel extends SampleModel
 
     for (int b = 0; b < numBands; b++)
       iArray[b] = (samples & bitMasks[b]) >>> bitOffsets[b];
-	
+
     return iArray;
   }
 
   /**
-   * Returns an array containing the samples for the pixels in the region 
+   * Returns an array containing the samples for the pixels in the region
    * specified by (x, y, w, h) in the specified data buffer.  The array is
-   * ordered by pixels (that is, all the samples for the first pixel are 
+   * ordered by pixels (that is, all the samples for the first pixel are
    * grouped together, followed by all the samples for the second pixel, and so
-   * on).  If <code>iArray</code> is not <code>null</code>, it will be 
-   * populated with the sample values and returned as the result of this 
+   * on).  If <code>iArray</code> is not <code>null</code>, it will be
+   * populated with the sample values and returned as the result of this
    * function (this avoids allocating a new array instance).
-   * 
+   *
    * @param x  the x-coordinate of the top-left pixel.
    * @param y  the y-coordinate of the top-left pixel.
    * @param w  the width of the region of pixels.
    * @param h  the height of the region of pixels.
-   * @param iArray  an array to populate with the sample values and return as 
+   * @param iArray  an array to populate with the sample values and return as
    *     the result (if <code>null</code>, a new array will be allocated).
    * @param data  the data buffer (<code>null</code> not permitted).
-   * 
+   *
    * @return The pixel sample values.
-   * 
+   *
    * @throws NullPointerException if <code>data</code> is <code>null</code>.
    */
   public int[] getPixels(int x, int y, int w, int h, int[] iArray,
-			 DataBuffer data)
+                         DataBuffer data)
   {
     int offset = scanlineStride*y + x;
     if (iArray == null) iArray = new int[numBands*w*h];
     int outOffset = 0;
     for (y = 0; y < h; y++)
       {
-	int lineOffset = offset;
-	for (x = 0; x < w; x++)
-	  {
-	    int samples = data.getElem(lineOffset++);
-	    for (int b = 0; b < numBands; b++)
-	      iArray[outOffset++] = (samples & bitMasks[b]) >>> bitOffsets[b];
-	  }
-	offset += scanlineStride;
+        int lineOffset = offset;
+        for (x = 0; x < w; x++)
+          {
+            int samples = data.getElem(lineOffset++);
+            for (int b = 0; b < numBands; b++)
+              iArray[outOffset++] = (samples & bitMasks[b]) >>> bitOffsets[b];
+          }
+        offset += scanlineStride;
       }
-    return iArray;	
+    return iArray;
   }
 
   /**
-   * Returns the sample value for the pixel at (x, y) in the specified data 
+   * Returns the sample value for the pixel at (x, y) in the specified data
    * buffer.
-   * 
+   *
    * @param x  the x-coordinate of the pixel.
    * @param y  the y-coordinate of the pixel.
-   * @param b  the band (in the range <code>0</code> to 
+   * @param b  the band (in the range <code>0</code> to
    *     <code>getNumBands() - 1</code>).
    * @param data  the data buffer (<code>null</code> not permitted).
-   * 
+   *
    * @return The sample value.
-   * 
+   *
    * @throws NullPointerException if <code>data</code> is <code>null</code>.
    */
   public int getSample(int x, int y, int b, DataBuffer data)
@@ -388,7 +388,7 @@ public class SinglePixelPackedSampleModel extends SampleModel
     int samples = data.getElem(offset);
     return (samples & bitMasks[b]) >>> bitOffsets[b];
   }
-  
+
   public void setDataElements(int x, int y, Object obj, DataBuffer data)
   {
     int transferType = getTransferType();
@@ -417,20 +417,20 @@ public class SinglePixelPackedSampleModel extends SampleModel
 
   /**
    * Sets the samples for the pixel at (x, y) in the specified data buffer to
-   * the specified values. 
-   * 
+   * the specified values.
+   *
    * @param x  the x-coordinate of the pixel.
    * @param y  the y-coordinate of the pixel.
    * @param iArray  the sample values (<code>null</code> not permitted).
    * @param data  the data buffer (<code>null</code> not permitted).
-   * 
-   * @throws NullPointerException if either <code>iArray</code> or 
+   *
+   * @throws NullPointerException if either <code>iArray</code> or
    *     <code>data</code> is <code>null</code>.
    */
   public void setPixel(int x, int y, int[] iArray, DataBuffer data)
   {
     int offset = scanlineStride*y + x;
-    
+
     int samples = 0;
     for (int b = 0; b < numBands; b++)
       samples |= (iArray[b] << bitOffsets[b]) & bitMasks[b];
@@ -448,18 +448,18 @@ public class SinglePixelPackedSampleModel extends SampleModel
    * @param h The height of the pixel rectangle in <code>obj</code>.
    * @param iArray The primitive array containing the pixels to set.
    * @param data The DataBuffer to store the pixels into.
-   * @see java.awt.image.SampleModel#setPixels(int, int, int, int, int[], 
+   * @see java.awt.image.SampleModel#setPixels(int, int, int, int, int[],
    *     java.awt.image.DataBuffer)
    */
   public void setPixels(int x, int y, int w, int h, int[] iArray,
-						DataBuffer data)
+                                                DataBuffer data)
   {
     int inOffset = 0;
     for (int yy=y; yy<(y+h); yy++)
      {
       int offset = scanlineStride*yy + x;
       for (int xx=x; xx<(x+w); xx++)
-       { 
+       {
         int samples = 0;
         for (int b = 0; b < numBands; b++)
           samples |= (iArray[inOffset+b] << bitOffsets[b]) & bitMasks[b];
@@ -469,18 +469,18 @@ public class SinglePixelPackedSampleModel extends SampleModel
       }
     }
   }
-  
+
   /**
-   * Sets the sample value for a band for the pixel at (x, y) in the 
-   * specified data buffer. 
-   * 
+   * Sets the sample value for a band for the pixel at (x, y) in the
+   * specified data buffer.
+   *
    * @param x  the x-coordinate of the pixel.
    * @param y  the y-coordinate of the pixel.
-   * @param b  the band (in the range <code>0</code> to 
+   * @param b  the band (in the range <code>0</code> to
    *     <code>getNumBands() - 1</code>).
    * @param s  the sample value.
    * @param data  the data buffer (<code>null</code> not permitted).
-   * 
+   *
    * @throws NullPointerException if <code>data</code> is <code>null</code>.
    */
   public void setSample(int x, int y, int b, int s, DataBuffer data)
@@ -492,13 +492,13 @@ public class SinglePixelPackedSampleModel extends SampleModel
     samples |= (s << bitOffsets[b]) & bitMask;
     data.setElem(offset, samples);
   }
-  
+
   /**
-   * Tests this sample model for equality with an arbitrary object.  This 
+   * Tests this sample model for equality with an arbitrary object.  This
    * method returns <code>true</code> if and only if:
    * <ul>
    *   <li><code>obj</code> is not <code>null</code>;
-   *   <li><code>obj</code> is an instance of 
+   *   <li><code>obj</code> is an instance of
    *       <code>SinglePixelPackedSampleModel</code>;
    *   <li>both models have the same:
    *     <ul>
@@ -512,17 +512,17 @@ public class SinglePixelPackedSampleModel extends SampleModel
    *     </ul>
    *   </li>
    * </ul>
-   * 
+   *
    * @param obj  the object (<code>null</code> permitted)
-   * 
+   *
    * @return <code>true</code> if this model is equal to <code>obj</code>, and
    *     <code>false</code> otherwise.
    */
-  public boolean equals(Object obj) 
+  public boolean equals(Object obj)
   {
-    if (this == obj) 
+    if (this == obj)
       return true;
-    if (! (obj instanceof SinglePixelPackedSampleModel)) 
+    if (! (obj instanceof SinglePixelPackedSampleModel))
       return false;
     SinglePixelPackedSampleModel that = (SinglePixelPackedSampleModel) obj;
     if (this.dataType != that.dataType)
@@ -537,14 +537,14 @@ public class SinglePixelPackedSampleModel extends SampleModel
       return false;
     if (!Arrays.equals(this.bitMasks, that.bitMasks))
       return false;
-    if (!Arrays.equals(this.bitOffsets, that.bitOffsets)) 
+    if (!Arrays.equals(this.bitOffsets, that.bitOffsets))
       return false;
     return true;
   }
-  
+
   /**
    * Returns a hash code for this <code>SinglePixelPackedSampleModel</code>.
-   * 
+   *
    * @return A hash code.
    */
   public int hashCode()
@@ -562,7 +562,7 @@ public class SinglePixelPackedSampleModel extends SampleModel
       result = 37 * result + bitOffsets[i];
     return result;
   }
-  
+
   /**
    * Creates a String with some information about this SampleModel.
    * @return A String describing this SampleModel.
@@ -579,7 +579,7 @@ public class SinglePixelPackedSampleModel extends SampleModel
       result.append(", mask[").append(i).append("]=0x").append(
           Integer.toHexString(bitMasks[i]));
     }
-    
+
     result.append("]");
     return result.toString();
   }
diff --git a/libjava/classpath/java/awt/image/TileObserver.java b/libjava/classpath/java/awt/image/TileObserver.java
index 99aafbc..769888e 100644
--- a/libjava/classpath/java/awt/image/TileObserver.java
+++ b/libjava/classpath/java/awt/image/TileObserver.java
@@ -1,4 +1,4 @@
-/* TileObserver.java -- 
+/* TileObserver.java --
    Copyright (C) 2002 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
diff --git a/libjava/classpath/java/awt/image/WritableRaster.java b/libjava/classpath/java/awt/image/WritableRaster.java
index 02789a3..68774f7 100644
--- a/libjava/classpath/java/awt/image/WritableRaster.java
+++ b/libjava/classpath/java/awt/image/WritableRaster.java
@@ -42,30 +42,30 @@ import java.awt.Rectangle;
 
 /**
  * A raster with methods to support updating pixel values.
- * 
+ *
  * @author Rolf W. Rasmussen (rolfwr@ii.uib.no)
  */
 public class WritableRaster extends Raster
 {
   /**
    * Creates a new <code>WritableRaster</code>.
-   * 
+   *
    * @param sampleModel  the sample model.
    * @param origin  the origin.
    */
-  protected WritableRaster(SampleModel sampleModel, Point origin) 
+  protected WritableRaster(SampleModel sampleModel, Point origin)
   {
     this(sampleModel, sampleModel.createDataBuffer(), origin);
   }
-  
+
   /**
    * Creates a new <code>WritableRaster</code> instance.
-   * 
+   *
    * @param sampleModel  the sample model.
    * @param dataBuffer  the data buffer.
    * @param origin  the origin.
    */
-  protected WritableRaster(SampleModel sampleModel, DataBuffer dataBuffer, 
+  protected WritableRaster(SampleModel sampleModel, DataBuffer dataBuffer,
                            Point origin)
   {
     this(sampleModel, dataBuffer,
@@ -77,14 +77,14 @@ public class WritableRaster extends Raster
 
   /**
    * Creates a new <code>WritableRaster</code> instance.
-   * 
+   *
    * @param sampleModel  the sample model.
    * @param dataBuffer  the data buffer.
    * @param aRegion  the raster's bounds.
    * @param sampleModelTranslate  the translation.
    * @param parent  the parent.
    */
-  protected WritableRaster(SampleModel sampleModel, 
+  protected WritableRaster(SampleModel sampleModel,
                            DataBuffer dataBuffer,
                            Rectangle aRegion,
                            Point sampleModelTranslate,
@@ -95,14 +95,14 @@ public class WritableRaster extends Raster
 
   /**
    * Returns the raster's parent, cast as a {@link WritableRaster}.
-   * 
+   *
    * @return The raster's parent.
    */
   public WritableRaster getWritableParent()
   {
     return (WritableRaster) getParent();
   }
-  
+
   /**
    * @param childMinX
    * @param childMinY
@@ -116,7 +116,7 @@ public class WritableRaster extends Raster
   }
 
   /**
-   * 
+   *
    * @param parentX
    * @param parentY
    * @param w
@@ -130,11 +130,11 @@ public class WritableRaster extends Raster
       int w, int h, int childMinX, int childMinY, int[] bandList)
   {
     // This mirrors the code from the super class
-    
+
     if (parentX < minX || parentX + w > minX + width
         || parentY < minY || parentY + h > minY + height)
       throw new RasterFormatException("Child raster extends beyond parent");
-    
+
     SampleModel sm = (bandList == null) ?
       sampleModel :
       sampleModel.createSubsetSampleModel(bandList);
@@ -147,7 +147,7 @@ public class WritableRaster extends Raster
                                           parentY),
                               this);
   }
-  
+
   public Raster createChild(int parentX, int parentY, int width,
                             int height, int childMinX, int childMinY,
                             int[] bandList)
@@ -155,7 +155,7 @@ public class WritableRaster extends Raster
     if (parentX < minX || parentX + width > minX + this.width
         || parentY < minY || parentY + height > minY + this.height)
       throw new RasterFormatException("Child raster extends beyond parent");
-    
+
     SampleModel sm = (bandList == null) ?
       sampleModel :
       sampleModel.createSubsetSampleModel(bandList);
@@ -169,7 +169,7 @@ public class WritableRaster extends Raster
 
   public void setDataElements(int x, int y, Object inData)
   {
-    sampleModel.setDataElements(x - sampleModelTranslateX, 
+    sampleModel.setDataElements(x - sampleModelTranslateX,
         y - sampleModelTranslateY, inData, dataBuffer);
   }
 
@@ -187,7 +187,7 @@ public class WritableRaster extends Raster
   }
 
   /**
-   * 
+   *
    * @param srcRaster
    */
   public void setRect(Raster srcRaster)
@@ -196,31 +196,31 @@ public class WritableRaster extends Raster
   }
 
   /**
-   * 
+   *
    * @param dx
    * @param dy
    * @param srcRaster
    */
-  public void setRect(int dx, int dy, Raster srcRaster) 
+  public void setRect(int dx, int dy, Raster srcRaster)
   {
     Rectangle targetUnclipped = new Rectangle(srcRaster.getMinX() + dx,
         srcRaster.getMinY() + dy, srcRaster.getWidth(), srcRaster.getHeight());
-        
+
     Rectangle target = getBounds().intersection(targetUnclipped);
 
     if (target.isEmpty()) return;
-    
+
     int sx = target.x - dx;
     int sy = target.y - dy;
-    
+
     // FIXME: Do tests on rasters and use get/set data instead.
-    
+
     /* The JDK documentation seems to imply this implementation.
        (the trucation of higher bits), but an implementation using
        get/setDataElements would be more efficient. None of the
        implementations would do anything sensible when the sample
        models don't match.
-       
+
        But this is probably not the place to consider such
        optimizations.*/
 
@@ -231,13 +231,13 @@ public class WritableRaster extends Raster
   }
 
   /**
-   * Sets the samples for the pixel at (x, y) in the raster to the specified 
-   * values. 
-   * 
+   * Sets the samples for the pixel at (x, y) in the raster to the specified
+   * values.
+   *
    * @param x  the x-coordinate of the pixel.
    * @param y  the y-coordinate of the pixel.
    * @param iArray  the sample values (<code>null</code> not permitted).
-   * 
+   *
    * @throws NullPointerException if <code>iArray</code> is <code>null</code>.
    */
   public void setPixel(int x, int y, int[] iArray)
@@ -247,13 +247,13 @@ public class WritableRaster extends Raster
   }
 
   /**
-   * Sets the samples for the pixel at (x, y) in the raster to the specified 
-   * values. 
-   * 
+   * Sets the samples for the pixel at (x, y) in the raster to the specified
+   * values.
+   *
    * @param x  the x-coordinate of the pixel.
    * @param y  the y-coordinate of the pixel.
    * @param fArray  the sample values (<code>null</code> not permitted).
-   * 
+   *
    * @throws NullPointerException if <code>fArray</code> is <code>null</code>.
    */
   public void setPixel(int x, int y, float[] fArray)
@@ -263,13 +263,13 @@ public class WritableRaster extends Raster
   }
 
   /**
-   * Sets the samples for the pixel at (x, y) in the raster to the specified 
-   * values. 
-   * 
+   * Sets the samples for the pixel at (x, y) in the raster to the specified
+   * values.
+   *
    * @param x  the x-coordinate of the pixel.
    * @param y  the y-coordinate of the pixel.
    * @param dArray  the sample values (<code>null</code> not permitted).
-   * 
+   *
    * @throws NullPointerException if <code>dArray</code> is <code>null</code>.
    */
   public void setPixel(int x, int y, double[] dArray)
@@ -279,17 +279,17 @@ public class WritableRaster extends Raster
   }
 
   /**
-   * Sets the sample values for the pixels in the region specified by 
-   * (x, y, w, h) in the raster.  The array is ordered by pixels (that is, all 
-   * the samples for the first pixel are grouped together, followed by all the 
-   * samples for the second pixel, and so on). 
-   *  
+   * Sets the sample values for the pixels in the region specified by
+   * (x, y, w, h) in the raster.  The array is ordered by pixels (that is, all
+   * the samples for the first pixel are grouped together, followed by all the
+   * samples for the second pixel, and so on).
+   *
    * @param x  the x-coordinate of the top-left pixel.
    * @param y  the y-coordinate of the top-left pixel.
    * @param w  the width of the region of pixels.
    * @param h  the height of the region of pixels.
    * @param iArray  the pixel sample values (<code>null</code> not permitted).
-   * 
+   *
    * @throws NullPointerException if <code>iArray</code> is <code>null</code>.
    */
   public void setPixels(int x, int y, int w, int h, int[] iArray)
@@ -299,17 +299,17 @@ public class WritableRaster extends Raster
   }
 
   /**
-   * Sets the sample values for the pixels in the region specified by 
-   * (x, y, w, h) in the raster.  The array is ordered by pixels (that is, all 
-   * the samples for the first pixel are grouped together, followed by all the 
-   * samples for the second pixel, and so on). 
-   *  
+   * Sets the sample values for the pixels in the region specified by
+   * (x, y, w, h) in the raster.  The array is ordered by pixels (that is, all
+   * the samples for the first pixel are grouped together, followed by all the
+   * samples for the second pixel, and so on).
+   *
    * @param x  the x-coordinate of the top-left pixel.
    * @param y  the y-coordinate of the top-left pixel.
    * @param w  the width of the region of pixels.
    * @param h  the height of the region of pixels.
    * @param fArray  the pixel sample values (<code>null</code> not permitted).
-   * 
+   *
    * @throws NullPointerException if <code>fArray</code> is <code>null</code>.
    */
   public void setPixels(int x, int y, int w, int h, float[] fArray)
@@ -319,17 +319,17 @@ public class WritableRaster extends Raster
   }
 
   /**
-   * Sets the sample values for the pixels in the region specified by 
-   * (x, y, w, h) in the raster.  The array is ordered by pixels (that is, all 
-   * the samples for the first pixel are grouped together, followed by all the 
-   * samples for the second pixel, and so on). 
-   *  
+   * Sets the sample values for the pixels in the region specified by
+   * (x, y, w, h) in the raster.  The array is ordered by pixels (that is, all
+   * the samples for the first pixel are grouped together, followed by all the
+   * samples for the second pixel, and so on).
+   *
    * @param x  the x-coordinate of the top-left pixel.
    * @param y  the y-coordinate of the top-left pixel.
    * @param w  the width of the region of pixels.
    * @param h  the height of the region of pixels.
    * @param dArray  the pixel sample values (<code>null</code> not permitted).
-   * 
+   *
    * @throws NullPointerException if <code>dArray</code> is <code>null</code>.
    */
   public void setPixels(int x, int y, int w, int h, double[] dArray)
@@ -339,11 +339,11 @@ public class WritableRaster extends Raster
   }
 
   /**
-   * Sets the sample value for a band for the pixel at (x, y) in the raster. 
-   * 
+   * Sets the sample value for a band for the pixel at (x, y) in the raster.
+   *
    * @param x  the x-coordinate of the pixel.
    * @param y  the y-coordinate of the pixel.
-   * @param b  the band (in the range <code>0</code> to 
+   * @param b  the band (in the range <code>0</code> to
    *     <code>getNumBands() - 1</code>).
    * @param s  the sample value.
    */
@@ -354,11 +354,11 @@ public class WritableRaster extends Raster
   }
 
   /**
-   * Sets the sample value for a band for the pixel at (x, y) in the raster. 
-   * 
+   * Sets the sample value for a band for the pixel at (x, y) in the raster.
+   *
    * @param x  the x-coordinate of the pixel.
    * @param y  the y-coordinate of the pixel.
-   * @param b  the band (in the range <code>0</code> to 
+   * @param b  the band (in the range <code>0</code> to
    *     <code>getNumBands() - 1</code>).
    * @param s  the sample value.
    */
@@ -369,11 +369,11 @@ public class WritableRaster extends Raster
   }
 
   /**
-   * Sets the sample value for a band for the pixel at (x, y) in the raster. 
-   * 
+   * Sets the sample value for a band for the pixel at (x, y) in the raster.
+   *
    * @param x  the x-coordinate of the pixel.
    * @param y  the y-coordinate of the pixel.
-   * @param b  the band (in the range <code>0</code> to 
+   * @param b  the band (in the range <code>0</code> to
    *     <code>getNumBands() - 1</code>).
    * @param s  the sample value.
    */
@@ -384,17 +384,17 @@ public class WritableRaster extends Raster
   }
 
   /**
-   * Sets the sample values for one band for the pixels in the region 
-   * specified by (x, y, w, h) in the raster. 
-   * 
+   * Sets the sample values for one band for the pixels in the region
+   * specified by (x, y, w, h) in the raster.
+   *
    * @param x  the x-coordinate of the top-left pixel.
    * @param y  the y-coordinate of the top-left pixel.
    * @param w  the width of the region of pixels.
    * @param h  the height of the region of pixels.
-   * @param b  the band (in the range <code>0</code> to 
+   * @param b  the band (in the range <code>0</code> to
    *     </code>getNumBands() - 1</code>).
    * @param iArray  the sample values (<code>null</code> not permitted).
-   * 
+   *
    * @throws NullPointerException if <code>iArray</code> is <code>null</code>.
    */
   public void setSamples(int x, int y, int w, int h, int b,
@@ -405,17 +405,17 @@ public class WritableRaster extends Raster
   }
 
   /**
-   * Sets the sample values for one band for the pixels in the region 
-   * specified by (x, y, w, h) in the raster. 
-   * 
+   * Sets the sample values for one band for the pixels in the region
+   * specified by (x, y, w, h) in the raster.
+   *
    * @param x  the x-coordinate of the top-left pixel.
    * @param y  the y-coordinate of the top-left pixel.
    * @param w  the width of the region of pixels.
    * @param h  the height of the region of pixels.
-   * @param b  the band (in the range <code>0</code> to 
+   * @param b  the band (in the range <code>0</code> to
    *     </code>getNumBands() - 1</code>).
    * @param fArray  the sample values (<code>null</code> not permitted).
-   * 
+   *
    * @throws NullPointerException if <code>fArray</code> is <code>null</code>.
    */
   public void setSamples(int x, int y, int w, int h, int b,
@@ -426,17 +426,17 @@ public class WritableRaster extends Raster
   }
 
   /**
-   * Sets the sample values for one band for the pixels in the region 
-   * specified by (x, y, w, h) in the raster. 
-   * 
+   * Sets the sample values for one band for the pixels in the region
+   * specified by (x, y, w, h) in the raster.
+   *
    * @param x  the x-coordinate of the top-left pixel.
    * @param y  the y-coordinate of the top-left pixel.
    * @param w  the width of the region of pixels.
    * @param h  the height of the region of pixels.
-   * @param b  the band (in the range <code>0</code> to 
+   * @param b  the band (in the range <code>0</code> to
    *     </code>getNumBands() - 1</code>).
    * @param dArray  the sample values (<code>null</code> not permitted).
-   * 
+   *
    * @throws NullPointerException if <code>dArray</code> is <code>null</code>.
    */
   public void setSamples(int x, int y, int w, int h, int b,
diff --git a/libjava/classpath/java/awt/image/WritableRenderedImage.java b/libjava/classpath/java/awt/image/WritableRenderedImage.java
index 4ed9f10..9142fe0 100644
--- a/libjava/classpath/java/awt/image/WritableRenderedImage.java
+++ b/libjava/classpath/java/awt/image/WritableRenderedImage.java
@@ -1,4 +1,4 @@
-/* WritableRenderedImage.java -- 
+/* WritableRenderedImage.java --
    Copyright (C) 2002 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
diff --git a/libjava/classpath/java/awt/image/renderable/ContextualRenderedImageFactory.java b/libjava/classpath/java/awt/image/renderable/ContextualRenderedImageFactory.java
index 729d857..8852bef 100644
--- a/libjava/classpath/java/awt/image/renderable/ContextualRenderedImageFactory.java
+++ b/libjava/classpath/java/awt/image/renderable/ContextualRenderedImageFactory.java
@@ -1,4 +1,4 @@
-/* ContextualRenderedImageFactory.java -- 
+/* ContextualRenderedImageFactory.java --
    Copyright (C) 2002 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
diff --git a/libjava/classpath/java/awt/image/renderable/ParameterBlock.java b/libjava/classpath/java/awt/image/renderable/ParameterBlock.java
index e484d6b..f380778 100644
--- a/libjava/classpath/java/awt/image/renderable/ParameterBlock.java
+++ b/libjava/classpath/java/awt/image/renderable/ParameterBlock.java
@@ -1,4 +1,4 @@
-/* ParameterBlock.java -- 
+/* ParameterBlock.java --
    Copyright (C) 2002 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
diff --git a/libjava/classpath/java/awt/image/renderable/RenderContext.java b/libjava/classpath/java/awt/image/renderable/RenderContext.java
index 67f0b8a..8017c1a 100644
--- a/libjava/classpath/java/awt/image/renderable/RenderContext.java
+++ b/libjava/classpath/java/awt/image/renderable/RenderContext.java
@@ -1,4 +1,4 @@
-/* RenderContext.java -- 
+/* RenderContext.java --
    Copyright (C) 2002 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
diff --git a/libjava/classpath/java/awt/image/renderable/RenderableImage.java b/libjava/classpath/java/awt/image/renderable/RenderableImage.java
index c2f6ad8..31767af 100644
--- a/libjava/classpath/java/awt/image/renderable/RenderableImage.java
+++ b/libjava/classpath/java/awt/image/renderable/RenderableImage.java
@@ -1,4 +1,4 @@
-/* RenderableImage.java -- 
+/* RenderableImage.java --
    Copyright (C) 2002 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -45,7 +45,7 @@ import java.util.Vector;
 public interface RenderableImage
 {
   String HINTS_OBSERVED = "HINTS_OBSERVED";
-  
+
   Vector<RenderableImage> getSources();
   Object getProperty(String name);
   String[] getPropertyNames();
@@ -59,4 +59,3 @@ public interface RenderableImage
   RenderedImage createRendering(RenderContext context);
 
 } // interface RenderableImage
-
diff --git a/libjava/classpath/java/awt/image/renderable/RenderableImageOp.java b/libjava/classpath/java/awt/image/renderable/RenderableImageOp.java
index b9d0cd3..81e537c 100644
--- a/libjava/classpath/java/awt/image/renderable/RenderableImageOp.java
+++ b/libjava/classpath/java/awt/image/renderable/RenderableImageOp.java
@@ -1,4 +1,4 @@
-/* RenderableImageOp.java -- 
+/* RenderableImageOp.java --
    Copyright (C) 2002 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
diff --git a/libjava/classpath/java/awt/image/renderable/RenderableImageProducer.java b/libjava/classpath/java/awt/image/renderable/RenderableImageProducer.java
index d8cca65..bd3b507 100644
--- a/libjava/classpath/java/awt/image/renderable/RenderableImageProducer.java
+++ b/libjava/classpath/java/awt/image/renderable/RenderableImageProducer.java
@@ -1,4 +1,4 @@
-/* RenderableImageProducer.java -- 
+/* RenderableImageProducer.java --
    Copyright (C) 2002, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
diff --git a/libjava/classpath/java/awt/image/renderable/RenderedImageFactory.java b/libjava/classpath/java/awt/image/renderable/RenderedImageFactory.java
index 6ff4cb0..ea2bd69 100644
--- a/libjava/classpath/java/awt/image/renderable/RenderedImageFactory.java
+++ b/libjava/classpath/java/awt/image/renderable/RenderedImageFactory.java
@@ -1,4 +1,4 @@
-/* RenderedImageFactory.java -- 
+/* RenderedImageFactory.java --
    Copyright (C) 2002 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
diff --git a/libjava/classpath/java/awt/peer/ButtonPeer.java b/libjava/classpath/java/awt/peer/ButtonPeer.java
index a55fc22..6e2510f 100644
--- a/libjava/classpath/java/awt/peer/ButtonPeer.java
+++ b/libjava/classpath/java/awt/peer/ButtonPeer.java
@@ -41,6 +41,5 @@ package java.awt.peer;
 public interface ButtonPeer extends ComponentPeer
 {
   void setLabel (String label);
-  
-} // interface ButtonPeer
 
+} // interface ButtonPeer
diff --git a/libjava/classpath/java/awt/peer/CanvasPeer.java b/libjava/classpath/java/awt/peer/CanvasPeer.java
index 4b33835..241a0e4 100644
--- a/libjava/classpath/java/awt/peer/CanvasPeer.java
+++ b/libjava/classpath/java/awt/peer/CanvasPeer.java
@@ -41,5 +41,4 @@ package java.awt.peer;
 public interface CanvasPeer extends ComponentPeer
 {
 
-} // interface CanvasPeer 
-
+} // interface CanvasPeer
diff --git a/libjava/classpath/java/awt/peer/CheckboxMenuItemPeer.java b/libjava/classpath/java/awt/peer/CheckboxMenuItemPeer.java
index 5213dc9..3cc8f72 100644
--- a/libjava/classpath/java/awt/peer/CheckboxMenuItemPeer.java
+++ b/libjava/classpath/java/awt/peer/CheckboxMenuItemPeer.java
@@ -41,6 +41,5 @@ package java.awt.peer;
 public interface CheckboxMenuItemPeer extends MenuItemPeer
 {
   void setState (boolean state);
-  
-} // interface CheckboxMenuItemPeer
 
+} // interface CheckboxMenuItemPeer
diff --git a/libjava/classpath/java/awt/peer/CheckboxPeer.java b/libjava/classpath/java/awt/peer/CheckboxPeer.java
index 8b23b3f..6396148 100644
--- a/libjava/classpath/java/awt/peer/CheckboxPeer.java
+++ b/libjava/classpath/java/awt/peer/CheckboxPeer.java
@@ -49,4 +49,3 @@ public interface CheckboxPeer extends ComponentPeer
   void setState (boolean state);
 
 } // interface CheckboxPeer
-
diff --git a/libjava/classpath/java/awt/peer/ChoicePeer.java b/libjava/classpath/java/awt/peer/ChoicePeer.java
index 8ed1107..3605a97 100644
--- a/libjava/classpath/java/awt/peer/ChoicePeer.java
+++ b/libjava/classpath/java/awt/peer/ChoicePeer.java
@@ -48,7 +48,6 @@ public interface ChoicePeer extends ComponentPeer
 
   void removeAll();
 
-  void select (int index);  
-
-} // interface ChoicePeer 
+  void select (int index);
 
+} // interface ChoicePeer
diff --git a/libjava/classpath/java/awt/peer/ComponentPeer.java b/libjava/classpath/java/awt/peer/ComponentPeer.java
index b498ddf..736cdf3 100644
--- a/libjava/classpath/java/awt/peer/ComponentPeer.java
+++ b/libjava/classpath/java/awt/peer/ComponentPeer.java
@@ -77,7 +77,7 @@ public interface ComponentPeer
    *
    * @return a bitwise ORed set of ImageObserver flags
    */
-  int checkImage(Image img, int width, int height, 
+  int checkImage(Image img, int width, int height,
                  ImageObserver ob);
 
   /**
@@ -187,7 +187,7 @@ public interface ComponentPeer
 
   /**
    * Handles the given event. This is called from
-   * {@link Component#dispatchEvent(AWTEvent)} to give the peer a chance to 
+   * {@link Component#dispatchEvent(AWTEvent)} to give the peer a chance to
    * react to events for the component.
    *
    * @param e the event
@@ -203,7 +203,7 @@ public interface ComponentPeer
   /**
    * Returns <code>true</code> if the component can receive keyboard input
    * focus. This is called from {@link Component#isFocusTraversable()}.
-   * 
+   *
    * @specnote Part of the earlier 1.1 API, replaced by isFocusable().
    */
   boolean isFocusTraversable();
@@ -247,7 +247,7 @@ public interface ComponentPeer
    *         receives updates)
    */
   boolean prepareImage(Image img, int width, int height,
-			      ImageObserver ob);
+                              ImageObserver ob);
 
   void print(Graphics graphics);
 
@@ -267,7 +267,7 @@ public interface ComponentPeer
    * Requests that this component receives the focus. This is called from
    * {@link Component#requestFocus()}.
    *
-   * @specnote Part of the earlier 1.1 API, apparently replaced by argument 
+   * @specnote Part of the earlier 1.1 API, apparently replaced by argument
    *           form of the same method.
    */
   void requestFocus();
@@ -369,7 +369,7 @@ public interface ComponentPeer
    */
   void show();
 
-  /** 
+  /**
    * Get the graphics configuration of the component. The color model
    * of the component can be derived from the configuration.
    *
@@ -476,10 +476,10 @@ public interface ComponentPeer
    * @since 1.2
    */
   void destroyBuffers();
-  
+
   /**
    * Get the bounds of this component peer.
-   * 
+   *
    * @return component peer bounds
    * @since 1.5
    */
@@ -487,15 +487,15 @@ public interface ComponentPeer
 
   /**
    * Reparent this component under another container.
-   * 
+   *
    * @param parent
    * @since 1.5
    */
   void reparent(ContainerPeer parent);
-  
+
   /**
    * Set the bounds of this component peer.
-   * 
+   *
    * @param x the new x co-ordinate
    * @param y the new y co-ordinate
    * @param width the new width
@@ -504,10 +504,10 @@ public interface ComponentPeer
    * @since 1.5
    */
   void setBounds (int x, int y, int width, int height, int z);
-  
+
   /**
    * Check if this component supports being reparented.
-   * 
+   *
    * @return true if this component can be reparented,
    * false otherwise.
    * @since 1.5
diff --git a/libjava/classpath/java/awt/peer/ContainerPeer.java b/libjava/classpath/java/awt/peer/ContainerPeer.java
index 76673a1..497abdc 100644
--- a/libjava/classpath/java/awt/peer/ContainerPeer.java
+++ b/libjava/classpath/java/awt/peer/ContainerPeer.java
@@ -54,10 +54,10 @@ public interface ContainerPeer extends ComponentPeer
   void endLayout();
 
   boolean isPaintPending();
-  
+
   /**
    * Check if this container peer can be restacked.
-   * 
+   *
    * @return true if this container peer supports being restacked, false otherwise
    * @since 1.5
    */
@@ -65,7 +65,7 @@ public interface ContainerPeer extends ComponentPeer
 
   /**
    * Cancel a pending paint event on a region of this container.
-   * 
+   *
    * @param x the x co-ordinate of the region
    * @param y the y co-ordinate of the region
    * @param width the width of the region
@@ -73,12 +73,11 @@ public interface ContainerPeer extends ComponentPeer
    * @since 1.5
    */
   void cancelPendingPaint(int x, int y, int width, int height);
-  
+
   /**
    * Restack the component peers in this container peer.
-   * 
+   *
    * @since 1.5
    */
   void restack();
-} // interface ContainerPeer 
-
+} // interface ContainerPeer
diff --git a/libjava/classpath/java/awt/peer/DesktopPeer.java b/libjava/classpath/java/awt/peer/DesktopPeer.java
index 355d293..626ea84 100644
--- a/libjava/classpath/java/awt/peer/DesktopPeer.java
+++ b/libjava/classpath/java/awt/peer/DesktopPeer.java
@@ -55,10 +55,10 @@ public interface DesktopPeer
   public boolean isSupported(Action action);
 
   public void mail(URI mailtoURL) throws IOException;
-  
+
   public void mail() throws IOException;
 
   public void open(File file) throws IOException;
-  
+
   public void print(File file) throws IOException;
 }
diff --git a/libjava/classpath/java/awt/peer/DialogPeer.java b/libjava/classpath/java/awt/peer/DialogPeer.java
index e26d64f..b0963ec 100644
--- a/libjava/classpath/java/awt/peer/DialogPeer.java
+++ b/libjava/classpath/java/awt/peer/DialogPeer.java
@@ -44,5 +44,4 @@ public interface DialogPeer extends WindowPeer
 
   void setTitle (String title);
 
-} // interface DialogPeer 
-
+} // interface DialogPeer
diff --git a/libjava/classpath/java/awt/peer/FileDialogPeer.java b/libjava/classpath/java/awt/peer/FileDialogPeer.java
index 7db1798..608b9c5d 100644
--- a/libjava/classpath/java/awt/peer/FileDialogPeer.java
+++ b/libjava/classpath/java/awt/peer/FileDialogPeer.java
@@ -48,5 +48,4 @@ public interface FileDialogPeer extends DialogPeer
 
   void setFilenameFilter (FilenameFilter ff);
 
-} // interface FileDialogPeer 
-
+} // interface FileDialogPeer
diff --git a/libjava/classpath/java/awt/peer/FontPeer.java b/libjava/classpath/java/awt/peer/FontPeer.java
index f0ba6d8..388e561 100644
--- a/libjava/classpath/java/awt/peer/FontPeer.java
+++ b/libjava/classpath/java/awt/peer/FontPeer.java
@@ -42,4 +42,3 @@ public interface FontPeer
 {
 
 } // interface FontPeer
-
diff --git a/libjava/classpath/java/awt/peer/FramePeer.java b/libjava/classpath/java/awt/peer/FramePeer.java
index 9297914..f002368 100644
--- a/libjava/classpath/java/awt/peer/FramePeer.java
+++ b/libjava/classpath/java/awt/peer/FramePeer.java
@@ -51,19 +51,19 @@ public interface FramePeer extends WindowPeer
   int getState();
   void setState(int state);
   void setMaximizedBounds(Rectangle r);
-  
+
   /**
    * Check if this frame peer supports being restacked.
-   * 
+   *
    * @return true if this frame peer can be restacked,
    * false otherwise
    * @since 1.5
    */
   boolean isRestackSupported();
-  
+
   /**
    * Sets the bounds of this frame peer.
-   * 
+   *
    * @param x the new x co-ordinate
    * @param y the new y co-ordinate
    * @param width the new width
@@ -75,4 +75,3 @@ public interface FramePeer extends WindowPeer
   Rectangle getBoundsPrivate();
 
 } // interface FramePeer
-
diff --git a/libjava/classpath/java/awt/peer/LabelPeer.java b/libjava/classpath/java/awt/peer/LabelPeer.java
index d0fca46..b0c5c34 100644
--- a/libjava/classpath/java/awt/peer/LabelPeer.java
+++ b/libjava/classpath/java/awt/peer/LabelPeer.java
@@ -42,5 +42,4 @@ public interface LabelPeer extends ComponentPeer
 {
   void setAlignment(int alignment);
   void setText(String text);
-} // interface LabelPeer 
-
+} // interface LabelPeer
diff --git a/libjava/classpath/java/awt/peer/LightweightPeer.java b/libjava/classpath/java/awt/peer/LightweightPeer.java
index 93cad7a..38333b0 100644
--- a/libjava/classpath/java/awt/peer/LightweightPeer.java
+++ b/libjava/classpath/java/awt/peer/LightweightPeer.java
@@ -42,4 +42,3 @@ public interface LightweightPeer extends ComponentPeer
 {
 
 } // interface LightweightPeer
-
diff --git a/libjava/classpath/java/awt/peer/ListPeer.java b/libjava/classpath/java/awt/peer/ListPeer.java
index c0f765d..55ff929 100644
--- a/libjava/classpath/java/awt/peer/ListPeer.java
+++ b/libjava/classpath/java/awt/peer/ListPeer.java
@@ -57,5 +57,4 @@ public interface ListPeer extends ComponentPeer
   void setMultipleSelections(boolean multi);
   Dimension getPreferredSize(int s);
   Dimension getMinimumSize(int s);
-} // interface ListPeer 
-
+} // interface ListPeer
diff --git a/libjava/classpath/java/awt/peer/MenuBarPeer.java b/libjava/classpath/java/awt/peer/MenuBarPeer.java
index 44e37e2..ae43af3 100644
--- a/libjava/classpath/java/awt/peer/MenuBarPeer.java
+++ b/libjava/classpath/java/awt/peer/MenuBarPeer.java
@@ -45,5 +45,4 @@ public interface MenuBarPeer extends MenuComponentPeer
   void addMenu(Menu m);
   void addHelpMenu(Menu menu);
   void delMenu(int index);
-} // interface MenuBarPeer 
-
+} // interface MenuBarPeer
diff --git a/libjava/classpath/java/awt/peer/MenuComponentPeer.java b/libjava/classpath/java/awt/peer/MenuComponentPeer.java
index bfd3414..7369aa5 100644
--- a/libjava/classpath/java/awt/peer/MenuComponentPeer.java
+++ b/libjava/classpath/java/awt/peer/MenuComponentPeer.java
@@ -1,4 +1,4 @@
-/* MenuComponentPeer.java -- 
+/* MenuComponentPeer.java --
    Copyright (C) 1999 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -43,13 +43,12 @@ import java.awt.Font;
 public interface MenuComponentPeer
 {
   void dispose();
-  
+
   /**
    * Set the font on this menu component peer.
-   * 
+   *
    * @param font the new font
    * @since 1.5
    */
   void setFont (Font font);
 } // interface MenuComponentPeer
-
diff --git a/libjava/classpath/java/awt/peer/MenuItemPeer.java b/libjava/classpath/java/awt/peer/MenuItemPeer.java
index 3ba1027..bedbd9f9 100644
--- a/libjava/classpath/java/awt/peer/MenuItemPeer.java
+++ b/libjava/classpath/java/awt/peer/MenuItemPeer.java
@@ -44,5 +44,4 @@ public interface MenuItemPeer extends MenuComponentPeer
   void enable();
   void setEnabled(boolean enabled);
   void setLabel(String text);
-} // interface MenuItemPeer 
-
+} // interface MenuItemPeer
diff --git a/libjava/classpath/java/awt/peer/MenuPeer.java b/libjava/classpath/java/awt/peer/MenuPeer.java
index 91d0f0d..e1f7a90 100644
--- a/libjava/classpath/java/awt/peer/MenuPeer.java
+++ b/libjava/classpath/java/awt/peer/MenuPeer.java
@@ -46,4 +46,3 @@ public interface MenuPeer extends MenuItemPeer
   void addSeparator ();
   void delItem (int index);
 }
-
diff --git a/libjava/classpath/java/awt/peer/MouseInfoPeer.java b/libjava/classpath/java/awt/peer/MouseInfoPeer.java
index e9923a6..71d2941 100644
--- a/libjava/classpath/java/awt/peer/MouseInfoPeer.java
+++ b/libjava/classpath/java/awt/peer/MouseInfoPeer.java
@@ -51,11 +51,11 @@ public interface MouseInfoPeer
   /**
    * Get the mouse pointer coordinates and store them in p (obviously non-null)
    * returns the index of the current screen device of the mouse.
-   */ 
+   */
   public int fillPointWithCoords(Point p);
 
   /**
    * Returns whether a given Window is under the mouse.
-   */ 
+   */
   public boolean isWindowUnderMouse(Window w);
-} 
+}
diff --git a/libjava/classpath/java/awt/peer/PanelPeer.java b/libjava/classpath/java/awt/peer/PanelPeer.java
index 192632e..a72b16c 100644
--- a/libjava/classpath/java/awt/peer/PanelPeer.java
+++ b/libjava/classpath/java/awt/peer/PanelPeer.java
@@ -42,4 +42,3 @@ public interface PanelPeer extends ContainerPeer
 {
 
 } // interface PanelPeer
-
diff --git a/libjava/classpath/java/awt/peer/PopupMenuPeer.java b/libjava/classpath/java/awt/peer/PopupMenuPeer.java
index 2e8f4bb..e747a4d 100644
--- a/libjava/classpath/java/awt/peer/PopupMenuPeer.java
+++ b/libjava/classpath/java/awt/peer/PopupMenuPeer.java
@@ -50,4 +50,3 @@ public interface PopupMenuPeer extends MenuPeer
 
   void show (Event e);
 } // interface PopupMenuPeer
-
diff --git a/libjava/classpath/java/awt/peer/RobotPeer.java b/libjava/classpath/java/awt/peer/RobotPeer.java
index a11bfc7..46c0086 100644
--- a/libjava/classpath/java/awt/peer/RobotPeer.java
+++ b/libjava/classpath/java/awt/peer/RobotPeer.java
@@ -53,4 +53,3 @@ public interface RobotPeer
   void dispose();
 
 } // interface RobotPeer
-
diff --git a/libjava/classpath/java/awt/peer/ScrollPanePeer.java b/libjava/classpath/java/awt/peer/ScrollPanePeer.java
index de4331e..afbd2f8 100644
--- a/libjava/classpath/java/awt/peer/ScrollPanePeer.java
+++ b/libjava/classpath/java/awt/peer/ScrollPanePeer.java
@@ -49,4 +49,3 @@ public interface ScrollPanePeer extends ContainerPeer
   void setUnitIncrement(Adjustable item, int inc);
   void setValue(Adjustable item, int value);
 } // interface ScollPanePeer
-
diff --git a/libjava/classpath/java/awt/peer/ScrollbarPeer.java b/libjava/classpath/java/awt/peer/ScrollbarPeer.java
index fe4f24d..4191a39 100644
--- a/libjava/classpath/java/awt/peer/ScrollbarPeer.java
+++ b/libjava/classpath/java/awt/peer/ScrollbarPeer.java
@@ -43,5 +43,4 @@ public interface ScrollbarPeer extends ComponentPeer
   void setLineIncrement(int inc);
   void setPageIncrement(int inc);
   void setValues(int value, int visible, int min, int max);
-} // interface ScrollbarPeer 
-
+} // interface ScrollbarPeer
diff --git a/libjava/classpath/java/awt/peer/TextComponentPeer.java b/libjava/classpath/java/awt/peer/TextComponentPeer.java
index f807299..57f0fd2 100644
--- a/libjava/classpath/java/awt/peer/TextComponentPeer.java
+++ b/libjava/classpath/java/awt/peer/TextComponentPeer.java
@@ -54,13 +54,12 @@ public interface TextComponentPeer extends ComponentPeer
   int getIndexAtPoint(int x, int y);
   Rectangle getCharacterBounds(int pos);
   long filterEvents(long filter);
-  
+
   /**
    * Retrieve this text component peer's input method requests.
-   * 
+   *
    * @return the input method requests made by this text component peer
    * @since 1.5
    */
   InputMethodRequests getInputMethodRequests();
-} // interface TextComponentPeer 
-
+} // interface TextComponentPeer
diff --git a/libjava/classpath/java/awt/peer/TextFieldPeer.java b/libjava/classpath/java/awt/peer/TextFieldPeer.java
index e68d666..55c673a 100644
--- a/libjava/classpath/java/awt/peer/TextFieldPeer.java
+++ b/libjava/classpath/java/awt/peer/TextFieldPeer.java
@@ -47,6 +47,5 @@ public interface TextFieldPeer extends TextComponentPeer
   Dimension getMinimumSize(int len);
   Dimension getPreferredSize(int len);
   void setEchoChar(char echo_char);
-  void setEchoCharacter(char echo_char);  
-} // interface TextFieldPeer 
-
+  void setEchoCharacter(char echo_char);
+} // interface TextFieldPeer
diff --git a/libjava/classpath/java/awt/peer/WindowPeer.java b/libjava/classpath/java/awt/peer/WindowPeer.java
index e8b7d72..3ca13a2 100644
--- a/libjava/classpath/java/awt/peer/WindowPeer.java
+++ b/libjava/classpath/java/awt/peer/WindowPeer.java
@@ -44,17 +44,17 @@ public interface WindowPeer extends ContainerPeer
 {
   void toBack();
   void toFront();
-  
+
   /**
    * Update the always-on-top status of the Window.
    *
    * @since 1.5
    */
   void updateAlwaysOnTop();
-  
+
   /**
    * Request that this window peer be given the window focus.
-   * 
+   *
    * @return true if the window received focus, false otherwise
    * @since 1.5
    */
@@ -66,5 +66,4 @@ public interface WindowPeer extends ContainerPeer
   void updateMinimumSize();
   void updateIconImages();
 
-} // interface WindowPeer 
-
+} // interface WindowPeer
diff --git a/libjava/classpath/java/awt/print/Book.java b/libjava/classpath/java/awt/print/Book.java
index b084a17..8b040b2 100644
--- a/libjava/classpath/java/awt/print/Book.java
+++ b/libjava/classpath/java/awt/print/Book.java
@@ -135,8 +135,8 @@ public class Book implements Pageable
   {
     for (int i = 0; i < num_pages; i++)
       {
-	printables.addElement(printable);
-	page_formats.addElement(page_format);
+        printables.addElement(printable);
+        page_formats.addElement(page_format);
       }
   }
 
diff --git a/libjava/classpath/java/awt/print/PageFormat.java b/libjava/classpath/java/awt/print/PageFormat.java
index 0a8aa3e..86d8ba2 100644
--- a/libjava/classpath/java/awt/print/PageFormat.java
+++ b/libjava/classpath/java/awt/print/PageFormat.java
@@ -41,7 +41,7 @@ package java.awt.print;
 /**
  * This class contains information about the desired page format to use for
  * printing a particular set of pages.
- * 
+ *
  * @author Aaron M. Renn (arenn@urbanophile.com)
  */
 public class PageFormat
@@ -61,9 +61,9 @@ public class PageFormat
 
   /**
    * A constant for a reversed landscaped page orientation. This is the
-   * orientation used by Macintosh's for landscape. The origin is in the 
-   * upper right hand corner instead of the upper left. The X and Y axes 
-   * are reversed. Used by <code>getOrientation</code> and 
+   * orientation used by Macintosh's for landscape. The origin is in the
+   * upper right hand corner instead of the upper left. The X and Y axes
+   * are reversed. Used by <code>getOrientation</code> and
    * <code>setOrientation</code>.
    */
   public static final int REVERSE_LANDSCAPE = 2;
@@ -87,7 +87,7 @@ public class PageFormat
   /**
    * This method returns the width of the page, in 1/72nd's of an inch. The
    * "width" measured depends on orientation.
-   * 
+   *
    * @return The width of the page.
    */
   public double getWidth()
@@ -98,7 +98,7 @@ public class PageFormat
   /**
    * This method returns the height of the page, in 1/72nd's of an inch. The
    * "height" measured depends on the orientation.
-   * 
+   *
    * @return The height of the page.
    */
   public double getHeight()
@@ -109,7 +109,7 @@ public class PageFormat
   /**
    * This method returns the X coordinate value of the upper leftmost drawable
    * area of the paper.
-   * 
+   *
    * @return The upper leftmost imageable X coordinate.
    */
   public double getImageableX()
@@ -120,7 +120,7 @@ public class PageFormat
   /**
    * This method returns the Y coordinate value of the upper leftmost drawable
    * area of the paper.
-   * 
+   *
    * @return The upper leftmost imageable Y coordinate.
    */
   public double getImageableY()
@@ -131,7 +131,7 @@ public class PageFormat
   /**
    * This method returns the imageable width of the paper, in 1/72nd's of an
    * inch.
-   * 
+   *
    * @return The imageable width of the paper.
    */
   public double getImageableWidth()
@@ -142,7 +142,7 @@ public class PageFormat
   /**
    * This method returns the imageable height of the paper, in 1/72nd's of an
    * inch.
-   * 
+   *
    * @return The imageable height of the paper.
    */
   public double getImageableHeight()
@@ -153,7 +153,7 @@ public class PageFormat
   /**
    * Returns a copy of the <code>paper</code> object being used for this page
    * format.
-   * 
+   *
    * @return A copy of the <code>Paper</code> object for this format.
    */
   public Paper getPaper()
@@ -163,7 +163,7 @@ public class PageFormat
 
   /**
    * Sets the <code>Paper</code> object to be used by this page format.
-   * 
+   *
    * @param paper The new <code>Paper</code> object for this page format.
    */
   public void setPaper(Paper paper)
@@ -174,7 +174,7 @@ public class PageFormat
   /**
    * This method returns the current page orientation. The value returned will
    * be one of the page orientation constants from this class.
-   * 
+   *
    * @return The current page orientation.
    */
   public int getOrientation()
@@ -184,11 +184,11 @@ public class PageFormat
 
   /**
    * This method sets the page orientation for this format to the specified
-   * value. It must be one of the page orientation constants from this class 
+   * value. It must be one of the page orientation constants from this class
    * or an exception will be thrown.
-   * 
+   *
    * @param orientation The new page orientation.
-   * @exception IllegalArgumentException If the specified page orientation 
+   * @exception IllegalArgumentException If the specified page orientation
    *            value is not one of the constants from this class.
    */
   public void setOrientation(int orientation) throws IllegalArgumentException
@@ -203,9 +203,9 @@ public class PageFormat
 
   /**
    * This method returns a matrix used for transforming user space coordinates
-   * to page coordinates. The value returned will be six doubles as described 
+   * to page coordinates. The value returned will be six doubles as described
    * in <code>java.awt.geom.AffineTransform</code>.
-   * 
+   *
    * @return The transformation matrix for this page format.
    */
   public double[] getMatrix()
diff --git a/libjava/classpath/java/awt/print/Pageable.java b/libjava/classpath/java/awt/print/Pageable.java
index d61195a..58e0885 100644
--- a/libjava/classpath/java/awt/print/Pageable.java
+++ b/libjava/classpath/java/awt/print/Pageable.java
@@ -40,7 +40,7 @@ package java.awt.print;
 
 /**
  * This interface represents pages that are to be printed.
- * 
+ *
  * @author Aaron M. Renn (arenn@urbanophile.com)
  */
 public interface Pageable
@@ -53,9 +53,9 @@ public interface Pageable
 
   /**
    * This method returns the number of pages this object contains, or
-   * <code>UNKNOWN_NUMBER_OF_PAGES</code> if it cannot determine the number 
+   * <code>UNKNOWN_NUMBER_OF_PAGES</code> if it cannot determine the number
    * of pages to be printed.
-   * 
+   *
    * @return The number of pages to be printed, or
    *         <code>UNKNOWN_NUMBER_OF_PAGES</code> if this is unknown.
    */
@@ -65,11 +65,11 @@ public interface Pageable
    * This method returns the <code>PageFormat</code> instance for the
    * specified page. Page numbers start at zero. An exception is thrown if the
    * requested page does not exist.
-   * 
+   *
    * @param pageIndex The index of the page to return the
    *          <code>PageFormat</code> for.
    * @return The <code>PageFormat</code> for the requested page.
-   * @exception IndexOutOfBoundsException If the requested page number does 
+   * @exception IndexOutOfBoundsException If the requested page number does
    *            not exist.
    */
   PageFormat getPageFormat(int pageIndex) throws IndexOutOfBoundsException;
@@ -78,11 +78,11 @@ public interface Pageable
    * This method returns the <code>Printable</code> instance for the specified
    * page. Page numbers start at zero. An exception is thrown if the requested
    * page does not exist.
-   * 
-   * @param pageIndex The index of the page to return the 
+   *
+   * @param pageIndex The index of the page to return the
    *        <code>Printable</code> for.
    * @return The <code>Printable</code> for the requested page.
-   * @exception IndexOutOfBoundsException If the requested page number does 
+   * @exception IndexOutOfBoundsException If the requested page number does
    *            not exist.
    */
   Printable getPrintable(int pageIndex) throws IndexOutOfBoundsException;
diff --git a/libjava/classpath/java/awt/print/Paper.java b/libjava/classpath/java/awt/print/Paper.java
index fb7ba91..a80da2f 100644
--- a/libjava/classpath/java/awt/print/Paper.java
+++ b/libjava/classpath/java/awt/print/Paper.java
@@ -40,7 +40,7 @@ package java.awt.print;
 
 /**
  * This class describes a particular type of paper.
- * 
+ *
  * @author Aaron M. Renn (arenn@urbanophile.com)
  */
 public class Paper
@@ -79,7 +79,7 @@ public class Paper
 
   /**
    * This method returns the height of the paper in 1/72nds of an inch.
-   * 
+   *
    * @return The height of the paper in 1/72nds of an inch.
    */
   public double getHeight()
@@ -89,7 +89,7 @@ public class Paper
 
   /**
    * Returns the width of the paper in 1/72nds of an inch.
-   * 
+   *
    * @return The width of the paper in 1/72nds of an inch.
    */
   public double getWidth()
@@ -100,7 +100,7 @@ public class Paper
   /**
    * This method returns the X coordinate of the upper left hand corner of the
    * imageable area of the paper.
-   * 
+   *
    * @return The X coordinate of the upper left hand corner of the imageable
    *         area of the paper.
    */
@@ -112,7 +112,7 @@ public class Paper
   /**
    * This method returns the Y coordinate of the upper left hand corner of the
    * imageable area of the paper.
-   * 
+   *
    * @return The Y coordinate of the upper left hand corner of the imageable
    *         area of the paper.
    */
@@ -123,7 +123,7 @@ public class Paper
 
   /**
    * Returns the width of the imageable area of the paper.
-   * 
+   *
    * @return The width of the imageable area of the paper.
    */
   public double getImageableWidth()
@@ -133,7 +133,7 @@ public class Paper
 
   /**
    * Returns the height of the imageable area of the paper.
-   * 
+   *
    * @return The height of the imageable area of the paper.
    */
   public double getImageableHeight()
@@ -144,7 +144,7 @@ public class Paper
   /**
    * This method sets the size of the paper to the specified width and height,
    * which are specified in 1/72nds of an inch.
-   * 
+   *
    * @param width The width of the paper in 1/72nds of an inch.
    * @param height The height of the paper in 1/72nds of an inch.
    */
@@ -156,9 +156,9 @@ public class Paper
 
   /**
    * This method sets the imageable area of the paper by specifying the
-   * coordinates of the upper left hand corner of that area, and its length 
+   * coordinates of the upper left hand corner of that area, and its length
    * and height. All values are in 1/72nds of an inch.
-   * 
+   *
    * @param imageableX The X coordinate of the upper left hand corner of the
    *          imageable area, in 1/72nds of an inch.
    * @param imageableY The Y coordinate of the upper left hand corner of the
@@ -179,7 +179,7 @@ public class Paper
 
   /**
    * This method creates a copy of this object.
-   * 
+   *
    * @return A copy of this object.
    */
   public Object clone()
diff --git a/libjava/classpath/java/awt/print/PrinterGraphics.java b/libjava/classpath/java/awt/print/PrinterGraphics.java
index 62fde84..c1f199c 100644
--- a/libjava/classpath/java/awt/print/PrinterGraphics.java
+++ b/libjava/classpath/java/awt/print/PrinterGraphics.java
@@ -42,7 +42,7 @@ package java.awt.print;
  * This interface is implemented by the <code>Graphics</code> instance that is
  * used for rendering pages. It provides a hook to return the object that is
  * controlling the print job.
- * 
+ *
  * @author Aaron M. Renn (arenn@urbanophile.com)
  */
 public interface PrinterGraphics
@@ -50,7 +50,7 @@ public interface PrinterGraphics
   /**
    * This method returns the instance of <code>PrinterJob</code> that is
    * controlling this print job.
-   * 
+   *
    * @return The <code>PrinterJob</code> that is controlling this print job.
    */
   PrinterJob getPrinterJob();
diff --git a/libjava/classpath/java/awt/print/PrinterIOException.java b/libjava/classpath/java/awt/print/PrinterIOException.java
index c646acd..2089af5 100644
--- a/libjava/classpath/java/awt/print/PrinterIOException.java
+++ b/libjava/classpath/java/awt/print/PrinterIOException.java
@@ -71,7 +71,7 @@ public class PrinterIOException extends PrinterException
   {
     super(mException == null ? null : mException.toString());
     initCause(mException);
-    this.mException = mException;  
+    this.mException = mException;
   }
 
   /**
@@ -95,4 +95,3 @@ public class PrinterIOException extends PrinterException
     return mException;
   }
 } // class PrinterIOException
-
diff --git a/libjava/classpath/java/awt/print/PrinterJob.java b/libjava/classpath/java/awt/print/PrinterJob.java
index 3715dd2..1a4b8c8 100644
--- a/libjava/classpath/java/awt/print/PrinterJob.java
+++ b/libjava/classpath/java/awt/print/PrinterJob.java
@@ -68,7 +68,7 @@ public abstract class PrinterJob
   }
 
   /**
-   * Initializes a new instance of <code>PrinterJob</code>. 
+   * Initializes a new instance of <code>PrinterJob</code>.
    */
   public PrinterJob()
   {
@@ -163,7 +163,7 @@ public abstract class PrinterJob
     // FIXME: Implement this for real.
     return pageDialog((PageFormat) null);
   }
-  
+
   /**
    * Prints the pages.
    */
@@ -239,7 +239,7 @@ public abstract class PrinterJob
 
   /**
    * Find and return 2D image print services.
-   * 
+   *
    * This is the same as calling PrintServiceLookup.lookupPrintServices()
    * with Pageable service-specified DocFlavor.
    * @return Array of PrintService objects, could be empty.
@@ -250,13 +250,13 @@ public abstract class PrinterJob
     return PrintServiceLookup.lookupPrintServices
       (
        new DocFlavor("application/x-java-jvm-local-objectref",
-		     "java.awt.print.Pageable"),
+                     "java.awt.print.Pageable"),
        null);
   }
 
   /**
    * Find and return 2D image stream print services.
-   * 
+   *
    * This is the same as calling
    * StreamPrintServiceFactory.lookupStreamPrintServices()
    * with Pageable service-specified DocFlavor.
@@ -274,7 +274,7 @@ public abstract class PrinterJob
   /**
    * Return the printer for this job.  If print services aren't supported by
    * the subclass, returns null.
-   * 
+   *
    * @return The associated PrintService.
    * @since 1.4
    */
author	Andrew John Hughes <ahughes@redhat.com>	2011-01-11 19:46:05 +0000
committer	Andrew John Hughes <gandalf@gcc.gnu.org>	2011-01-11 19:46:05 +0000
commit	dc6715320db92089b3c1b046157b56b5680738a5 (patch)
tree	0da7dbb2f6c016ebe1a6d0bf012840bd76da9170 /libjava/classpath/java/awt
parent	9a270ad3c0ba0eb21d09657f8fb3a7786a69ec5d (diff)
download	gcc-dc6715320db92089b3c1b046157b56b5680738a5.zip gcc-dc6715320db92089b3c1b046157b56b5680738a5.tar.gz gcc-dc6715320db92089b3c1b046157b56b5680738a5.tar.bz2